OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #64100 - wesleywiser:fix_miri_const_eval, r=oli-obk

Browse Source 
Fix const eval bug breaking run-pass tests in Miri

PR #63580 broke miri's ability to run the run-pass test suite with MIR
optimizations enabled. The issue was that we weren't properly handling
the substs and DefId associated with a Promoted value. This didn't break
anything in rustc because in rustc this code runs before the Inliner
pass which is where the DefId and substs can diverge from their initial
values. It broke Miri though because it ran this code again after
running the optimization pass.

r? @oli-obk
cc @RalfJung
This commit is contained in:
Mazdak Farrokhzad 2019-09-05 12:11:17 +02:00 committed by GitHub
commit 23265741d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/librustc_mir/interpret/place.rs
View File

@ -585,8 +585,9 @@ where
use rustc::mir::StaticKind;
Ok(match place_static.kind {
StaticKind::Promoted(promoted, _) => {
let instance = self.frame().instance;
StaticKind::Promoted(promoted, promoted_substs) => {
let substs = self.subst_from_frame_and_normalize_erasing_regions(promoted_substs);
let instance = ty::Instance::new(place_static.def_id, substs);
self.const_eval_raw(GlobalId {
instance,
promoted: Some(promoted),