Evaluated computed values to constants.

Author: cjgillot

compiler/rustc_const_eval/src/interpret/discriminant.rs

@@ -1,7 +1,8 @@
 //! Functions for reading and writing discriminants of multi-variant layouts (enums and generators).
 
-use rustc_middle::ty::layout::{LayoutOf, PrimitiveExt, TyAndLayout};
-use rustc_middle::{mir, ty};
+use rustc_middle::mir;
+use rustc_middle::ty::layout::{LayoutOf, PrimitiveExt};
+use rustc_middle::ty::{self, Ty};
 use rustc_target::abi::{self, TagEncoding};
 use rustc_target::abi::{VariantIdx, Variants};
 
@@ -245,11 +246,11 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
 
     pub fn discriminant_for_variant(
         &self,
-        layout: TyAndLayout<'tcx>,
+        ty: Ty<'tcx>,
         variant: VariantIdx,
     ) -> InterpResult<'tcx, ImmTy<'tcx, M::Provenance>> {
-        let discr_layout = self.layout_of(layout.ty.discriminant_ty(*self.tcx))?;
-        let discr_value = match layout.ty.discriminant_for_variant(*self.tcx, variant) {
+        let discr_layout = self.layout_of(ty.discriminant_ty(*self.tcx))?;
+        let discr_value = match ty.discriminant_for_variant(*self.tcx, variant) {
             Some(discr) => {
                 // This type actually has discriminants.
                 assert_eq!(discr.ty, discr_layout.ty);

compiler/rustc_const_eval/src/interpret/intrinsics.rs

@@ -219,7 +219,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             sym::discriminant_value => {
                 let place = self.deref_pointer(&args[0])?;
                 let variant = self.read_discriminant(&place)?;
-                let discr = self.discriminant_for_variant(place.layout, variant)?;
+                let discr = self.discriminant_for_variant(place.layout.ty, variant)?;
                 self.write_immediate(*discr, dest)?;
             }
             sym::exact_div => {

compiler/rustc_const_eval/src/interpret/operand.rs

@@ -157,6 +157,16 @@ impl<'tcx, Prov: Provenance> ImmTy<'tcx, Prov> {
         ImmTy { imm: val.into(), layout }
     }
 
+    #[inline]
+    pub fn from_scalar_pair(a: Scalar<Prov>, b: Scalar<Prov>, layout: TyAndLayout<'tcx>) -> Self {
+        debug_assert!(
+            matches!(layout.abi, Abi::ScalarPair(..)),
+            "`ImmTy::from_scalar_pair` on non-scalar-pair layout"
+        );
+        let imm = Immediate::ScalarPair(a, b);
+        ImmTy { imm, layout }
+    }
+
     #[inline(always)]
     pub fn from_immediate(imm: Immediate<Prov>, layout: TyAndLayout<'tcx>) -> Self {
         debug_assert!(layout.is_sized(), "immediates must be sized");

compiler/rustc_const_eval/src/interpret/step.rs

@@ -300,7 +300,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
             Discriminant(place) => {
                 let op = self.eval_place_to_op(place, None)?;
                 let variant = self.read_discriminant(&op)?;
-                let discr = self.discriminant_for_variant(op.layout, variant)?;
+                let discr = self.discriminant_for_variant(op.layout.ty, variant)?;
                 self.write_immediate(*discr, &dest)?;
             }
         }

compiler/rustc_middle/src/mir/consts.rs

@@ -165,6 +165,20 @@ impl<'tcx> ConstValue<'tcx> {
         // This is for diagnostics only, so we are okay to use `inspect_with_uninit_and_ptr_outside_interpreter`.
         Some(data.inner().inspect_with_uninit_and_ptr_outside_interpreter(start..end))
     }
+
+    pub fn has_provenance(&self, tcx: TyCtxt<'tcx>, size: Size) -> bool {
+        let (alloc, start, end) = match *self {
+            ConstValue::ZeroSized | ConstValue::Scalar(Scalar::Int(_)) => return false,
+            ConstValue::Scalar(Scalar::Ptr(..)) => return true,
+            ConstValue::Slice { data, start, end } => {
+                (data, Size::from_bytes(start), Size::from_bytes(end))
+            }
+            ConstValue::Indirect { alloc_id, offset } => {
+                (tcx.global_alloc(alloc_id).unwrap_memory(), offset, offset + size)
+            }
+        };
+        !alloc.inner().provenance().range_empty(super::AllocRange::from(start..end), &tcx)
+    }
 }
 
 ///////////////////////////////////////////////////////////////////////////

compiler/rustc_mir_transform/src/dataflow_const_prop.rs

@@ -400,7 +400,8 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> {
                 TrackElem::Variant(idx) => self.ecx.project_downcast(op, idx).ok(),
                 TrackElem::Discriminant => {
                     let variant = self.ecx.read_discriminant(op).ok()?;
-                    let discr_value = self.ecx.discriminant_for_variant(op.layout, variant).ok()?;
+                    let discr_value =
+                        self.ecx.discriminant_for_variant(op.layout.ty, variant).ok()?;
                     Some(discr_value.into())
                 }
                 TrackElem::DerefLen => {
@@ -499,7 +500,8 @@ impl<'a, 'tcx> ConstAnalysis<'a, 'tcx> {
             return None;
         }
         let enum_ty_layout = self.tcx.layout_of(self.param_env.and(enum_ty)).ok()?;
-        let discr_value = self.ecx.discriminant_for_variant(enum_ty_layout, variant_index).ok()?;
+        let discr_value =
+            self.ecx.discriminant_for_variant(enum_ty_layout.ty, variant_index).ok()?;
         Some(discr_value.to_scalar())
     }
 
@@ -693,7 +695,7 @@ impl<'tcx> Visitor<'tcx> for OperandCollector<'tcx, '_, '_, '_> {
     }
 }
 
-struct DummyMachine;
+pub(crate) struct DummyMachine;
 
 impl<'mir, 'tcx: 'mir> rustc_const_eval::interpret::Machine<'mir, 'tcx> for DummyMachine {
     rustc_const_eval::interpret::compile_time_machine!(<'mir, 'tcx>);
@@ -708,8 +710,9 @@ impl<'mir, 'tcx: 'mir> rustc_const_eval::interpret::Machine<'mir, 'tcx> for Dumm
     }
 
     fn enforce_validity(_ecx: &InterpCx<'mir, 'tcx, Self>, _layout: TyAndLayout<'tcx>) -> bool {
-        unimplemented!()
+        false
     }
+
     fn alignment_check_failed(
         _ecx: &InterpCx<'mir, 'tcx, Self>,
         _has: Align,

compiler/rustc_mir_transform/src/gvn.rs

@@ -35,7 +35,8 @@
 +                             debug ((f: (bool, bool, u32)).2: u32) => const 123_u32;
                               let _6: std::option::Option<u16>;
                               scope 7 {
-                                  debug o => _6;
+-                                 debug o => _6;
++                                 debug o => const Option::<u16>::Some(99_u16);
                                   let _11: u32;
                                   let _12: u32;
                                   scope 8 {
@@ -72,7 +73,7 @@
           _9 = const false;
           _10 = const 123_u32;
           StorageLive(_6);
-          _6 = Option::<u16>::Some(const 99_u16);
+          _6 = const Option::<u16>::Some(99_u16);
           _11 = const 32_u32;
           _12 = const 32_u32;
           StorageLive(_7);
@@ -88,3 +89,7 @@
       }
   }
 
+  alloc11 (size: 4, align: 2) {
+      01 00 63 00                                     │ ..c.
+  }
+  

tests/mir-opt/const_debuginfo.main.ConstDebugInfo.diff

@@ -121,9 +121,10 @@
           StorageLive(_15);
           StorageLive(_16);
           _16 = _1;
-          _17 = Eq(const 0_u64, const 0_u64);
+-         _17 = Eq(const 0_u64, const 0_u64);
 -         assert(!move _17, "attempt to divide `{}` by zero", _16) -> [success: bb5, unwind unreachable];
-+         assert(!_17, "attempt to divide `{}` by zero", _1) -> [success: bb5, unwind unreachable];
++         _17 = const true;
++         assert(!const true, "attempt to divide `{}` by zero", _1) -> [success: bb5, unwind unreachable];
       }
 
       bb5: {
@@ -140,9 +141,10 @@
           StorageLive(_19);
           StorageLive(_20);
           _20 = _1;
-          _21 = Eq(const 1_u64, const 0_u64);
+-         _21 = Eq(const 1_u64, const 0_u64);
 -         assert(!move _21, "attempt to divide `{}` by zero", _20) -> [success: bb7, unwind unreachable];
-+         assert(!_21, "attempt to divide `{}` by zero", _1) -> [success: bb7, unwind unreachable];
++         _21 = const false;
++         assert(!const false, "attempt to divide `{}` by zero", _1) -> [success: bb7, unwind unreachable];
       }
 
       bb7: {
@@ -201,8 +203,8 @@
           _32 = _1;
 -         _33 = Eq(const 0_u64, const 0_u64);
 -         assert(!move _33, "attempt to calculate the remainder of `{}` with a divisor of zero", _32) -> [success: bb13, unwind unreachable];
-+         _33 = _17;
-+         assert(!_17, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb13, unwind unreachable];
++         _33 = const true;
++         assert(!const true, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb13, unwind unreachable];
       }
 
       bb13: {
@@ -221,8 +223,8 @@
           _36 = _1;
 -         _37 = Eq(const 1_u64, const 0_u64);
 -         assert(!move _37, "attempt to calculate the remainder of `{}` with a divisor of zero", _36) -> [success: bb15, unwind unreachable];
-+         _37 = _21;
-+         assert(!_21, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb15, unwind unreachable];
++         _37 = const false;
++         assert(!const false, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb15, unwind unreachable];
       }
 
       bb15: {

tests/mir-opt/gvn.arithmetic.GVN.panic-abort.diff

@@ -121,9 +121,10 @@
           StorageLive(_15);
           StorageLive(_16);
           _16 = _1;
-          _17 = Eq(const 0_u64, const 0_u64);
+-         _17 = Eq(const 0_u64, const 0_u64);
 -         assert(!move _17, "attempt to divide `{}` by zero", _16) -> [success: bb5, unwind continue];
-+         assert(!_17, "attempt to divide `{}` by zero", _1) -> [success: bb5, unwind continue];
++         _17 = const true;
++         assert(!const true, "attempt to divide `{}` by zero", _1) -> [success: bb5, unwind continue];
       }
 
       bb5: {
@@ -140,9 +141,10 @@
           StorageLive(_19);
           StorageLive(_20);
           _20 = _1;
-          _21 = Eq(const 1_u64, const 0_u64);
+-         _21 = Eq(const 1_u64, const 0_u64);
 -         assert(!move _21, "attempt to divide `{}` by zero", _20) -> [success: bb7, unwind continue];
-+         assert(!_21, "attempt to divide `{}` by zero", _1) -> [success: bb7, unwind continue];
++         _21 = const false;
++         assert(!const false, "attempt to divide `{}` by zero", _1) -> [success: bb7, unwind continue];
       }
 
       bb7: {
@@ -201,8 +203,8 @@
           _32 = _1;
 -         _33 = Eq(const 0_u64, const 0_u64);
 -         assert(!move _33, "attempt to calculate the remainder of `{}` with a divisor of zero", _32) -> [success: bb13, unwind continue];
-+         _33 = _17;
-+         assert(!_17, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb13, unwind continue];
++         _33 = const true;
++         assert(!const true, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb13, unwind continue];
       }
 
       bb13: {
@@ -221,8 +223,8 @@
           _36 = _1;
 -         _37 = Eq(const 1_u64, const 0_u64);
 -         assert(!move _37, "attempt to calculate the remainder of `{}` with a divisor of zero", _36) -> [success: bb15, unwind continue];
-+         _37 = _21;
-+         assert(!_21, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb15, unwind continue];
++         _37 = const false;
++         assert(!const false, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb15, unwind continue];
       }
 
       bb15: {

tests/mir-opt/gvn.arithmetic.GVN.panic-unwind.diff

@@ -153,9 +153,10 @@
           StorageLive(_19);
           StorageLive(_20);
           _20 = _1;
-          _21 = Eq(const 0_u64, const 0_u64);
+-         _21 = Eq(const 0_u64, const 0_u64);
 -         assert(!move _21, "attempt to divide `{}` by zero", _20) -> [success: bb9, unwind unreachable];
-+         assert(!_21, "attempt to divide `{}` by zero", _1) -> [success: bb9, unwind unreachable];
++         _21 = const true;
++         assert(!const true, "attempt to divide `{}` by zero", _1) -> [success: bb9, unwind unreachable];
       }
 
       bb9: {
@@ -172,9 +173,10 @@
           StorageLive(_23);
           StorageLive(_24);
           _24 = _1;
-          _25 = Eq(const 1_u64, const 0_u64);
+-         _25 = Eq(const 1_u64, const 0_u64);
 -         assert(!move _25, "attempt to divide `{}` by zero", _24) -> [success: bb11, unwind unreachable];
-+         assert(!_25, "attempt to divide `{}` by zero", _1) -> [success: bb11, unwind unreachable];
++         _25 = const false;
++         assert(!const false, "attempt to divide `{}` by zero", _1) -> [success: bb11, unwind unreachable];
       }
 
       bb11: {
@@ -233,8 +235,8 @@
           _36 = _1;
 -         _37 = Eq(const 0_u64, const 0_u64);
 -         assert(!move _37, "attempt to calculate the remainder of `{}` with a divisor of zero", _36) -> [success: bb17, unwind unreachable];
-+         _37 = _21;
-+         assert(!_21, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb17, unwind unreachable];
++         _37 = const true;
++         assert(!const true, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb17, unwind unreachable];
       }
 
       bb17: {
@@ -253,8 +255,8 @@
           _40 = _1;
 -         _41 = Eq(const 1_u64, const 0_u64);
 -         assert(!move _41, "attempt to calculate the remainder of `{}` with a divisor of zero", _40) -> [success: bb19, unwind unreachable];
-+         _41 = _25;
-+         assert(!_25, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb19, unwind unreachable];
++         _41 = const false;
++         assert(!const false, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb19, unwind unreachable];
       }
 
       bb19: {
@@ -350,11 +352,12 @@
           StorageLive(_60);
           StorageLive(_61);
           _61 = _1;
-          _62 = const 0_i32 as u32 (IntToInt);
+-         _62 = const 0_i32 as u32 (IntToInt);
 -         _63 = Lt(move _62, const 64_u32);
 -         assert(move _63, "attempt to shift right by `{}`, which would overflow", const 0_i32) -> [success: bb28, unwind unreachable];
-+         _63 = Lt(_62, const 64_u32);
-+         assert(_63, "attempt to shift right by `{}`, which would overflow", const 0_i32) -> [success: bb28, unwind unreachable];
++         _62 = const 0_u32;
++         _63 = const true;
++         assert(const true, "attempt to shift right by `{}`, which would overflow", const 0_i32) -> [success: bb28, unwind unreachable];
       }
 
       bb28: {
@@ -374,9 +377,9 @@
 -         _67 = const 0_i32 as u32 (IntToInt);
 -         _68 = Lt(move _67, const 64_u32);
 -         assert(move _68, "attempt to shift left by `{}`, which would overflow", const 0_i32) -> [success: bb30, unwind unreachable];
-+         _67 = _62;
-+         _68 = _63;
-+         assert(_63, "attempt to shift left by `{}`, which would overflow", const 0_i32) -> [success: bb30, unwind unreachable];
++         _67 = const 0_u32;
++         _68 = const true;
++         assert(const true, "attempt to shift left by `{}`, which would overflow", const 0_i32) -> [success: bb30, unwind unreachable];
       }
 
       bb30: {

tests/mir-opt/gvn.arithmetic_checked.GVN.panic-abort.diff

@@ -153,9 +153,10 @@
           StorageLive(_19);
           StorageLive(_20);
           _20 = _1;
-          _21 = Eq(const 0_u64, const 0_u64);
+-         _21 = Eq(const 0_u64, const 0_u64);
 -         assert(!move _21, "attempt to divide `{}` by zero", _20) -> [success: bb9, unwind continue];
-+         assert(!_21, "attempt to divide `{}` by zero", _1) -> [success: bb9, unwind continue];
++         _21 = const true;
++         assert(!const true, "attempt to divide `{}` by zero", _1) -> [success: bb9, unwind continue];
       }
 
       bb9: {
@@ -172,9 +173,10 @@
           StorageLive(_23);
           StorageLive(_24);
           _24 = _1;
-          _25 = Eq(const 1_u64, const 0_u64);
+-         _25 = Eq(const 1_u64, const 0_u64);
 -         assert(!move _25, "attempt to divide `{}` by zero", _24) -> [success: bb11, unwind continue];
-+         assert(!_25, "attempt to divide `{}` by zero", _1) -> [success: bb11, unwind continue];
++         _25 = const false;
++         assert(!const false, "attempt to divide `{}` by zero", _1) -> [success: bb11, unwind continue];
       }
 
       bb11: {
@@ -233,8 +235,8 @@
           _36 = _1;
 -         _37 = Eq(const 0_u64, const 0_u64);
 -         assert(!move _37, "attempt to calculate the remainder of `{}` with a divisor of zero", _36) -> [success: bb17, unwind continue];
-+         _37 = _21;
-+         assert(!_21, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb17, unwind continue];
++         _37 = const true;
++         assert(!const true, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb17, unwind continue];
       }
 
       bb17: {
@@ -253,8 +255,8 @@
           _40 = _1;
 -         _41 = Eq(const 1_u64, const 0_u64);
 -         assert(!move _41, "attempt to calculate the remainder of `{}` with a divisor of zero", _40) -> [success: bb19, unwind continue];
-+         _41 = _25;
-+         assert(!_25, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb19, unwind continue];
++         _41 = const false;
++         assert(!const false, "attempt to calculate the remainder of `{}` with a divisor of zero", _1) -> [success: bb19, unwind continue];
       }
 
       bb19: {
@@ -350,11 +352,12 @@
           StorageLive(_60);
           StorageLive(_61);
           _61 = _1;
-          _62 = const 0_i32 as u32 (IntToInt);
+-         _62 = const 0_i32 as u32 (IntToInt);
 -         _63 = Lt(move _62, const 64_u32);
 -         assert(move _63, "attempt to shift right by `{}`, which would overflow", const 0_i32) -> [success: bb28, unwind continue];
-+         _63 = Lt(_62, const 64_u32);
-+         assert(_63, "attempt to shift right by `{}`, which would overflow", const 0_i32) -> [success: bb28, unwind continue];
++         _62 = const 0_u32;
++         _63 = const true;
++         assert(const true, "attempt to shift right by `{}`, which would overflow", const 0_i32) -> [success: bb28, unwind continue];
       }
 
       bb28: {
@@ -374,9 +377,9 @@
 -         _67 = const 0_i32 as u32 (IntToInt);
 -         _68 = Lt(move _67, const 64_u32);
 -         assert(move _68, "attempt to shift left by `{}`, which would overflow", const 0_i32) -> [success: bb30, unwind continue];
-+         _67 = _62;
-+         _68 = _63;
-+         assert(_63, "attempt to shift left by `{}`, which would overflow", const 0_i32) -> [success: bb30, unwind continue];
++         _67 = const 0_u32;
++         _68 = const true;
++         assert(const true, "attempt to shift left by `{}`, which would overflow", const 0_i32) -> [success: bb30, unwind continue];
       }
 
       bb30: {

tests/mir-opt/gvn.arithmetic_checked.GVN.panic-unwind.diff

@@ -119,9 +119,10 @@
 -         _6 = _1;
 -         _5 = move _6 as u8 (IntToInt);
 +         _6 = const 1_i64;
-+         _5 = const 1_i64 as u8 (IntToInt);
++         _5 = const 1_u8;
           StorageDead(_6);
-          _4 = opaque::<u8>(move _5) -> [return: bb1, unwind unreachable];
+-         _4 = opaque::<u8>(move _5) -> [return: bb1, unwind unreachable];
++         _4 = opaque::<u8>(const 1_u8) -> [return: bb1, unwind unreachable];
       }
 
       bb1: {
@@ -133,9 +134,10 @@
 -         _9 = _1;
 -         _8 = move _9 as u16 (IntToInt);
 +         _9 = const 1_i64;
-+         _8 = const 1_i64 as u16 (IntToInt);
++         _8 = const 1_u16;
           StorageDead(_9);
-          _7 = opaque::<u16>(move _8) -> [return: bb2, unwind unreachable];
+-         _7 = opaque::<u16>(move _8) -> [return: bb2, unwind unreachable];
++         _7 = opaque::<u16>(const 1_u16) -> [return: bb2, unwind unreachable];
       }
 
       bb2: {
@@ -147,9 +149,10 @@
 -         _12 = _1;
 -         _11 = move _12 as u32 (IntToInt);
 +         _12 = const 1_i64;
-+         _11 = const 1_i64 as u32 (IntToInt);
++         _11 = const 1_u32;
           StorageDead(_12);
-          _10 = opaque::<u32>(move _11) -> [return: bb3, unwind unreachable];
+-         _10 = opaque::<u32>(move _11) -> [return: bb3, unwind unreachable];
++         _10 = opaque::<u32>(const 1_u32) -> [return: bb3, unwind unreachable];
       }
 
       bb3: {
@@ -161,9 +164,10 @@
 -         _15 = _1;
 -         _14 = move _15 as u64 (IntToInt);
 +         _15 = const 1_i64;
-+         _14 = const 1_i64 as u64 (IntToInt);
++         _14 = const 1_u64;
           StorageDead(_15);
-          _13 = opaque::<u64>(move _14) -> [return: bb4, unwind unreachable];
+-         _13 = opaque::<u64>(move _14) -> [return: bb4, unwind unreachable];
++         _13 = opaque::<u64>(const 1_u64) -> [return: bb4, unwind unreachable];
       }
 
       bb4: {
@@ -175,9 +179,10 @@
 -         _18 = _1;
 -         _17 = move _18 as i8 (IntToInt);
 +         _18 = const 1_i64;
-+         _17 = const 1_i64 as i8 (IntToInt);
++         _17 = const 1_i8;
           StorageDead(_18);
-          _16 = opaque::<i8>(move _17) -> [return: bb5, unwind unreachable];
+-         _16 = opaque::<i8>(move _17) -> [return: bb5, unwind unreachable];
++         _16 = opaque::<i8>(const 1_i8) -> [return: bb5, unwind unreachable];
       }
 
       bb5: {
@@ -189,9 +194,10 @@
 -         _21 = _1;
 -         _20 = move _21 as i16 (IntToInt);
 +         _21 = const 1_i64;
-+         _20 = const 1_i64 as i16 (IntToInt);
++         _20 = const 1_i16;
           StorageDead(_21);
-          _19 = opaque::<i16>(move _20) -> [return: bb6, unwind unreachable];
+-         _19 = opaque::<i16>(move _20) -> [return: bb6, unwind unreachable];
++         _19 = opaque::<i16>(const 1_i16) -> [return: bb6, unwind unreachable];
       }
 
       bb6: {
@@ -203,9 +209,10 @@
 -         _24 = _1;
 -         _23 = move _24 as i32 (IntToInt);
 +         _24 = const 1_i64;
-+         _23 = const 1_i64 as i32 (IntToInt);
++         _23 = const 1_i32;
           StorageDead(_24);
-          _22 = opaque::<i32>(move _23) -> [return: bb7, unwind unreachable];
+-         _22 = opaque::<i32>(move _23) -> [return: bb7, unwind unreachable];
++         _22 = opaque::<i32>(const 1_i32) -> [return: bb7, unwind unreachable];
       }
 
       bb7: {
@@ -228,9 +235,10 @@
 -         _29 = _1;
 -         _28 = move _29 as f32 (IntToFloat);
 +         _29 = const 1_i64;
-+         _28 = const 1_i64 as f32 (IntToFloat);
++         _28 = const 1f32;
           StorageDead(_29);
-          _27 = opaque::<f32>(move _28) -> [return: bb9, unwind unreachable];
+-         _27 = opaque::<f32>(move _28) -> [return: bb9, unwind unreachable];
++         _27 = opaque::<f32>(const 1f32) -> [return: bb9, unwind unreachable];
       }
 
       bb9: {
@@ -242,9 +250,10 @@
 -         _32 = _1;
 -         _31 = move _32 as f64 (IntToFloat);
 +         _32 = const 1_i64;
-+         _31 = const 1_i64 as f64 (IntToFloat);
++         _31 = const 1f64;
           StorageDead(_32);
-          _30 = opaque::<f64>(move _31) -> [return: bb10, unwind unreachable];
+-         _30 = opaque::<f64>(move _31) -> [return: bb10, unwind unreachable];
++         _30 = opaque::<f64>(const 1f64) -> [return: bb10, unwind unreachable];
       }
 
       bb10: {
@@ -256,9 +265,10 @@
 -         _35 = _2;
 -         _34 = move _35 as u8 (IntToInt);
 +         _35 = const 1_u64;
-+         _34 = const 1_u64 as u8 (IntToInt);
++         _34 = const 1_u8;
           StorageDead(_35);
-          _33 = opaque::<u8>(move _34) -> [return: bb11, unwind unreachable];
+-         _33 = opaque::<u8>(move _34) -> [return: bb11, unwind unreachable];
++         _33 = opaque::<u8>(const 1_u8) -> [return: bb11, unwind unreachable];
       }
 
       bb11: {
@@ -270,9 +280,10 @@
 -         _38 = _2;
 -         _37 = move _38 as u16 (IntToInt);
 +         _38 = const 1_u64;
-+         _37 = const 1_u64 as u16 (IntToInt);
++         _37 = const 1_u16;
           StorageDead(_38);
-          _36 = opaque::<u16>(move _37) -> [return: bb12, unwind unreachable];
+-         _36 = opaque::<u16>(move _37) -> [return: bb12, unwind unreachable];
++         _36 = opaque::<u16>(const 1_u16) -> [return: bb12, unwind unreachable];
       }
 
       bb12: {
@@ -284,9 +295,10 @@
 -         _41 = _2;
 -         _40 = move _41 as u32 (IntToInt);
 +         _41 = const 1_u64;
-+         _40 = const 1_u64 as u32 (IntToInt);
++         _40 = const 1_u32;
           StorageDead(_41);
-          _39 = opaque::<u32>(move _40) -> [return: bb13, unwind unreachable];
+-         _39 = opaque::<u32>(move _40) -> [return: bb13, unwind unreachable];
++         _39 = opaque::<u32>(const 1_u32) -> [return: bb13, unwind unreachable];
       }
 
       bb13: {
@@ -309,9 +321,10 @@
 -         _46 = _2;
 -         _45 = move _46 as i8 (IntToInt);
 +         _46 = const 1_u64;
-+         _45 = const 1_u64 as i8 (IntToInt);
++         _45 = const 1_i8;
           StorageDead(_46);
-          _44 = opaque::<i8>(move _45) -> [return: bb15, unwind unreachable];
+-         _44 = opaque::<i8>(move _45) -> [return: bb15, unwind unreachable];
++         _44 = opaque::<i8>(const 1_i8) -> [return: bb15, unwind unreachable];
       }
 
       bb15: {
@@ -323,9 +336,10 @@
 -         _49 = _2;
 -         _48 = move _49 as i16 (IntToInt);
 +         _49 = const 1_u64;
-+         _48 = const 1_u64 as i16 (IntToInt);
++         _48 = const 1_i16;
           StorageDead(_49);
-          _47 = opaque::<i16>(move _48) -> [return: bb16, unwind unreachable];
+-         _47 = opaque::<i16>(move _48) -> [return: bb16, unwind unreachable];
++         _47 = opaque::<i16>(const 1_i16) -> [return: bb16, unwind unreachable];
       }
 
       bb16: {
@@ -337,9 +351,10 @@
 -         _52 = _2;
 -         _51 = move _52 as i32 (IntToInt);
 +         _52 = const 1_u64;
-+         _51 = const 1_u64 as i32 (IntToInt);
++         _51 = const 1_i32;
           StorageDead(_52);
-          _50 = opaque::<i32>(move _51) -> [return: bb17, unwind unreachable];
+-         _50 = opaque::<i32>(move _51) -> [return: bb17, unwind unreachable];
++         _50 = opaque::<i32>(const 1_i32) -> [return: bb17, unwind unreachable];
       }
 
       bb17: {
@@ -351,9 +366,10 @@
 -         _55 = _2;
 -         _54 = move _55 as i64 (IntToInt);
 +         _55 = const 1_u64;
-+         _54 = const 1_u64 as i64 (IntToInt);
++         _54 = const 1_i64;
           StorageDead(_55);
-          _53 = opaque::<i64>(move _54) -> [return: bb18, unwind unreachable];
+-         _53 = opaque::<i64>(move _54) -> [return: bb18, unwind unreachable];
++         _53 = opaque::<i64>(const 1_i64) -> [return: bb18, unwind unreachable];
       }
 
       bb18: {
@@ -365,9 +381,10 @@
 -         _58 = _2;
 -         _57 = move _58 as f32 (IntToFloat);
 +         _58 = const 1_u64;
-+         _57 = const 1_u64 as f32 (IntToFloat);
++         _57 = const 1f32;
           StorageDead(_58);
-          _56 = opaque::<f32>(move _57) -> [return: bb19, unwind unreachable];
+-         _56 = opaque::<f32>(move _57) -> [return: bb19, unwind unreachable];
++         _56 = opaque::<f32>(const 1f32) -> [return: bb19, unwind unreachable];
       }
 
       bb19: {
@@ -379,9 +396,10 @@
 -         _61 = _2;
 -         _60 = move _61 as f64 (IntToFloat);
 +         _61 = const 1_u64;
-+         _60 = const 1_u64 as f64 (IntToFloat);
++         _60 = const 1f64;
           StorageDead(_61);
-          _59 = opaque::<f64>(move _60) -> [return: bb20, unwind unreachable];
+-         _59 = opaque::<f64>(move _60) -> [return: bb20, unwind unreachable];
++         _59 = opaque::<f64>(const 1f64) -> [return: bb20, unwind unreachable];
       }
 
       bb20: {
@@ -393,9 +411,10 @@
 -         _64 = _3;
 -         _63 = move _64 as u8 (FloatToInt);
 +         _64 = const 1f64;
-+         _63 = const 1f64 as u8 (FloatToInt);
++         _63 = const 1_u8;
           StorageDead(_64);
-          _62 = opaque::<u8>(move _63) -> [return: bb21, unwind unreachable];
+-         _62 = opaque::<u8>(move _63) -> [return: bb21, unwind unreachable];
++         _62 = opaque::<u8>(const 1_u8) -> [return: bb21, unwind unreachable];
       }
 
       bb21: {
@@ -407,9 +426,10 @@
 -         _67 = _3;
 -         _66 = move _67 as u16 (FloatToInt);
 +         _67 = const 1f64;
-+         _66 = const 1f64 as u16 (FloatToInt);
++         _66 = const 1_u16;
           StorageDead(_67);
-          _65 = opaque::<u16>(move _66) -> [return: bb22, unwind unreachable];
+-         _65 = opaque::<u16>(move _66) -> [return: bb22, unwind unreachable];
++         _65 = opaque::<u16>(const 1_u16) -> [return: bb22, unwind unreachable];
       }
 
       bb22: {
@@ -421,9 +441,10 @@
 -         _70 = _3;
 -         _69 = move _70 as u32 (FloatToInt);
 +         _70 = const 1f64;
-+         _69 = const 1f64 as u32 (FloatToInt);
++         _69 = const 1_u32;
           StorageDead(_70);
-          _68 = opaque::<u32>(move _69) -> [return: bb23, unwind unreachable];
+-         _68 = opaque::<u32>(move _69) -> [return: bb23, unwind unreachable];
++         _68 = opaque::<u32>(const 1_u32) -> [return: bb23, unwind unreachable];
       }
 
       bb23: {
@@ -435,9 +456,10 @@
 -         _73 = _3;
 -         _72 = move _73 as u64 (FloatToInt);
 +         _73 = const 1f64;
-+         _72 = const 1f64 as u64 (FloatToInt);
++         _72 = const 1_u64;
           StorageDead(_73);
-          _71 = opaque::<u64>(move _72) -> [return: bb24, unwind unreachable];
+-         _71 = opaque::<u64>(move _72) -> [return: bb24, unwind unreachable];
++         _71 = opaque::<u64>(const 1_u64) -> [return: bb24, unwind unreachable];
       }
 
       bb24: {
@@ -449,9 +471,10 @@
 -         _76 = _3;
 -         _75 = move _76 as i8 (FloatToInt);
 +         _76 = const 1f64;
-+         _75 = const 1f64 as i8 (FloatToInt);
++         _75 = const 1_i8;
           StorageDead(_76);
-          _74 = opaque::<i8>(move _75) -> [return: bb25, unwind unreachable];
+-         _74 = opaque::<i8>(move _75) -> [return: bb25, unwind unreachable];
++         _74 = opaque::<i8>(const 1_i8) -> [return: bb25, unwind unreachable];
       }
 
       bb25: {
@@ -463,9 +486,10 @@
 -         _79 = _3;
 -         _78 = move _79 as i16 (FloatToInt);
 +         _79 = const 1f64;
-+         _78 = const 1f64 as i16 (FloatToInt);
++         _78 = const 1_i16;
           StorageDead(_79);
-          _77 = opaque::<i16>(move _78) -> [return: bb26, unwind unreachable];
+-         _77 = opaque::<i16>(move _78) -> [return: bb26, unwind unreachable];
++         _77 = opaque::<i16>(const 1_i16) -> [return: bb26, unwind unreachable];
       }
 
       bb26: {
@@ -477,9 +501,10 @@
 -         _82 = _3;
 -         _81 = move _82 as i32 (FloatToInt);
 +         _82 = const 1f64;
-+         _81 = const 1f64 as i32 (FloatToInt);
++         _81 = const 1_i32;
           StorageDead(_82);
-          _80 = opaque::<i32>(move _81) -> [return: bb27, unwind unreachable];
+-         _80 = opaque::<i32>(move _81) -> [return: bb27, unwind unreachable];
++         _80 = opaque::<i32>(const 1_i32) -> [return: bb27, unwind unreachable];
       }
 
       bb27: {
@@ -491,9 +516,10 @@
 -         _85 = _3;
 -         _84 = move _85 as i64 (FloatToInt);
 +         _85 = const 1f64;
-+         _84 = const 1f64 as i64 (FloatToInt);
++         _84 = const 1_i64;
           StorageDead(_85);
-          _83 = opaque::<i64>(move _84) -> [return: bb28, unwind unreachable];
+-         _83 = opaque::<i64>(move _84) -> [return: bb28, unwind unreachable];
++         _83 = opaque::<i64>(const 1_i64) -> [return: bb28, unwind unreachable];
       }
 
       bb28: {
@@ -505,9 +531,10 @@
 -         _88 = _3;
 -         _87 = move _88 as f32 (FloatToFloat);
 +         _88 = const 1f64;
-+         _87 = const 1f64 as f32 (FloatToFloat);
++         _87 = const 1f32;
           StorageDead(_88);
-          _86 = opaque::<f32>(move _87) -> [return: bb29, unwind unreachable];
+-         _86 = opaque::<f32>(move _87) -> [return: bb29, unwind unreachable];
++         _86 = opaque::<f32>(const 1f32) -> [return: bb29, unwind unreachable];
       }
 
       bb29: {

tests/mir-opt/gvn.cast.GVN.panic-abort.diff

@@ -119,9 +119,10 @@
 -         _6 = _1;
 -         _5 = move _6 as u8 (IntToInt);
 +         _6 = const 1_i64;
-+         _5 = const 1_i64 as u8 (IntToInt);
++         _5 = const 1_u8;
           StorageDead(_6);
-          _4 = opaque::<u8>(move _5) -> [return: bb1, unwind continue];
+-         _4 = opaque::<u8>(move _5) -> [return: bb1, unwind continue];
++         _4 = opaque::<u8>(const 1_u8) -> [return: bb1, unwind continue];
       }
 
       bb1: {
@@ -133,9 +134,10 @@
 -         _9 = _1;
 -         _8 = move _9 as u16 (IntToInt);
 +         _9 = const 1_i64;
-+         _8 = const 1_i64 as u16 (IntToInt);
++         _8 = const 1_u16;
           StorageDead(_9);
-          _7 = opaque::<u16>(move _8) -> [return: bb2, unwind continue];
+-         _7 = opaque::<u16>(move _8) -> [return: bb2, unwind continue];
++         _7 = opaque::<u16>(const 1_u16) -> [return: bb2, unwind continue];
       }
 
       bb2: {
@@ -147,9 +149,10 @@
 -         _12 = _1;
 -         _11 = move _12 as u32 (IntToInt);
 +         _12 = const 1_i64;
-+         _11 = const 1_i64 as u32 (IntToInt);
++         _11 = const 1_u32;
           StorageDead(_12);
-          _10 = opaque::<u32>(move _11) -> [return: bb3, unwind continue];
+-         _10 = opaque::<u32>(move _11) -> [return: bb3, unwind continue];
++         _10 = opaque::<u32>(const 1_u32) -> [return: bb3, unwind continue];
       }
 
       bb3: {
@@ -161,9 +164,10 @@
 -         _15 = _1;
 -         _14 = move _15 as u64 (IntToInt);
 +         _15 = const 1_i64;
-+         _14 = const 1_i64 as u64 (IntToInt);
++         _14 = const 1_u64;
           StorageDead(_15);
-          _13 = opaque::<u64>(move _14) -> [return: bb4, unwind continue];
+-         _13 = opaque::<u64>(move _14) -> [return: bb4, unwind continue];
++         _13 = opaque::<u64>(const 1_u64) -> [return: bb4, unwind continue];
       }
 
       bb4: {
@@ -175,9 +179,10 @@
 -         _18 = _1;
 -         _17 = move _18 as i8 (IntToInt);
 +         _18 = const 1_i64;
-+         _17 = const 1_i64 as i8 (IntToInt);
++         _17 = const 1_i8;
           StorageDead(_18);
-          _16 = opaque::<i8>(move _17) -> [return: bb5, unwind continue];
+-         _16 = opaque::<i8>(move _17) -> [return: bb5, unwind continue];
++         _16 = opaque::<i8>(const 1_i8) -> [return: bb5, unwind continue];
       }
 
       bb5: {
@@ -189,9 +194,10 @@
 -         _21 = _1;
 -         _20 = move _21 as i16 (IntToInt);
 +         _21 = const 1_i64;
-+         _20 = const 1_i64 as i16 (IntToInt);
++         _20 = const 1_i16;
           StorageDead(_21);
-          _19 = opaque::<i16>(move _20) -> [return: bb6, unwind continue];
+-         _19 = opaque::<i16>(move _20) -> [return: bb6, unwind continue];
++         _19 = opaque::<i16>(const 1_i16) -> [return: bb6, unwind continue];
       }
 
       bb6: {
@@ -203,9 +209,10 @@
 -         _24 = _1;
 -         _23 = move _24 as i32 (IntToInt);
 +         _24 = const 1_i64;
-+         _23 = const 1_i64 as i32 (IntToInt);
++         _23 = const 1_i32;
           StorageDead(_24);
-          _22 = opaque::<i32>(move _23) -> [return: bb7, unwind continue];
+-         _22 = opaque::<i32>(move _23) -> [return: bb7, unwind continue];
++         _22 = opaque::<i32>(const 1_i32) -> [return: bb7, unwind continue];
       }
 
       bb7: {
@@ -228,9 +235,10 @@
 -         _29 = _1;
 -         _28 = move _29 as f32 (IntToFloat);
 +         _29 = const 1_i64;
-+         _28 = const 1_i64 as f32 (IntToFloat);
++         _28 = const 1f32;
           StorageDead(_29);
-          _27 = opaque::<f32>(move _28) -> [return: bb9, unwind continue];
+-         _27 = opaque::<f32>(move _28) -> [return: bb9, unwind continue];
++         _27 = opaque::<f32>(const 1f32) -> [return: bb9, unwind continue];
       }
 
       bb9: {
@@ -242,9 +250,10 @@
 -         _32 = _1;
 -         _31 = move _32 as f64 (IntToFloat);
 +         _32 = const 1_i64;
-+         _31 = const 1_i64 as f64 (IntToFloat);
++         _31 = const 1f64;
           StorageDead(_32);
-          _30 = opaque::<f64>(move _31) -> [return: bb10, unwind continue];
+-         _30 = opaque::<f64>(move _31) -> [return: bb10, unwind continue];
++         _30 = opaque::<f64>(const 1f64) -> [return: bb10, unwind continue];
       }
 
       bb10: {
@@ -256,9 +265,10 @@
 -         _35 = _2;
 -         _34 = move _35 as u8 (IntToInt);
 +         _35 = const 1_u64;
-+         _34 = const 1_u64 as u8 (IntToInt);
++         _34 = const 1_u8;
           StorageDead(_35);
-          _33 = opaque::<u8>(move _34) -> [return: bb11, unwind continue];
+-         _33 = opaque::<u8>(move _34) -> [return: bb11, unwind continue];
++         _33 = opaque::<u8>(const 1_u8) -> [return: bb11, unwind continue];
       }
 
       bb11: {
@@ -270,9 +280,10 @@
 -         _38 = _2;
 -         _37 = move _38 as u16 (IntToInt);
 +         _38 = const 1_u64;
-+         _37 = const 1_u64 as u16 (IntToInt);
++         _37 = const 1_u16;
           StorageDead(_38);
-          _36 = opaque::<u16>(move _37) -> [return: bb12, unwind continue];
+-         _36 = opaque::<u16>(move _37) -> [return: bb12, unwind continue];
++         _36 = opaque::<u16>(const 1_u16) -> [return: bb12, unwind continue];
       }
 
       bb12: {
@@ -284,9 +295,10 @@
 -         _41 = _2;
 -         _40 = move _41 as u32 (IntToInt);
 +         _41 = const 1_u64;
-+         _40 = const 1_u64 as u32 (IntToInt);
++         _40 = const 1_u32;
           StorageDead(_41);
-          _39 = opaque::<u32>(move _40) -> [return: bb13, unwind continue];
+-         _39 = opaque::<u32>(move _40) -> [return: bb13, unwind continue];
++         _39 = opaque::<u32>(const 1_u32) -> [return: bb13, unwind continue];
       }
 
       bb13: {
@@ -309,9 +321,10 @@
 -         _46 = _2;
 -         _45 = move _46 as i8 (IntToInt);
 +         _46 = const 1_u64;
-+         _45 = const 1_u64 as i8 (IntToInt);
++         _45 = const 1_i8;
           StorageDead(_46);
-          _44 = opaque::<i8>(move _45) -> [return: bb15, unwind continue];
+-         _44 = opaque::<i8>(move _45) -> [return: bb15, unwind continue];
++         _44 = opaque::<i8>(const 1_i8) -> [return: bb15, unwind continue];
       }
 
       bb15: {
@@ -323,9 +336,10 @@
 -         _49 = _2;
 -         _48 = move _49 as i16 (IntToInt);
 +         _49 = const 1_u64;
-+         _48 = const 1_u64 as i16 (IntToInt);
++         _48 = const 1_i16;
           StorageDead(_49);
-          _47 = opaque::<i16>(move _48) -> [return: bb16, unwind continue];
+-         _47 = opaque::<i16>(move _48) -> [return: bb16, unwind continue];
++         _47 = opaque::<i16>(const 1_i16) -> [return: bb16, unwind continue];
       }
 
       bb16: {
@@ -337,9 +351,10 @@
 -         _52 = _2;
 -         _51 = move _52 as i32 (IntToInt);
 +         _52 = const 1_u64;
-+         _51 = const 1_u64 as i32 (IntToInt);
++         _51 = const 1_i32;
           StorageDead(_52);
-          _50 = opaque::<i32>(move _51) -> [return: bb17, unwind continue];
+-         _50 = opaque::<i32>(move _51) -> [return: bb17, unwind continue];
++         _50 = opaque::<i32>(const 1_i32) -> [return: bb17, unwind continue];
       }
 
       bb17: {
@@ -351,9 +366,10 @@
 -         _55 = _2;
 -         _54 = move _55 as i64 (IntToInt);
 +         _55 = const 1_u64;
-+         _54 = const 1_u64 as i64 (IntToInt);
++         _54 = const 1_i64;
           StorageDead(_55);
-          _53 = opaque::<i64>(move _54) -> [return: bb18, unwind continue];
+-         _53 = opaque::<i64>(move _54) -> [return: bb18, unwind continue];
++         _53 = opaque::<i64>(const 1_i64) -> [return: bb18, unwind continue];
       }
 
       bb18: {
@@ -365,9 +381,10 @@
 -         _58 = _2;
 -         _57 = move _58 as f32 (IntToFloat);
 +         _58 = const 1_u64;
-+         _57 = const 1_u64 as f32 (IntToFloat);
++         _57 = const 1f32;
           StorageDead(_58);
-          _56 = opaque::<f32>(move _57) -> [return: bb19, unwind continue];
+-         _56 = opaque::<f32>(move _57) -> [return: bb19, unwind continue];
++         _56 = opaque::<f32>(const 1f32) -> [return: bb19, unwind continue];
       }
 
       bb19: {
@@ -379,9 +396,10 @@
 -         _61 = _2;
 -         _60 = move _61 as f64 (IntToFloat);
 +         _61 = const 1_u64;
-+         _60 = const 1_u64 as f64 (IntToFloat);
++         _60 = const 1f64;
           StorageDead(_61);
-          _59 = opaque::<f64>(move _60) -> [return: bb20, unwind continue];
+-         _59 = opaque::<f64>(move _60) -> [return: bb20, unwind continue];
++         _59 = opaque::<f64>(const 1f64) -> [return: bb20, unwind continue];
       }
 
       bb20: {
@@ -393,9 +411,10 @@
 -         _64 = _3;
 -         _63 = move _64 as u8 (FloatToInt);
 +         _64 = const 1f64;
-+         _63 = const 1f64 as u8 (FloatToInt);
++         _63 = const 1_u8;
           StorageDead(_64);
-          _62 = opaque::<u8>(move _63) -> [return: bb21, unwind continue];
+-         _62 = opaque::<u8>(move _63) -> [return: bb21, unwind continue];
++         _62 = opaque::<u8>(const 1_u8) -> [return: bb21, unwind continue];
       }
 
       bb21: {
@@ -407,9 +426,10 @@
 -         _67 = _3;
 -         _66 = move _67 as u16 (FloatToInt);
 +         _67 = const 1f64;
-+         _66 = const 1f64 as u16 (FloatToInt);
++         _66 = const 1_u16;
           StorageDead(_67);
-          _65 = opaque::<u16>(move _66) -> [return: bb22, unwind continue];
+-         _65 = opaque::<u16>(move _66) -> [return: bb22, unwind continue];
++         _65 = opaque::<u16>(const 1_u16) -> [return: bb22, unwind continue];
       }
 
       bb22: {
@@ -421,9 +441,10 @@
 -         _70 = _3;
 -         _69 = move _70 as u32 (FloatToInt);
 +         _70 = const 1f64;
-+         _69 = const 1f64 as u32 (FloatToInt);
++         _69 = const 1_u32;
           StorageDead(_70);
-          _68 = opaque::<u32>(move _69) -> [return: bb23, unwind continue];
+-         _68 = opaque::<u32>(move _69) -> [return: bb23, unwind continue];
++         _68 = opaque::<u32>(const 1_u32) -> [return: bb23, unwind continue];
       }
 
       bb23: {
@@ -435,9 +456,10 @@
 -         _73 = _3;
 -         _72 = move _73 as u64 (FloatToInt);
 +         _73 = const 1f64;
-+         _72 = const 1f64 as u64 (FloatToInt);
++         _72 = const 1_u64;
           StorageDead(_73);
-          _71 = opaque::<u64>(move _72) -> [return: bb24, unwind continue];
+-         _71 = opaque::<u64>(move _72) -> [return: bb24, unwind continue];
++         _71 = opaque::<u64>(const 1_u64) -> [return: bb24, unwind continue];
       }
 
       bb24: {
@@ -449,9 +471,10 @@
 -         _76 = _3;
 -         _75 = move _76 as i8 (FloatToInt);
 +         _76 = const 1f64;
-+         _75 = const 1f64 as i8 (FloatToInt);
++         _75 = const 1_i8;
           StorageDead(_76);
-          _74 = opaque::<i8>(move _75) -> [return: bb25, unwind continue];
+-         _74 = opaque::<i8>(move _75) -> [return: bb25, unwind continue];
++         _74 = opaque::<i8>(const 1_i8) -> [return: bb25, unwind continue];
       }
 
       bb25: {
@@ -463,9 +486,10 @@
 -         _79 = _3;
 -         _78 = move _79 as i16 (FloatToInt);
 +         _79 = const 1f64;
-+         _78 = const 1f64 as i16 (FloatToInt);
++         _78 = const 1_i16;
           StorageDead(_79);
-          _77 = opaque::<i16>(move _78) -> [return: bb26, unwind continue];
+-         _77 = opaque::<i16>(move _78) -> [return: bb26, unwind continue];
++         _77 = opaque::<i16>(const 1_i16) -> [return: bb26, unwind continue];
       }
 
       bb26: {
@@ -477,9 +501,10 @@
 -         _82 = _3;
 -         _81 = move _82 as i32 (FloatToInt);
 +         _82 = const 1f64;
-+         _81 = const 1f64 as i32 (FloatToInt);
++         _81 = const 1_i32;
           StorageDead(_82);
-          _80 = opaque::<i32>(move _81) -> [return: bb27, unwind continue];
+-         _80 = opaque::<i32>(move _81) -> [return: bb27, unwind continue];
++         _80 = opaque::<i32>(const 1_i32) -> [return: bb27, unwind continue];
       }
 
       bb27: {
@@ -491,9 +516,10 @@
 -         _85 = _3;
 -         _84 = move _85 as i64 (FloatToInt);
 +         _85 = const 1f64;
-+         _84 = const 1f64 as i64 (FloatToInt);
++         _84 = const 1_i64;
           StorageDead(_85);
-          _83 = opaque::<i64>(move _84) -> [return: bb28, unwind continue];
+-         _83 = opaque::<i64>(move _84) -> [return: bb28, unwind continue];
++         _83 = opaque::<i64>(const 1_i64) -> [return: bb28, unwind continue];
       }
 
       bb28: {
@@ -505,9 +531,10 @@
 -         _88 = _3;
 -         _87 = move _88 as f32 (FloatToFloat);
 +         _88 = const 1f64;
-+         _87 = const 1f64 as f32 (FloatToFloat);
++         _87 = const 1f32;
           StorageDead(_88);
-          _86 = opaque::<f32>(move _87) -> [return: bb29, unwind continue];
+-         _86 = opaque::<f32>(move _87) -> [return: bb29, unwind continue];
++         _86 = opaque::<f32>(const 1f32) -> [return: bb29, unwind continue];
       }
 
       bb29: {

tests/mir-opt/gvn.cast.GVN.panic-unwind.diff

@@ -37,7 +37,7 @@
 -     }
 - 
 -     bb1: {
-+         _4 = [generator@$DIR/inline_generator.rs:16:5: 16:8 (#0)];
++         _4 = const Indirect { alloc_id: alloc6, offset: Size(0 bytes) }: [generator@$DIR/inline_generator.rs:16:5: 16:8];
           _3 = &mut _4;
 -         _2 = Pin::<&mut [generator@$DIR/inline_generator.rs:16:5: 16:8]>::new(move _3) -> [return: bb2, unwind unreachable];
 -     }
@@ -61,7 +61,7 @@
           _0 = const ();
           StorageDead(_1);
           return;
-+     }
+      }
 + 
 +     bb2: {
 +         StorageLive(_8);
@@ -98,6 +98,10 @@
 + 
 +     bb8: {
 +         unreachable;
-      }
++     }
++ }
++ 
++ alloc6 (size: 1, align: 1) {
++     00                                              │ .
   }
 

tests/mir-opt/inline/inline_generator.main.Inline.panic-abort.diff

@@ -37,7 +37,7 @@
 -     }
 - 
 -     bb1: {
-+         _4 = [generator@$DIR/inline_generator.rs:16:5: 16:8 (#0)];
++         _4 = const Indirect { alloc_id: alloc6, offset: Size(0 bytes) }: [generator@$DIR/inline_generator.rs:16:5: 16:8];
           _3 = &mut _4;
 -         _2 = Pin::<&mut [generator@$DIR/inline_generator.rs:16:5: 16:8]>::new(move _3) -> [return: bb2, unwind: bb4];
 -     }
@@ -66,7 +66,7 @@
 -     bb4 (cleanup): {
 +     bb2 (cleanup): {
           resume;
-+     }
+      }
 + 
 +     bb3: {
 +         StorageLive(_8);
@@ -103,6 +103,10 @@
 + 
 +     bb9: {
 +         unreachable;
-      }
++     }
++ }
++ 
++ alloc6 (size: 1, align: 1) {
++     00                                              │ .
   }