From 1192fd40f3fffb69f46173b1dc15eeddc2180e1b Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 29 Sep 2023 22:38:52 +0200 Subject: [PATCH 1/2] dont call mir.post_mono_checks in codegen --- src/concurrency/thread.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/concurrency/thread.rs b/src/concurrency/thread.rs index ef4e7df3ab..9041683fbc 100644 --- a/src/concurrency/thread.rs +++ b/src/concurrency/thread.rs @@ -803,8 +803,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> { if tcx.is_foreign_item(def_id) { throw_unsup_format!("foreign thread-local statics are not supported"); } - // We don't give a span -- statics don't need that, they cannot be generic or associated. - let allocation = this.ctfe_query(None, |tcx| tcx.eval_static_initializer(def_id))?; + let allocation = this.ctfe_query(|tcx| tcx.eval_static_initializer(def_id))?; let mut allocation = allocation.inner().clone(); // This allocation will be deallocated when the thread dies, so it is not in read-only memory. allocation.mutability = Mutability::Mut; From 71a5e2ba4fea1a426d999344ef69770a508536cc Mon Sep 17 00:00:00 2001 From: The Miri Conjob Bot Date: Sat, 7 Oct 2023 05:01:29 +0000 Subject: [PATCH 2/2] Preparing for merge from rustc --- rust-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-version b/rust-version index dc2601e9e9..8f0a0a045a 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -1bc0463b183392ad4e0ae9c5f7a76630d487230d +4ea5190026dbc1302b644d938e68bc6843cb8b24