Auto merge of #3489 - rust-lang:rustup-2024-04-19, r=RalfJung

Automatic Rustup

Author: bors

rust-version

@@ -1 +1 @@
-c45dee5efd0c042e9d1e24559ebd0d6424d8aa70
+fa0068b5412baecc932772dda72c0621bfa7ab00

src/machine.rs

@@ -241,12 +241,12 @@ pub enum ProvenanceExtra {
     Wildcard,
 }
 
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 static_assert_size!(Pointer<Provenance>, 24);
 // FIXME: this would with in 24bytes but layout optimizations are not smart enough
-// #[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+// #[cfg(target_pointer_width = "64")]
 //static_assert_size!(Pointer<Option<Provenance>>, 24);
-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(target_pointer_width = "64")]
 static_assert_size!(Scalar<Provenance>, 32);
 
 impl fmt::Debug for Provenance {

tests/panic/mir-validation.rs

@@ -3,6 +3,7 @@
 //@normalize-stderr-test: "\n +at [^\n]+" -> ""
 //@normalize-stderr-test: "\n +\[\.\.\. omitted [0-9]+ frames? \.\.\.\]" -> ""
 //@normalize-stderr-test: "\n[ =]*note:.*" -> ""
+//@normalize-stderr-test: "DefId\([^()]*\)" -> "DefId"
 #![feature(custom_mir, core_intrinsics)]
 use core::intrinsics::mir::*;
 

tests/panic/mir-validation.stderr

@@ -1,5 +1,5 @@
 thread 'rustc' panicked at compiler/rustc_const_eval/src/transform/validate.rs:LL:CC:
-broken MIR in Item(DefId(0:4 ~ mir_validation[fad2]::main)) (after phase change to runtime-optimized) at bb0[1]:
+broken MIR in Item(DefId) (after phase change to runtime-optimized) at bb0[1]:
 (*(_2.0: *mut i32)), has deref at the wrong place
 stack backtrace: