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

rustup

Cc https://github.com/rust-lang/rust/issues/86723

diff --git a/rust-version b/rust-version
index 128548fd922bad11c071bc7770adabdb3cc75c19..a8a75e9f046c417782cbd9fbf99b12596ee003ce 100644 (file)
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-192920c22bc8433ab14706ee0829e707d119b74f
+e98897e5dc9898707bf4331c43b2e76ab7e282fe

diff --git a/src/data_race.rs b/src/data_race.rs
index 45159ef4c07c371c26e0a5651cc9e35f9c93cbbd..cb7b1fc6dbe0c9ad8679958e17c681908a223517 100644 (file)
--- a/src/data_race.rs
+++ b/src/data_race.rs
@@ -759,8 +759,7 @@ pub fn new_allocation(
                 | 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(