diff options
| author | Jubilee <46493976+workingjubilee@users.noreply.github.com> | 2023-10-06 16:37:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-06 16:37:46 -0700 |
| commit | 6d1c3a40cb4ce7b455e44834f79c5ecf39cd5021 (patch) | |
| tree | eab08be69d6bc410f9d64083b1fe394879d884bd /src | |
| parent | 960754090acc9cdd2a5a57586f244c0fc712d26c (diff) | |
| parent | fa248cd9e6927dd6981078963aa47feb941a0d10 (diff) | |
| download | rust-6d1c3a40cb4ce7b455e44834f79c5ecf39cd5021.tar.gz rust-6d1c3a40cb4ce7b455e44834f79c5ecf39cd5021.zip | |
Rollup merge of #116277 - RalfJung:post-mono, r=oli-obk
dont call mir.post_mono_checks in codegen It seems like all tests are still passing when I remove this... let's see what CI says.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/src/concurrency/thread.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/tools/miri/src/concurrency/thread.rs b/src/tools/miri/src/concurrency/thread.rs index ef4e7df3aba..9041683fbc4 100644 --- a/src/tools/miri/src/concurrency/thread.rs +++ b/src/tools/miri/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; |