mirror of
https://github.com/rust-lang/rust.git
synced 2026-06-01 22:18:23 +03:00
Auto merge of #1815 - RalfJung:rustup2, r=RalfJung
rustup Cc https://github.com/rust-lang/rust/issues/85591
This commit is contained in:
+1
-1
@@ -1 +1 @@
|
||||
35bab923c8e5a1e8291735e7630539002eb80d7b
|
||||
6e92fb409816c65cd0a78a1fbcc71e2fbabdf50a
|
||||
|
||||
+1
-1
@@ -719,7 +719,7 @@ fn reset_vector_clocks(&mut self, ptr: Pointer<Tag>, size: Size) -> InterpResult
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user