Skip to content

Commit a44bb29

Browse files
committed
Auto merge of #1507 - rust-lang:get_static, r=RalfJung
Bump for rustc changes rustc-side: rust-lang/rust#75394
2 parents 50f3796 + 2f68a1f commit a44bb29

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c92fc8db8b009b7661cff31fa59a7c0348653bd0
1+
c94ed5ca91f1363b66970ce2cbd6e2773e3cb1d3

src/thread.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
530530
if tcx.is_foreign_item(def_id) {
531531
throw_unsup_format!("foreign thread-local statics are not supported");
532532
}
533-
let allocation = interpret::get_static(*tcx, def_id)?;
533+
let allocation = tcx.eval_static_initializer(def_id)?;
534534
// Create a fresh allocation with this content.
535535
let new_alloc_id = this.memory.allocate_with(allocation.clone(), MiriMemoryKind::Tls.into()).alloc_id;
536536
this.machine.threads.set_thread_local_alloc_id(def_id, new_alloc_id);

0 commit comments

Comments
 (0)