Skip to content

Commit 43e030c

Browse files
committed
Auto merge of #139269 - matthiaskrgr:rollup-pk78gig, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #138992 (literal pattern lowering: use the pattern's type instead of the literal's in `const_to_pat`) - #139211 (interpret: add a version of run_for_validation for &self) - #139235 (`AstValidator` tweaks) - #139237 (Add a dep kind for use of the anon node with zero dependencies) - #139260 (Add dianqk to codegen reviewers) - #139264 (Fix two incorrect turbofish suggestions) r? `@ghost` `@rustbot` modify labels: rollup
2 parents cf845a1 + f02405c commit 43e030c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/concurrency/data_race.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ pub trait EvalContextExt<'tcx>: MiriInterpCxExt<'tcx> {
717717
// The program didn't actually do a read, so suppress the memory access hooks.
718718
// This is also a very special exception where we just ignore an error -- if this read
719719
// was UB e.g. because the memory is uninitialized, we don't want to know!
720-
let old_val = this.run_for_validation(|this| this.read_scalar(dest)).discard_err();
720+
let old_val = this.run_for_validation_mut(|this| this.read_scalar(dest)).discard_err();
721721
this.allow_data_races_mut(move |this| this.write_scalar(val, dest))?;
722722
this.validate_atomic_store(dest, atomic)?;
723723
this.buffered_atomic_write(val, dest, atomic, old_val)

0 commit comments

Comments
 (0)