Skip to content

Commit 6f4096b

Browse files
committed
Auto merge of #116501 - workingjubilee:rollup-fpzov6m, r=workingjubilee
Rollup of 4 pull requests Successful merges: - #116277 (dont call mir.post_mono_checks in codegen) - #116400 (Detect missing `=>` after match guard during parsing) - #116458 (Properly export function defined in test which uses global_asm!()) - #116500 (Add tvOS to target_os for register_dtor) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 8fa442d + fbc1e55 commit 6f4096b

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/concurrency/thread.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,8 +803,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
803803
if tcx.is_foreign_item(def_id) {
804804
throw_unsup_format!("foreign thread-local statics are not supported");
805805
}
806-
// We don't give a span -- statics don't need that, they cannot be generic or associated.
807-
let allocation = this.ctfe_query(None, |tcx| tcx.eval_static_initializer(def_id))?;
806+
let allocation = this.ctfe_query(|tcx| tcx.eval_static_initializer(def_id))?;
808807
let mut allocation = allocation.inner().clone();
809808
// This allocation will be deallocated when the thread dies, so it is not in read-only memory.
810809
allocation.mutability = Mutability::Mut;

0 commit comments

Comments
 (0)