Auto merge of #1374 - divergentdave:InvalidUndefBytes, r=RalfJung

InvalidUndefBytes: Update to match rustc changes

This is a companion PR for rust-lang/rust#71610. This won't build yet, but we may need these changes in a future rustup.

rust-version

@@ -1 +1 @@
-c60b675e280fedded8d8487acd051cd342e486f2
+a9ca1ec9280ca1e5020edd699917c3367a30a798

src/diagnostics.rs

@@ -118,13 +118,17 @@ pub fn report_error<'tcx, 'mir>(
     report_msg(ecx, &format!("{}: {}", title, msg), msg, helps, true);
 
     // Extra output to help debug specific issues.
-    if let UndefinedBehavior(UndefinedBehaviorInfo::InvalidUninitBytes(Some(ptr))) = e.kind {
-        eprintln!(
-            "Uninitialized read occurred at offset 0x{:x} into this allocation:",
-            ptr.offset.bytes(),
-        );
-        ecx.memory.dump_alloc(ptr.alloc_id);
-        eprintln!();
+    match e.kind {
+        UndefinedBehavior(UndefinedBehaviorInfo::InvalidUninitBytes(Some(access))) => {
+            eprintln!(
+                "Uninitialized read occurred at offsets 0x{:x}..0x{:x} into this allocation:",
+                access.uninit_ptr.offset.bytes(),
+                access.uninit_ptr.offset.bytes() + access.uninit_size.bytes(),
+            );
+            ecx.memory.dump_alloc(access.uninit_ptr.alloc_id);
+            eprintln!();
+        }
+        _ => {}
     }
 
     None

tests/compile-fail/uninit_buffer.rs

@@ -1,4 +1,4 @@
-// error-pattern: reading uninitialized memory
+// error-pattern: 12 bytes are uninitialized
 
 use std::alloc::{alloc, dealloc, Layout};
 use std::slice::from_raw_parts;