Auto merge of #1843 - RalfJung:rustup, r=RalfJung

bors · bors · commit 61605ebde25f · 2021-06-29T18:48:08.000Z
rustup Cc rust-lang/rust#86723
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-192920c22bc8433ab14706ee0829e707d119b74f
+e98897e5dc9898707bf4331c43b2e76ab7e282fe
diff --git a/src/data_race.rs b/src/data_race.rs
@@ -759,8 +759,7 @@ impl VClockAlloc {
                 | MiriMemoryKind::ExternStatic
                 | MiriMemoryKind::Tls,
             )
-            | MemoryKind::CallerLocation
-            | MemoryKind::Vtable => (0, VectorIdx::MAX_INDEX),
+            | MemoryKind::CallerLocation => (0, VectorIdx::MAX_INDEX),
         };
         VClockAlloc {
             alloc_ranges: RefCell::new(RangeMap::new(
