Rebase fallout.

cjgillot · cjgillot · commit a2c3ebf96310 · 2026-02-22T20:02:56.000Z
diff --git a/tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.32bit.panic-abort.diff b/tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.32bit.panic-abort.diff
@@ -50,7 +50,8 @@
 +         _4 = const ();
           StorageLive(_12);
           StorageLive(_13);
-          _13 = boxed::box_new_uninit(const <() as std::mem::SizedTypeProperties>::LAYOUT) -> [return: bb2, unwind unreachable];
+-         _13 = boxed::box_new_uninit(const <() as std::mem::SizedTypeProperties>::LAYOUT) -> [return: bb2, unwind unreachable];
++         _13 = boxed::box_new_uninit(const Layout {{ size: 0_usize, align: std::ptr::Alignment {{ _inner_repr_trick: std::ptr::alignment::AlignmentEnum::_Align1Shl0 }} }}) -> [return: bb2, unwind unreachable];
       }
   
       bb1: {
@@ -103,5 +104,9 @@
 +         nop;
           drop(_3) -> [return: bb1, unwind unreachable];
       }
++ }
++ 
++ ALLOC0 (size: 8, align: 4) {
++     01 00 00 00 00 00 00 00                         │ ........
   }
   
diff --git a/tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.64bit.panic-abort.diff b/tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.64bit.panic-abort.diff
@@ -50,7 +50,8 @@
 +         _4 = const ();
           StorageLive(_12);
           StorageLive(_13);
-          _13 = boxed::box_new_uninit(const <() as std::mem::SizedTypeProperties>::LAYOUT) -> [return: bb2, unwind unreachable];
+-         _13 = boxed::box_new_uninit(const <() as std::mem::SizedTypeProperties>::LAYOUT) -> [return: bb2, unwind unreachable];
++         _13 = boxed::box_new_uninit(const Layout {{ size: 0_usize, align: std::ptr::Alignment {{ _inner_repr_trick: std::ptr::alignment::AlignmentEnum::_Align1Shl0 }} }}) -> [return: bb2, unwind unreachable];
       }
   
       bb1: {
@@ -103,5 +104,9 @@
 +         nop;
           drop(_3) -> [return: bb1, unwind unreachable];
       }
++ }
++ 
++ ALLOC0 (size: 16, align: 8) {
++     01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 │ ................
   }
   

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@`
`50`	`50`	`+ _4 = const ();`
`51`	`51`	`StorageLive(_12);`
`52`	`52`	`StorageLive(_13);`
`53`		`- _13 = boxed::box_new_uninit(const <() as std::mem::SizedTypeProperties>::LAYOUT) -> [return: bb2, unwind unreachable];`
	`53`	`+- _13 = boxed::box_new_uninit(const <() as std::mem::SizedTypeProperties>::LAYOUT) -> [return: bb2, unwind unreachable];`
	`54`	`++ _13 = boxed::box_new_uninit(const Layout {{ size: 0_usize, align: std::ptr::Alignment {{ _inner_repr_trick: std::ptr::alignment::AlignmentEnum::_Align1Shl0 }} }}) -> [return: bb2, unwind unreachable];`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`bb1: {`
`@@ -103,5 +104,9 @@`
`103`	`104`	`+ nop;`
`104`	`105`	`drop(_3) -> [return: bb1, unwind unreachable];`
`105`	`106`	`}`
	`107`	`++ }`
	`108`	`++`
	`109`	`++ ALLOC0 (size: 8, align: 4) {`
	`110`	`++ 01 00 00 00 00 00 00 00 │ ........`
`106`	`111`	`}`
`107`	`112`