Update UI tests for enums that shrank

Author: zachs18

tests/ui/consts/const-eval/ub-enum.rs

@@ -95,9 +95,9 @@ const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { mem::transmute
 
 // All variants are uninhabited but also have data.
 // Use `0` as constant to make behavior endianness-independent.
-const BAD_UNINHABITED_WITH_DATA1: Result<(i32, Never), (i32, !)> = unsafe { mem::transmute(0u64) };
+const BAD_UNINHABITED_WITH_DATA1: Result<(i32, Never), (i32, !)> = unsafe { mem::transmute(0u32) };
 //~^ ERROR uninhabited enum variant
-const BAD_UNINHABITED_WITH_DATA2: Result<(i32, !), (i32, Never)> = unsafe { mem::transmute(0u64) };
+const BAD_UNINHABITED_WITH_DATA2: Result<(i32, !), (i32, Never)> = unsafe { mem::transmute(0u32) };
 //~^ ERROR uninhabited enum variant
 
 const TEST_ICE_89765: () = {

tests/ui/consts/const-eval/ub-enum.stderr

@@ -111,13 +111,13 @@ LL | const BAD_OPTION_CHAR: Option<(char, char)> = Some(('x', unsafe { mem::tran
 error[E0080]: constructing invalid value at .<enum-tag>: encountered an uninhabited enum variant
   --> $DIR/ub-enum.rs:98:77
    |
-LL | const BAD_UNINHABITED_WITH_DATA1: Result<(i32, Never), (i32, !)> = unsafe { mem::transmute(0u64) };
+LL | const BAD_UNINHABITED_WITH_DATA1: Result<(i32, Never), (i32, !)> = unsafe { mem::transmute(0u32) };
    |                                                                             ^^^^^^^^^^^^^^^^^^^^ evaluation of `BAD_UNINHABITED_WITH_DATA1` failed here
 
 error[E0080]: constructing invalid value at .<enum-tag>: encountered an uninhabited enum variant
   --> $DIR/ub-enum.rs:100:77
    |
-LL | const BAD_UNINHABITED_WITH_DATA2: Result<(i32, !), (i32, Never)> = unsafe { mem::transmute(0u64) };
+LL | const BAD_UNINHABITED_WITH_DATA2: Result<(i32, !), (i32, Never)> = unsafe { mem::transmute(0u32) };
    |                                                                             ^^^^^^^^^^^^^^^^^^^^ evaluation of `BAD_UNINHABITED_WITH_DATA2` failed here
 
 error[E0080]: read discriminant of an uninhabited enum variant

tests/ui/layout/debug.stderr

@@ -5,7 +5,7 @@ LL | union EmptyUnion {}
    | ^^^^^^^^^^^^^^^^^^^
 
 error: layout_of(E) = Layout {
-           size: Size(12 bytes),
+           size: Size(8 bytes),
            align: AbiAlign {
                abi: Align(4 bytes),
            },
@@ -64,23 +64,36 @@ error: layout_of(E) = Layout {
                        randomization_seed: $SEED,
                    },
                    Layout {
-                       size: Size(12 bytes),
+                       size: Size(8 bytes),
                        align: AbiAlign {
                            abi: Align(4 bytes),
                        },
-                       backend_repr: Memory {
-                           sized: true,
-                       },
+                       backend_repr: ScalarPair(
+                           Initialized {
+                               value: Int(
+                                   I32,
+                                   true,
+                               ),
+                               valid_range: 0..=4294967295,
+                           },
+                           Initialized {
+                               value: Int(
+                                   I32,
+                                   true,
+                               ),
+                               valid_range: 0..=4294967295,
+                           },
+                       ),
                        fields: Arbitrary {
                            offsets: [
-                               Size(4 bytes),
-                               Size(4 bytes),
                                Size(8 bytes),
+                               Size(0 bytes),
+                               Size(4 bytes),
                            ],
                            memory_index: [
+                               2,
                                0,
                                1,
-                               2,
                            ],
                        },
                        largest_niche: None,
@@ -493,7 +506,7 @@ LL | union P3 { x: F32x4 }
    | ^^^^^^^^
 
 error: layout_of(P4) = Layout {
-           size: Size(12 bytes),
+           size: Size(8 bytes),
            align: AbiAlign {
                abi: Align(1 bytes),
            },

tests/ui/layout/enum.rs

@@ -12,7 +12,7 @@ enum UninhabitedVariantAlign { //~ERROR: abi: Align(2 bytes)
 }
 
 #[rustc_layout(size)]
-enum UninhabitedVariantSpace { //~ERROR: size: Size(16 bytes)
+enum UninhabitedVariantSpace { //~ERROR: size: Size(15 bytes)
     A,
     B([u8; 15], !), // make sure there is space being reserved for this field.
 }

tests/ui/layout/enum.stderr

@@ -4,7 +4,7 @@ error: align: AbiAlign { abi: Align(2 bytes) }
 LL | enum UninhabitedVariantAlign {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: size: Size(16 bytes)
+error: size: Size(15 bytes)
   --> $DIR/enum.rs:15:1
    |
 LL | enum UninhabitedVariantSpace {