mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rustup

Browse Source
This commit is contained in:
Ralf Jung 2020-06-01 19:23:54 +02:00
parent a8df047f5c
commit 17dd44ee92
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
5fd2f06e99a985dd896684cb2c9f8c7090eca1ab d3cba254e464303a6495942f3a831c2bbd7f1768

9
src/machine.rs
View File

@ -22,6 +22,7 @@ use rustc_middle::{
}, },
}; };
use rustc_span::symbol::{sym, Symbol}; use rustc_span::symbol::{sym, Symbol};
use rustc_span::def_id::DefId;
use rustc_target::abi::{LayoutOf, Size}; use rustc_target::abi::{LayoutOf, Size};
use crate::*; use crate::*;
@ -416,10 +417,18 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
Ok(()) Ok(())
} }
fn thread_local_alloc_id(
ecx: &mut InterpCx<'mir, 'tcx, Self>,
def_id: DefId,
) -> InterpResult<'tcx, AllocId> {
ecx.get_or_create_thread_local_alloc_id(def_id)
}
fn adjust_global_const( fn adjust_global_const(
ecx: &InterpCx<'mir, 'tcx, Self>, ecx: &InterpCx<'mir, 'tcx, Self>,
mut val: mir::interpret::ConstValue<'tcx>, mut val: mir::interpret::ConstValue<'tcx>,
) -> InterpResult<'tcx, mir::interpret::ConstValue<'tcx>> { ) -> InterpResult<'tcx, mir::interpret::ConstValue<'tcx>> {
// FIXME: Remove this, do The Right Thing in `thread_local_alloc_id` instead.
ecx.remap_thread_local_alloc_ids(&mut val)?; ecx.remap_thread_local_alloc_ids(&mut val)?;
Ok(val) Ok(val)
} }