diff options
Diffstat (limited to 'user/rust/mir-opt-tests-endianness.patch')
| -rw-r--r-- | user/rust/mir-opt-tests-endianness.patch | 1564 |
1 files changed, 1564 insertions, 0 deletions
diff --git a/user/rust/mir-opt-tests-endianness.patch b/user/rust/mir-opt-tests-endianness.patch new file mode 100644 index 000000000..e6972ebe9 --- /dev/null +++ b/user/rust/mir-opt-tests-endianness.patch @@ -0,0 +1,1564 @@ +Upstream: https://github.com/rust-lang/rust/pull/126502 + +From 31851d4770774ac95a694f2596138fc43fcd39b4 Mon Sep 17 00:00:00 2001 +From: Josh Stone <jistone@redhat.com> +Date: Fri, 14 Jun 2024 15:49:45 -0700 +Subject: [PATCH 1/3] Add `-Zdump-mir-exclude-alloc-bytes` + +--- + compiler/rustc_interface/src/tests.rs | 1 + + compiler/rustc_middle/src/mir/pretty.rs | 3 +++ + compiler/rustc_session/src/options.rs | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs +index 6ffc518097ef0..619b125a8780d 100644 +--- a/compiler/rustc_interface/src/tests.rs ++++ b/compiler/rustc_interface/src/tests.rs +@@ -683,6 +683,7 @@ fn test_unstable_options_tracking_hash() { + untracked!(dump_mir, Some(String::from("abc"))); + untracked!(dump_mir_dataflow, true); + untracked!(dump_mir_dir, String::from("abc")); ++ untracked!(dump_mir_exclude_alloc_bytes, true); + untracked!(dump_mir_exclude_pass_number, true); + untracked!(dump_mir_graphviz, true); + untracked!(dump_mono_stats, SwitchWithOptPath::Enabled(Some("mono-items-dir/".into()))); +diff --git a/compiler/rustc_middle/src/mir/pretty.rs b/compiler/rustc_middle/src/mir/pretty.rs +index 4657f4dcf8132..3ea98de1a177d 100644 +--- a/compiler/rustc_middle/src/mir/pretty.rs ++++ b/compiler/rustc_middle/src/mir/pretty.rs +@@ -1521,6 +1521,9 @@ impl<'a, 'tcx, Prov: Provenance, Extra, Bytes: AllocBytes> std::fmt::Display + // We are done. + return write!(w, " {{}}"); + } ++ if tcx.sess.opts.unstable_opts.dump_mir_exclude_alloc_bytes { ++ return write!(w, " {{ .. }}"); ++ } + // Write allocation bytes. + writeln!(w, " {{")?; + write_allocation_bytes(tcx, alloc, w, " ")?; +diff --git a/compiler/rustc_session/src/options.rs b/compiler/rustc_session/src/options.rs +index 9a10adeb6d1a1..a3f1369776de4 100644 +--- a/compiler/rustc_session/src/options.rs ++++ b/compiler/rustc_session/src/options.rs +@@ -1647,6 +1647,8 @@ options! { + (default: no)"), + dump_mir_dir: String = ("mir_dump".to_string(), parse_string, [UNTRACKED], + "the directory the MIR is dumped into (default: `mir_dump`)"), ++ dump_mir_exclude_alloc_bytes: bool = (false, parse_bool, [UNTRACKED], ++ "exclude the raw bytes of allocations when dumping MIR (used in tests) (default: no)"), + dump_mir_exclude_pass_number: bool = (false, parse_bool, [UNTRACKED], + "exclude the pass number when dumping MIR (used in tests) (default: no)"), + dump_mir_graphviz: bool = (false, parse_bool, [UNTRACKED], + +From 1a05cb2d9358879468c87645b0c1d5d1e8e12a12 Mon Sep 17 00:00:00 2001 +From: Josh Stone <jistone@redhat.com> +Date: Fri, 14 Jun 2024 16:01:26 -0700 +Subject: [PATCH 2/3] Use `-Zdump-mir-exclude-alloc-bytes` in some mir-opt + tests + +--- + tests/mir-opt/const_debuginfo.rs | 2 +- + tests/mir-opt/const_prop/address_of_pair.rs | 1 + + tests/mir-opt/const_prop/checked_add.rs | 2 +- + tests/mir-opt/const_prop/mutable_variable_aggregate.rs | 1 + + tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs | 1 + + tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs | 1 + + tests/mir-opt/const_prop/return_place.rs | 2 +- + tests/mir-opt/const_prop/slice_len.rs | 2 +- + tests/mir-opt/const_prop/tuple_literal_propagation.rs | 1 + + tests/mir-opt/dataflow-const-prop/checked.rs | 2 +- + tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs | 2 +- + tests/mir-opt/dataflow-const-prop/enum.rs | 1 + + tests/mir-opt/dataflow-const-prop/struct.rs | 1 + + tests/mir-opt/dataflow-const-prop/tuple.rs | 1 + + tests/mir-opt/enum_opt.rs | 2 +- + tests/mir-opt/gvn.rs | 1 + + tests/mir-opt/pre-codegen/optimizes_into_variable.rs | 2 +- + 17 files changed, 17 insertions(+), 8 deletions(-) + +diff --git a/tests/mir-opt/const_debuginfo.rs b/tests/mir-opt/const_debuginfo.rs +index 907d7fef06746..3b2bc4559ced9 100644 +--- a/tests/mir-opt/const_debuginfo.rs ++++ b/tests/mir-opt/const_debuginfo.rs +@@ -1,5 +1,5 @@ + //@ test-mir-pass: ConstDebugInfo +-//@ compile-flags: -C overflow-checks=no -Zmir-enable-passes=+GVN ++//@ compile-flags: -C overflow-checks=no -Zmir-enable-passes=+GVN -Zdump-mir-exclude-alloc-bytes + + struct Point { + x: u32, +diff --git a/tests/mir-opt/const_prop/address_of_pair.rs b/tests/mir-opt/const_prop/address_of_pair.rs +index 6d0c0f8ad52a7..9acaaa0ccaf9d 100644 +--- a/tests/mir-opt/const_prop/address_of_pair.rs ++++ b/tests/mir-opt/const_prop/address_of_pair.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR address_of_pair.fn0.GVN.diff + pub fn fn0() -> bool { +diff --git a/tests/mir-opt/const_prop/checked_add.rs b/tests/mir-opt/const_prop/checked_add.rs +index 0560b04957311..d450f7d03f38c 100644 +--- a/tests/mir-opt/const_prop/checked_add.rs ++++ b/tests/mir-opt/const_prop/checked_add.rs +@@ -1,6 +1,6 @@ + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + //@ test-mir-pass: GVN +-//@ compile-flags: -C overflow-checks=on ++//@ compile-flags: -C overflow-checks=on -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR checked_add.main.GVN.diff + fn main() { +diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate.rs b/tests/mir-opt/const_prop/mutable_variable_aggregate.rs +index 7de647ed9c37f..80cd75215c1b7 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_aggregate.rs ++++ b/tests/mir-opt/const_prop/mutable_variable_aggregate.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR mutable_variable_aggregate.main.GVN.diff + fn main() { +diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs +index 5656c0e7a6863..856afd53ab46b 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs ++++ b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR mutable_variable_aggregate_mut_ref.main.GVN.diff + fn main() { +diff --git a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs +index cc92949128f72..2c6cc0db6b211 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs ++++ b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.rs +@@ -1,5 +1,6 @@ + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR mutable_variable_unprop_assign.main.GVN.diff + fn main() { +diff --git a/tests/mir-opt/const_prop/return_place.rs b/tests/mir-opt/const_prop/return_place.rs +index e7eea11ae492f..c5293aa73e55b 100644 +--- a/tests/mir-opt/const_prop/return_place.rs ++++ b/tests/mir-opt/const_prop/return_place.rs +@@ -1,6 +1,6 @@ + //@ test-mir-pass: GVN + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY +-//@ compile-flags: -C overflow-checks=on ++//@ compile-flags: -C overflow-checks=on -Zdump-mir-exclude-alloc-bytes + + // EMIT_MIR return_place.add.GVN.diff + // EMIT_MIR return_place.add.PreCodegen.before.mir +diff --git a/tests/mir-opt/const_prop/slice_len.rs b/tests/mir-opt/const_prop/slice_len.rs +index 63cdbf01b3e82..265a496f39a36 100644 +--- a/tests/mir-opt/const_prop/slice_len.rs ++++ b/tests/mir-opt/const_prop/slice_len.rs +@@ -1,5 +1,5 @@ + //@ test-mir-pass: GVN +-//@ compile-flags: -Zmir-enable-passes=+InstSimplify ++//@ compile-flags: -Zmir-enable-passes=+InstSimplify -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + // EMIT_MIR_FOR_EACH_BIT_WIDTH + +diff --git a/tests/mir-opt/const_prop/tuple_literal_propagation.rs b/tests/mir-opt/const_prop/tuple_literal_propagation.rs +index e42a62cb6fdf3..baed5670dda81 100644 +--- a/tests/mir-opt/const_prop/tuple_literal_propagation.rs ++++ b/tests/mir-opt/const_prop/tuple_literal_propagation.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + // EMIT_MIR tuple_literal_propagation.main.GVN.diff + +diff --git a/tests/mir-opt/dataflow-const-prop/checked.rs b/tests/mir-opt/dataflow-const-prop/checked.rs +index a73693464f95b..f5a6cdb2c8d35 100644 +--- a/tests/mir-opt/dataflow-const-prop/checked.rs ++++ b/tests/mir-opt/dataflow-const-prop/checked.rs +@@ -1,5 +1,5 @@ + //@ test-mir-pass: DataflowConstProp +-//@ compile-flags: -Coverflow-checks=on ++//@ compile-flags: -Coverflow-checks=on -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + + // EMIT_MIR checked.main.DataflowConstProp.diff +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs +index 3a0cbac328cb5..087bd7a18572c 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.rs +@@ -1,5 +1,5 @@ + //@ test-mir-pass: DataflowConstProp +-//@ compile-flags: -Zmir-enable-passes=+GVN,+Inline ++//@ compile-flags: -Zmir-enable-passes=+GVN,+Inline -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_BIT_WIDTH + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + +diff --git a/tests/mir-opt/dataflow-const-prop/enum.rs b/tests/mir-opt/dataflow-const-prop/enum.rs +index 946cfa4c76c02..37304e3a270e9 100644 +--- a/tests/mir-opt/dataflow-const-prop/enum.rs ++++ b/tests/mir-opt/dataflow-const-prop/enum.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: DataflowConstProp ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_BIT_WIDTH + + #![feature(custom_mir, core_intrinsics, rustc_attrs)] +diff --git a/tests/mir-opt/dataflow-const-prop/struct.rs b/tests/mir-opt/dataflow-const-prop/struct.rs +index eed782c9036b2..4b160c3dab7e8 100644 +--- a/tests/mir-opt/dataflow-const-prop/struct.rs ++++ b/tests/mir-opt/dataflow-const-prop/struct.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: DataflowConstProp ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_BIT_WIDTH + + #[derive(Copy, Clone)] +diff --git a/tests/mir-opt/dataflow-const-prop/tuple.rs b/tests/mir-opt/dataflow-const-prop/tuple.rs +index d624e21f21ac4..19b675770abe9 100644 +--- a/tests/mir-opt/dataflow-const-prop/tuple.rs ++++ b/tests/mir-opt/dataflow-const-prop/tuple.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: DataflowConstProp ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_BIT_WIDTH + + // EMIT_MIR tuple.main.DataflowConstProp.diff +diff --git a/tests/mir-opt/enum_opt.rs b/tests/mir-opt/enum_opt.rs +index 2cc5df84d6b59..e42be8ac06dc9 100644 +--- a/tests/mir-opt/enum_opt.rs ++++ b/tests/mir-opt/enum_opt.rs +@@ -1,7 +1,7 @@ + // skip-filecheck + //@ test-mir-pass: EnumSizeOpt + // EMIT_MIR_FOR_EACH_BIT_WIDTH +-//@ compile-flags: -Zunsound-mir-opts ++//@ compile-flags: -Zunsound-mir-opts -Zdump-mir-exclude-alloc-bytes + + #![feature(arbitrary_enum_discriminant, repr128)] + +diff --git a/tests/mir-opt/gvn.rs b/tests/mir-opt/gvn.rs +index 86f42d23f3835..29f28e7af4145 100644 +--- a/tests/mir-opt/gvn.rs ++++ b/tests/mir-opt/gvn.rs +@@ -1,4 +1,5 @@ + //@ test-mir-pass: GVN ++//@ compile-flags: -Zdump-mir-exclude-alloc-bytes + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY + //@ only-64bit + +diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.rs b/tests/mir-opt/pre-codegen/optimizes_into_variable.rs +index de5e2d5c3121b..44b4b0ad888a5 100644 +--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.rs ++++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.rs +@@ -1,6 +1,6 @@ + // skip-filecheck + // EMIT_MIR_FOR_EACH_PANIC_STRATEGY +-//@ compile-flags: -C overflow-checks=on ++//@ compile-flags: -C overflow-checks=on -Zdump-mir-exclude-alloc-bytes + + struct Point { + x: u32, + +From 7c3673ff6f2ff4e8e85344c091c9feb4b5da1290 Mon Sep 17 00:00:00 2001 +From: Josh Stone <jistone@redhat.com> +Date: Fri, 14 Jun 2024 16:05:22 -0700 +Subject: [PATCH 3/3] Bless mir-opt for excluded alloc bytes + +--- + .../const_debuginfo.main.ConstDebugInfo.diff | 8 +-- + .../const_prop/address_of_pair.fn0.GVN.diff | 6 +- + .../checked_add.main.GVN.panic-abort.diff | 6 +- + .../checked_add.main.GVN.panic-unwind.diff | 6 +- + .../mutable_variable_aggregate.main.GVN.diff | 6 +- + ...e_variable_aggregate_mut_ref.main.GVN.diff | 6 +- + ...le_unprop_assign.main.GVN.panic-abort.diff | 6 +- + ...e_unprop_assign.main.GVN.panic-unwind.diff | 6 +- + .../return_place.add.GVN.panic-abort.diff | 6 +- + .../return_place.add.GVN.panic-unwind.diff | 6 +- + ...lace.add.PreCodegen.before.panic-abort.mir | 4 +- + ...ace.add.PreCodegen.before.panic-unwind.mir | 4 +- + .../slice_len.main.GVN.32bit.panic-abort.diff | 6 +- + ...slice_len.main.GVN.32bit.panic-unwind.diff | 6 +- + .../slice_len.main.GVN.64bit.panic-abort.diff | 6 +- + ...slice_len.main.GVN.64bit.panic-unwind.diff | 6 +- + ...eral_propagation.main.GVN.panic-abort.diff | 6 +- + ...ral_propagation.main.GVN.panic-unwind.diff | 6 +- + ...ed.main.DataflowConstProp.panic-abort.diff | 10 +--- + ...d.main.DataflowConstProp.panic-unwind.diff | 10 +--- + ...n.DataflowConstProp.32bit.panic-abort.diff | 12 +--- + ....DataflowConstProp.32bit.panic-unwind.diff | 12 +--- + ...n.DataflowConstProp.64bit.panic-abort.diff | 12 +--- + ....DataflowConstProp.64bit.panic-unwind.diff | 12 +--- + ...oxed_slice.main.GVN.32bit.panic-abort.diff | 14 ++--- + ...xed_slice.main.GVN.32bit.panic-unwind.diff | 14 ++--- + ...oxed_slice.main.GVN.64bit.panic-abort.diff | 14 ++--- + ...xed_slice.main.GVN.64bit.panic-unwind.diff | 14 ++--- + .../enum.simple.DataflowConstProp.32bit.diff | 6 +- + .../enum.simple.DataflowConstProp.64bit.diff | 6 +- + .../enum.statics.DataflowConstProp.32bit.diff | 23 +++----- + .../enum.statics.DataflowConstProp.64bit.diff | 23 +++----- + .../struct.main.DataflowConstProp.32bit.diff | 58 ++++++------------- + .../struct.main.DataflowConstProp.64bit.diff | 58 ++++++------------- + .../tuple.main.DataflowConstProp.32bit.diff | 18 ++---- + .../tuple.main.DataflowConstProp.64bit.diff | 18 ++---- + .../enum_opt.cand.EnumSizeOpt.32bit.diff | 6 +- + .../enum_opt.cand.EnumSizeOpt.64bit.diff | 6 +- + .../enum_opt.unin.EnumSizeOpt.32bit.diff | 6 +- + .../enum_opt.unin.EnumSizeOpt.64bit.diff | 6 +- + ...vn.arithmetic_checked.GVN.panic-abort.diff | 6 +- + ...n.arithmetic_checked.GVN.panic-unwind.diff | 6 +- + .../gvn.fn_pointers.GVN.panic-abort.diff | 18 +++--- + .../gvn.fn_pointers.GVN.panic-unwind.diff | 18 +++--- + .../gvn.indirect_static.GVN.panic-abort.diff | 4 +- + .../gvn.indirect_static.GVN.panic-unwind.diff | 4 +- + .../gvn.wide_ptr_integer.GVN.panic-abort.diff | 10 +--- + ...gvn.wide_ptr_integer.GVN.panic-unwind.diff | 10 +--- + ...o_variable.main.GVN.32bit.panic-abort.diff | 6 +- + ..._variable.main.GVN.32bit.panic-unwind.diff | 6 +- + ...o_variable.main.GVN.64bit.panic-abort.diff | 6 +- + ..._variable.main.GVN.64bit.panic-unwind.diff | 6 +- + 52 files changed, 182 insertions(+), 382 deletions(-) + +diff --git a/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff b/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff +index ac33f51984cd8..8088984bc77ab 100644 +--- a/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff ++++ b/tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff +@@ -105,11 +105,7 @@ + } + } + +- ALLOC0 (size: 8, align: 4) { +- 20 00 00 00 20 00 00 00 │ ... ... +- } ++ ALLOC0 (size: 8, align: 4) { .. } + +- ALLOC1 (size: 4, align: 2) { +- 01 00 63 00 │ ..c. +- } ++ ALLOC1 (size: 4, align: 2) { .. } + +diff --git a/tests/mir-opt/const_prop/address_of_pair.fn0.GVN.diff b/tests/mir-opt/const_prop/address_of_pair.fn0.GVN.diff +index 3f4958f60e85b..ac372f837268b 100644 +--- a/tests/mir-opt/const_prop/address_of_pair.fn0.GVN.diff ++++ b/tests/mir-opt/const_prop/address_of_pair.fn0.GVN.diff +@@ -44,9 +44,7 @@ + StorageDead(_2); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/checked_add.main.GVN.panic-abort.diff b/tests/mir-opt/const_prop/checked_add.main.GVN.panic-abort.diff +index 0e93c167ebc96..798f957caa58c 100644 +--- a/tests/mir-opt/const_prop/checked_add.main.GVN.panic-abort.diff ++++ b/tests/mir-opt/const_prop/checked_add.main.GVN.panic-abort.diff +@@ -24,9 +24,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 02 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/checked_add.main.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/checked_add.main.GVN.panic-unwind.diff +index 589eed5776c9f..a09f8ee5be12a 100644 +--- a/tests/mir-opt/const_prop/checked_add.main.GVN.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/checked_add.main.GVN.panic-unwind.diff +@@ -24,9 +24,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 02 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff b/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff +index b6ff7b0fc234d..7584353620ec5 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff ++++ b/tests/mir-opt/const_prop/mutable_variable_aggregate.main.GVN.diff +@@ -24,9 +24,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 2a 00 00 00 2b 00 00 00 │ *...+... + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.GVN.diff b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.GVN.diff +index 4ed7c98514796..e16e2969eb895 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.GVN.diff ++++ b/tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.GVN.diff +@@ -31,9 +31,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 2a 00 00 00 2b 00 00 00 │ *...+... + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-abort.diff b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-abort.diff +index d1d23675bfd91..19d79694666f2 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-abort.diff ++++ b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-abort.diff +@@ -48,9 +48,7 @@ + + nop; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-unwind.diff +index 4d69c9ce2efe6..2bb277bf27f7f 100644 +--- a/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/mutable_variable_unprop_assign.main.GVN.panic-unwind.diff +@@ -48,9 +48,7 @@ + + nop; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/return_place.add.GVN.panic-abort.diff b/tests/mir-opt/const_prop/return_place.add.GVN.panic-abort.diff +index b2d40daa80c4c..037fe60c2fdb3 100644 +--- a/tests/mir-opt/const_prop/return_place.add.GVN.panic-abort.diff ++++ b/tests/mir-opt/const_prop/return_place.add.GVN.panic-abort.diff +@@ -17,9 +17,7 @@ + + _0 = const 4_u32; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/return_place.add.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/return_place.add.GVN.panic-unwind.diff +index 2eafc51cd3db6..438a1cebea8cb 100644 +--- a/tests/mir-opt/const_prop/return_place.add.GVN.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/return_place.add.GVN.panic-unwind.diff +@@ -17,9 +17,7 @@ + + _0 = const 4_u32; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir +index f87c26bb004c6..66fd61cc3aee9 100644 +--- a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir ++++ b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-abort.mir +@@ -15,6 +15,4 @@ fn add() -> u32 { + } + } + +-ALLOC0 (size: 8, align: 4) { +- 04 00 00 00 00 __ __ __ │ .....░░░ +-} ++ALLOC0 (size: 8, align: 4) { .. } +diff --git a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir +index 33f97591387c3..f9b07a59de9c3 100644 +--- a/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir ++++ b/tests/mir-opt/const_prop/return_place.add.PreCodegen.before.panic-unwind.mir +@@ -15,6 +15,4 @@ fn add() -> u32 { + } + } + +-ALLOC0 (size: 8, align: 4) { +- 04 00 00 00 00 __ __ __ │ .....░░░ +-} ++ALLOC0 (size: 8, align: 4) { .. } +diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-abort.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-abort.diff +index ef298dddd5a49..8415789de6ecd 100644 +--- a/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-abort.diff ++++ b/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-abort.diff +@@ -49,9 +49,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 12, align: 4) { +-+ 01 00 00 00 02 00 00 00 03 00 00 00 │ ............ + } +++ +++ ALLOC0 (size: 12, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-unwind.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-unwind.diff +index 5379df3f60b44..fea7caac3cdce 100644 +--- a/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/slice_len.main.GVN.32bit.panic-unwind.diff +@@ -49,9 +49,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 12, align: 4) { +-+ 01 00 00 00 02 00 00 00 03 00 00 00 │ ............ + } +++ +++ ALLOC0 (size: 12, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-abort.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-abort.diff +index ef298dddd5a49..8415789de6ecd 100644 +--- a/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-abort.diff ++++ b/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-abort.diff +@@ -49,9 +49,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 12, align: 4) { +-+ 01 00 00 00 02 00 00 00 03 00 00 00 │ ............ + } +++ +++ ALLOC0 (size: 12, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-unwind.diff b/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-unwind.diff +index 5379df3f60b44..fea7caac3cdce 100644 +--- a/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/slice_len.main.GVN.64bit.panic-unwind.diff +@@ -49,9 +49,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 12, align: 4) { +-+ 01 00 00 00 02 00 00 00 03 00 00 00 │ ............ + } +++ +++ ALLOC0 (size: 12, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-abort.diff b/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-abort.diff +index c2f3fb1b3b575..bf8fece3d37b9 100644 +--- a/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-abort.diff ++++ b/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-abort.diff +@@ -31,9 +31,7 @@ + + nop; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-unwind.diff b/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-unwind.diff +index 55d9a3b0cac67..02a75849d8872 100644 +--- a/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-unwind.diff ++++ b/tests/mir-opt/const_prop/tuple_literal_propagation.main.GVN.panic-unwind.diff +@@ -31,9 +31,7 @@ + + nop; + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-abort.diff b/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-abort.diff +index 53663c6476bdc..79ea55617481e 100644 +--- a/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-abort.diff ++++ b/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-abort.diff +@@ -76,13 +76,9 @@ + StorageDead(_1); + return; + } +-+ } ++ } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 00 00 00 80 01 __ __ __ │ .....░░░ +-+ } +++ ALLOC0 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 03 00 00 00 00 __ __ __ │ .....░░░ +- } +++ ALLOC1 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-unwind.diff b/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-unwind.diff +index 34feb2a640629..bd22c50dd8fcf 100644 +--- a/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-unwind.diff ++++ b/tests/mir-opt/dataflow-const-prop/checked.main.DataflowConstProp.panic-unwind.diff +@@ -76,13 +76,9 @@ + StorageDead(_1); + return; + } +-+ } ++ } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 00 00 00 80 01 __ __ __ │ .....░░░ +-+ } +++ ALLOC0 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 03 00 00 00 00 __ __ __ │ .....░░░ +- } +++ ALLOC1 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff +index 8005bc23cf699..4097e060f4d47 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-abort.diff +@@ -94,15 +94,9 @@ + } + } + +- ALLOC2 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC2 (size: 8, align: 4) { .. } + +- ALLOC1 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC1 (size: 8, align: 4) { .. } + +- ALLOC0 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff +index 42b1be32387c4..ff44d0df5e3e9 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.32bit.panic-unwind.diff +@@ -98,15 +98,9 @@ + } + } + +- ALLOC2 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC2 (size: 8, align: 4) { .. } + +- ALLOC1 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC1 (size: 8, align: 4) { .. } + +- ALLOC0 (size: 8, align: 4) { +- 01 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff +index 7b57b0db50c94..3662c3b59d271 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-abort.diff +@@ -94,15 +94,9 @@ + } + } + +- ALLOC2 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC2 (size: 16, align: 8) { .. } + +- ALLOC1 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC1 (size: 16, align: 8) { .. } + +- ALLOC0 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff +index 2e75a63e29052..68dee57dee9e0 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.DataflowConstProp.64bit.panic-unwind.diff +@@ -98,15 +98,9 @@ + } + } + +- ALLOC2 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC2 (size: 16, align: 8) { .. } + +- ALLOC1 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC1 (size: 16, align: 8) { .. } + +- ALLOC0 (size: 16, align: 8) { +- 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } ++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff +index 06011f9d75967..9d96e895c8aa5 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-abort.diff +@@ -102,17 +102,11 @@ + _0 = const (); + drop(_1) -> [return: bb1, unwind unreachable]; + } +-+ } ++ } + + +-+ ALLOC2 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +-+ } +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +-+ } +++ ALLOC1 (size: 8, align: 4) { .. } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +- } +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff +index eb4a3ffd91d2e..0bdff584b01ec 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.32bit.panic-unwind.diff +@@ -106,17 +106,11 @@ + _0 = const (); + drop(_1) -> [return: bb1, unwind: bb2]; + } +-+ } ++ } + + +-+ ALLOC2 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +-+ } +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +-+ } +++ ALLOC1 (size: 8, align: 4) { .. } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 01 00 00 00 00 00 00 00 │ ........ +- } +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff +index a7cc243e548e9..99e96fe5d70fd 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-abort.diff +@@ -102,17 +102,11 @@ + _0 = const (); + drop(_1) -> [return: bb1, unwind unreachable]; + } +-+ } ++ } + + +-+ ALLOC2 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC2 (size: 16, align: 8) { .. } + + +-+ ALLOC1 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC1 (size: 16, align: 8) { .. } + + +-+ ALLOC0 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff +index c905a48862caa..5eefabeac3868 100644 +--- a/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff ++++ b/tests/mir-opt/dataflow-const-prop/default_boxed_slice.main.GVN.64bit.panic-unwind.diff +@@ -106,17 +106,11 @@ + _0 = const (); + drop(_1) -> [return: bb1, unwind: bb2]; + } +-+ } ++ } + + +-+ ALLOC2 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC2 (size: 16, align: 8) { .. } + + +-+ ALLOC1 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC1 (size: 16, align: 8) { .. } + + +-+ ALLOC0 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................ +- } +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.32bit.diff b/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.32bit.diff +index 89ed26f065b28..a64dda0d06c48 100644 +--- a/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.32bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.32bit.diff +@@ -60,9 +60,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 00 00 00 00 00 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.64bit.diff b/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.64bit.diff +index 89ed26f065b28..a64dda0d06c48 100644 +--- a/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.64bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/enum.simple.DataflowConstProp.64bit.diff +@@ -60,9 +60,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 00 00 00 00 00 00 00 00 │ ........ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.32bit.diff b/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.32bit.diff +index fe8ed0114897d..b4d14f25fe2ab 100644 +--- a/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.32bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.32bit.diff +@@ -43,7 +43,7 @@ + bb0: { + StorageLive(_1); + StorageLive(_2); +- _2 = const {ALLOC1: &E}; ++ _2 = const {ALLOC0: &E}; + - _1 = (*_2); + + _1 = const E::V1(0_i32); + StorageDead(_2); +@@ -79,7 +79,7 @@ + bb4: { + StorageLive(_7); + StorageLive(_8); +- _8 = const {ALLOC2: &&E}; ++ _8 = const {ALLOC1: &&E}; + _7 = (*_8); + StorageDead(_8); + StorageLive(_9); +@@ -111,21 +111,14 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC3 (size: 8, align: 4) { +-+ 00 00 00 00 00 00 00 00 │ ........ + } + +- ALLOC2 (static: RC, size: 4, align: 4) { +- ╾ALLOC0<imm>╼ │ ╾──╼ +- } +++ ALLOC2 (size: 8, align: 4) { .. } +++ ++ ALLOC1 (static: RC, size: 4, align: 4) { .. } + +- ALLOC0 (size: 8, align: 4) { +- 01 00 00 00 04 00 00 00 │ ........ +- } ++- ALLOC2 (size: 8, align: 4) { .. } +++ ALLOC3 (size: 8, align: 4) { .. } + +- ALLOC1 (static: statics::C, size: 8, align: 4) { +- 00 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC0 (static: statics::C, size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.64bit.diff b/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.64bit.diff +index df3a989d09eba..57d02b87d1369 100644 +--- a/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.64bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/enum.statics.DataflowConstProp.64bit.diff +@@ -43,7 +43,7 @@ + bb0: { + StorageLive(_1); + StorageLive(_2); +- _2 = const {ALLOC1: &E}; ++ _2 = const {ALLOC0: &E}; + - _1 = (*_2); + + _1 = const E::V1(0_i32); + StorageDead(_2); +@@ -79,7 +79,7 @@ + bb4: { + StorageLive(_7); + StorageLive(_8); +- _8 = const {ALLOC2: &&E}; ++ _8 = const {ALLOC1: &&E}; + _7 = (*_8); + StorageDead(_8); + StorageLive(_9); +@@ -111,21 +111,14 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC3 (size: 8, align: 4) { +-+ 00 00 00 00 00 00 00 00 │ ........ + } + +- ALLOC2 (static: RC, size: 8, align: 8) { +- ╾ALLOC0<imm>╼ │ ╾──────╼ +- } +++ ALLOC2 (size: 8, align: 4) { .. } +++ ++ ALLOC1 (static: RC, size: 8, align: 8) { .. } + +- ALLOC0 (size: 8, align: 4) { +- 01 00 00 00 04 00 00 00 │ ........ +- } ++- ALLOC2 (size: 8, align: 4) { .. } +++ ALLOC3 (size: 8, align: 4) { .. } + +- ALLOC1 (static: statics::C, size: 8, align: 4) { +- 00 00 00 00 00 00 00 00 │ ........ +- } ++ ALLOC0 (static: statics::C, size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff +index f674169e28b26..a6da1483c1ac5 100644 +--- a/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff +@@ -112,7 +112,7 @@ + _9 = (_10.2: &[f32]); + StorageDead(_10); + StorageLive(_14); +- _14 = const {ALLOC4: &&SmallStruct}; ++ _14 = const {ALLOC0: &&SmallStruct}; + _31 = deref_copy (*_14); + StorageLive(_11); + _32 = deref_copy (*_14); +@@ -149,7 +149,7 @@ + _21 = (_22.2: &[f32]); + StorageDead(_22); + StorageLive(_26); +- _26 = const {ALLOC5: &&BigStruct}; ++ _26 = const {ALLOC1: &&BigStruct}; + _35 = deref_copy (*_26); + StorageLive(_23); + _36 = deref_copy (*_26); +@@ -197,51 +197,31 @@ + StorageDead(_1); + return; + } +-+ } ++ } ++ +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC6 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC3 (size: 8, align: 4) { .. } + + +-+ ALLOC7 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC4 (size: 8, align: 4) { .. } + + +-+ ALLOC8 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC5 (size: 8, align: 4) { .. } + + +-+ ALLOC9 (size: 8, align: 4) { +-+ 01 00 00 00 01 00 00 00 │ ........ +-+ } +++ ALLOC6 (size: 4, align: 4) { .. } + + +-+ ALLOC10 (size: 4, align: 4) { +-+ 01 00 00 00 │ .... +- } +- +- ALLOC5 (static: BIG_STAT, size: 4, align: 4) { +- ╾ALLOC0<imm>╼ │ ╾──╼ +- } ++ ALLOC1 (static: BIG_STAT, size: 4, align: 4) { .. } + +- ALLOC0 (size: 20, align: 4) { +- 0x00 │ 01 00 00 00 23 00 00 00 ╾ALLOC1<imm>╼ 02 00 00 00 │ ....#...╾──╼.... +- 0x10 │ 00 00 a4 42 │ ...B +- } ++- ALLOC2 (size: 20, align: 4) { .. } +++ ALLOC7 (size: 20, align: 4) { .. } + +- ALLOC1 (size: 8, align: 4) { +- 00 00 34 42 00 00 90 42 │ ..4B...B +- } ++- ALLOC3 (size: 8, align: 4) { .. } +++ ALLOC8 (size: 8, align: 4) { .. } + +- ALLOC4 (static: SMALL_STAT, size: 4, align: 4) { +- ╾ALLOC2<imm>╼ │ ╾──╼ +- } ++ ALLOC0 (static: SMALL_STAT, size: 4, align: 4) { .. } + +- ALLOC2 (size: 20, align: 4) { +- 0x00 │ 00 00 00 00 __ __ __ __ ╾ALLOC3<imm>╼ 01 00 00 00 │ ....░░░░╾──╼.... +- 0x10 │ 00 00 10 41 │ ...A +- } ++- ALLOC4 (size: 20, align: 4) { .. } +++ ALLOC9 (size: 20, align: 4) { .. } + +- ALLOC3 (size: 4, align: 4) { +- 00 00 50 41 │ ..PA +- } ++- ALLOC5 (size: 4, align: 4) { .. } +++ ALLOC10 (size: 4, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.64bit.diff b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.64bit.diff +index c2608190a6b97..7ca25e4429953 100644 +--- a/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.64bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.64bit.diff +@@ -112,7 +112,7 @@ + _9 = (_10.2: &[f32]); + StorageDead(_10); + StorageLive(_14); +- _14 = const {ALLOC4: &&SmallStruct}; ++ _14 = const {ALLOC0: &&SmallStruct}; + _31 = deref_copy (*_14); + StorageLive(_11); + _32 = deref_copy (*_14); +@@ -149,7 +149,7 @@ + _21 = (_22.2: &[f32]); + StorageDead(_22); + StorageLive(_26); +- _26 = const {ALLOC5: &&BigStruct}; ++ _26 = const {ALLOC1: &&BigStruct}; + _35 = deref_copy (*_26); + StorageLive(_23); + _36 = deref_copy (*_26); +@@ -197,51 +197,31 @@ + StorageDead(_1); + return; + } +-+ } ++ } ++ +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC6 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC3 (size: 8, align: 4) { .. } + + +-+ ALLOC7 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC4 (size: 8, align: 4) { .. } + + +-+ ALLOC8 (size: 8, align: 4) { +-+ 01 00 00 00 23 00 00 00 │ ....#... +-+ } +++ ALLOC5 (size: 8, align: 4) { .. } + + +-+ ALLOC9 (size: 8, align: 4) { +-+ 01 00 00 00 01 00 00 00 │ ........ +-+ } +++ ALLOC6 (size: 4, align: 4) { .. } + + +-+ ALLOC10 (size: 4, align: 4) { +-+ 01 00 00 00 │ .... +- } +- +- ALLOC5 (static: BIG_STAT, size: 8, align: 8) { +- ╾ALLOC0<imm>╼ │ ╾──────╼ +- } ++ ALLOC1 (static: BIG_STAT, size: 8, align: 8) { .. } + +- ALLOC0 (size: 32, align: 8) { +- 0x00 │ 01 00 00 00 23 00 00 00 ╾ALLOC1<imm>╼ │ ....#...╾──────╼ +- 0x10 │ 02 00 00 00 00 00 00 00 00 00 a4 42 __ __ __ __ │ ...........B░░░░ +- } ++- ALLOC2 (size: 32, align: 8) { .. } +++ ALLOC7 (size: 32, align: 8) { .. } + +- ALLOC1 (size: 8, align: 4) { +- 00 00 34 42 00 00 90 42 │ ..4B...B +- } ++- ALLOC3 (size: 8, align: 4) { .. } +++ ALLOC8 (size: 8, align: 4) { .. } + +- ALLOC4 (static: SMALL_STAT, size: 8, align: 8) { +- ╾ALLOC2<imm>╼ │ ╾──────╼ +- } ++ ALLOC0 (static: SMALL_STAT, size: 8, align: 8) { .. } + +- ALLOC2 (size: 32, align: 8) { +- 0x00 │ 00 00 00 00 __ __ __ __ ╾ALLOC3<imm>╼ │ ....░░░░╾──────╼ +- 0x10 │ 01 00 00 00 00 00 00 00 00 00 10 41 __ __ __ __ │ ...........A░░░░ +- } ++- ALLOC4 (size: 32, align: 8) { .. } +++ ALLOC9 (size: 32, align: 8) { .. } + +- ALLOC3 (size: 4, align: 4) { +- 00 00 50 41 │ ..PA +- } ++- ALLOC5 (size: 4, align: 4) { .. } +++ ALLOC10 (size: 4, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.32bit.diff b/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.32bit.diff +index f5723cac7d9c8..e4031b65caafe 100644 +--- a/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.32bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.32bit.diff +@@ -92,21 +92,13 @@ + StorageDead(_1); + return; + } +-+ } ++ } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC0 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC1 (size: 8, align: 4) { .. } + + +-+ ALLOC2 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC3 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ +- } +++ ALLOC3 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.64bit.diff b/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.64bit.diff +index f5723cac7d9c8..e4031b65caafe 100644 +--- a/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.64bit.diff ++++ b/tests/mir-opt/dataflow-const-prop/tuple.main.DataflowConstProp.64bit.diff +@@ -92,21 +92,13 @@ + StorageDead(_1); + return; + } +-+ } ++ } + + +-+ ALLOC0 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC0 (size: 8, align: 4) { .. } + + +-+ ALLOC1 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC1 (size: 8, align: 4) { .. } + + +-+ ALLOC2 (size: 8, align: 4) { +-+ 02 00 00 00 03 00 00 00 │ ........ +-+ } +++ ALLOC2 (size: 8, align: 4) { .. } + + +-+ ALLOC3 (size: 8, align: 4) { +-+ 01 00 00 00 02 00 00 00 │ ........ +- } +++ ALLOC3 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/enum_opt.cand.EnumSizeOpt.32bit.diff b/tests/mir-opt/enum_opt.cand.EnumSizeOpt.32bit.diff +index 775a60f1c9603..085c55caaa03c 100644 +--- a/tests/mir-opt/enum_opt.cand.EnumSizeOpt.32bit.diff ++++ b/tests/mir-opt/enum_opt.cand.EnumSizeOpt.32bit.diff +@@ -64,9 +64,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 02 00 00 00 05 20 00 00 │ ..... .. + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/enum_opt.cand.EnumSizeOpt.64bit.diff b/tests/mir-opt/enum_opt.cand.EnumSizeOpt.64bit.diff +index c4b57579943d4..798b7c10fe8d5 100644 +--- a/tests/mir-opt/enum_opt.cand.EnumSizeOpt.64bit.diff ++++ b/tests/mir-opt/enum_opt.cand.EnumSizeOpt.64bit.diff +@@ -64,9 +64,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 16, align: 8) { +-+ 02 00 00 00 00 00 00 00 05 20 00 00 00 00 00 00 │ ......... ...... + } +++ +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/enum_opt.unin.EnumSizeOpt.32bit.diff b/tests/mir-opt/enum_opt.unin.EnumSizeOpt.32bit.diff +index f7d0d1fb56c3e..a04829af4b532 100644 +--- a/tests/mir-opt/enum_opt.unin.EnumSizeOpt.32bit.diff ++++ b/tests/mir-opt/enum_opt.unin.EnumSizeOpt.32bit.diff +@@ -64,9 +64,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 05 20 00 00 01 00 00 00 │ . ...... + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/enum_opt.unin.EnumSizeOpt.64bit.diff b/tests/mir-opt/enum_opt.unin.EnumSizeOpt.64bit.diff +index 15f1bd0df51a2..f5521a1e22a47 100644 +--- a/tests/mir-opt/enum_opt.unin.EnumSizeOpt.64bit.diff ++++ b/tests/mir-opt/enum_opt.unin.EnumSizeOpt.64bit.diff +@@ -64,9 +64,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 16, align: 8) { +-+ 05 20 00 00 00 00 00 00 01 00 00 00 00 00 00 00 │ . .............. + } +++ +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-abort.diff b/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-abort.diff +index 5bf22af6ae83d..0e3f2459fae35 100644 +--- a/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-abort.diff ++++ b/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-abort.diff +@@ -140,9 +140,7 @@ + _0 = const (); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 16, align: 8) { +-+ 00 00 00 00 00 00 00 00 00 __ __ __ __ __ __ __ │ .........░░░░░░░ + } +++ +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-unwind.diff b/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-unwind.diff +index 18d2029e44500..2873d7ef0ab13 100644 +--- a/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-unwind.diff ++++ b/tests/mir-opt/gvn.arithmetic_checked.GVN.panic-unwind.diff +@@ -140,9 +140,7 @@ + _0 = const (); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 16, align: 8) { +-+ 00 00 00 00 00 00 00 00 00 __ __ __ __ __ __ __ │ .........░░░░░░░ + } +++ +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/gvn.fn_pointers.GVN.panic-abort.diff b/tests/mir-opt/gvn.fn_pointers.GVN.panic-abort.diff +index 0c49e706c9ecf..b5c0cee784688 100644 +--- a/tests/mir-opt/gvn.fn_pointers.GVN.panic-abort.diff ++++ b/tests/mir-opt/gvn.fn_pointers.GVN.panic-abort.diff +@@ -8,10 +8,10 @@ + let mut _3: fn(u8) -> u8; + let _5: (); + let mut _6: fn(u8) -> u8; +- let mut _9: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let mut _9: {closure@$DIR/gvn.rs:613:19: 613:21}; + let _10: (); + let mut _11: fn(); +- let mut _13: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let mut _13: {closure@$DIR/gvn.rs:613:19: 613:21}; + let _14: (); + let mut _15: fn(); + scope 1 { +@@ -19,7 +19,7 @@ + let _4: fn(u8) -> u8; + scope 2 { + debug g => _4; +- let _7: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let _7: {closure@$DIR/gvn.rs:613:19: 613:21}; + scope 3 { + debug closure => _7; + let _8: fn(); +@@ -62,16 +62,16 @@ + StorageDead(_6); + StorageDead(_5); + - StorageLive(_7); +-- _7 = {closure@$DIR/gvn.rs:612:19: 612:21}; ++- _7 = {closure@$DIR/gvn.rs:613:19: 613:21}; + - StorageLive(_8); + + nop; +-+ _7 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +++ _7 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; + + nop; + StorageLive(_9); + - _9 = _7; + - _8 = move _9 as fn() (PointerCoercion(ClosureFnPointer(Safe))); +-+ _9 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +-+ _8 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); +++ _9 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; +++ _8 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); + StorageDead(_9); + StorageLive(_10); + StorageLive(_11); +@@ -88,8 +88,8 @@ + StorageLive(_13); + - _13 = _7; + - _12 = move _13 as fn() (PointerCoercion(ClosureFnPointer(Safe))); +-+ _13 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +-+ _12 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); +++ _13 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; +++ _12 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); + StorageDead(_13); + StorageLive(_14); + StorageLive(_15); +diff --git a/tests/mir-opt/gvn.fn_pointers.GVN.panic-unwind.diff b/tests/mir-opt/gvn.fn_pointers.GVN.panic-unwind.diff +index e5f865b74b9f4..7bc6573c13d4d 100644 +--- a/tests/mir-opt/gvn.fn_pointers.GVN.panic-unwind.diff ++++ b/tests/mir-opt/gvn.fn_pointers.GVN.panic-unwind.diff +@@ -8,10 +8,10 @@ + let mut _3: fn(u8) -> u8; + let _5: (); + let mut _6: fn(u8) -> u8; +- let mut _9: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let mut _9: {closure@$DIR/gvn.rs:613:19: 613:21}; + let _10: (); + let mut _11: fn(); +- let mut _13: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let mut _13: {closure@$DIR/gvn.rs:613:19: 613:21}; + let _14: (); + let mut _15: fn(); + scope 1 { +@@ -19,7 +19,7 @@ + let _4: fn(u8) -> u8; + scope 2 { + debug g => _4; +- let _7: {closure@$DIR/gvn.rs:612:19: 612:21}; ++ let _7: {closure@$DIR/gvn.rs:613:19: 613:21}; + scope 3 { + debug closure => _7; + let _8: fn(); +@@ -62,16 +62,16 @@ + StorageDead(_6); + StorageDead(_5); + - StorageLive(_7); +-- _7 = {closure@$DIR/gvn.rs:612:19: 612:21}; ++- _7 = {closure@$DIR/gvn.rs:613:19: 613:21}; + - StorageLive(_8); + + nop; +-+ _7 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +++ _7 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; + + nop; + StorageLive(_9); + - _9 = _7; + - _8 = move _9 as fn() (PointerCoercion(ClosureFnPointer(Safe))); +-+ _9 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +-+ _8 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); +++ _9 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; +++ _8 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); + StorageDead(_9); + StorageLive(_10); + StorageLive(_11); +@@ -88,8 +88,8 @@ + StorageLive(_13); + - _13 = _7; + - _12 = move _13 as fn() (PointerCoercion(ClosureFnPointer(Safe))); +-+ _13 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21}; +-+ _12 = const ZeroSized: {closure@$DIR/gvn.rs:612:19: 612:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); +++ _13 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21}; +++ _12 = const ZeroSized: {closure@$DIR/gvn.rs:613:19: 613:21} as fn() (PointerCoercion(ClosureFnPointer(Safe))); + StorageDead(_13); + StorageLive(_14); + StorageLive(_15); +diff --git a/tests/mir-opt/gvn.indirect_static.GVN.panic-abort.diff b/tests/mir-opt/gvn.indirect_static.GVN.panic-abort.diff +index f853942bbb664..e84f91e495d9c 100644 +--- a/tests/mir-opt/gvn.indirect_static.GVN.panic-abort.diff ++++ b/tests/mir-opt/gvn.indirect_static.GVN.panic-abort.diff +@@ -13,7 +13,5 @@ + } + } + +- ALLOC0 (static: A, size: 2, align: 1) { +- 00 __ │ .░ +- } ++ ALLOC0 (static: A, size: 2, align: 1) { .. } + +diff --git a/tests/mir-opt/gvn.indirect_static.GVN.panic-unwind.diff b/tests/mir-opt/gvn.indirect_static.GVN.panic-unwind.diff +index f853942bbb664..e84f91e495d9c 100644 +--- a/tests/mir-opt/gvn.indirect_static.GVN.panic-unwind.diff ++++ b/tests/mir-opt/gvn.indirect_static.GVN.panic-unwind.diff +@@ -13,7 +13,5 @@ + } + } + +- ALLOC0 (static: A, size: 2, align: 1) { +- 00 __ │ .░ +- } ++ ALLOC0 (static: A, size: 2, align: 1) { .. } + +diff --git a/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-abort.diff b/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-abort.diff +index 07c4c7663c154..3eed0473f7fc2 100644 +--- a/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-abort.diff ++++ b/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-abort.diff +@@ -176,13 +176,9 @@ + + nop; + return; + } +-+ } ++ } + + +-+ ALLOC1 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC1 (size: 16, align: 8) { .. } + + +-+ ALLOC0 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 │ ................ +- } +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-unwind.diff b/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-unwind.diff +index df0f93f1077ee..9a6e255a872ea 100644 +--- a/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-unwind.diff ++++ b/tests/mir-opt/gvn.wide_ptr_integer.GVN.panic-unwind.diff +@@ -176,13 +176,9 @@ + + nop; + return; + } +-+ } ++ } + + +-+ ALLOC1 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 02 00 00 00 00 00 00 00 │ ................ +-+ } +++ ALLOC1 (size: 16, align: 8) { .. } + + +-+ ALLOC0 (size: 16, align: 8) { +-+ 01 00 00 00 00 00 00 00 01 00 00 00 00 00 00 00 │ ................ +- } +++ ALLOC0 (size: 16, align: 8) { .. } + +diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-abort.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-abort.diff +index 2f34a62b3d136..45b8d89c0f4fa 100644 +--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-abort.diff ++++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-abort.diff +@@ -61,9 +61,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-unwind.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-unwind.diff +index da7add371a5bf..e6ee1e6f9a348 100644 +--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-unwind.diff ++++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.32bit.panic-unwind.diff +@@ -61,9 +61,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-abort.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-abort.diff +index 2f34a62b3d136..45b8d89c0f4fa 100644 +--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-abort.diff ++++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-abort.diff +@@ -61,9 +61,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + +diff --git a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-unwind.diff b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-unwind.diff +index da7add371a5bf..e6ee1e6f9a348 100644 +--- a/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-unwind.diff ++++ b/tests/mir-opt/pre-codegen/optimizes_into_variable.main.GVN.64bit.panic-unwind.diff +@@ -61,9 +61,7 @@ + StorageDead(_1); + return; + } +-+ } +-+ +-+ ALLOC0 (size: 8, align: 4) { +-+ 04 00 00 00 00 __ __ __ │ .....░░░ + } +++ +++ ALLOC0 (size: 8, align: 4) { .. } + |