Skip to content

Commit 401efdc

Browse files
committed
Auto merge of #134305 - matthiaskrgr:rollup-bja3lsz, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #133221 (Add external macros specific diagnostics for check-cfg) - #133386 (Update linux_musl base to dynamically link the crt by default) - #134191 (Make some types and methods related to Polonius + Miri public) - #134227 (Update wasi-sdk used to build WASI targets) - #134279 ((Re-)return adjustment target if adjust kind is never-to-any) - #134295 (Encode coroutine-closures in SMIR) r? `@ghost` `@rustbot` modify labels: rollup
2 parents cbe0700 + 524ebfc commit 401efdc

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/machine.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1571,8 +1571,12 @@ impl<'tcx> Machine<'tcx> for MiriMachine<'tcx> {
15711571
res
15721572
}
15731573

1574-
fn after_local_read(ecx: &InterpCx<'tcx, Self>, local: mir::Local) -> InterpResult<'tcx> {
1575-
if let Some(data_race) = &ecx.frame().extra.data_race {
1574+
fn after_local_read(
1575+
ecx: &InterpCx<'tcx, Self>,
1576+
frame: &Frame<'tcx, Provenance, FrameExtra<'tcx>>,
1577+
local: mir::Local,
1578+
) -> InterpResult<'tcx> {
1579+
if let Some(data_race) = &frame.extra.data_race {
15761580
data_race.local_read(local, &ecx.machine);
15771581
}
15781582
interp_ok(())

0 commit comments

Comments
 (0)