diff --git a/rust-version b/rust-version index 75cd757fcc..c8fd55f4c3 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -c92fc8db8b009b7661cff31fa59a7c0348653bd0 +c94ed5ca91f1363b66970ce2cbd6e2773e3cb1d3 diff --git a/src/thread.rs b/src/thread.rs index 1e710a25ed..cffbec93c5 100644 --- a/src/thread.rs +++ b/src/thread.rs @@ -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);