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

bors · bors · commit cf7e4b9df68c · 2021-05-23T10:40:13.000Z
rustup Cc rust-lang/rust#85591
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-35bab923c8e5a1e8291735e7630539002eb80d7b
+6e92fb409816c65cd0a78a1fbcc71e2fbabdf50a
diff --git a/src/data_race.rs b/src/data_race.rs
@@ -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);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -719,7 +719,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: MiriEvalContextExt<'mir, 'tcx> {`
`719`	`719`	`if let Some(data_race) = &mut this.memory.extra.data_race {`
`720`	`720`	`if data_race.multi_threaded.get() {`
`721`	`721`	`let alloc_meta =`
`722`		`- this.memory.get_alloc_extra_mut(ptr.alloc_id)?.data_race.as_mut().unwrap();`
	`722`	`+ this.memory.get_alloc_extra_mut(ptr.alloc_id)?.0.data_race.as_mut().unwrap();`
`723`	`723`	`alloc_meta.reset_clocks(ptr.offset, size);`
`724`	`724`	`}`
`725`	`725`	`}`