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

rustup Cc https://github.com/rust-lang/rust/issues/86723
2021-06-29 18:48:08 +00:00 · 2021-06-29 18:48:08 +00:00 · 61605ebde2
commit 61605ebde2
parent 4933e280b2 e33bf695db
2 changed files with 2 additions and 3 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-192920c22bc8433ab14706ee0829e707d119b74f
+e98897e5dc9898707bf4331c43b2e76ab7e282fe
--- 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(