user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #1815 - RalfJung:rustup2, r=RalfJung

Browse source 
rustup

Cc https://github.com/rust-lang/rust/issues/85591
This commit is contained in:
bors 2021-05-23 10:40:13 +00:00
commit cf7e4b9df6
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rust-version
View file

@ -1 +1 @@
35bab923c8e5a1e8291735e7630539002eb80d7b
6e92fb409816c65cd0a78a1fbcc71e2fbabdf50a

2
src/data_race.rs
View file

@ -719,7 +719,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: MiriEvalContextExt<'mir, 'tcx> {
if let Some(data_race) = &mut this.memory.extra.data_race {
if data_race.multi_threaded.get() {
let alloc_meta =
this.memory.get_alloc_extra_mut(ptr.alloc_id)?.data_race.as_mut().unwrap();
this.memory.get_alloc_extra_mut(ptr.alloc_id)?.0.data_race.as_mut().unwrap();
alloc_meta.reset_clocks(ptr.offset, size);
}
}