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

Auto merge of #1507 - rust-lang:get_static, r=RalfJung

Browse Source 
Bump for rustc changes

rustc-side: https://github.com/rust-lang/rust/pull/75394
This commit is contained in:
bors 2020-08-12 07:19:59 +00:00
commit a44bb290f1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust-version
View File

@ -1 +1 @@
c92fc8db8b009b7661cff31fa59a7c0348653bd0
c94ed5ca91f1363b66970ce2cbd6e2773e3cb1d3

2
src/thread.rs
View File

@ -530,7 +530,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
if tcx.is_foreign_item(def_id) {
throw_unsup_format!("foreign thread-local statics are not supported");
}
let allocation = interpret::get_static(*tcx, def_id)?;
let allocation = tcx.eval_static_initializer(def_id)?;
// Create a fresh allocation with this content.
let new_alloc_id = this.memory.allocate_with(allocation.clone(), MiriMemoryKind::Tls.into()).alloc_id;
this.machine.threads.set_thread_local_alloc_id(def_id, new_alloc_id);