]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #75566 - alasher:master, r=oli-obk
authorbors <bors@rust-lang.org>
Tue, 18 Aug 2020 07:39:48 +0000 (07:39 +0000)
committerbors <bors@rust-lang.org>
Tue, 18 Aug 2020 07:39:48 +0000 (07:39 +0000)
Suppress verbose MIR comments for trivial types

Addresses #74508

This is my first contribution to the Rust project! Please let me know if anything needs revising, I'm happy to make changes.

132 files changed:
src/librustc_mir/util/pretty.rs
src/test/mir-opt/address_of.address_of_reborrow.SimplifyCfg-initial.after.mir
src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.32bit
src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.mir.64bit
src/test/mir-opt/basic_assignment.main.SimplifyCfg-initial.after.mir
src/test/mir-opt/byte_slice.main.SimplifyCfg-elaborate-drops.after.mir
src/test/mir-opt/combine_array_len.norm2.InstCombine.diff.32bit
src/test/mir-opt/combine_array_len.norm2.InstCombine.diff.64bit
src/test/mir-opt/const_prop/aggregate.main.ConstProp.diff
src/test/mir-opt/const_prop/array_index.main.ConstProp.diff.32bit
src/test/mir-opt/const_prop/array_index.main.ConstProp.diff.64bit
src/test/mir-opt/const_prop/bad_op_div_by_zero.main.ConstProp.diff
src/test/mir-opt/const_prop/bad_op_mod_by_zero.main.ConstProp.diff
src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.diff.32bit
src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.diff.64bit
src/test/mir-opt/const_prop/boolean_identities.test.ConstProp.diff
src/test/mir-opt/const_prop/boxes.main.ConstProp.diff
src/test/mir-opt/const_prop/cast.main.ConstProp.diff
src/test/mir-opt/const_prop/checked_add.main.ConstProp.diff
src/test/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff
src/test/mir-opt/const_prop/discriminant.main.ConstProp.diff.32bit
src/test/mir-opt/const_prop/discriminant.main.ConstProp.diff.64bit
src/test/mir-opt/const_prop/indirect.main.ConstProp.diff
src/test/mir-opt/const_prop/issue_66971.main.ConstProp.diff
src/test/mir-opt/const_prop/issue_67019.main.ConstProp.diff
src/test/mir-opt/const_prop/large_array_index.main.ConstProp.diff.32bit
src/test/mir-opt/const_prop/large_array_index.main.ConstProp.diff.64bit
src/test/mir-opt/const_prop/mult_by_zero.test.ConstProp.diff
src/test/mir-opt/const_prop/mutable_variable.main.ConstProp.diff
src/test/mir-opt/const_prop/mutable_variable_aggregate.main.ConstProp.diff
src/test/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.ConstProp.diff
src/test/mir-opt/const_prop/mutable_variable_aggregate_partial_read.main.ConstProp.diff
src/test/mir-opt/const_prop/mutable_variable_no_prop.main.ConstProp.diff
src/test/mir-opt/const_prop/mutable_variable_unprop_assign.main.ConstProp.diff
src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.diff.32bit
src/test/mir-opt/const_prop/optimizes_into_variable.main.ConstProp.diff.64bit
src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.mir.32bit
src/test/mir-opt/const_prop/optimizes_into_variable.main.SimplifyLocals.after.mir.64bit
src/test/mir-opt/const_prop/read_immutable_static.main.ConstProp.diff
src/test/mir-opt/const_prop/ref_deref.main.ConstProp.diff
src/test/mir-opt/const_prop/ref_deref.main.PromoteTemps.diff
src/test/mir-opt/const_prop/ref_deref_project.main.PromoteTemps.diff
src/test/mir-opt/const_prop/repeat.main.ConstProp.diff.32bit
src/test/mir-opt/const_prop/repeat.main.ConstProp.diff.64bit
src/test/mir-opt/const_prop/return_place.add.ConstProp.diff
src/test/mir-opt/const_prop/return_place.add.PreCodegen.before.mir
src/test/mir-opt/const_prop/scalar_literal_propagation.main.ConstProp.diff
src/test/mir-opt/const_prop/slice_len.main.ConstProp.diff.32bit
src/test/mir-opt/const_prop/slice_len.main.ConstProp.diff.64bit
src/test/mir-opt/const_prop/switch_int.main.ConstProp.diff
src/test/mir-opt/const_prop/switch_int.main.SimplifyBranches-after-const-prop.diff
src/test/mir-opt/const_prop/tuple_literal_propagation.main.ConstProp.diff
src/test/mir-opt/const_prop_miscompile.bar.ConstProp.diff
src/test/mir-opt/const_prop_miscompile.foo.ConstProp.diff
src/test/mir-opt/copy_propagation_arg.arg_src.CopyPropagation.diff
src/test/mir-opt/copy_propagation_arg.bar.CopyPropagation.diff
src/test/mir-opt/deaggregator_test.bar.Deaggregator.diff
src/test/mir-opt/exponential_or.match_tuple.SimplifyCfg-initial.after.mir
src/test/mir-opt/funky_arms.float_to_exponential_common.ConstProp.diff
src/test/mir-opt/generator_storage_dead_unwind.main-{{closure}}.StateTransform.before.mir
src/test/mir-opt/inline/inline_any_operand.bar.Inline.after.mir
src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff.32bit
src/test/mir-opt/inline/inline_into_box_place.main.Inline.diff.64bit
src/test/mir-opt/inline/inline_specialization.main.Inline.diff
src/test/mir-opt/instrument_coverage.bar.InstrumentCoverage.diff
src/test/mir-opt/instrument_coverage.main.InstrumentCoverage.diff
src/test/mir-opt/issue_38669.main.SimplifyCfg-initial.after.mir
src/test/mir-opt/issue_41110.main.ElaborateDrops.after.mir
src/test/mir-opt/issue_41110.test.ElaborateDrops.after.mir
src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-qualify-consts.after.mir.32bit
src/test/mir-opt/issue_41697.{{impl}}-{{constant}}.SimplifyCfg-qualify-consts.after.mir.64bit
src/test/mir-opt/issue_41888.main.ElaborateDrops.after.mir
src/test/mir-opt/issue_49232.main.mir_map.0.mir
src/test/mir-opt/issue_72181.foo.mir_map.0.mir.32bit
src/test/mir-opt/issue_72181.foo.mir_map.0.mir.64bit
src/test/mir-opt/issue_72181.main.mir_map.0.mir.32bit
src/test/mir-opt/issue_72181.main.mir_map.0.mir.64bit
src/test/mir-opt/issue_73223.main.PreCodegen.diff.32bit
src/test/mir-opt/issue_73223.main.PreCodegen.diff.64bit
src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff.32bit
src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff.64bit
src/test/mir-opt/loop_test.main.SimplifyCfg-qualify-consts.after.mir
src/test/mir-opt/match_arm_scopes.complicated_match.SimplifyCfg-initial.after-ElaborateDrops.after.diff
src/test/mir-opt/match_false_edges.full_tested_match.PromoteTemps.after.mir
src/test/mir-opt/match_false_edges.full_tested_match2.PromoteTemps.before.mir
src/test/mir-opt/match_false_edges.main.PromoteTemps.before.mir
src/test/mir-opt/match_test.main.SimplifyCfg-initial.after.mir
src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff.32bit
src/test/mir-opt/matches_reduce_branches.bar.MatchBranchSimplification.diff.64bit
src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff.32bit
src/test/mir-opt/matches_reduce_branches.foo.MatchBranchSimplification.diff.64bit
src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff.32bit
src/test/mir-opt/matches_u8.exhaustive_match.MatchBranchSimplification.diff.64bit
src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.32bit
src/test/mir-opt/matches_u8.exhaustive_match_i8.MatchBranchSimplification.diff.64bit
src/test/mir-opt/nll/named_lifetimes_basic.use_x.nll.0.mir
src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.mir.32bit
src/test/mir-opt/nll/region_subtyping_basic.main.nll.0.mir.64bit
src/test/mir-opt/nrvo_simple.nrvo.RenameReturnPlace.diff
src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.32bit
src/test/mir-opt/packed_struct_drop_aligned.main.SimplifyCfg-elaborate-drops.after.mir.64bit
src/test/mir-opt/remove_fake_borrows.match_guard.CleanupNonCodegenStatements.diff
src/test/mir-opt/retag.main.SimplifyCfg-elaborate-drops.after.mir
src/test/mir-opt/simple_match.match_bool.mir_map.0.mir.32bit
src/test/mir-opt/simple_match.match_bool.mir_map.0.mir.64bit
src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.diff.32bit
src/test/mir-opt/simplify_arm_identity.main.SimplifyArmIdentity.diff.64bit
src/test/mir-opt/simplify_if.main.SimplifyBranches-after-const-prop.diff
src/test/mir-opt/simplify_locals_fixedpoint.foo.SimplifyLocals.diff
src/test/mir-opt/simplify_locals_removes_unused_consts.main.SimplifyLocals.diff
src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.32bit
src/test/mir-opt/simplify_locals_removes_unused_discriminant_reads.map.SimplifyLocals.diff.64bit
src/test/mir-opt/simplify_match.main.ConstProp.diff
src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[std__string__String].AddMovesForPackedDrops.before.mir.32bit
src/test/mir-opt/slice_drop_shim.core.ptr-drop_in_place.[std__string__String].AddMovesForPackedDrops.before.mir.64bit
src/test/mir-opt/storage_live_dead_in_statics.XXX.mir_map.0.mir
src/test/mir-opt/storage_ranges.main.nll.0.mir
src/test/mir-opt/tls_access.main.SimplifyCfg-final.after.mir
src/test/mir-opt/uniform_array_move_out.move_out_by_subslice.mir_map.0.mir
src/test/mir-opt/uniform_array_move_out.move_out_from_end.mir_map.0.mir
src/test/mir-opt/unreachable.main.UnreachablePropagation.diff
src/test/mir-opt/unreachable_asm.main.UnreachablePropagation.diff
src/test/mir-opt/unreachable_asm_2.main.UnreachablePropagation.diff
src/test/mir-opt/unreachable_diverging.main.UnreachablePropagation.diff
src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.mir.32bit
src/test/mir-opt/unusual_item_types.E-V-{{constant}}.mir_map.0.mir.64bit
src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.32bit
src/test/mir-opt/unusual_item_types.{{impl}}-ASSOCIATED_CONSTANT.mir_map.0.mir.64bit
src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.diff.32bit
src/test/mir-opt/while_let_loops.change_loop_body.ConstProp.diff.64bit
src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir.32bit
src/test/mir-opt/while_let_loops.change_loop_body.PreCodegen.after.mir.64bit

index c3dbac08ed800faa53580d697845f03e0cdc6c16..0294a7cd7aff1ecb5577316e4b50f725433c9a92 100644 (file)
@@ -387,20 +387,30 @@ impl Visitor<'tcx> for ExtraComments<'tcx> {
     fn visit_constant(&mut self, constant: &Constant<'tcx>, location: Location) {
         self.super_constant(constant, location);
         let Constant { span, user_ty, literal } = constant;
-        self.push("mir::Constant");
-        self.push(&format!("+ span: {}", self.tcx.sess.source_map().span_to_string(*span)));
-        if let Some(user_ty) = user_ty {
-            self.push(&format!("+ user_ty: {:?}", user_ty));
+        match literal.ty.kind {
+            ty::Int(_) | ty::Uint(_) | ty::Bool | ty::Char => {}
+            _ => {
+                self.push("mir::Constant");
+                self.push(&format!("+ span: {}", self.tcx.sess.source_map().span_to_string(*span)));
+                if let Some(user_ty) = user_ty {
+                    self.push(&format!("+ user_ty: {:?}", user_ty));
+                }
+                self.push(&format!("+ literal: {:?}", literal));
+            }
         }
-        self.push(&format!("+ literal: {:?}", literal));
     }
 
     fn visit_const(&mut self, constant: &&'tcx ty::Const<'tcx>, _: Location) {
         self.super_const(constant);
         let ty::Const { ty, val, .. } = constant;
-        self.push("ty::Const");
-        self.push(&format!("+ ty: {:?}", ty));
-        self.push(&format!("+ val: {:?}", val));
+        match ty.kind {
+            ty::Int(_) | ty::Uint(_) | ty::Bool | ty::Char => {}
+            _ => {
+                self.push("ty::Const");
+                self.push(&format!("+ ty: {:?}", ty));
+                self.push(&format!("+ val: {:?}", val));
+            }
+        }
     }
 
     fn visit_rvalue(&mut self, rvalue: &Rvalue<'tcx>, location: Location) {
index 07793b3598f9ead5b07ea7d87856469ade523520..d9b5094f1e1982945289b1eb3023e5a06962e743 100644 (file)
@@ -129,23 +129,11 @@ fn address_of_reborrow() -> () {
         StorageLive(_1);                 // scope 0 at $DIR/address-of.rs:4:9: 4:10
         StorageLive(_2);                 // scope 0 at $DIR/address-of.rs:4:14: 4:21
         _2 = [const 0_i32; 10];          // scope 0 at $DIR/address-of.rs:4:14: 4:21
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/address-of.rs:4:15: 4:16
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
         _1 = &_2;                        // scope 0 at $DIR/address-of.rs:4:13: 4:21
         FakeRead(ForLet, _1);            // scope 0 at $DIR/address-of.rs:4:9: 4:10
         StorageLive(_3);                 // scope 1 at $DIR/address-of.rs:5:9: 5:14
         StorageLive(_4);                 // scope 1 at $DIR/address-of.rs:5:22: 5:29
         _4 = [const 0_i32; 10];          // scope 1 at $DIR/address-of.rs:5:22: 5:29
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/address-of.rs:5:23: 5:24
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
         _3 = &mut _4;                    // scope 1 at $DIR/address-of.rs:5:17: 5:29
         FakeRead(ForLet, _3);            // scope 1 at $DIR/address-of.rs:5:9: 5:14
         StorageLive(_5);                 // scope 2 at $DIR/address-of.rs:7:5: 7:18
index 2a3a18d6c5b5dbe50f429fb12b81346f550514ee..895824947e93d5517dcd8108a9d6a9e52862f452 100644 (file)
@@ -26,32 +26,8 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/array-index-is-temporary.rs:13:9: 13:14
         _1 = [const 42_u32, const 43_u32, const 44_u32]; // scope 0 at $DIR/array-index-is-temporary.rs:13:17: 13:29
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x0000002a))
-                                         // mir::Constant
-                                         // + span: $DIR/array-index-is-temporary.rs:13:18: 13:20
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x0000002b))
-                                         // mir::Constant
-                                         // + span: $DIR/array-index-is-temporary.rs:13:22: 13:24
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x0000002b)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x0000002c))
-                                         // mir::Constant
-                                         // + span: $DIR/array-index-is-temporary.rs:13:26: 13:28
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x0000002c)) }
         StorageLive(_2);                 // scope 1 at $DIR/array-index-is-temporary.rs:14:9: 14:14
         _2 = const 1_usize;              // scope 1 at $DIR/array-index-is-temporary.rs:14:17: 14:18
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/array-index-is-temporary.rs:14:17: 14:18
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
         StorageLive(_3);                 // scope 2 at $DIR/array-index-is-temporary.rs:15:9: 15:10
         StorageLive(_4);                 // scope 2 at $DIR/array-index-is-temporary.rs:15:25: 15:31
         _4 = &mut _2;                    // scope 2 at $DIR/array-index-is-temporary.rs:15:25: 15:31
index 093c170cf7a3a41ae68187368e7e4801e39579ae..895824947e93d5517dcd8108a9d6a9e52862f452 100644 (file)
@@ -26,32 +26,8 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/array-index-is-temporary.rs:13:9: 13:14
         _1 = [const 42_u32, const 43_u32, const 44_u32]; // scope 0 at $DIR/array-index-is-temporary.rs:13:17: 13:29
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x0000002a))
-                                         // mir::Constant
-                                         // + span: $DIR/array-index-is-temporary.rs:13:18: 13:20
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x0000002b))
-                                         // mir::Constant
-                                         // + span: $DIR/array-index-is-temporary.rs:13:22: 13:24
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x0000002b)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x0000002c))
-                                         // mir::Constant
-                                         // + span: $DIR/array-index-is-temporary.rs:13:26: 13:28
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x0000002c)) }
         StorageLive(_2);                 // scope 1 at $DIR/array-index-is-temporary.rs:14:9: 14:14
         _2 = const 1_usize;              // scope 1 at $DIR/array-index-is-temporary.rs:14:17: 14:18
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000001))
-                                         // mir::Constant
-                                         // + span: $DIR/array-index-is-temporary.rs:14:17: 14:18
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
         StorageLive(_3);                 // scope 2 at $DIR/array-index-is-temporary.rs:15:9: 15:10
         StorageLive(_4);                 // scope 2 at $DIR/array-index-is-temporary.rs:15:25: 15:31
         _4 = &mut _2;                    // scope 2 at $DIR/array-index-is-temporary.rs:15:25: 15:31
index de423cd907afee058a8732b9eba7accf64663372..4bb91169cb584c18f63d38a18727de9b6ba087ba 100644 (file)
@@ -28,12 +28,6 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/basic_assignment.rs:11:9: 11:17
         _1 = const false;                // scope 0 at $DIR/basic_assignment.rs:11:20: 11:25
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/basic_assignment.rs:11:20: 11:25
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         FakeRead(ForLet, _1);            // scope 0 at $DIR/basic_assignment.rs:11:9: 11:17
         StorageLive(_2);                 // scope 1 at $DIR/basic_assignment.rs:12:9: 12:17
         StorageLive(_3);                 // scope 2 at $DIR/basic_assignment.rs:16:16: 16:24
index 54e01dceb5099967c27e37e63f62f1f99ec60eda..9e3f6cff4b3311f4baa0e2ca28cd62868a0501e0 100644 (file)
@@ -22,18 +22,6 @@ fn main() -> () {
                                          // + literal: Const { ty: &[u8; 3], val: Value(Scalar(alloc0)) }
         StorageLive(_2);                 // scope 1 at $DIR/byte_slice.rs:6:9: 6:10
         _2 = [const 5_u8, const 120_u8]; // scope 1 at $DIR/byte_slice.rs:6:13: 6:24
-                                         // ty::Const
-                                         // + ty: u8
-                                         // + val: Value(Scalar(0x05))
-                                         // mir::Constant
-                                         // + span: $DIR/byte_slice.rs:6:14: 6:17
-                                         // + literal: Const { ty: u8, val: Value(Scalar(0x05)) }
-                                         // ty::Const
-                                         // + ty: u8
-                                         // + val: Value(Scalar(0x78))
-                                         // mir::Constant
-                                         // + span: $DIR/byte_slice.rs:6:19: 6:23
-                                         // + literal: Const { ty: u8, val: Value(Scalar(0x78)) }
         _0 = const ();                   // scope 0 at $DIR/byte_slice.rs:4:11: 7:2
                                          // ty::Const
                                          // + ty: ()
index 65db967fe5f81f81afeb3e4d7777be114e4f2c24..61e987cc685168a00188771f55fb4ee5e6ffb075 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/combine_array_len.rs:5:9: 5:10
           StorageLive(_3);                 // scope 0 at $DIR/combine_array_len.rs:5:15: 5:16
           _3 = const 0_usize;              // scope 0 at $DIR/combine_array_len.rs:5:15: 5:16
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/combine_array_len.rs:5:15: 5:16
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000000)) }
 -         _4 = Len(_1);                    // scope 0 at $DIR/combine_array_len.rs:5:13: 5:17
 +         _4 = const 2_usize;              // scope 0 at $DIR/combine_array_len.rs:5:13: 5:17
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/combine_array_len.rs:5:13: 5:17
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000002)) }
           _5 = Lt(_3, _4);                 // scope 0 at $DIR/combine_array_len.rs:5:13: 5:17
           assert(move _5, "index out of bounds: the len is {} but the index is {}", move _4, _3) -> bb1; // scope 0 at $DIR/combine_array_len.rs:5:13: 5:17
       }
           StorageLive(_6);                 // scope 1 at $DIR/combine_array_len.rs:6:9: 6:10
           StorageLive(_7);                 // scope 1 at $DIR/combine_array_len.rs:6:15: 6:16
           _7 = const 1_usize;              // scope 1 at $DIR/combine_array_len.rs:6:15: 6:16
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/combine_array_len.rs:6:15: 6:16
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
 -         _8 = Len(_1);                    // scope 1 at $DIR/combine_array_len.rs:6:13: 6:17
 +         _8 = const 2_usize;              // scope 1 at $DIR/combine_array_len.rs:6:13: 6:17
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/combine_array_len.rs:6:13: 6:17
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000002)) }
           _9 = Lt(_7, _8);                 // scope 1 at $DIR/combine_array_len.rs:6:13: 6:17
           assert(move _9, "index out of bounds: the len is {} but the index is {}", move _8, _7) -> bb2; // scope 1 at $DIR/combine_array_len.rs:6:13: 6:17
       }
index 712c4eb230c7eef2a522c395d1aae33dca3ca805..61e987cc685168a00188771f55fb4ee5e6ffb075 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/combine_array_len.rs:5:9: 5:10
           StorageLive(_3);                 // scope 0 at $DIR/combine_array_len.rs:5:15: 5:16
           _3 = const 0_usize;              // scope 0 at $DIR/combine_array_len.rs:5:15: 5:16
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000000))
-                                           // mir::Constant
-                                           // + span: $DIR/combine_array_len.rs:5:15: 5:16
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000000)) }
 -         _4 = Len(_1);                    // scope 0 at $DIR/combine_array_len.rs:5:13: 5:17
 +         _4 = const 2_usize;              // scope 0 at $DIR/combine_array_len.rs:5:13: 5:17
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/combine_array_len.rs:5:13: 5:17
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000002)) }
           _5 = Lt(_3, _4);                 // scope 0 at $DIR/combine_array_len.rs:5:13: 5:17
           assert(move _5, "index out of bounds: the len is {} but the index is {}", move _4, _3) -> bb1; // scope 0 at $DIR/combine_array_len.rs:5:13: 5:17
       }
           StorageLive(_6);                 // scope 1 at $DIR/combine_array_len.rs:6:9: 6:10
           StorageLive(_7);                 // scope 1 at $DIR/combine_array_len.rs:6:15: 6:16
           _7 = const 1_usize;              // scope 1 at $DIR/combine_array_len.rs:6:15: 6:16
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000001))
-                                           // mir::Constant
-                                           // + span: $DIR/combine_array_len.rs:6:15: 6:16
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
 -         _8 = Len(_1);                    // scope 1 at $DIR/combine_array_len.rs:6:13: 6:17
 +         _8 = const 2_usize;              // scope 1 at $DIR/combine_array_len.rs:6:13: 6:17
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/combine_array_len.rs:6:13: 6:17
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000002)) }
           _9 = Lt(_7, _8);                 // scope 1 at $DIR/combine_array_len.rs:6:13: 6:17
           assert(move _9, "index out of bounds: the len is {} but the index is {}", move _8, _7) -> bb2; // scope 1 at $DIR/combine_array_len.rs:6:13: 6:17
       }
index 6992abae6c2bec1fb62db7204950cb87b2c4c144..f44025bd523b2db999194a8c7b64d00b42b37f48 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/aggregate.rs:5:13: 5:24
           StorageLive(_3);                 // scope 0 at $DIR/aggregate.rs:5:13: 5:22
           (_3.0: i32) = const 0_i32;       // scope 0 at $DIR/aggregate.rs:5:13: 5:22
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/aggregate.rs:5:14: 5:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           (_3.1: i32) = const 1_i32;       // scope 0 at $DIR/aggregate.rs:5:13: 5:22
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/aggregate.rs:5:17: 5:18
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           (_3.2: i32) = const 2_i32;       // scope 0 at $DIR/aggregate.rs:5:13: 5:22
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/aggregate.rs:5:20: 5:21
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
 -         _2 = (_3.1: i32);                // scope 0 at $DIR/aggregate.rs:5:13: 5:24
 -         _1 = Add(move _2, const 0_i32);  // scope 0 at $DIR/aggregate.rs:5:13: 5:28
 +         _2 = const 1_i32;                // scope 0 at $DIR/aggregate.rs:5:13: 5:24
-                                           // ty::Const
-                                           // + ty: i32
--                                          // + val: Value(Scalar(0x00000000))
-+                                          // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
--                                          // + span: $DIR/aggregate.rs:5:27: 5:28
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
-+                                          // + span: $DIR/aggregate.rs:5:13: 5:24
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
 +         _1 = const 1_i32;                // scope 0 at $DIR/aggregate.rs:5:13: 5:28
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/aggregate.rs:5:13: 5:28
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           StorageDead(_2);                 // scope 0 at $DIR/aggregate.rs:5:27: 5:28
           StorageDead(_3);                 // scope 0 at $DIR/aggregate.rs:5:28: 5:29
           _0 = const ();                   // scope 0 at $DIR/aggregate.rs:4:11: 6:2
index bbd6c8042f1964ab3f22f748bbf70b7d4315bb5b..9b456b6529ad1c45290e11c65ded6661cd315374 100644 (file)
           StorageLive(_1);                 // scope 0 at $DIR/array_index.rs:5:9: 5:10
           StorageLive(_2);                 // scope 0 at $DIR/array_index.rs:5:18: 5:30
           _2 = [const 0_u32, const 1_u32, const 2_u32, const 3_u32]; // scope 0 at $DIR/array_index.rs:5:18: 5:30
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:19: 5:20
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:22: 5:23
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:25: 5:26
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000003))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:28: 5:29
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
           StorageLive(_3);                 // scope 0 at $DIR/array_index.rs:5:31: 5:32
           _3 = const 2_usize;              // scope 0 at $DIR/array_index.rs:5:31: 5:32
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:31: 5:32
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000002)) }
           _4 = const 4_usize;              // scope 0 at $DIR/array_index.rs:5:18: 5:33
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000004))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:18: 5:33
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000004)) }
 -         _5 = Lt(_3, _4);                 // scope 0 at $DIR/array_index.rs:5:18: 5:33
 -         assert(move _5, "index out of bounds: the len is {} but the index is {}", move _4, _3) -> bb1; // scope 0 at $DIR/array_index.rs:5:18: 5:33
 +         _5 = const true;                 // scope 0 at $DIR/array_index.rs:5:18: 5:33
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/array_index.rs:5:18: 5:33
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(const true, "index out of bounds: the len is {} but the index is {}", const 4_usize, const 2_usize) -> bb1; // scope 0 at $DIR/array_index.rs:5:18: 5:33
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/array_index.rs:5:18: 5:33
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000004))
-+                                          // mir::Constant
-+                                          // + span: $DIR/array_index.rs:5:18: 5:33
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000004)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/array_index.rs:5:18: 5:33
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000002)) }
       }
   
       bb1: {
 -         _1 = _2[_3];                     // scope 0 at $DIR/array_index.rs:5:18: 5:33
 +         _1 = const 2_u32;                // scope 0 at $DIR/array_index.rs:5:18: 5:33
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/array_index.rs:5:18: 5:33
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
           StorageDead(_3);                 // scope 0 at $DIR/array_index.rs:5:33: 5:34
           StorageDead(_2);                 // scope 0 at $DIR/array_index.rs:5:33: 5:34
           _0 = const ();                   // scope 0 at $DIR/array_index.rs:4:11: 6:2
index d9096e5f3f13e27a7a3174da6ee29cda6d11f0d7..9b456b6529ad1c45290e11c65ded6661cd315374 100644 (file)
           StorageLive(_1);                 // scope 0 at $DIR/array_index.rs:5:9: 5:10
           StorageLive(_2);                 // scope 0 at $DIR/array_index.rs:5:18: 5:30
           _2 = [const 0_u32, const 1_u32, const 2_u32, const 3_u32]; // scope 0 at $DIR/array_index.rs:5:18: 5:30
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:19: 5:20
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:22: 5:23
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:25: 5:26
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000003))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:28: 5:29
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
           StorageLive(_3);                 // scope 0 at $DIR/array_index.rs:5:31: 5:32
           _3 = const 2_usize;              // scope 0 at $DIR/array_index.rs:5:31: 5:32
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000002))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:31: 5:32
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000002)) }
           _4 = const 4_usize;              // scope 0 at $DIR/array_index.rs:5:18: 5:33
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000004))
-                                           // mir::Constant
-                                           // + span: $DIR/array_index.rs:5:18: 5:33
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000004)) }
 -         _5 = Lt(_3, _4);                 // scope 0 at $DIR/array_index.rs:5:18: 5:33
 -         assert(move _5, "index out of bounds: the len is {} but the index is {}", move _4, _3) -> bb1; // scope 0 at $DIR/array_index.rs:5:18: 5:33
 +         _5 = const true;                 // scope 0 at $DIR/array_index.rs:5:18: 5:33
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/array_index.rs:5:18: 5:33
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(const true, "index out of bounds: the len is {} but the index is {}", const 4_usize, const 2_usize) -> bb1; // scope 0 at $DIR/array_index.rs:5:18: 5:33
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/array_index.rs:5:18: 5:33
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000004))
-+                                          // mir::Constant
-+                                          // + span: $DIR/array_index.rs:5:18: 5:33
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000004)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/array_index.rs:5:18: 5:33
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000002)) }
       }
   
       bb1: {
 -         _1 = _2[_3];                     // scope 0 at $DIR/array_index.rs:5:18: 5:33
 +         _1 = const 2_u32;                // scope 0 at $DIR/array_index.rs:5:18: 5:33
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/array_index.rs:5:18: 5:33
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
           StorageDead(_3);                 // scope 0 at $DIR/array_index.rs:5:33: 5:34
           StorageDead(_2);                 // scope 0 at $DIR/array_index.rs:5:33: 5:34
           _0 = const ();                   // scope 0 at $DIR/array_index.rs:4:11: 6:2
index 4bd4bb0dd7dd4ea4b5fe846b7c29f64659ae1048..cb3951c162378dcabeee9b00491760be2a7d2543 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/bad_op_div_by_zero.rs:4:9: 4:10
           _1 = const 0_i32;                // scope 0 at $DIR/bad_op_div_by_zero.rs:4:13: 4:14
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_div_by_zero.rs:4:13: 4:14
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           StorageLive(_2);                 // scope 1 at $DIR/bad_op_div_by_zero.rs:5:9: 5:11
           StorageLive(_3);                 // scope 1 at $DIR/bad_op_div_by_zero.rs:5:18: 5:19
 -         _3 = _1;                         // scope 1 at $DIR/bad_op_div_by_zero.rs:5:18: 5:19
 -         _4 = Eq(_3, const 0_i32);        // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+         _3 = const 0_i32;                // scope 1 at $DIR/bad_op_div_by_zero.rs:5:18: 5:19
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
--                                          // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+                                          // + span: $DIR/bad_op_div_by_zero.rs:5:18: 5:19
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
 -         assert(!move _4, "attempt to divide {} by zero", const 1_i32) -> bb1; // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
++         _3 = const 0_i32;                // scope 1 at $DIR/bad_op_div_by_zero.rs:5:18: 5:19
 +         _4 = const true;                 // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-                                           // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(!const true, "attempt to divide {} by zero", const 1_i32) -> bb1; // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
       }
   
       bb1: {
 -         _5 = Eq(_3, const -1_i32);       // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+         _5 = const false;                // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-                                           // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0xffffffff))
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:19
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0xffffffff)) }
 -         _6 = Eq(const 1_i32, const i32::MIN); // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+         _6 = const false;                // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-                                           // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x00000001))
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
--                                          // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:15
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
-+                                          // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+         _7 = const false;                // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-                                           // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x80000000))
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:19
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x80000000)) }
 -         _7 = BitAnd(move _5, move _6);   // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
 -         assert(!move _7, "attempt to compute `{} / {}` which would overflow", const 1_i32, _3) -> bb2; // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
++         _5 = const false;                // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
++         _6 = const false;                // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
++         _7 = const false;                // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
 +         assert(!const false, "attempt to compute `{} / {}` which would overflow", const 1_i32, const 0_i32) -> bb2; // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-                                           // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+                                          // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000000))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
       }
   
       bb2: {
 -         _2 = Div(const 1_i32, move _3);  // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
 +         _2 = Div(const 1_i32, const 0_i32); // scope 1 at $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000000))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_div_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           StorageDead(_3);                 // scope 1 at $DIR/bad_op_div_by_zero.rs:5:18: 5:19
           _0 = const ();                   // scope 0 at $DIR/bad_op_div_by_zero.rs:3:11: 6:2
                                            // ty::Const
index ecd030e32b4ee76dc01668d8925e9d79a7ee09b0..d0757aa8a851b2bb7310da40fe6ac4837256792d 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/bad_op_mod_by_zero.rs:4:9: 4:10
           _1 = const 0_i32;                // scope 0 at $DIR/bad_op_mod_by_zero.rs:4:13: 4:14
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_mod_by_zero.rs:4:13: 4:14
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           StorageLive(_2);                 // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:9: 5:11
           StorageLive(_3);                 // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:18: 5:19
 -         _3 = _1;                         // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:18: 5:19
 -         _4 = Eq(_3, const 0_i32);        // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+         _3 = const 0_i32;                // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:18: 5:19
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
--                                          // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+                                          // + span: $DIR/bad_op_mod_by_zero.rs:5:18: 5:19
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
 -         assert(!move _4, "attempt to calculate the remainder of {} with a divisor of zero", const 1_i32) -> bb1; // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
++         _3 = const 0_i32;                // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:18: 5:19
 +         _4 = const true;                 // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-                                           // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(!const true, "attempt to calculate the remainder of {} with a divisor of zero", const 1_i32) -> bb1; // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
       }
   
       bb1: {
 -         _5 = Eq(_3, const -1_i32);       // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+         _5 = const false;                // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-                                           // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0xffffffff))
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0xffffffff)) }
 -         _6 = Eq(const 1_i32, const i32::MIN); // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+         _6 = const false;                // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-                                           // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x00000001))
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
--                                          // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:15
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
-+                                          // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+         _7 = const false;                // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-                                           // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x80000000))
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x80000000)) }
 -         _7 = BitAnd(move _5, move _6);   // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
 -         assert(!move _7, "attempt to compute the remainder of `{} % {}` which would overflow", const 1_i32, _3) -> bb2; // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
++         _5 = const false;                // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
++         _6 = const false;                // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
++         _7 = const false;                // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
 +         assert(!const false, "attempt to compute the remainder of `{} % {}` which would overflow", const 1_i32, const 0_i32) -> bb2; // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-                                           // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+                                          // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000000))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
       }
   
       bb2: {
 -         _2 = Rem(const 1_i32, move _3);  // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
 +         _2 = Rem(const 1_i32, const 0_i32); // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000000))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_mod_by_zero.rs:5:14: 5:19
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           StorageDead(_3);                 // scope 1 at $DIR/bad_op_mod_by_zero.rs:5:18: 5:19
           _0 = const ();                   // scope 0 at $DIR/bad_op_mod_by_zero.rs:3:11: 6:2
                                            // ty::Const
index 2b5010759d75000e74b2f75c4e8e16a748c6a5de..6584bcddc47b22531301d5145de1f18df46fa536 100644 (file)
           StorageLive(_5);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:13: 7:15
           StorageLive(_6);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:23: 7:24
           _6 = const 3_usize;              // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:23: 7:24
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000003))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_unsafe_oob_for_slices.rs:7:23: 7:24
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000003)) }
           _7 = Len((*_1));                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
 -         _8 = Lt(_6, _7);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
 -         assert(move _8, "index out of bounds: the len is {} but the index is {}", move _7, _6) -> bb1; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
 +         _8 = Lt(const 3_usize, _7);      // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000003)) }
 +         assert(move _8, "index out of bounds: the len is {} but the index is {}", move _7, const 3_usize) -> bb1; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000003)) }
       }
   
       bb1: {
index 301aaf29247612556cac550f40d633c26dba1952..6584bcddc47b22531301d5145de1f18df46fa536 100644 (file)
           StorageLive(_5);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:13: 7:15
           StorageLive(_6);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:23: 7:24
           _6 = const 3_usize;              // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:23: 7:24
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000003))
-                                           // mir::Constant
-                                           // + span: $DIR/bad_op_unsafe_oob_for_slices.rs:7:23: 7:24
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000003)) }
           _7 = Len((*_1));                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
 -         _8 = Lt(_6, _7);                 // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
 -         assert(move _8, "index out of bounds: the len is {} but the index is {}", move _7, _6) -> bb1; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
 +         _8 = Lt(const 3_usize, _7);      // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000003)) }
 +         assert(move _8, "index out of bounds: the len is {} but the index is {}", move _7, const 3_usize) -> bb1; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/bad_op_unsafe_oob_for_slices.rs:7:18: 7:25
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000003)) }
       }
   
       bb1: {
index b8f0ad4d434cb8e0549c0c4d8d8581f200f627d0..8a6d16a3a15c17cb8eb928c5e14d7b1483aa54c3 100644 (file)
           _4 = _2;                         // scope 0 at $DIR/boolean_identities.rs:5:6: 5:7
 -         _3 = BitOr(move _4, const true); // scope 0 at $DIR/boolean_identities.rs:5:5: 5:15
 +         _3 = const true;                 // scope 0 at $DIR/boolean_identities.rs:5:5: 5:15
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
--                                          // + span: $DIR/boolean_identities.rs:5:10: 5:14
-+                                          // + span: $DIR/boolean_identities.rs:5:5: 5:15
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           StorageDead(_4);                 // scope 0 at $DIR/boolean_identities.rs:5:14: 5:15
           StorageLive(_5);                 // scope 0 at $DIR/boolean_identities.rs:5:18: 5:29
           StorageLive(_6);                 // scope 0 at $DIR/boolean_identities.rs:5:19: 5:20
           _6 = _1;                         // scope 0 at $DIR/boolean_identities.rs:5:19: 5:20
 -         _5 = BitAnd(move _6, const false); // scope 0 at $DIR/boolean_identities.rs:5:18: 5:29
 +         _5 = const false;                // scope 0 at $DIR/boolean_identities.rs:5:18: 5:29
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
--                                          // + span: $DIR/boolean_identities.rs:5:23: 5:28
-+                                          // + span: $DIR/boolean_identities.rs:5:18: 5:29
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           StorageDead(_6);                 // scope 0 at $DIR/boolean_identities.rs:5:28: 5:29
 -         _0 = BitAnd(move _3, move _5);   // scope 0 at $DIR/boolean_identities.rs:5:5: 5:29
 +         _0 = const false;                // scope 0 at $DIR/boolean_identities.rs:5:5: 5:29
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/boolean_identities.rs:5:5: 5:29
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           StorageDead(_5);                 // scope 0 at $DIR/boolean_identities.rs:5:28: 5:29
           StorageDead(_3);                 // scope 0 at $DIR/boolean_identities.rs:5:28: 5:29
           return;                          // scope 0 at $DIR/boolean_identities.rs:6:2: 6:2
index f271188ebfdb0bf755e1109248bd88735c7567b3..aa47c645da58969d107f9e03e42724ed0ee789a1 100644 (file)
           StorageLive(_4);                 // scope 0 at $DIR/boxes.rs:12:14: 12:22
           _4 = Box(i32);                   // scope 0 at $DIR/boxes.rs:12:14: 12:22
           (*_4) = const 42_i32;            // scope 0 at $DIR/boxes.rs:12:19: 12:21
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/boxes.rs:12:19: 12:21
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
           _3 = move _4;                    // scope 0 at $DIR/boxes.rs:12:14: 12:22
           StorageDead(_4);                 // scope 0 at $DIR/boxes.rs:12:21: 12:22
           _2 = (*_3);                      // scope 0 at $DIR/boxes.rs:12:13: 12:22
           _1 = Add(move _2, const 0_i32);  // scope 0 at $DIR/boxes.rs:12:13: 12:26
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/boxes.rs:12:25: 12:26
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           StorageDead(_2);                 // scope 0 at $DIR/boxes.rs:12:25: 12:26
           drop(_3) -> [return: bb2, unwind: bb1]; // scope 0 at $DIR/boxes.rs:12:26: 12:27
       }
index 54af804d19b000701291b43b06f2c07ecf087ae2..895df6ee4cb39fa65db8dcbc0629c74441926fed 100644 (file)
           StorageLive(_1);                 // scope 0 at $DIR/cast.rs:4:9: 4:10
 -         _1 = const 42_u8 as u32 (Misc);  // scope 0 at $DIR/cast.rs:4:13: 4:24
 +         _1 = const 42_u32;               // scope 0 at $DIR/cast.rs:4:13: 4:24
-                                           // ty::Const
--                                          // + ty: u8
--                                          // + val: Value(Scalar(0x2a))
--                                          // mir::Constant
--                                          // + span: $DIR/cast.rs:4:13: 4:17
--                                          // + literal: Const { ty: u8, val: Value(Scalar(0x2a)) }
--         StorageLive(_2);                 // scope 1 at $DIR/cast.rs:6:9: 6:10
+          StorageLive(_2);                 // scope 1 at $DIR/cast.rs:6:9: 6:10
 -         _2 = const 42_u32 as u8 (Misc);  // scope 1 at $DIR/cast.rs:6:13: 6:24
--                                          // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
--                                          // + span: $DIR/cast.rs:6:13: 6:18
-+                                          // + span: $DIR/cast.rs:4:13: 4:24
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
-+         StorageLive(_2);                 // scope 1 at $DIR/cast.rs:6:9: 6:10
 +         _2 = const 42_u8;                // scope 1 at $DIR/cast.rs:6:13: 6:24
-+                                          // ty::Const
-+                                          // + ty: u8
-+                                          // + val: Value(Scalar(0x2a))
-+                                          // mir::Constant
-+                                          // + span: $DIR/cast.rs:6:13: 6:24
-+                                          // + literal: Const { ty: u8, val: Value(Scalar(0x2a)) }
           _0 = const ();                   // scope 0 at $DIR/cast.rs:3:11: 7:2
                                            // ty::Const
                                            // + ty: ()
index e3690d71294979dc7fb5a04ce5b4a7121015c2a0..9510f0dad34e1a89c60696c4ab00d4b9bca6bb7c 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/checked_add.rs:5:9: 5:10
 -         _2 = CheckedAdd(const 1_u32, const 1_u32); // scope 0 at $DIR/checked_add.rs:5:18: 5:23
-+         _2 = (const 2_u32, const false); // scope 0 at $DIR/checked_add.rs:5:18: 5:23
-                                           // ty::Const
-                                           // + ty: u32
--                                          // + val: Value(Scalar(0x00000001))
-+                                          // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
--                                          // + span: $DIR/checked_add.rs:5:18: 5:19
--                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
-+                                          // + span: $DIR/checked_add.rs:5:18: 5:23
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
-                                           // ty::Const
--                                          // + ty: u32
--                                          // + val: Value(Scalar(0x00000001))
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
--                                          // + span: $DIR/checked_add.rs:5:22: 5:23
--                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
 -         assert(!move (_2.1: bool), "attempt to compute `{} + {}` which would overflow", const 1_u32, const 1_u32) -> bb1; // scope 0 at $DIR/checked_add.rs:5:18: 5:23
-+                                          // + span: $DIR/checked_add.rs:5:18: 5:23
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
++         _2 = (const 2_u32, const false); // scope 0 at $DIR/checked_add.rs:5:18: 5:23
 +         assert(!const false, "attempt to compute `{} + {}` which would overflow", const 1_u32, const 1_u32) -> bb1; // scope 0 at $DIR/checked_add.rs:5:18: 5:23
-                                           // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/checked_add.rs:5:18: 5:23
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+                                          // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/checked_add.rs:5:18: 5:19
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/checked_add.rs:5:22: 5:23
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
       }
   
       bb1: {
 -         _1 = move (_2.0: u32);           // scope 0 at $DIR/checked_add.rs:5:18: 5:23
 +         _1 = const 2_u32;                // scope 0 at $DIR/checked_add.rs:5:18: 5:23
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/checked_add.rs:5:18: 5:23
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
           _0 = const ();                   // scope 0 at $DIR/checked_add.rs:4:11: 6:2
                                            // ty::Const
                                            // + ty: ()
index 474b9ffefbadc9ab147211b1710566a3194c29e6..e004b29f504f0aaf7fc9dacbc9b5ca96252e9f08 100644 (file)
@@ -9,23 +9,9 @@
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/control-flow-simplification.rs:12:8: 12:21
 -         _1 = const <bool as NeedsDrop>::NEEDS; // scope 0 at $DIR/control-flow-simplification.rs:12:8: 12:21
-+         _1 = const false;                // scope 0 at $DIR/control-flow-simplification.rs:12:8: 12:21
-                                           // ty::Const
-                                           // + ty: bool
--                                          // + val: Unevaluated(WithOptConstParam { did: DefId(0:4 ~ control_flow_simplification[317d]::NeedsDrop[0]::NEEDS[0]), const_param_did: None }, [bool], None)
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/control-flow-simplification.rs:12:8: 12:21
--                                          // + literal: Const { ty: bool, val: Unevaluated(WithOptConstParam { did: DefId(0:4 ~ control_flow_simplification[317d]::NeedsDrop[0]::NEEDS[0]), const_param_did: None }, [bool], None) }
 -         switchInt(_1) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/control-flow-simplification.rs:12:5: 14:6
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
++         _1 = const false;                // scope 0 at $DIR/control-flow-simplification.rs:12:8: 12:21
 +         switchInt(const false) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/control-flow-simplification.rs:12:5: 14:6
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/control-flow-simplification.rs:12:5: 14:6
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
       }
   
       bb1: {
index be9b24bfde8aa528d268a442dace154e2dd23d50..f114eab1e0f845074cadcf70878f9747de8d29ff 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/discriminant.rs:11:13: 11:64
           StorageLive(_3);                 // scope 0 at $DIR/discriminant.rs:11:34: 11:44
           ((_3 as Some).0: bool) = const true; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/discriminant.rs:11:39: 11:43
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           discriminant(_3) = 1;            // scope 0 at $DIR/discriminant.rs:11:34: 11:44
 -         _4 = discriminant(_3);           // scope 0 at $DIR/discriminant.rs:11:21: 11:31
 -         switchInt(move _4) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/discriminant.rs:11:21: 11:31
 +         _4 = const 1_isize;              // scope 0 at $DIR/discriminant.rs:11:21: 11:31
-+                                          // ty::Const
-+                                          // + ty: isize
-+                                          // + val: Value(Scalar(0x00000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/discriminant.rs:11:21: 11:31
-+                                          // + literal: Const { ty: isize, val: Value(Scalar(0x00000001)) }
 +         switchInt(const 1_isize) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/discriminant.rs:11:21: 11:31
-+                                          // ty::Const
-+                                          // + ty: isize
-+                                          // + val: Value(Scalar(0x00000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/discriminant.rs:11:21: 11:31
-+                                          // + literal: Const { ty: isize, val: Value(Scalar(0x00000001)) }
       }
   
       bb1: {
           _2 = const 10_i32;               // scope 0 at $DIR/discriminant.rs:11:59: 11:61
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000000a))
-                                           // mir::Constant
-                                           // + span: $DIR/discriminant.rs:11:59: 11:61
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000000a)) }
           goto -> bb4;                     // scope 0 at $DIR/discriminant.rs:11:13: 11:64
       }
   
   
       bb3: {
           _2 = const 42_i32;               // scope 0 at $DIR/discriminant.rs:11:47: 11:49
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/discriminant.rs:11:47: 11:49
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
           goto -> bb4;                     // scope 0 at $DIR/discriminant.rs:11:13: 11:64
       }
   
       bb4: {
           _1 = Add(move _2, const 0_i32);  // scope 0 at $DIR/discriminant.rs:11:13: 11:68
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/discriminant.rs:11:67: 11:68
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           StorageDead(_2);                 // scope 0 at $DIR/discriminant.rs:11:67: 11:68
           StorageDead(_3);                 // scope 0 at $DIR/discriminant.rs:11:68: 11:69
           _0 = const ();                   // scope 0 at $DIR/discriminant.rs:10:11: 12:2
index 05b57a6c280750a2329b44645f685d6aede04366..f114eab1e0f845074cadcf70878f9747de8d29ff 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/discriminant.rs:11:13: 11:64
           StorageLive(_3);                 // scope 0 at $DIR/discriminant.rs:11:34: 11:44
           ((_3 as Some).0: bool) = const true; // scope 0 at $DIR/discriminant.rs:11:34: 11:44
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/discriminant.rs:11:39: 11:43
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           discriminant(_3) = 1;            // scope 0 at $DIR/discriminant.rs:11:34: 11:44
 -         _4 = discriminant(_3);           // scope 0 at $DIR/discriminant.rs:11:21: 11:31
 -         switchInt(move _4) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/discriminant.rs:11:21: 11:31
 +         _4 = const 1_isize;              // scope 0 at $DIR/discriminant.rs:11:21: 11:31
-+                                          // ty::Const
-+                                          // + ty: isize
-+                                          // + val: Value(Scalar(0x0000000000000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/discriminant.rs:11:21: 11:31
-+                                          // + literal: Const { ty: isize, val: Value(Scalar(0x0000000000000001)) }
 +         switchInt(const 1_isize) -> [1_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/discriminant.rs:11:21: 11:31
-+                                          // ty::Const
-+                                          // + ty: isize
-+                                          // + val: Value(Scalar(0x0000000000000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/discriminant.rs:11:21: 11:31
-+                                          // + literal: Const { ty: isize, val: Value(Scalar(0x0000000000000001)) }
       }
   
       bb1: {
           _2 = const 10_i32;               // scope 0 at $DIR/discriminant.rs:11:59: 11:61
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000000a))
-                                           // mir::Constant
-                                           // + span: $DIR/discriminant.rs:11:59: 11:61
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000000a)) }
           goto -> bb4;                     // scope 0 at $DIR/discriminant.rs:11:13: 11:64
       }
   
   
       bb3: {
           _2 = const 42_i32;               // scope 0 at $DIR/discriminant.rs:11:47: 11:49
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/discriminant.rs:11:47: 11:49
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
           goto -> bb4;                     // scope 0 at $DIR/discriminant.rs:11:13: 11:64
       }
   
       bb4: {
           _1 = Add(move _2, const 0_i32);  // scope 0 at $DIR/discriminant.rs:11:13: 11:68
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/discriminant.rs:11:67: 11:68
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           StorageDead(_2);                 // scope 0 at $DIR/discriminant.rs:11:67: 11:68
           StorageDead(_3);                 // scope 0 at $DIR/discriminant.rs:11:68: 11:69
           _0 = const ();                   // scope 0 at $DIR/discriminant.rs:10:11: 12:2
index 57906b1cabddb9c01b37afb877d0696e69b9b31a..fde3c1244ea58e5d39f0b1890313e19f8bc6a7f0 100644 (file)
           StorageLive(_1);                 // scope 0 at $DIR/indirect.rs:5:9: 5:10
           StorageLive(_2);                 // scope 0 at $DIR/indirect.rs:5:13: 5:25
 -         _2 = const 2_u32 as u8 (Misc);   // scope 0 at $DIR/indirect.rs:5:13: 5:25
-+         _2 = const 2_u8;                 // scope 0 at $DIR/indirect.rs:5:13: 5:25
-                                           // ty::Const
--                                          // + ty: u32
--                                          // + val: Value(Scalar(0x00000002))
-+                                          // + ty: u8
-+                                          // + val: Value(Scalar(0x02))
-                                           // mir::Constant
--                                          // + span: $DIR/indirect.rs:5:14: 5:18
--                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
 -         _3 = CheckedAdd(_2, const 1_u8); // scope 0 at $DIR/indirect.rs:5:13: 5:29
-+                                          // + span: $DIR/indirect.rs:5:13: 5:25
-+                                          // + literal: Const { ty: u8, val: Value(Scalar(0x02)) }
-+         _3 = (const 3_u8, const false);  // scope 0 at $DIR/indirect.rs:5:13: 5:29
-                                           // ty::Const
-                                           // + ty: u8
--                                          // + val: Value(Scalar(0x01))
-+                                          // + val: Value(Scalar(0x03))
-                                           // mir::Constant
--                                          // + span: $DIR/indirect.rs:5:28: 5:29
--                                          // + literal: Const { ty: u8, val: Value(Scalar(0x01)) }
 -         assert(!move (_3.1: bool), "attempt to compute `{} + {}` which would overflow", move _2, const 1_u8) -> bb1; // scope 0 at $DIR/indirect.rs:5:13: 5:29
-+                                          // + span: $DIR/indirect.rs:5:13: 5:29
-+                                          // + literal: Const { ty: u8, val: Value(Scalar(0x03)) }
-                                           // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/indirect.rs:5:13: 5:29
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
++         _2 = const 2_u8;                 // scope 0 at $DIR/indirect.rs:5:13: 5:25
++         _3 = (const 3_u8, const false);  // scope 0 at $DIR/indirect.rs:5:13: 5:29
 +         assert(!const false, "attempt to compute `{} + {}` which would overflow", const 2_u8, const 1_u8) -> bb1; // scope 0 at $DIR/indirect.rs:5:13: 5:29
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/indirect.rs:5:13: 5:29
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+                                          // ty::Const
-                                           // + ty: u8
-+                                          // + val: Value(Scalar(0x02))
-+                                          // mir::Constant
-+                                          // + span: $DIR/indirect.rs:5:13: 5:29
-+                                          // + literal: Const { ty: u8, val: Value(Scalar(0x02)) }
-+                                          // ty::Const
-+                                          // + ty: u8
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/indirect.rs:5:28: 5:29
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x01)) }
       }
   
       bb1: {
 -         _1 = move (_3.0: u8);            // scope 0 at $DIR/indirect.rs:5:13: 5:29
 +         _1 = const 3_u8;                 // scope 0 at $DIR/indirect.rs:5:13: 5:29
-+                                          // ty::Const
-+                                          // + ty: u8
-+                                          // + val: Value(Scalar(0x03))
-+                                          // mir::Constant
-+                                          // + span: $DIR/indirect.rs:5:13: 5:29
-+                                          // + literal: Const { ty: u8, val: Value(Scalar(0x03)) }
           StorageDead(_2);                 // scope 0 at $DIR/indirect.rs:5:28: 5:29
           _0 = const ();                   // scope 0 at $DIR/indirect.rs:4:11: 6:2
                                            // ty::Const
index 59e5b207f120ce2a713505e71a430e019916f269..236cbfe63036d4b9f4d95526f08103099c4524a1 100644 (file)
 +                                          // + span: $DIR/issue-66971.rs:16:12: 16:22
 +                                          // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
           (_2.1: u8) = const 0_u8;         // scope 0 at $DIR/issue-66971.rs:16:12: 16:22
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/issue-66971.rs:16:17: 16:18
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           (_2.2: u8) = const 0_u8;         // scope 0 at $DIR/issue-66971.rs:16:12: 16:22
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/issue-66971.rs:16:20: 16:21
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           StorageDead(_3);                 // scope 0 at $DIR/issue-66971.rs:16:21: 16:22
           _1 = const encode(move _2) -> bb1; // scope 0 at $DIR/issue-66971.rs:16:5: 16:23
                                            // ty::Const
index d3e5e9fe5b4226c902f1419a18399135e1ed3f19..8b47f66a1178b714ead3ac78e72fe367f3544ae1 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/issue-67019.rs:11:10: 11:19
           StorageLive(_3);                 // scope 0 at $DIR/issue-67019.rs:11:11: 11:17
           (_3.0: u8) = const 1_u8;         // scope 0 at $DIR/issue-67019.rs:11:11: 11:17
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/issue-67019.rs:11:12: 11:13
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x01)) }
           (_3.1: u8) = const 2_u8;         // scope 0 at $DIR/issue-67019.rs:11:11: 11:17
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x02))
-                                           // mir::Constant
-                                           // + span: $DIR/issue-67019.rs:11:15: 11:16
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x02)) }
 -         (_2.0: (u8, u8)) = move _3;      // scope 0 at $DIR/issue-67019.rs:11:10: 11:19
 +         (_2.0: (u8, u8)) = (const 1_u8, const 2_u8); // scope 0 at $DIR/issue-67019.rs:11:10: 11:19
-+                                          // ty::Const
-+                                          // + ty: u8
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/issue-67019.rs:11:10: 11:19
-+                                          // + literal: Const { ty: u8, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: u8
-+                                          // + val: Value(Scalar(0x02))
-+                                          // mir::Constant
-+                                          // + span: $DIR/issue-67019.rs:11:10: 11:19
-+                                          // + literal: Const { ty: u8, val: Value(Scalar(0x02)) }
           StorageDead(_3);                 // scope 0 at $DIR/issue-67019.rs:11:18: 11:19
           _1 = const test(move _2) -> bb1; // scope 0 at $DIR/issue-67019.rs:11:5: 11:20
                                            // ty::Const
index 721766f9849710050ef7685f85478765cf600ea9..cb55efe20784dfdf34ca53aa9b51f8cd1e23f13d 100644 (file)
           StorageLive(_1);                 // scope 0 at $DIR/large_array_index.rs:6:9: 6:10
           StorageLive(_2);                 // scope 0 at $DIR/large_array_index.rs:6:17: 6:29
           _2 = [const 0_u8; 5000];         // scope 0 at $DIR/large_array_index.rs:6:17: 6:29
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/large_array_index.rs:6:18: 6:22
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           StorageLive(_3);                 // scope 0 at $DIR/large_array_index.rs:6:30: 6:31
           _3 = const 2_usize;              // scope 0 at $DIR/large_array_index.rs:6:30: 6:31
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/large_array_index.rs:6:30: 6:31
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000002)) }
           _4 = const 5000_usize;           // scope 0 at $DIR/large_array_index.rs:6:17: 6:32
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00001388))
-                                           // mir::Constant
-                                           // + span: $DIR/large_array_index.rs:6:17: 6:32
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00001388)) }
 -         _5 = Lt(_3, _4);                 // scope 0 at $DIR/large_array_index.rs:6:17: 6:32
 -         assert(move _5, "index out of bounds: the len is {} but the index is {}", move _4, _3) -> bb1; // scope 0 at $DIR/large_array_index.rs:6:17: 6:32
 +         _5 = const true;                 // scope 0 at $DIR/large_array_index.rs:6:17: 6:32
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/large_array_index.rs:6:17: 6:32
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(const true, "index out of bounds: the len is {} but the index is {}", const 5000_usize, const 2_usize) -> bb1; // scope 0 at $DIR/large_array_index.rs:6:17: 6:32
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/large_array_index.rs:6:17: 6:32
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00001388))
-+                                          // mir::Constant
-+                                          // + span: $DIR/large_array_index.rs:6:17: 6:32
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00001388)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/large_array_index.rs:6:17: 6:32
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000002)) }
       }
   
       bb1: {
index eae2ce6671cc15b5ee7283ac1e32686ffdd1e2cf..cb55efe20784dfdf34ca53aa9b51f8cd1e23f13d 100644 (file)
           StorageLive(_1);                 // scope 0 at $DIR/large_array_index.rs:6:9: 6:10
           StorageLive(_2);                 // scope 0 at $DIR/large_array_index.rs:6:17: 6:29
           _2 = [const 0_u8; 5000];         // scope 0 at $DIR/large_array_index.rs:6:17: 6:29
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/large_array_index.rs:6:18: 6:22
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           StorageLive(_3);                 // scope 0 at $DIR/large_array_index.rs:6:30: 6:31
           _3 = const 2_usize;              // scope 0 at $DIR/large_array_index.rs:6:30: 6:31
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000002))
-                                           // mir::Constant
-                                           // + span: $DIR/large_array_index.rs:6:30: 6:31
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000002)) }
           _4 = const 5000_usize;           // scope 0 at $DIR/large_array_index.rs:6:17: 6:32
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000001388))
-                                           // mir::Constant
-                                           // + span: $DIR/large_array_index.rs:6:17: 6:32
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000001388)) }
 -         _5 = Lt(_3, _4);                 // scope 0 at $DIR/large_array_index.rs:6:17: 6:32
 -         assert(move _5, "index out of bounds: the len is {} but the index is {}", move _4, _3) -> bb1; // scope 0 at $DIR/large_array_index.rs:6:17: 6:32
 +         _5 = const true;                 // scope 0 at $DIR/large_array_index.rs:6:17: 6:32
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/large_array_index.rs:6:17: 6:32
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(const true, "index out of bounds: the len is {} but the index is {}", const 5000_usize, const 2_usize) -> bb1; // scope 0 at $DIR/large_array_index.rs:6:17: 6:32
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/large_array_index.rs:6:17: 6:32
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000001388))
-+                                          // mir::Constant
-+                                          // + span: $DIR/large_array_index.rs:6:17: 6:32
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000001388)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/large_array_index.rs:6:17: 6:32
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000002)) }
       }
   
       bb1: {
index 7b36669bf15b2e63870562aa24ac93c7d333df5a..84ae8cc7477e37b6e3d4f3eac82a2d33ceb6cdc4 100644 (file)
           _2 = _1;                         // scope 0 at $DIR/mult_by_zero.rs:5:3: 5:4
 -         _0 = Mul(move _2, const 0_i32);  // scope 0 at $DIR/mult_by_zero.rs:5:3: 5:8
 +         _0 = const 0_i32;                // scope 0 at $DIR/mult_by_zero.rs:5:3: 5:8
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
--                                          // + span: $DIR/mult_by_zero.rs:5:7: 5:8
-+                                          // + span: $DIR/mult_by_zero.rs:5:3: 5:8
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           StorageDead(_2);                 // scope 0 at $DIR/mult_by_zero.rs:5:7: 5:8
           return;                          // scope 0 at $DIR/mult_by_zero.rs:6:2: 6:2
       }
index 3d4309a8aec547e830778e86417a506ccc615851..edbb1e57c7d37172f3fa1a5a0be738bbf3020cad 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/mutable_variable.rs:5:9: 5:14
           _1 = const 42_i32;               // scope 0 at $DIR/mutable_variable.rs:5:17: 5:19
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable.rs:5:17: 5:19
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
           _1 = const 99_i32;               // scope 1 at $DIR/mutable_variable.rs:6:5: 6:11
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000063))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable.rs:6:9: 6:11
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000063)) }
           StorageLive(_2);                 // scope 1 at $DIR/mutable_variable.rs:7:9: 7:10
 -         _2 = _1;                         // scope 1 at $DIR/mutable_variable.rs:7:13: 7:14
 +         _2 = const 99_i32;               // scope 1 at $DIR/mutable_variable.rs:7:13: 7:14
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000063))
-+                                          // mir::Constant
-+                                          // + span: $DIR/mutable_variable.rs:7:13: 7:14
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000063)) }
           _0 = const ();                   // scope 0 at $DIR/mutable_variable.rs:4:11: 8:2
                                            // ty::Const
                                            // + ty: ()
index 617702a520912631b20ef5b1cba7b80d1b261040..05c618b3a1279e091a6c458621adf3c6841a3714 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/mutable_variable_aggregate.rs:5:9: 5:14
           (_1.0: i32) = const 42_i32;      // scope 0 at $DIR/mutable_variable_aggregate.rs:5:17: 5:25
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_aggregate.rs:5:18: 5:20
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
           (_1.1: i32) = const 43_i32;      // scope 0 at $DIR/mutable_variable_aggregate.rs:5:17: 5:25
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002b))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_aggregate.rs:5:22: 5:24
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002b)) }
           (_1.1: i32) = const 99_i32;      // scope 1 at $DIR/mutable_variable_aggregate.rs:6:5: 6:13
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000063))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_aggregate.rs:6:11: 6:13
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000063)) }
           StorageLive(_2);                 // scope 1 at $DIR/mutable_variable_aggregate.rs:7:9: 7:10
 -         _2 = _1;                         // scope 1 at $DIR/mutable_variable_aggregate.rs:7:13: 7:14
 +         _2 = (const 42_i32, const 99_i32); // scope 1 at $DIR/mutable_variable_aggregate.rs:7:13: 7:14
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x0000002a))
-+                                          // mir::Constant
-+                                          // + span: $DIR/mutable_variable_aggregate.rs:7:13: 7:14
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000063))
-+                                          // mir::Constant
-+                                          // + span: $DIR/mutable_variable_aggregate.rs:7:13: 7:14
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000063)) }
           _0 = const ();                   // scope 0 at $DIR/mutable_variable_aggregate.rs:4:11: 8:2
                                            // ty::Const
                                            // + ty: ()
index dbf77cf6b378b7ba0f6c4683c2e9b5a52562965f..d8f066c7b9b17dae5e44c62637109811da3afde5 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:5:9: 5:14
           (_1.0: i32) = const 42_i32;      // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:5:17: 5:25
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_aggregate_mut_ref.rs:5:18: 5:20
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
           (_1.1: i32) = const 43_i32;      // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:5:17: 5:25
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002b))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_aggregate_mut_ref.rs:5:22: 5:24
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002b)) }
           StorageLive(_2);                 // scope 1 at $DIR/mutable_variable_aggregate_mut_ref.rs:6:9: 6:10
           _2 = &mut _1;                    // scope 1 at $DIR/mutable_variable_aggregate_mut_ref.rs:6:13: 6:19
           ((*_2).1: i32) = const 99_i32;   // scope 2 at $DIR/mutable_variable_aggregate_mut_ref.rs:7:5: 7:13
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000063))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_aggregate_mut_ref.rs:7:11: 7:13
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000063)) }
           StorageLive(_3);                 // scope 2 at $DIR/mutable_variable_aggregate_mut_ref.rs:8:9: 8:10
           _3 = _1;                         // scope 2 at $DIR/mutable_variable_aggregate_mut_ref.rs:8:13: 8:14
           _0 = const ();                   // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:4:11: 9:2
index b1a0ab88fccd59f708c04b469526bb2a702e7a42..59a43bda35ade2cea1dba0f7362da151a71caa0e 100644 (file)
   
       bb1: {
           (_1.1: i32) = const 99_i32;      // scope 1 at $DIR/mutable_variable_aggregate_partial_read.rs:6:5: 6:13
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000063))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_aggregate_partial_read.rs:6:11: 6:13
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000063)) }
           (_1.0: i32) = const 42_i32;      // scope 1 at $DIR/mutable_variable_aggregate_partial_read.rs:7:5: 7:13
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_aggregate_partial_read.rs:7:11: 7:13
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
           StorageLive(_2);                 // scope 1 at $DIR/mutable_variable_aggregate_partial_read.rs:8:9: 8:10
 -         _2 = (_1.1: i32);                // scope 1 at $DIR/mutable_variable_aggregate_partial_read.rs:8:13: 8:16
 +         _2 = const 99_i32;               // scope 1 at $DIR/mutable_variable_aggregate_partial_read.rs:8:13: 8:16
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000063))
-+                                          // mir::Constant
-+                                          // + span: $DIR/mutable_variable_aggregate_partial_read.rs:8:13: 8:16
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000063)) }
           _0 = const ();                   // scope 0 at $DIR/mutable_variable_aggregate_partial_read.rs:4:11: 9:2
                                            // ty::Const
                                            // + ty: ()
index 3b72af2d0b9c57341342d7f53c1c88b6a0678270..945aeaf1e88b0f079e2724f8ce209814e5892c81 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/mutable_variable_no_prop.rs:7:9: 7:14
           _1 = const 42_u32;               // scope 0 at $DIR/mutable_variable_no_prop.rs:7:17: 7:19
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_no_prop.rs:7:17: 7:19
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
           StorageLive(_2);                 // scope 1 at $DIR/mutable_variable_no_prop.rs:8:5: 10:6
           StorageLive(_3);                 // scope 2 at $DIR/mutable_variable_no_prop.rs:9:13: 9:19
           StorageLive(_4);                 // scope 2 at $DIR/mutable_variable_no_prop.rs:9:13: 9:19
index 84e858debddc0ea83d95138c99a521e269055ce4..5812814a0ec4f884009dd1f762f78216a60f630b 100644 (file)
       bb1: {
           StorageLive(_2);                 // scope 1 at $DIR/mutable_variable_unprop_assign.rs:6:9: 6:14
           (_2.0: i32) = const 1_i32;       // scope 1 at $DIR/mutable_variable_unprop_assign.rs:6:29: 6:35
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_unprop_assign.rs:6:30: 6:31
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           (_2.1: i32) = const 2_i32;       // scope 1 at $DIR/mutable_variable_unprop_assign.rs:6:29: 6:35
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/mutable_variable_unprop_assign.rs:6:33: 6:34
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
           StorageLive(_3);                 // scope 2 at $DIR/mutable_variable_unprop_assign.rs:7:11: 7:12
           _3 = _1;                         // scope 2 at $DIR/mutable_variable_unprop_assign.rs:7:11: 7:12
           (_2.1: i32) = move _3;           // scope 2 at $DIR/mutable_variable_unprop_assign.rs:7:5: 7:12
index c2381f3da90dd7e6562b00e62174d81d4357b9a6..3bdf9e753c044579d43442f75af46d7727e38eb4 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/optimizes_into_variable.rs:12:9: 12:10
 -         _2 = CheckedAdd(const 2_i32, const 2_i32); // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-+         _2 = (const 4_i32, const false); // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-                                           // ty::Const
-                                           // + ty: i32
--                                          // + val: Value(Scalar(0x00000002))
-+                                          // + val: Value(Scalar(0x00000004))
-                                           // mir::Constant
--                                          // + span: $DIR/optimizes_into_variable.rs:12:13: 12:14
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
-+                                          // + span: $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
-                                           // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x00000002))
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
--                                          // + span: $DIR/optimizes_into_variable.rs:12:17: 12:18
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
 -         assert(!move (_2.1: bool), "attempt to compute `{} + {}` which would overflow", const 2_i32, const 2_i32) -> bb1; // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // + span: $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
++         _2 = (const 4_i32, const false); // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
 +         assert(!const false, "attempt to compute `{} + {}` which would overflow", const 2_i32, const 2_i32) -> bb1; // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-                                           // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+                                          // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:12:13: 12:14
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:12:17: 12:18
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
       }
   
       bb1: {
 -         _1 = move (_2.0: i32);           // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
 +         _1 = const 4_i32;                // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000004))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
           StorageLive(_3);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:9: 13:10
           StorageLive(_4);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:31
           _4 = [const 0_i32, const 1_i32, const 2_i32, const 3_i32, const 4_i32, const 5_i32]; // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:31
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:14: 13:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:17: 13:18
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:20: 13:21
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000003))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:23: 13:24
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000004))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:26: 13:27
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000005))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:29: 13:30
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000005)) }
           StorageLive(_5);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:32: 13:33
           _5 = const 3_usize;              // scope 1 at $DIR/optimizes_into_variable.rs:13:32: 13:33
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000003))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:32: 13:33
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000003)) }
           _6 = const 6_usize;              // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000006))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000006)) }
 -         _7 = Lt(_5, _6);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
 -         assert(move _7, "index out of bounds: the len is {} but the index is {}", move _6, _5) -> bb2; // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
 +         _7 = const true;                 // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(const true, "index out of bounds: the len is {} but the index is {}", const 6_usize, const 3_usize) -> bb2; // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000006))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000006)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000003)) }
       }
   
       bb2: {
 -         _3 = _4[_5];                     // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
 +         _3 = const 3_i32;                // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
           StorageDead(_5);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:34: 13:35
           StorageDead(_4);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:34: 13:35
           StorageLive(_8);                 // scope 2 at $DIR/optimizes_into_variable.rs:14:9: 14:10
           StorageLive(_9);                 // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
           (_9.0: u32) = const 12_u32;      // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x0000000c))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:14:25: 14:27
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x0000000c)) }
           (_9.1: u32) = const 42_u32;      // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:14:32: 14:34
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
 -         _8 = (_9.1: u32);                // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:38
 +         _8 = const 42_u32;               // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:38
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x0000002a))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:14:13: 14:38
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
           StorageDead(_9);                 // scope 2 at $DIR/optimizes_into_variable.rs:14:38: 14:39
           _0 = const ();                   // scope 0 at $DIR/optimizes_into_variable.rs:11:11: 15:2
                                            // ty::Const
index bc965b4ade7305d0dcc30691c94cdb3433050b4f..3bdf9e753c044579d43442f75af46d7727e38eb4 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/optimizes_into_variable.rs:12:9: 12:10
 -         _2 = CheckedAdd(const 2_i32, const 2_i32); // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-+         _2 = (const 4_i32, const false); // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-                                           // ty::Const
-                                           // + ty: i32
--                                          // + val: Value(Scalar(0x00000002))
-+                                          // + val: Value(Scalar(0x00000004))
-                                           // mir::Constant
--                                          // + span: $DIR/optimizes_into_variable.rs:12:13: 12:14
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
-+                                          // + span: $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
-                                           // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x00000002))
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
--                                          // + span: $DIR/optimizes_into_variable.rs:12:17: 12:18
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
 -         assert(!move (_2.1: bool), "attempt to compute `{} + {}` which would overflow", const 2_i32, const 2_i32) -> bb1; // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // + span: $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
++         _2 = (const 4_i32, const false); // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
 +         assert(!const false, "attempt to compute `{} + {}` which would overflow", const 2_i32, const 2_i32) -> bb1; // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-                                           // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+                                          // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:12:13: 12:14
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:12:17: 12:18
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
       }
   
       bb1: {
 -         _1 = move (_2.0: i32);           // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
 +         _1 = const 4_i32;                // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000004))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:12:13: 12:18
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
           StorageLive(_3);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:9: 13:10
           StorageLive(_4);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:31
           _4 = [const 0_i32, const 1_i32, const 2_i32, const 3_i32, const 4_i32, const 5_i32]; // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:31
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:14: 13:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:17: 13:18
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:20: 13:21
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000003))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:23: 13:24
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000004))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:26: 13:27
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000005))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:29: 13:30
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000005)) }
           StorageLive(_5);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:32: 13:33
           _5 = const 3_usize;              // scope 1 at $DIR/optimizes_into_variable.rs:13:32: 13:33
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000003))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:32: 13:33
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000003)) }
           _6 = const 6_usize;              // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000006))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000006)) }
 -         _7 = Lt(_5, _6);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
 -         assert(move _7, "index out of bounds: the len is {} but the index is {}", move _6, _5) -> bb2; // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
 +         _7 = const true;                 // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(const true, "index out of bounds: the len is {} but the index is {}", const 6_usize, const 3_usize) -> bb2; // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000006))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000006)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000003)) }
       }
   
       bb2: {
 -         _3 = _4[_5];                     // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
 +         _3 = const 3_i32;                // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
           StorageDead(_5);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:34: 13:35
           StorageDead(_4);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:34: 13:35
           StorageLive(_8);                 // scope 2 at $DIR/optimizes_into_variable.rs:14:9: 14:10
           StorageLive(_9);                 // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
           (_9.0: u32) = const 12_u32;      // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x0000000c))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:14:25: 14:27
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x0000000c)) }
           (_9.1: u32) = const 42_u32;      // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:36
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/optimizes_into_variable.rs:14:32: 14:34
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
 -         _8 = (_9.1: u32);                // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:38
 +         _8 = const 42_u32;               // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:38
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x0000002a))
-+                                          // mir::Constant
-+                                          // + span: $DIR/optimizes_into_variable.rs:14:13: 14:38
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
           StorageDead(_9);                 // scope 2 at $DIR/optimizes_into_variable.rs:14:38: 14:39
           _0 = const ();                   // scope 0 at $DIR/optimizes_into_variable.rs:11:11: 15:2
                                            // ty::Const
index 7b74bf81d96fea575bed78ff602ca82f5257068f..91d9c9aa0836cb0bb657a175d5f8fbd973407e3c 100644 (file)
@@ -18,28 +18,10 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/optimizes_into_variable.rs:12:9: 12:10
         _1 = const 4_i32;                // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000004))
-                                         // mir::Constant
-                                         // + span: $DIR/optimizes_into_variable.rs:12:13: 12:18
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
         StorageLive(_2);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:9: 13:10
         _2 = const 3_i32;                // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
         StorageLive(_3);                 // scope 2 at $DIR/optimizes_into_variable.rs:14:9: 14:10
         _3 = const 42_u32;               // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:38
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x0000002a))
-                                         // mir::Constant
-                                         // + span: $DIR/optimizes_into_variable.rs:14:13: 14:38
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
         _0 = const ();                   // scope 0 at $DIR/optimizes_into_variable.rs:11:11: 15:2
                                          // ty::Const
                                          // + ty: ()
index 7b74bf81d96fea575bed78ff602ca82f5257068f..91d9c9aa0836cb0bb657a175d5f8fbd973407e3c 100644 (file)
@@ -18,28 +18,10 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/optimizes_into_variable.rs:12:9: 12:10
         _1 = const 4_i32;                // scope 0 at $DIR/optimizes_into_variable.rs:12:13: 12:18
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000004))
-                                         // mir::Constant
-                                         // + span: $DIR/optimizes_into_variable.rs:12:13: 12:18
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
         StorageLive(_2);                 // scope 1 at $DIR/optimizes_into_variable.rs:13:9: 13:10
         _2 = const 3_i32;                // scope 1 at $DIR/optimizes_into_variable.rs:13:13: 13:34
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/optimizes_into_variable.rs:13:13: 13:34
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
         StorageLive(_3);                 // scope 2 at $DIR/optimizes_into_variable.rs:14:9: 14:10
         _3 = const 42_u32;               // scope 2 at $DIR/optimizes_into_variable.rs:14:13: 14:38
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x0000002a))
-                                         // mir::Constant
-                                         // + span: $DIR/optimizes_into_variable.rs:14:13: 14:38
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
         _0 = const ();                   // scope 0 at $DIR/optimizes_into_variable.rs:11:11: 15:2
                                          // ty::Const
                                          // + ty: ()
index 36edfc42b9a76c3168ed0f911ba0cdcdd6a248a0..53d10f01eac7f33934335b2bf47f9e8bd772c455 100644 (file)
                                            // + literal: Const { ty: &u8, val: Value(Scalar(alloc0)) }
 -         _2 = (*_3);                      // scope 0 at $DIR/read_immutable_static.rs:7:13: 7:16
 +         _2 = const 2_u8;                 // scope 0 at $DIR/read_immutable_static.rs:7:13: 7:16
-+                                          // ty::Const
-+                                          // + ty: u8
-+                                          // + val: Value(Scalar(0x02))
-+                                          // mir::Constant
-+                                          // + span: $DIR/read_immutable_static.rs:7:13: 7:16
-+                                          // + literal: Const { ty: u8, val: Value(Scalar(0x02)) }
           StorageLive(_4);                 // scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22
           StorageLive(_5);                 // scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22
           _5 = const {alloc0: &u8};        // scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22
 -         _4 = (*_5);                      // scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22
 -         _1 = Add(move _2, move _4);      // scope 0 at $DIR/read_immutable_static.rs:7:13: 7:22
 +         _4 = const 2_u8;                 // scope 0 at $DIR/read_immutable_static.rs:7:19: 7:22
-+                                          // ty::Const
-+                                          // + ty: u8
-+                                          // + val: Value(Scalar(0x02))
-+                                          // mir::Constant
-+                                          // + span: $DIR/read_immutable_static.rs:7:19: 7:22
-+                                          // + literal: Const { ty: u8, val: Value(Scalar(0x02)) }
 +         _1 = const 4_u8;                 // scope 0 at $DIR/read_immutable_static.rs:7:13: 7:22
-+                                          // ty::Const
-+                                          // + ty: u8
-+                                          // + val: Value(Scalar(0x04))
-+                                          // mir::Constant
-+                                          // + span: $DIR/read_immutable_static.rs:7:13: 7:22
-+                                          // + literal: Const { ty: u8, val: Value(Scalar(0x04)) }
           StorageDead(_4);                 // scope 0 at $DIR/read_immutable_static.rs:7:21: 7:22
           StorageDead(_2);                 // scope 0 at $DIR/read_immutable_static.rs:7:21: 7:22
           StorageDead(_5);                 // scope 0 at $DIR/read_immutable_static.rs:7:22: 7:23
index ba5ac8d3ddf87b5bd5ca81ac69a25d226abd38ba..f8f9b5ce59c82645f46d3c8f45fe73fba4fc3525 100644 (file)
           _2 = _4;                         // scope 0 at $DIR/ref_deref.rs:5:6: 5:10
 -         _1 = (*_2);                      // scope 0 at $DIR/ref_deref.rs:5:5: 5:10
 +         _1 = const 4_i32;                // scope 0 at $DIR/ref_deref.rs:5:5: 5:10
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000004))
-+                                          // mir::Constant
-+                                          // + span: $DIR/ref_deref.rs:5:5: 5:10
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
           StorageDead(_2);                 // scope 0 at $DIR/ref_deref.rs:5:10: 5:11
           StorageDead(_1);                 // scope 0 at $DIR/ref_deref.rs:5:10: 5:11
           _0 = const ();                   // scope 0 at $DIR/ref_deref.rs:4:11: 6:2
index fa68eb348185a87bb282bc2ba80fe7befd398ea2..019bb63a020814817a655e9914afb8237e4e1b58 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/ref_deref.rs:5:6: 5:10
 -         StorageLive(_3);                 // scope 0 at $DIR/ref_deref.rs:5:8: 5:9
 -         _3 = const 4_i32;                // scope 0 at $DIR/ref_deref.rs:5:8: 5:9
+-         _2 = &_3;                        // scope 0 at $DIR/ref_deref.rs:5:6: 5:10
 +         _4 = const main::promoted[0];    // scope 0 at $DIR/ref_deref.rs:5:6: 5:10
-                                           // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x00000004))
++                                          // ty::Const
 +                                          // + ty: &i32
 +                                          // + val: Unevaluated(WithOptConstParam { did: DefId(0:3 ~ ref_deref[317d]::main[0]), const_param_did: None }, [], Some(promoted[0]))
-                                           // mir::Constant
--                                          // + span: $DIR/ref_deref.rs:5:8: 5:9
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
--         _2 = &_3;                        // scope 0 at $DIR/ref_deref.rs:5:6: 5:10
++                                          // mir::Constant
 +                                          // + span: $DIR/ref_deref.rs:5:6: 5:10
 +                                          // + literal: Const { ty: &i32, val: Unevaluated(WithOptConstParam { did: DefId(0:3 ~ ref_deref[317d]::main[0]), const_param_did: None }, [], Some(promoted[0])) }
 +         _2 = &(*_4);                     // scope 0 at $DIR/ref_deref.rs:5:6: 5:10
index 86e6aacab45a7b73ecc1a057ad2d84439a172e83..d7b3ff7d0c22b534e85af730d86543b606267ee1 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/ref_deref_project.rs:5:6: 5:17
 -         StorageLive(_3);                 // scope 0 at $DIR/ref_deref_project.rs:5:8: 5:14
 -         _3 = (const 4_i32, const 5_i32); // scope 0 at $DIR/ref_deref_project.rs:5:8: 5:14
+-         _2 = &(_3.1: i32);               // scope 0 at $DIR/ref_deref_project.rs:5:6: 5:17
 +         _4 = const main::promoted[0];    // scope 0 at $DIR/ref_deref_project.rs:5:6: 5:17
-                                           // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x00000004))
++                                          // ty::Const
 +                                          // + ty: &(i32, i32)
 +                                          // + val: Unevaluated(WithOptConstParam { did: DefId(0:3 ~ ref_deref_project[317d]::main[0]), const_param_did: None }, [], Some(promoted[0]))
-                                           // mir::Constant
--                                          // + span: $DIR/ref_deref_project.rs:5:9: 5:10
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
--                                          // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x00000005))
--                                          // mir::Constant
--                                          // + span: $DIR/ref_deref_project.rs:5:12: 5:13
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000005)) }
--         _2 = &(_3.1: i32);               // scope 0 at $DIR/ref_deref_project.rs:5:6: 5:17
++                                          // mir::Constant
 +                                          // + span: $DIR/ref_deref_project.rs:5:6: 5:17
 +                                          // + literal: Const { ty: &(i32, i32), val: Unevaluated(WithOptConstParam { did: DefId(0:3 ~ ref_deref_project[317d]::main[0]), const_param_did: None }, [], Some(promoted[0])) }
 +         _2 = &((*_4).1: i32);            // scope 0 at $DIR/ref_deref_project.rs:5:6: 5:17
index c30075bbb05fdd7dcc0c2f845a5e21dd8192346b..61e3606ef83290e8e6b9f55a6f2283e6ea16bbc0 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/repeat.rs:6:18: 6:28
           StorageLive(_3);                 // scope 0 at $DIR/repeat.rs:6:18: 6:25
           _3 = [const 42_u32; 8];          // scope 0 at $DIR/repeat.rs:6:18: 6:25
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/repeat.rs:6:19: 6:21
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
           StorageLive(_4);                 // scope 0 at $DIR/repeat.rs:6:26: 6:27
           _4 = const 2_usize;              // scope 0 at $DIR/repeat.rs:6:26: 6:27
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/repeat.rs:6:26: 6:27
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000002)) }
           _5 = const 8_usize;              // scope 0 at $DIR/repeat.rs:6:18: 6:28
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000008))
-                                           // mir::Constant
-                                           // + span: $DIR/repeat.rs:6:18: 6:28
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000008)) }
 -         _6 = Lt(_4, _5);                 // scope 0 at $DIR/repeat.rs:6:18: 6:28
 -         assert(move _6, "index out of bounds: the len is {} but the index is {}", move _5, _4) -> bb1; // scope 0 at $DIR/repeat.rs:6:18: 6:28
 +         _6 = const true;                 // scope 0 at $DIR/repeat.rs:6:18: 6:28
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/repeat.rs:6:18: 6:28
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(const true, "index out of bounds: the len is {} but the index is {}", const 8_usize, const 2_usize) -> bb1; // scope 0 at $DIR/repeat.rs:6:18: 6:28
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/repeat.rs:6:18: 6:28
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000008))
-+                                          // mir::Constant
-+                                          // + span: $DIR/repeat.rs:6:18: 6:28
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000008)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/repeat.rs:6:18: 6:28
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000002)) }
       }
   
       bb1: {
 -         _2 = _3[_4];                     // scope 0 at $DIR/repeat.rs:6:18: 6:28
 -         _1 = Add(move _2, const 0_u32);  // scope 0 at $DIR/repeat.rs:6:18: 6:32
 +         _2 = const 42_u32;               // scope 0 at $DIR/repeat.rs:6:18: 6:28
-                                           // ty::Const
-                                           // + ty: u32
--                                          // + val: Value(Scalar(0x00000000))
-+                                          // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
--                                          // + span: $DIR/repeat.rs:6:31: 6:32
--                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-+                                          // + span: $DIR/repeat.rs:6:18: 6:28
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
 +         _1 = const 42_u32;               // scope 0 at $DIR/repeat.rs:6:18: 6:32
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x0000002a))
-+                                          // mir::Constant
-+                                          // + span: $DIR/repeat.rs:6:18: 6:32
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
           StorageDead(_2);                 // scope 0 at $DIR/repeat.rs:6:31: 6:32
           StorageDead(_4);                 // scope 0 at $DIR/repeat.rs:6:32: 6:33
           StorageDead(_3);                 // scope 0 at $DIR/repeat.rs:6:32: 6:33
index cadce59cf954db2dddcdb3270196210183bed789..61e3606ef83290e8e6b9f55a6f2283e6ea16bbc0 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/repeat.rs:6:18: 6:28
           StorageLive(_3);                 // scope 0 at $DIR/repeat.rs:6:18: 6:25
           _3 = [const 42_u32; 8];          // scope 0 at $DIR/repeat.rs:6:18: 6:25
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/repeat.rs:6:19: 6:21
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
           StorageLive(_4);                 // scope 0 at $DIR/repeat.rs:6:26: 6:27
           _4 = const 2_usize;              // scope 0 at $DIR/repeat.rs:6:26: 6:27
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000002))
-                                           // mir::Constant
-                                           // + span: $DIR/repeat.rs:6:26: 6:27
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000002)) }
           _5 = const 8_usize;              // scope 0 at $DIR/repeat.rs:6:18: 6:28
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000008))
-                                           // mir::Constant
-                                           // + span: $DIR/repeat.rs:6:18: 6:28
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000008)) }
 -         _6 = Lt(_4, _5);                 // scope 0 at $DIR/repeat.rs:6:18: 6:28
 -         assert(move _6, "index out of bounds: the len is {} but the index is {}", move _5, _4) -> bb1; // scope 0 at $DIR/repeat.rs:6:18: 6:28
 +         _6 = const true;                 // scope 0 at $DIR/repeat.rs:6:18: 6:28
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/repeat.rs:6:18: 6:28
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(const true, "index out of bounds: the len is {} but the index is {}", const 8_usize, const 2_usize) -> bb1; // scope 0 at $DIR/repeat.rs:6:18: 6:28
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/repeat.rs:6:18: 6:28
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000008))
-+                                          // mir::Constant
-+                                          // + span: $DIR/repeat.rs:6:18: 6:28
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000008)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/repeat.rs:6:18: 6:28
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000002)) }
       }
   
       bb1: {
 -         _2 = _3[_4];                     // scope 0 at $DIR/repeat.rs:6:18: 6:28
 -         _1 = Add(move _2, const 0_u32);  // scope 0 at $DIR/repeat.rs:6:18: 6:32
 +         _2 = const 42_u32;               // scope 0 at $DIR/repeat.rs:6:18: 6:28
-                                           // ty::Const
-                                           // + ty: u32
--                                          // + val: Value(Scalar(0x00000000))
-+                                          // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
--                                          // + span: $DIR/repeat.rs:6:31: 6:32
--                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-+                                          // + span: $DIR/repeat.rs:6:18: 6:28
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
 +         _1 = const 42_u32;               // scope 0 at $DIR/repeat.rs:6:18: 6:32
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x0000002a))
-+                                          // mir::Constant
-+                                          // + span: $DIR/repeat.rs:6:18: 6:32
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000002a)) }
           StorageDead(_2);                 // scope 0 at $DIR/repeat.rs:6:31: 6:32
           StorageDead(_4);                 // scope 0 at $DIR/repeat.rs:6:32: 6:33
           StorageDead(_3);                 // scope 0 at $DIR/repeat.rs:6:32: 6:33
index 5e39c8e6d523ed4a5563ff3d3293e0fc17bc48ab..99893aa19cff354791f46bee022fb3aa54d29976 100644 (file)
@@ -7,57 +7,14 @@
   
       bb0: {
 -         _1 = CheckedAdd(const 2_u32, const 2_u32); // scope 0 at $DIR/return_place.rs:6:5: 6:10
-+         _1 = (const 4_u32, const false); // scope 0 at $DIR/return_place.rs:6:5: 6:10
-                                           // ty::Const
-                                           // + ty: u32
--                                          // + val: Value(Scalar(0x00000002))
-+                                          // + val: Value(Scalar(0x00000004))
-                                           // mir::Constant
--                                          // + span: $DIR/return_place.rs:6:5: 6:6
--                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
-+                                          // + span: $DIR/return_place.rs:6:5: 6:10
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000004)) }
-                                           // ty::Const
--                                          // + ty: u32
--                                          // + val: Value(Scalar(0x00000002))
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-                                           // mir::Constant
--                                          // + span: $DIR/return_place.rs:6:9: 6:10
--                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
 -         assert(!move (_1.1: bool), "attempt to compute `{} + {}` which would overflow", const 2_u32, const 2_u32) -> bb1; // scope 0 at $DIR/return_place.rs:6:5: 6:10
-+                                          // + span: $DIR/return_place.rs:6:5: 6:10
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
++         _1 = (const 4_u32, const false); // scope 0 at $DIR/return_place.rs:6:5: 6:10
 +         assert(!const false, "attempt to compute `{} + {}` which would overflow", const 2_u32, const 2_u32) -> bb1; // scope 0 at $DIR/return_place.rs:6:5: 6:10
-                                           // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/return_place.rs:6:5: 6:10
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
-+                                          // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/return_place.rs:6:5: 6:6
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/return_place.rs:6:9: 6:10
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
       }
   
       bb1: {
 -         _0 = move (_1.0: u32);           // scope 0 at $DIR/return_place.rs:6:5: 6:10
 +         _0 = const 4_u32;                // scope 0 at $DIR/return_place.rs:6:5: 6:10
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000004))
-+                                          // mir::Constant
-+                                          // + span: $DIR/return_place.rs:6:5: 6:10
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000004)) }
           return;                          // scope 0 at $DIR/return_place.rs:7:2: 7:2
       }
   }
index 23ad8d057ba8dbb5cb061b64d11adeebb634c6a4..e6dd096e1c0e35fb3bfa6ab2b60bc8bb0e681bfb 100644 (file)
@@ -5,12 +5,6 @@ fn add() -> u32 {
 
     bb0: {
         _0 = const 4_u32;                // scope 0 at $DIR/return_place.rs:6:5: 6:10
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000004))
-                                         // mir::Constant
-                                         // + span: $DIR/return_place.rs:6:5: 6:10
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000004)) }
         return;                          // scope 0 at $DIR/return_place.rs:7:2: 7:2
     }
 }
index 43e0eb09a2e5f2b3c2296177f099c59c4a299741..569e2f8ec2efe5463bc34dcdb1a65fceca33ae38 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/scalar_literal_propagation.rs:3:9: 3:10
           _1 = const 1_u32;                // scope 0 at $DIR/scalar_literal_propagation.rs:3:13: 3:14
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/scalar_literal_propagation.rs:3:13: 3:14
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
           StorageLive(_2);                 // scope 1 at $DIR/scalar_literal_propagation.rs:4:5: 4:15
           StorageLive(_3);                 // scope 1 at $DIR/scalar_literal_propagation.rs:4:13: 4:14
 -         _3 = _1;                         // scope 1 at $DIR/scalar_literal_propagation.rs:4:13: 4:14
 -         _2 = const consume(move _3) -> bb1; // scope 1 at $DIR/scalar_literal_propagation.rs:4:5: 4:15
 +         _3 = const 1_u32;                // scope 1 at $DIR/scalar_literal_propagation.rs:4:13: 4:14
-                                           // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/scalar_literal_propagation.rs:4:13: 4:14
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
 +         _2 = const consume(const 1_u32) -> bb1; // scope 1 at $DIR/scalar_literal_propagation.rs:4:5: 4:15
-+                                          // ty::Const
+                                           // ty::Const
                                            // + ty: fn(u32) {consume}
                                            // + val: Value(Scalar(<ZST>))
                                            // mir::Constant
                                            // + span: $DIR/scalar_literal_propagation.rs:4:5: 4:12
                                            // + literal: Const { ty: fn(u32) {consume}, val: Value(Scalar(<ZST>)) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/scalar_literal_propagation.rs:4:5: 4:15
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
       }
   
       bb1: {
index 0a07a1a11f27541cff7a471ec14c87b9fe0ec395..100e37d368186fcf920d798f9664a9e0c9e80d6e 100644 (file)
           StorageDead(_3);                 // scope 0 at $DIR/slice_len.rs:5:18: 5:19
           StorageLive(_6);                 // scope 0 at $DIR/slice_len.rs:5:31: 5:32
           _6 = const 1_usize;              // scope 0 at $DIR/slice_len.rs:5:31: 5:32
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/slice_len.rs:5:31: 5:32
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
 -         _7 = Len((*_2));                 // scope 0 at $DIR/slice_len.rs:5:5: 5:33
 -         _8 = Lt(_6, _7);                 // scope 0 at $DIR/slice_len.rs:5:5: 5:33
 -         assert(move _8, "index out of bounds: the len is {} but the index is {}", move _7, _6) -> bb1; // scope 0 at $DIR/slice_len.rs:5:5: 5:33
 +         _7 = const 3_usize;              // scope 0 at $DIR/slice_len.rs:5:5: 5:33
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000003)) }
 +         _8 = const true;                 // scope 0 at $DIR/slice_len.rs:5:5: 5:33
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(const true, "index out of bounds: the len is {} but the index is {}", const 3_usize, const 1_usize) -> bb1; // scope 0 at $DIR/slice_len.rs:5:5: 5:33
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000003)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
       }
   
       bb1: {
 -         _1 = (*_2)[_6];                  // scope 0 at $DIR/slice_len.rs:5:5: 5:33
 +         _1 = const 2_u32;                // scope 0 at $DIR/slice_len.rs:5:5: 5:33
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
           StorageDead(_6);                 // scope 0 at $DIR/slice_len.rs:5:33: 5:34
           StorageDead(_4);                 // scope 0 at $DIR/slice_len.rs:5:33: 5:34
           StorageDead(_2);                 // scope 0 at $DIR/slice_len.rs:5:33: 5:34
index f8c6f29e854df77e106c790260f01b32ace6cb3e..100e37d368186fcf920d798f9664a9e0c9e80d6e 100644 (file)
           StorageDead(_3);                 // scope 0 at $DIR/slice_len.rs:5:18: 5:19
           StorageLive(_6);                 // scope 0 at $DIR/slice_len.rs:5:31: 5:32
           _6 = const 1_usize;              // scope 0 at $DIR/slice_len.rs:5:31: 5:32
-                                           // ty::Const
-                                           // + ty: usize
-                                           // + val: Value(Scalar(0x0000000000000001))
-                                           // mir::Constant
-                                           // + span: $DIR/slice_len.rs:5:31: 5:32
-                                           // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
 -         _7 = Len((*_2));                 // scope 0 at $DIR/slice_len.rs:5:5: 5:33
 -         _8 = Lt(_6, _7);                 // scope 0 at $DIR/slice_len.rs:5:5: 5:33
 -         assert(move _8, "index out of bounds: the len is {} but the index is {}", move _7, _6) -> bb1; // scope 0 at $DIR/slice_len.rs:5:5: 5:33
 +         _7 = const 3_usize;              // scope 0 at $DIR/slice_len.rs:5:5: 5:33
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000003)) }
 +         _8 = const true;                 // scope 0 at $DIR/slice_len.rs:5:5: 5:33
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         assert(const true, "index out of bounds: the len is {} but the index is {}", const 3_usize, const 1_usize) -> bb1; // scope 0 at $DIR/slice_len.rs:5:5: 5:33
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000003))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000003)) }
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
       }
   
       bb1: {
 -         _1 = (*_2)[_6];                  // scope 0 at $DIR/slice_len.rs:5:5: 5:33
 +         _1 = const 2_u32;                // scope 0 at $DIR/slice_len.rs:5:5: 5:33
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/slice_len.rs:5:5: 5:33
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
           StorageDead(_6);                 // scope 0 at $DIR/slice_len.rs:5:33: 5:34
           StorageDead(_4);                 // scope 0 at $DIR/slice_len.rs:5:33: 5:34
           StorageDead(_2);                 // scope 0 at $DIR/slice_len.rs:5:33: 5:34
index 9580b99da9e403650378c1c15917aada453fcf92..5fcf830479e247578e740a9606c1199397507e39 100644 (file)
@@ -8,20 +8,8 @@
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/switch_int.rs:7:11: 7:12
           _1 = const 1_i32;                // scope 0 at $DIR/switch_int.rs:7:11: 7:12
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/switch_int.rs:7:11: 7:12
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
 -         switchInt(_1) -> [1_i32: bb2, otherwise: bb1]; // scope 0 at $DIR/switch_int.rs:8:9: 8:10
 +         switchInt(const 1_i32) -> [1_i32: bb2, otherwise: bb1]; // scope 0 at $DIR/switch_int.rs:8:9: 8:10
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/switch_int.rs:8:9: 8:10
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
       }
   
       bb1: {
                                            // mir::Constant
                                            // + span: $DIR/switch_int.rs:9:14: 9:17
                                            // + literal: Const { ty: fn(i32) {foo}, val: Value(Scalar(<ZST>)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0xffffffff))
-                                           // mir::Constant
-                                           // + span: $DIR/switch_int.rs:9:18: 9:20
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0xffffffff)) }
       }
   
       bb2: {
                                            // mir::Constant
                                            // + span: $DIR/switch_int.rs:8:14: 8:17
                                            // + literal: Const { ty: fn(i32) {foo}, val: Value(Scalar(<ZST>)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/switch_int.rs:8:18: 8:19
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
       }
   
       bb3: {
index 54f37e609ec1310f87248d9cf81a4786b0970d58..0337d0e061b08e74a8325478c141c8558840591a 100644 (file)
@@ -8,19 +8,7 @@
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/switch_int.rs:7:11: 7:12
           _1 = const 1_i32;                // scope 0 at $DIR/switch_int.rs:7:11: 7:12
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/switch_int.rs:7:11: 7:12
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
 -         switchInt(const 1_i32) -> [1_i32: bb2, otherwise: bb1]; // scope 0 at $DIR/switch_int.rs:8:9: 8:10
--                                          // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x00000001))
--                                          // mir::Constant
--                                          // + span: $DIR/switch_int.rs:8:9: 8:10
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
 +         goto -> bb2;                     // scope 0 at $DIR/switch_int.rs:8:9: 8:10
       }
   
                                            // mir::Constant
                                            // + span: $DIR/switch_int.rs:9:14: 9:17
                                            // + literal: Const { ty: fn(i32) {foo}, val: Value(Scalar(<ZST>)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0xffffffff))
-                                           // mir::Constant
-                                           // + span: $DIR/switch_int.rs:9:18: 9:20
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0xffffffff)) }
       }
   
       bb2: {
                                            // mir::Constant
                                            // + span: $DIR/switch_int.rs:8:14: 8:17
                                            // + literal: Const { ty: fn(i32) {foo}, val: Value(Scalar(<ZST>)) }
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/switch_int.rs:8:18: 8:19
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
       }
   
       bb3: {
index e4a0ef27b24edbed8ee417b723d5f6f06e2a0233..83cdd6b5836aec9293f0cd080a509ffc30a57fcf 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/tuple_literal_propagation.rs:3:9: 3:10
           (_1.0: u32) = const 1_u32;       // scope 0 at $DIR/tuple_literal_propagation.rs:3:13: 3:19
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/tuple_literal_propagation.rs:3:14: 3:15
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
           (_1.1: u32) = const 2_u32;       // scope 0 at $DIR/tuple_literal_propagation.rs:3:13: 3:19
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/tuple_literal_propagation.rs:3:17: 3:18
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
           StorageLive(_2);                 // scope 1 at $DIR/tuple_literal_propagation.rs:5:5: 5:15
           StorageLive(_3);                 // scope 1 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
 -         _3 = _1;                         // scope 1 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
 +         _3 = (const 1_u32, const 2_u32); // scope 1 at $DIR/tuple_literal_propagation.rs:5:13: 5:14
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000001))
-+                                          // mir::Constant
-+                                          // + span: $DIR/tuple_literal_propagation.rs:5:13: 5:14
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: $DIR/tuple_literal_propagation.rs:5:13: 5:14
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
           _2 = const consume(move _3) -> bb1; // scope 1 at $DIR/tuple_literal_propagation.rs:5:5: 5:15
                                            // ty::Const
                                            // + ty: fn((u32, u32)) {consume}
index b4733b5ed39f9684b9e0970a8aaa880f5d2e2be4..666ab74e72f6e9145af3c1f08abb494ac1e7bc40 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/const_prop_miscompile.rs:12:9: 12:14
           (_1.0: i32) = const 1_i32;       // scope 0 at $DIR/const_prop_miscompile.rs:12:17: 12:21
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/const_prop_miscompile.rs:12:18: 12:19
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           StorageLive(_2);                 // scope 1 at $DIR/const_prop_miscompile.rs:13:5: 15:6
           StorageLive(_3);                 // scope 2 at $DIR/const_prop_miscompile.rs:14:10: 14:22
           _3 = &raw mut (_1.0: i32);       // scope 2 at $DIR/const_prop_miscompile.rs:14:10: 14:22
           (*_3) = const 5_i32;             // scope 2 at $DIR/const_prop_miscompile.rs:14:9: 14:26
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000005))
-                                           // mir::Constant
-                                           // + span: $DIR/const_prop_miscompile.rs:14:25: 14:26
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000005)) }
           StorageDead(_3);                 // scope 2 at $DIR/const_prop_miscompile.rs:14:26: 14:27
           _2 = const ();                   // scope 2 at $DIR/const_prop_miscompile.rs:13:5: 15:6
                                            // ty::Const
           StorageLive(_5);                 // scope 1 at $DIR/const_prop_miscompile.rs:16:13: 16:20
           _5 = (_1.0: i32);                // scope 1 at $DIR/const_prop_miscompile.rs:16:15: 16:18
           _4 = Eq(move _5, const 5_i32);   // scope 1 at $DIR/const_prop_miscompile.rs:16:13: 16:25
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000005))
-                                           // mir::Constant
-                                           // + span: $DIR/const_prop_miscompile.rs:16:24: 16:25
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000005)) }
           StorageDead(_5);                 // scope 1 at $DIR/const_prop_miscompile.rs:16:24: 16:25
           _0 = const ();                   // scope 0 at $DIR/const_prop_miscompile.rs:11:10: 17:2
                                            // ty::Const
index b54fc41d0b496af7bae2b9f5de07d95cad10cb0e..ef458c50741cdd46b998590e3c5ae42613e30b1c 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/const_prop_miscompile.rs:5:9: 5:14
           (_1.0: i32) = const 1_i32;       // scope 0 at $DIR/const_prop_miscompile.rs:5:17: 5:21
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/const_prop_miscompile.rs:5:18: 5:19
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           StorageLive(_2);                 // scope 1 at $DIR/const_prop_miscompile.rs:6:6: 6:14
           _2 = &mut (_1.0: i32);           // scope 1 at $DIR/const_prop_miscompile.rs:6:6: 6:14
           (*_2) = const 5_i32;             // scope 1 at $DIR/const_prop_miscompile.rs:6:5: 6:18
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000005))
-                                           // mir::Constant
-                                           // + span: $DIR/const_prop_miscompile.rs:6:17: 6:18
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000005)) }
           StorageDead(_2);                 // scope 1 at $DIR/const_prop_miscompile.rs:6:18: 6:19
           StorageLive(_3);                 // scope 1 at $DIR/const_prop_miscompile.rs:7:9: 7:10
           StorageLive(_4);                 // scope 1 at $DIR/const_prop_miscompile.rs:7:13: 7:20
           _4 = (_1.0: i32);                // scope 1 at $DIR/const_prop_miscompile.rs:7:15: 7:18
           _3 = Eq(move _4, const 5_i32);   // scope 1 at $DIR/const_prop_miscompile.rs:7:13: 7:25
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000005))
-                                           // mir::Constant
-                                           // + span: $DIR/const_prop_miscompile.rs:7:24: 7:25
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000005)) }
           StorageDead(_4);                 // scope 1 at $DIR/const_prop_miscompile.rs:7:24: 7:25
           _0 = const ();                   // scope 0 at $DIR/const_prop_miscompile.rs:4:10: 8:2
                                            // ty::Const
index 22fbf4e836ba47937a29c5be02db06c3d2202a3a..a4d60ae25d0c4078c5c68c88c66bd1f6d936872a 100644 (file)
           StorageLive(_2);                 // scope 0 at $DIR/copy_propagation_arg.rs:28:9: 28:10
           _2 = _1;                         // scope 0 at $DIR/copy_propagation_arg.rs:28:13: 28:14
           _1 = const 123_i32;              // scope 1 at $DIR/copy_propagation_arg.rs:29:5: 29:12
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000007b))
-                                           // mir::Constant
-                                           // + span: $DIR/copy_propagation_arg.rs:29:9: 29:12
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000007b)) }
           _0 = _2;                         // scope 1 at $DIR/copy_propagation_arg.rs:30:5: 30:6
           StorageDead(_2);                 // scope 0 at $DIR/copy_propagation_arg.rs:31:1: 31:2
           return;                          // scope 0 at $DIR/copy_propagation_arg.rs:31:2: 31:2
index 6953a80a5f08aea697866010ab19e8a8f08aec64..fccb5bb16c07e58c99f37ea98972751350441703 100644 (file)
           StorageDead(_3);                 // scope 0 at $DIR/copy_propagation_arg.rs:16:12: 16:13
           StorageDead(_2);                 // scope 0 at $DIR/copy_propagation_arg.rs:16:13: 16:14
           _1 = const 5_u8;                 // scope 0 at $DIR/copy_propagation_arg.rs:17:5: 17:10
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x05))
-                                           // mir::Constant
-                                           // + span: $DIR/copy_propagation_arg.rs:17:9: 17:10
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x05)) }
           _0 = const ();                   // scope 0 at $DIR/copy_propagation_arg.rs:15:19: 18:2
                                            // ty::Const
                                            // + ty: ()
index 524156e0b929d170e73dce36b6e11fca090e1322..ebe76e8e270cdc4096ce4ebb28ca422bd145aa39 100644 (file)
                                            // + span: $DIR/deaggregator_test.rs:9:20: 9:23
                                            // + literal: Const { ty: f32, val: Value(Scalar(0x00000000)) }
 +         (_0.2: bool) = const false;      // scope 0 at $DIR/deaggregator_test.rs:9:5: 9:35
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/deaggregator_test.rs:9:28: 9:33
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           StorageDead(_2);                 // scope 0 at $DIR/deaggregator_test.rs:9:34: 9:35
           return;                          // scope 0 at $DIR/deaggregator_test.rs:10:2: 10:2
       }
index 00942cd12b42c6f600f073be48be9cadefb3318a..28364d4fbfb40addcf03a674cfa68050a2359eb3 100644 (file)
@@ -24,12 +24,6 @@ fn match_tuple(_1: (u32, bool, std::option::Option<i32>, u32)) -> u32 {
 
     bb1: {
         _0 = const 0_u32;                // scope 0 at $DIR/exponential-or.rs:9:14: 9:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/exponential-or.rs:9:14: 9:15
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
         goto -> bb10;                    // scope 0 at $DIR/exponential-or.rs:7:5: 10:6
     }
 
@@ -44,45 +38,21 @@ fn match_tuple(_1: (u32, bool, std::option::Option<i32>, u32)) -> u32 {
 
     bb4: {
         _5 = Le(const 6_u32, (_1.3: u32)); // scope 0 at $DIR/exponential-or.rs:8:62: 8:67
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000006))
-                                         // mir::Constant
-                                         // + span: $DIR/exponential-or.rs:8:62: 8:67
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000006)) }
         switchInt(move _5) -> [false: bb6, otherwise: bb5]; // scope 0 at $DIR/exponential-or.rs:8:62: 8:67
     }
 
     bb5: {
         _6 = Le((_1.3: u32), const 9_u32); // scope 0 at $DIR/exponential-or.rs:8:62: 8:67
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000009))
-                                         // mir::Constant
-                                         // + span: $DIR/exponential-or.rs:8:62: 8:67
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000009)) }
         switchInt(move _6) -> [false: bb6, otherwise: bb8]; // scope 0 at $DIR/exponential-or.rs:8:62: 8:67
     }
 
     bb6: {
         _3 = Le(const 13_u32, (_1.3: u32)); // scope 0 at $DIR/exponential-or.rs:8:70: 8:77
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x0000000d))
-                                         // mir::Constant
-                                         // + span: $DIR/exponential-or.rs:8:70: 8:77
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x0000000d)) }
         switchInt(move _3) -> [false: bb1, otherwise: bb7]; // scope 0 at $DIR/exponential-or.rs:8:70: 8:77
     }
 
     bb7: {
         _4 = Le((_1.3: u32), const 16_u32); // scope 0 at $DIR/exponential-or.rs:8:70: 8:77
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000010))
-                                         // mir::Constant
-                                         // + span: $DIR/exponential-or.rs:8:70: 8:77
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000010)) }
         switchInt(move _4) -> [false: bb1, otherwise: bb8]; // scope 0 at $DIR/exponential-or.rs:8:70: 8:77
     }
 
index 5f928ea2a16297a860a159299f107fe86d03cb66..4291e580bbfa668457ba461015ad2b94d86dc63e 100644 (file)
           _15 = move _16 as u32 (Misc);    // scope 3 at $DIR/funky_arms.rs:26:59: 26:75
           StorageDead(_16);                // scope 3 at $DIR/funky_arms.rs:26:74: 26:75
           _14 = Add(move _15, const 1_u32); // scope 3 at $DIR/funky_arms.rs:26:59: 26:79
-                                           // ty::Const
-                                           // + ty: u32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/funky_arms.rs:26:78: 26:79
-                                           // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
           StorageDead(_15);                // scope 3 at $DIR/funky_arms.rs:26:78: 26:79
           StorageLive(_17);                // scope 3 at $DIR/funky_arms.rs:26:81: 26:86
           _17 = _3;                        // scope 3 at $DIR/funky_arms.rs:26:81: 26:86
index 356470f8fec8765661a5319de819e1c977b882a7..6d7e7b6a627465b3cf03797a25513220085da183 100644 (file)
@@ -22,20 +22,8 @@ yields ()
     bb0: {
         StorageLive(_3);                 // scope 0 at $DIR/generator-storage-dead-unwind.rs:23:13: 23:14
         (_3.0: i32) = const 5_i32;       // scope 0 at $DIR/generator-storage-dead-unwind.rs:23:17: 23:23
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000005))
-                                         // mir::Constant
-                                         // + span: $DIR/generator-storage-dead-unwind.rs:23:21: 23:22
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000005)) }
         StorageLive(_4);                 // scope 1 at $DIR/generator-storage-dead-unwind.rs:24:13: 24:14
         (_4.0: i32) = const 6_i32;       // scope 1 at $DIR/generator-storage-dead-unwind.rs:24:17: 24:23
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000006))
-                                         // mir::Constant
-                                         // + span: $DIR/generator-storage-dead-unwind.rs:24:21: 24:22
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000006)) }
         StorageLive(_5);                 // scope 2 at $DIR/generator-storage-dead-unwind.rs:25:9: 25:14
         StorageLive(_6);                 // scope 2 at $DIR/generator-storage-dead-unwind.rs:25:9: 25:14
         _5 = yield(move _6) -> [resume: bb2, drop: bb4]; // scope 2 at $DIR/generator-storage-dead-unwind.rs:25:9: 25:14
index c9ff1fe29f5edf96c948c0ede4e65fa02a202429..a31e7aaf272717d0fe0787398e46dd75ef625aa2 100644 (file)
@@ -26,19 +26,7 @@ fn bar() -> bool {
         StorageLive(_2);                 // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:6
         _2 = _1;                         // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:6
         _3 = const 1_i32;                // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/inline-any-operand.rs:12:7: 12:8
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
         _4 = const -1_i32;               // scope 1 at $DIR/inline-any-operand.rs:12:5: 12:13
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0xffffffff))
-                                         // mir::Constant
-                                         // + span: $DIR/inline-any-operand.rs:12:10: 12:12
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0xffffffff)) }
         _0 = Eq(move _3, move _4);       // scope 2 at $DIR/inline-any-operand.rs:17:5: 17:11
         StorageDead(_2);                 // scope 1 at $DIR/inline-any-operand.rs:12:12: 12:13
         StorageDead(_1);                 // scope 0 at $DIR/inline-any-operand.rs:13:1: 13:2
index 855811964b1efaeaf1e92d7d3d41d939267493eb..73ce79992202b67dcac5647c0735ffce3d77ab20 100644 (file)
 +                                          // + user_ty: UserType(0)
 +                                          // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [255], len: Size { raw: 8 } }, size: Size { raw: 8 }, align: Align { pow2: 2 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
 +         ((*_4).1: usize) = const 0_usize; // scope 2 at $SRC_DIR/alloc/src/vec.rs:LL:COL
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x00000000))
-+                                          // mir::Constant
-+                                          // + span: $SRC_DIR/alloc/src/vec.rs:LL:COL
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x00000000)) }
           _1 = move _2;                    // scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
           StorageDead(_2);                 // scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
           _0 = const ();                   // scope 0 at $DIR/inline-into-box-place.rs:7:11: 9:2
index 507e45a445be3afdf155d6acde215f160fd3d081..27ecaefd87574ae0bcfb7cef1ad951aa623a6fb6 100644 (file)
 +                                          // + user_ty: UserType(0)
 +                                          // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Value(ByRef { alloc: Allocation { bytes: [4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [65535], len: Size { raw: 16 } }, size: Size { raw: 16 }, align: Align { pow2: 3 }, mutability: Not, extra: () }, offset: Size { raw: 0 } }) }
 +         ((*_4).1: usize) = const 0_usize; // scope 2 at $SRC_DIR/alloc/src/vec.rs:LL:COL
-+                                          // ty::Const
-+                                          // + ty: usize
-+                                          // + val: Value(Scalar(0x0000000000000000))
-+                                          // mir::Constant
-+                                          // + span: $SRC_DIR/alloc/src/vec.rs:LL:COL
-+                                          // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000000)) }
           _1 = move _2;                    // scope 0 at $DIR/inline-into-box-place.rs:8:29: 8:43
           StorageDead(_2);                 // scope 0 at $DIR/inline-into-box-place.rs:8:42: 8:43
           _0 = const ();                   // scope 0 at $DIR/inline-into-box-place.rs:7:11: 9:2
index c273c43c4297da7f9731c653de0b626c175c2563..fc0b40a84511db1a41dfdfe8dd2ebb2017d24da5 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/inline-specialization.rs:5:9: 5:10
 -         _1 = const <std::vec::Vec<()> as Foo>::bar() -> bb1; // scope 0 at $DIR/inline-specialization.rs:5:13: 5:38
-+         _1 = const 123_u32;              // scope 2 at $DIR/inline-specialization.rs:14:31: 14:34
-                                           // ty::Const
+-                                          // ty::Const
 -                                          // + ty: fn() -> u32 {<std::vec::Vec<()> as Foo>::bar}
 -                                          // + val: Value(Scalar(<ZST>))
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x0000007b))
-                                           // mir::Constant
+-                                          // mir::Constant
 -                                          // + span: $DIR/inline-specialization.rs:5:13: 5:36
 -                                          // + literal: Const { ty: fn() -> u32 {<std::vec::Vec<()> as Foo>::bar}, val: Value(Scalar(<ZST>)) }
 -     }
 - 
 -     bb1: {
-+                                          // + span: $DIR/inline-specialization.rs:14:31: 14:34
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000007b)) }
++         _1 = const 123_u32;              // scope 2 at $DIR/inline-specialization.rs:14:31: 14:34
           _0 = const ();                   // scope 0 at $DIR/inline-specialization.rs:4:11: 6:2
                                            // ty::Const
                                            // + ty: ()
index 9ca6f93c9bc08d21aeb506fe6e8fd795a346f67b..f048757ad861e422d6a6f43a831f8565786f678e 100644 (file)
 +                                          // + span: /the/src/instrument_coverage.rs:19:18: 19:18
 +                                          // + literal: Const { ty: unsafe extern "rust-intrinsic" fn(u64, u32, &'static str, u32, u32, u32, u32) {std::intrinsics::count_code_region}, val: Value(Scalar(<ZST>)) }
 +                                          // ty::Const
-+                                          // + ty: u64
-+                                          // + val: Value(Scalar(0x8dabe565aaa2aefd))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:19:18: 19:18
-+                                          // + literal: Const { ty: u64, val: Value(Scalar(0x8dabe565aaa2aefd)) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000000))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:19:18: 19:18
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-+                                          // ty::Const
 +                                          // + ty: &str
 +                                          // + val: Value(Slice { data: Allocation { bytes: [47, 116, 104, 101, 47, 115, 114, 99, 47, 105, 110, 115, 116, 114, 117, 109, 101, 110, 116, 95, 99, 111, 118, 101, 114, 97, 103, 101, 46, 114, 115], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [2147483647], len: Size { raw: 31 } }, size: Size { raw: 31 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 31 })
 +                                          // mir::Constant
 +                                          // + span: /the/src/instrument_coverage.rs:19:18: 19:18
 +                                          // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [47, 116, 104, 101, 47, 115, 114, 99, 47, 105, 110, 115, 116, 114, 117, 109, 101, 110, 116, 95, 99, 111, 118, 101, 114, 97, 103, 101, 46, 114, 115], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [2147483647], len: Size { raw: 31 } }, size: Size { raw: 31 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 31 }) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000013))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:19:18: 19:18
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000013)) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000012))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:19:18: 19:18
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000012)) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000015))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:19:18: 19:18
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000015)) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:19:18: 19:18
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
 +     }
 + 
 +     bb1 (cleanup): {
 +     bb2: {
 +         StorageDead(_1);                 // scope 0 at /the/src/instrument_coverage.rs:20:5: 20:9
           _0 = const true;                 // scope 0 at /the/src/instrument_coverage.rs:20:5: 20:9
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: /the/src/instrument_coverage.rs:20:5: 20:9
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           return;                          // scope 0 at /the/src/instrument_coverage.rs:21:2: 21:2
       }
   }
index 3f47aa13bf91fdc225b64ce624fe8a961e8dba22..931ebf5e1404e020412bea43b30247a9943e1e5b 100644 (file)
 +                                          // + span: /the/src/instrument_coverage.rs:10:11: 10:11
 +                                          // + literal: Const { ty: unsafe extern "rust-intrinsic" fn(u64, u32, &'static str, u32, u32, u32, u32) {std::intrinsics::count_code_region}, val: Value(Scalar(<ZST>)) }
 +                                          // ty::Const
-+                                          // + ty: u64
-+                                          // + val: Value(Scalar(0xde1b3f75a72fc7f7))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:10:11: 10:11
-+                                          // + literal: Const { ty: u64, val: Value(Scalar(0xde1b3f75a72fc7f7)) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000000))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:10:11: 10:11
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-+                                          // ty::Const
 +                                          // + ty: &str
 +                                          // + val: Value(Slice { data: Allocation { bytes: [47, 116, 104, 101, 47, 115, 114, 99, 47, 105, 110, 115, 116, 114, 117, 109, 101, 110, 116, 95, 99, 111, 118, 101, 114, 97, 103, 101, 46, 114, 115], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [2147483647], len: Size { raw: 31 } }, size: Size { raw: 31 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 31 })
 +                                          // mir::Constant
 +                                          // + span: /the/src/instrument_coverage.rs:10:11: 10:11
 +                                          // + literal: Const { ty: &str, val: Value(Slice { data: Allocation { bytes: [47, 116, 104, 101, 47, 115, 114, 99, 47, 105, 110, 115, 116, 114, 117, 109, 101, 110, 116, 95, 99, 111, 118, 101, 114, 97, 103, 101, 46, 114, 115], relocations: Relocations(SortedMap { data: [] }), init_mask: InitMask { blocks: [2147483647], len: Size { raw: 31 } }, size: Size { raw: 31 }, align: Align { pow2: 0 }, mutability: Not, extra: () }, start: 0, end: 31 }) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x0000000a))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:10:11: 10:11
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000000a)) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x0000000b))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:10:11: 10:11
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x0000000b)) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000010))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:10:11: 10:11
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000010)) }
-+                                          // ty::Const
-+                                          // + ty: u32
-+                                          // + val: Value(Scalar(0x00000002))
-+                                          // mir::Constant
-+                                          // + span: /the/src/instrument_coverage.rs:10:11: 10:11
-+                                          // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
       }
   
       bb1: {
index 7b58dc1f624a594cd2d2e5aa5013d3b2e11231e1..3dabc41f195203f3c71efedb6e8fc18f559966d5 100644 (file)
@@ -14,12 +14,6 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/issue-38669.rs:5:9: 5:25
         _1 = const false;                // scope 0 at $DIR/issue-38669.rs:5:28: 5:33
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-38669.rs:5:28: 5:33
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         FakeRead(ForLet, _1);            // scope 0 at $DIR/issue-38669.rs:5:9: 5:25
         goto -> bb2;                     // scope 1 at $DIR/issue-38669.rs:6:5: 11:6
     }
@@ -55,12 +49,6 @@ fn main() -> () {
         StorageDead(_4);                 // scope 1 at $DIR/issue-38669.rs:9:9: 9:10
         StorageDead(_3);                 // scope 1 at $DIR/issue-38669.rs:9:9: 9:10
         _1 = const true;                 // scope 1 at $DIR/issue-38669.rs:10:9: 10:28
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-38669.rs:10:24: 10:28
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         _2 = const ();                   // scope 1 at $DIR/issue-38669.rs:6:10: 11:6
                                          // ty::Const
                                          // + ty: ()
index 77763f2d3a0d1b3588ef16b6df064255201e030b..70eaf8170216249aa48306eedb1158f6fc1b044d 100644 (file)
@@ -13,21 +13,9 @@ fn main() -> () {
 
     bb0: {
         _5 = const false;                // scope 0 at $DIR/issue-41110.rs:8:9: 8:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41110.rs:8:9: 8:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         StorageLive(_1);                 // scope 0 at $DIR/issue-41110.rs:8:9: 8:10
         StorageLive(_2);                 // scope 0 at $DIR/issue-41110.rs:8:13: 8:14
         _5 = const true;                 // scope 0 at $DIR/issue-41110.rs:8:13: 8:14
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41110.rs:8:13: 8:14
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         _2 = S;                          // scope 0 at $DIR/issue-41110.rs:8:13: 8:14
         StorageLive(_3);                 // scope 0 at $DIR/issue-41110.rs:8:21: 8:27
         StorageLive(_4);                 // scope 0 at $DIR/issue-41110.rs:8:21: 8:22
@@ -48,12 +36,6 @@ fn main() -> () {
     bb2: {
         StorageDead(_4);                 // scope 0 at $DIR/issue-41110.rs:8:26: 8:27
         _5 = const false;                // scope 0 at $DIR/issue-41110.rs:8:13: 8:28
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41110.rs:8:13: 8:28
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         _1 = const S::other(move _2, move _3) -> [return: bb6, unwind: bb5]; // scope 0 at $DIR/issue-41110.rs:8:13: 8:28
                                          // ty::Const
                                          // + ty: fn(S, S) {S::other}
@@ -78,12 +60,6 @@ fn main() -> () {
     bb6: {
         StorageDead(_3);                 // scope 0 at $DIR/issue-41110.rs:8:27: 8:28
         _5 = const false;                // scope 0 at $DIR/issue-41110.rs:8:27: 8:28
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41110.rs:8:27: 8:28
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         StorageDead(_2);                 // scope 0 at $DIR/issue-41110.rs:8:27: 8:28
         _0 = const ();                   // scope 0 at $DIR/issue-41110.rs:7:11: 9:2
                                          // ty::Const
@@ -102,12 +78,6 @@ fn main() -> () {
 
     bb8 (cleanup): {
         _5 = const false;                // scope 0 at $DIR/issue-41110.rs:8:27: 8:28
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41110.rs:8:27: 8:28
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         goto -> bb7;                     // scope 0 at $DIR/issue-41110.rs:8:27: 8:28
     }
 
index a99846bd15daf4a76bd6bf385c1930b72dce4141..6b4f641b1f0bc68ce0022d976965b18d5a9aa88f 100644 (file)
@@ -17,20 +17,8 @@ fn test() -> () {
 
     bb0: {
         _6 = const false;                // scope 0 at $DIR/issue-41110.rs:15:9: 15:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41110.rs:15:9: 15:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         StorageLive(_1);                 // scope 0 at $DIR/issue-41110.rs:15:9: 15:10
         _6 = const true;                 // scope 0 at $DIR/issue-41110.rs:15:13: 15:14
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41110.rs:15:13: 15:14
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         _1 = S;                          // scope 0 at $DIR/issue-41110.rs:15:13: 15:14
         StorageLive(_2);                 // scope 1 at $DIR/issue-41110.rs:16:9: 16:14
         _2 = S;                          // scope 1 at $DIR/issue-41110.rs:16:17: 16:18
@@ -55,12 +43,6 @@ fn test() -> () {
         StorageDead(_3);                 // scope 2 at $DIR/issue-41110.rs:17:12: 17:13
         StorageLive(_5);                 // scope 2 at $DIR/issue-41110.rs:18:9: 18:10
         _6 = const false;                // scope 2 at $DIR/issue-41110.rs:18:9: 18:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41110.rs:18:9: 18:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         _5 = move _1;                    // scope 2 at $DIR/issue-41110.rs:18:9: 18:10
         goto -> bb12;                    // scope 2 at $DIR/issue-41110.rs:18:5: 18:6
     }
@@ -104,12 +86,6 @@ fn test() -> () {
 
     bb10: {
         _6 = const false;                // scope 0 at $DIR/issue-41110.rs:19:1: 19:2
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41110.rs:19:1: 19:2
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         StorageDead(_1);                 // scope 0 at $DIR/issue-41110.rs:19:1: 19:2
         return;                          // scope 0 at $DIR/issue-41110.rs:19:2: 19:2
     }
@@ -130,12 +106,6 @@ fn test() -> () {
 
     bb14 (cleanup): {
         _6 = const false;                // scope 0 at $DIR/issue-41110.rs:19:1: 19:2
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41110.rs:19:1: 19:2
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         goto -> bb13;                    // scope 0 at $DIR/issue-41110.rs:19:1: 19:2
     }
 
index 403555964ca15310fabcc122544ecdcf9e615fa7..14ece035f34af6445984e9e6966ee3e58639fd99 100644 (file)
@@ -6,31 +6,7 @@
 
     bb0: {
         _1 = CheckedAdd(const 1_usize, const 1_usize); // scope 0 at $DIR/issue-41697.rs:18:19: 18:22
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41697.rs:18:19: 18:20
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41697.rs:18:21: 18:22
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
         assert(!move (_1.1: bool), "attempt to compute `{} + {}` which would overflow", const 1_usize, const 1_usize) -> [success: bb2, unwind: bb1]; // scope 0 at $DIR/issue-41697.rs:18:19: 18:22
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41697.rs:18:19: 18:20
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41697.rs:18:21: 18:22
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
     }
 
     bb1 (cleanup): {
index df933d3ac251f21a8016869ca0d26c7ce1b293b8..14ece035f34af6445984e9e6966ee3e58639fd99 100644 (file)
@@ -6,31 +6,7 @@
 
     bb0: {
         _1 = CheckedAdd(const 1_usize, const 1_usize); // scope 0 at $DIR/issue-41697.rs:18:19: 18:22
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000001))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41697.rs:18:19: 18:20
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000001))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41697.rs:18:21: 18:22
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
         assert(!move (_1.1: bool), "attempt to compute `{} + {}` which would overflow", const 1_usize, const 1_usize) -> [success: bb2, unwind: bb1]; // scope 0 at $DIR/issue-41697.rs:18:19: 18:22
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000001))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41697.rs:18:19: 18:20
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000001))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41697.rs:18:21: 18:22
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
     }
 
     bb1 (cleanup): {
index 76ad865bcc842ef5e7b3fd91a207d03cefca2303..cb8057eb75b52544998130a1b83914d0d5f3f67f 100644 (file)
@@ -22,26 +22,8 @@ fn main() -> () {
 
     bb0: {
         _9 = const false;                // scope 0 at $DIR/issue-41888.rs:7:9: 7:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:7:9: 7:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         _7 = const false;                // scope 0 at $DIR/issue-41888.rs:7:9: 7:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:7:9: 7:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         _8 = const false;                // scope 0 at $DIR/issue-41888.rs:7:9: 7:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:7:9: 7:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         StorageLive(_1);                 // scope 0 at $DIR/issue-41888.rs:7:9: 7:10
         StorageLive(_2);                 // scope 1 at $DIR/issue-41888.rs:8:8: 8:14
         _2 = const cond() -> [return: bb2, unwind: bb3]; // scope 1 at $DIR/issue-41888.rs:8:8: 8:14
@@ -113,12 +95,6 @@ fn main() -> () {
     bb10: {
         StorageLive(_6);                 // scope 1 at $DIR/issue-41888.rs:10:21: 10:23
         _9 = const false;                // scope 1 at $DIR/issue-41888.rs:10:21: 10:23
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:10:21: 10:23
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         _6 = move ((_1 as F).0: K);      // scope 1 at $DIR/issue-41888.rs:10:21: 10:23
         _0 = const ();                   // scope 2 at $DIR/issue-41888.rs:10:29: 13:10
                                          // ty::Const
@@ -137,26 +113,8 @@ fn main() -> () {
 
     bb12: {
         _7 = const false;                // scope 0 at $DIR/issue-41888.rs:15:1: 15:2
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:15:1: 15:2
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         _8 = const false;                // scope 0 at $DIR/issue-41888.rs:15:1: 15:2
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:15:1: 15:2
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         _9 = const false;                // scope 0 at $DIR/issue-41888.rs:15:1: 15:2
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:15:1: 15:2
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         StorageDead(_1);                 // scope 0 at $DIR/issue-41888.rs:15:1: 15:2
         StorageDead(_2);                 // scope 0 at $DIR/issue-41888.rs:15:1: 15:2
         return;                          // scope 0 at $DIR/issue-41888.rs:15:2: 15:2
@@ -164,75 +122,27 @@ fn main() -> () {
 
     bb13 (cleanup): {
         _7 = const true;                 // scope 1 at $DIR/issue-41888.rs:9:9: 9:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:9:9: 9:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         _8 = const true;                 // scope 1 at $DIR/issue-41888.rs:9:9: 9:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:9:9: 9:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         _9 = const true;                 // scope 1 at $DIR/issue-41888.rs:9:9: 9:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:9:9: 9:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         _1 = move _3;                    // scope 1 at $DIR/issue-41888.rs:9:9: 9:10
         goto -> bb7;                     // scope 1 at $DIR/issue-41888.rs:9:9: 9:10
     }
 
     bb14: {
         _7 = const true;                 // scope 1 at $DIR/issue-41888.rs:9:9: 9:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:9:9: 9:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         _8 = const true;                 // scope 1 at $DIR/issue-41888.rs:9:9: 9:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:9:9: 9:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         _9 = const true;                 // scope 1 at $DIR/issue-41888.rs:9:9: 9:10
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:9:9: 9:10
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         _1 = move _3;                    // scope 1 at $DIR/issue-41888.rs:9:9: 9:10
         goto -> bb6;                     // scope 1 at $DIR/issue-41888.rs:9:9: 9:10
     }
 
     bb15: {
         _7 = const false;                // scope 0 at $DIR/issue-41888.rs:15:1: 15:2
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:15:1: 15:2
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         goto -> bb12;                    // scope 0 at $DIR/issue-41888.rs:15:1: 15:2
     }
 
     bb16 (cleanup): {
         _7 = const false;                // scope 0 at $DIR/issue-41888.rs:15:1: 15:2
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x00))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-41888.rs:15:1: 15:2
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
         goto -> bb1;                     // scope 0 at $DIR/issue-41888.rs:15:1: 15:2
     }
 
index 918dc5ec38701789962880be5ce27c1919b049c6..4b6cdbf264497bfb432ab0c72ff2c76f92cf8bfd 100644 (file)
@@ -28,12 +28,6 @@ fn main() -> () {
         StorageLive(_2);                 // scope 0 at $DIR/issue-49232.rs:7:13: 7:19
         StorageLive(_3);                 // scope 0 at $DIR/issue-49232.rs:8:19: 8:23
         _3 = const true;                 // scope 0 at $DIR/issue-49232.rs:8:19: 8:23
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-49232.rs:8:19: 8:23
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         FakeRead(ForMatchedPlace, _3);   // scope 0 at $DIR/issue-49232.rs:8:19: 8:23
         switchInt(_3) -> [false: bb5, otherwise: bb6]; // scope 0 at $DIR/issue-49232.rs:9:17: 9:22
     }
@@ -59,12 +53,6 @@ fn main() -> () {
 
     bb7: {
         _2 = const 4_i32;                // scope 0 at $DIR/issue-49232.rs:9:26: 9:27
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000004))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-49232.rs:9:26: 9:27
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
         goto -> bb12;                    // scope 0 at $DIR/issue-49232.rs:8:13: 11:14
     }
 
index 9f8810e752cb305e5e52750cc0b9e30a80c52c9f..972a36a30a127e7266cf414df758dbbadeb149b5 100644 (file)
@@ -10,12 +10,6 @@ fn foo(_1: [(Never, u32); 1]) -> u32 {
     bb0: {
         StorageLive(_2);                 // scope 0 at $DIR/issue-72181.rs:16:43: 16:44
         _2 = const 0_usize;              // scope 0 at $DIR/issue-72181.rs:16:43: 16:44
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-72181.rs:16:43: 16:44
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000000)) }
         _3 = Len(_1);                    // scope 0 at $DIR/issue-72181.rs:16:40: 16:45
         _4 = Lt(_2, _3);                 // scope 0 at $DIR/issue-72181.rs:16:40: 16:45
         assert(move _4, "index out of bounds: the len is {} but the index is {}", move _3, _2) -> [success: bb2, unwind: bb1]; // scope 0 at $DIR/issue-72181.rs:16:40: 16:45
index aab8efb415c69c4110b160b1feaa8bd380e9ed69..972a36a30a127e7266cf414df758dbbadeb149b5 100644 (file)
@@ -10,12 +10,6 @@ fn foo(_1: [(Never, u32); 1]) -> u32 {
     bb0: {
         StorageLive(_2);                 // scope 0 at $DIR/issue-72181.rs:16:43: 16:44
         _2 = const 0_usize;              // scope 0 at $DIR/issue-72181.rs:16:43: 16:44
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000000))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-72181.rs:16:43: 16:44
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000000)) }
         _3 = Len(_1);                    // scope 0 at $DIR/issue-72181.rs:16:40: 16:45
         _4 = Lt(_2, _3);                 // scope 0 at $DIR/issue-72181.rs:16:40: 16:45
         assert(move _4, "index out of bounds: the len is {} but the index is {}", move _3, _2) -> [success: bb2, unwind: bb1]; // scope 0 at $DIR/issue-72181.rs:16:40: 16:45
index e3fb5eb193ae961ee6ae4af5c6491a3011829889..71a70d2d211376f72b5c096e55c47439788da8d0 100644 (file)
@@ -40,20 +40,8 @@ fn main() -> () {
         StorageLive(_2);                 // scope 1 at $DIR/issue-72181.rs:26:9: 26:10
         StorageLive(_3);                 // scope 1 at $DIR/issue-72181.rs:26:14: 26:27
         _3 = Foo { a: const 42_u64 };    // scope 1 at $DIR/issue-72181.rs:26:14: 26:27
-                                         // ty::Const
-                                         // + ty: u64
-                                         // + val: Value(Scalar(0x000000000000002a))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-72181.rs:26:23: 26:25
-                                         // + literal: Const { ty: u64, val: Value(Scalar(0x000000000000002a)) }
         StorageLive(_4);                 // scope 1 at $DIR/issue-72181.rs:26:29: 26:42
         _4 = Foo { a: const 10_u64 };    // scope 1 at $DIR/issue-72181.rs:26:29: 26:42
-                                         // ty::Const
-                                         // + ty: u64
-                                         // + val: Value(Scalar(0x000000000000000a))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-72181.rs:26:38: 26:40
-                                         // + literal: Const { ty: u64, val: Value(Scalar(0x000000000000000a)) }
         _2 = [move _3, move _4];         // scope 1 at $DIR/issue-72181.rs:26:13: 26:43
         StorageDead(_4);                 // scope 1 at $DIR/issue-72181.rs:26:42: 26:43
         StorageDead(_3);                 // scope 1 at $DIR/issue-72181.rs:26:42: 26:43
@@ -61,12 +49,6 @@ fn main() -> () {
         StorageLive(_5);                 // scope 2 at $DIR/issue-72181.rs:27:13: 27:30
         StorageLive(_6);                 // scope 4 at $DIR/issue-72181.rs:27:24: 27:25
         _6 = const 0_usize;              // scope 4 at $DIR/issue-72181.rs:27:24: 27:25
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-72181.rs:27:24: 27:25
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000000)) }
         _7 = Len(_2);                    // scope 4 at $DIR/issue-72181.rs:27:22: 27:26
         _8 = Lt(_6, _7);                 // scope 4 at $DIR/issue-72181.rs:27:22: 27:26
         assert(move _8, "index out of bounds: the len is {} but the index is {}", move _7, _6) -> [success: bb3, unwind: bb1]; // scope 4 at $DIR/issue-72181.rs:27:22: 27:26
index d9e791b86bc2b203e0c690c6dfa338c2066373e2..71a70d2d211376f72b5c096e55c47439788da8d0 100644 (file)
@@ -40,20 +40,8 @@ fn main() -> () {
         StorageLive(_2);                 // scope 1 at $DIR/issue-72181.rs:26:9: 26:10
         StorageLive(_3);                 // scope 1 at $DIR/issue-72181.rs:26:14: 26:27
         _3 = Foo { a: const 42_u64 };    // scope 1 at $DIR/issue-72181.rs:26:14: 26:27
-                                         // ty::Const
-                                         // + ty: u64
-                                         // + val: Value(Scalar(0x000000000000002a))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-72181.rs:26:23: 26:25
-                                         // + literal: Const { ty: u64, val: Value(Scalar(0x000000000000002a)) }
         StorageLive(_4);                 // scope 1 at $DIR/issue-72181.rs:26:29: 26:42
         _4 = Foo { a: const 10_u64 };    // scope 1 at $DIR/issue-72181.rs:26:29: 26:42
-                                         // ty::Const
-                                         // + ty: u64
-                                         // + val: Value(Scalar(0x000000000000000a))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-72181.rs:26:38: 26:40
-                                         // + literal: Const { ty: u64, val: Value(Scalar(0x000000000000000a)) }
         _2 = [move _3, move _4];         // scope 1 at $DIR/issue-72181.rs:26:13: 26:43
         StorageDead(_4);                 // scope 1 at $DIR/issue-72181.rs:26:42: 26:43
         StorageDead(_3);                 // scope 1 at $DIR/issue-72181.rs:26:42: 26:43
@@ -61,12 +49,6 @@ fn main() -> () {
         StorageLive(_5);                 // scope 2 at $DIR/issue-72181.rs:27:13: 27:30
         StorageLive(_6);                 // scope 4 at $DIR/issue-72181.rs:27:24: 27:25
         _6 = const 0_usize;              // scope 4 at $DIR/issue-72181.rs:27:24: 27:25
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000000))
-                                         // mir::Constant
-                                         // + span: $DIR/issue-72181.rs:27:24: 27:25
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000000)) }
         _7 = Len(_2);                    // scope 4 at $DIR/issue-72181.rs:27:22: 27:26
         _8 = Lt(_6, _7);                 // scope 4 at $DIR/issue-72181.rs:27:22: 27:26
         assert(move _8, "index out of bounds: the len is {} but the index is {}", move _7, _6) -> [success: bb3, unwind: bb1]; // scope 4 at $DIR/issue-72181.rs:27:22: 27:26
index 919c37a5fc34178a0b906f4d6da44cf92f31d5b3..f7db1626016c4103c8d0ec149ad74a057079b08c 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
           ((_1 as Some).0: i32) = const 1_i32; // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/issue-73223.rs:2:28: 2:29
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           discriminant(_1) = 1;            // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
           _2 = ((_1 as Some).0: i32);      // scope 0 at $DIR/issue-73223.rs:3:14: 3:15
           StorageDead(_1);                 // scope 0 at $DIR/issue-73223.rs:5:6: 5:7
           StorageLive(_11);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _11 = (*_7);                     // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _10 = Eq(move _11, const 1_i32); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           StorageDead(_11);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _9 = Not(move _10);              // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           StorageDead(_10);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
index 919c37a5fc34178a0b906f4d6da44cf92f31d5b3..f7db1626016c4103c8d0ec149ad74a057079b08c 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
           ((_1 as Some).0: i32) = const 1_i32; // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/issue-73223.rs:2:28: 2:29
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           discriminant(_1) = 1;            // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
           _2 = ((_1 as Some).0: i32);      // scope 0 at $DIR/issue-73223.rs:3:14: 3:15
           StorageDead(_1);                 // scope 0 at $DIR/issue-73223.rs:5:6: 5:7
           StorageLive(_11);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _11 = (*_7);                     // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _10 = Eq(move _11, const 1_i32); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           StorageDead(_11);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _9 = Not(move _10);              // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           StorageDead(_10);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
index 28d949be271e8984514b8adc1ce1e4ee5488e3c9..957d33e2461f3a2c6ba5a7897a1efa89cac84c3a 100644 (file)
           StorageLive(_1);                 // scope 0 at $DIR/issue-73223.rs:2:9: 2:14
           StorageLive(_2);                 // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
           ((_2 as Some).0: i32) = const 1_i32; // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/issue-73223.rs:2:28: 2:29
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           discriminant(_2) = 1;            // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
           _3 = const 1_isize;              // scope 0 at $DIR/issue-73223.rs:3:9: 3:16
-                                           // ty::Const
-                                           // + ty: isize
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/issue-73223.rs:3:9: 3:16
-                                           // + literal: Const { ty: isize, val: Value(Scalar(0x00000001)) }
           goto -> bb2;                     // scope 0 at $DIR/issue-73223.rs:3:9: 3:16
       }
   
           _17 = (*_13);                    // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           StorageLive(_18);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _18 = const 1_i32;               // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           _16 = Eq(move _17, const 1_i32); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           StorageDead(_18);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           StorageDead(_17);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _15 = Not(move _16);             // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
index 2b854850deaf1d376c5f26212eb451716a5d443e..957d33e2461f3a2c6ba5a7897a1efa89cac84c3a 100644 (file)
           StorageLive(_1);                 // scope 0 at $DIR/issue-73223.rs:2:9: 2:14
           StorageLive(_2);                 // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
           ((_2 as Some).0: i32) = const 1_i32; // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/issue-73223.rs:2:28: 2:29
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           discriminant(_2) = 1;            // scope 0 at $DIR/issue-73223.rs:2:23: 2:30
           _3 = const 1_isize;              // scope 0 at $DIR/issue-73223.rs:3:9: 3:16
-                                           // ty::Const
-                                           // + ty: isize
-                                           // + val: Value(Scalar(0x0000000000000001))
-                                           // mir::Constant
-                                           // + span: $DIR/issue-73223.rs:3:9: 3:16
-                                           // + literal: Const { ty: isize, val: Value(Scalar(0x0000000000000001)) }
           goto -> bb2;                     // scope 0 at $DIR/issue-73223.rs:3:9: 3:16
       }
   
           _17 = (*_13);                    // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           StorageLive(_18);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _18 = const 1_i32;               // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           _16 = Eq(move _17, const 1_i32); // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           StorageDead(_18);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           StorageDead(_17);                // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
           _15 = Not(move _16);             // scope 4 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
index e699abf421d6074b08d99b550f1a00e446d1481b..77bd8846812721075fba96396623e5993315d631 100644 (file)
@@ -16,12 +16,6 @@ fn main() -> () {
         StorageLive(_1);                 // scope 0 at $DIR/loop_test.rs:10:5: 12:6
         StorageLive(_2);                 // scope 0 at $DIR/loop_test.rs:10:8: 10:12
         _2 = const true;                 // scope 0 at $DIR/loop_test.rs:10:8: 10:12
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/loop_test.rs:10:8: 10:12
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         FakeRead(ForMatchedPlace, _2);   // scope 0 at $DIR/loop_test.rs:10:8: 10:12
         switchInt(_2) -> [false: bb3, otherwise: bb2]; // scope 0 at $DIR/loop_test.rs:10:5: 12:6
     }
@@ -68,12 +62,6 @@ fn main() -> () {
     bb6: {
         StorageLive(_6);                 // scope 0 at $DIR/loop_test.rs:14:13: 14:14
         _6 = const 1_i32;                // scope 0 at $DIR/loop_test.rs:14:17: 14:18
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/loop_test.rs:14:17: 14:18
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
         FakeRead(ForLet, _6);            // scope 0 at $DIR/loop_test.rs:14:13: 14:14
         StorageDead(_6);                 // scope 0 at $DIR/loop_test.rs:16:5: 16:6
         goto -> bb5;                     // scope 0 at $DIR/loop_test.rs:15:9: 15:17
index 58847e1bceee66e208ec2c55c5d73600b1998d34..7a7d86f98ac2677cc4dfb7d9ad12682f62372d8a 100644 (file)
 -     bb8: {
 +     bb5: {
           _0 = const 1_i32;                // scope 1 at $DIR/match-arm-scopes.rs:15:77: 15:78
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/match-arm-scopes.rs:15:77: 15:78
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
 -         drop(_7) -> [return: bb24, unwind: bb14]; // scope 0 at $DIR/match-arm-scopes.rs:15:77: 15:78
 +         drop(_7) -> [return: bb19, unwind: bb10]; // scope 0 at $DIR/match-arm-scopes.rs:15:77: 15:78
       }
 -     bb12: {
 +     bb8: {
           _0 = const 3_i32;                // scope 0 at $DIR/match-arm-scopes.rs:15:59: 15:60
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000003))
-                                           // mir::Constant
-                                           // + span: $DIR/match-arm-scopes.rs:15:59: 15:60
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
           StorageDead(_10);                // scope 0 at $DIR/match-arm-scopes.rs:15:72: 15:73
           StorageDead(_9);                 // scope 0 at $DIR/match-arm-scopes.rs:15:77: 15:78
           StorageDead(_8);                 // scope 0 at $DIR/match-arm-scopes.rs:15:77: 15:78
 -     bb21: {
 +     bb16: {
           _0 = const 3_i32;                // scope 0 at $DIR/match-arm-scopes.rs:15:59: 15:60
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000003))
-                                           // mir::Constant
-                                           // + span: $DIR/match-arm-scopes.rs:15:59: 15:60
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
           StorageDead(_13);                // scope 0 at $DIR/match-arm-scopes.rs:15:72: 15:73
           StorageDead(_12);                // scope 0 at $DIR/match-arm-scopes.rs:15:77: 15:78
           StorageDead(_8);                 // scope 0 at $DIR/match-arm-scopes.rs:15:77: 15:78
 -     bb25: {
 +     bb20: {
           _0 = const 2_i32;                // scope 2 at $DIR/match-arm-scopes.rs:16:41: 16:42
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000002))
-                                           // mir::Constant
-                                           // + span: $DIR/match-arm-scopes.rs:16:41: 16:42
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
 -         drop(_16) -> [return: bb27, unwind: bb14]; // scope 0 at $DIR/match-arm-scopes.rs:16:41: 16:42
 +         drop(_16) -> [return: bb22, unwind: bb10]; // scope 0 at $DIR/match-arm-scopes.rs:16:41: 16:42
       }
index c53c9cf1db7cc8bdd04c670b0e464bc6a1a69041..dbf1f1ead2cdba0445a62e98bfaa54b169604194 100644 (file)
@@ -27,12 +27,6 @@ fn full_tested_match() -> () {
         StorageLive(_1);                 // scope 0 at $DIR/match_false_edges.rs:15:13: 19:6
         StorageLive(_2);                 // scope 0 at $DIR/match_false_edges.rs:15:19: 15:27
         _2 = std::option::Option::<i32>::Some(const 42_i32); // scope 0 at $DIR/match_false_edges.rs:15:19: 15:27
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x0000002a))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:15:24: 15:26
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
         FakeRead(ForMatchedPlace, _2);   // scope 0 at $DIR/match_false_edges.rs:15:19: 15:27
         _3 = discriminant(_2);           // scope 0 at $DIR/match_false_edges.rs:16:9: 16:16
         switchInt(move _3) -> [0_isize: bb2, 1_isize: bb3, otherwise: bb5]; // scope 0 at $DIR/match_false_edges.rs:16:9: 16:16
@@ -44,18 +38,6 @@ fn full_tested_match() -> () {
 
     bb2: {
         _1 = (const 3_i32, const 3_i32); // scope 0 at $DIR/match_false_edges.rs:18:17: 18:23
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:18:18: 18:19
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:18:21: 18:22
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
         goto -> bb11;                    // scope 0 at $DIR/match_false_edges.rs:15:13: 19:6
     }
 
@@ -105,12 +87,6 @@ fn full_tested_match() -> () {
         StorageLive(_8);                 // scope 2 at $DIR/match_false_edges.rs:16:35: 16:36
         _8 = _5;                         // scope 2 at $DIR/match_false_edges.rs:16:35: 16:36
         _1 = (const 1_i32, move _8);     // scope 2 at $DIR/match_false_edges.rs:16:31: 16:37
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:16:32: 16:33
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
         StorageDead(_8);                 // scope 2 at $DIR/match_false_edges.rs:16:36: 16:37
         StorageDead(_5);                 // scope 0 at $DIR/match_false_edges.rs:16:36: 16:37
         StorageDead(_6);                 // scope 0 at $DIR/match_false_edges.rs:16:36: 16:37
@@ -129,12 +105,6 @@ fn full_tested_match() -> () {
         StorageLive(_10);                // scope 3 at $DIR/match_false_edges.rs:17:24: 17:25
         _10 = _9;                        // scope 3 at $DIR/match_false_edges.rs:17:24: 17:25
         _1 = (const 2_i32, move _10);    // scope 3 at $DIR/match_false_edges.rs:17:20: 17:26
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:17:21: 17:22
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
         StorageDead(_10);                // scope 3 at $DIR/match_false_edges.rs:17:25: 17:26
         StorageDead(_9);                 // scope 0 at $DIR/match_false_edges.rs:17:25: 17:26
         goto -> bb11;                    // scope 0 at $DIR/match_false_edges.rs:15:13: 19:6
index b79416fe31a41de61927d981e07af403c88a5ebb..c2805968029c8fc024f7d41d70e0af33da5c2270 100644 (file)
@@ -26,12 +26,6 @@ fn full_tested_match2() -> () {
         StorageLive(_1);                 // scope 0 at $DIR/match_false_edges.rs:26:13: 30:6
         StorageLive(_2);                 // scope 0 at $DIR/match_false_edges.rs:26:19: 26:27
         _2 = std::option::Option::<i32>::Some(const 42_i32); // scope 0 at $DIR/match_false_edges.rs:26:19: 26:27
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x0000002a))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:26:24: 26:26
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
         FakeRead(ForMatchedPlace, _2);   // scope 0 at $DIR/match_false_edges.rs:26:19: 26:27
         _3 = discriminant(_2);           // scope 0 at $DIR/match_false_edges.rs:27:9: 27:16
         switchInt(move _3) -> [0_isize: bb2, 1_isize: bb3, otherwise: bb5]; // scope 0 at $DIR/match_false_edges.rs:27:9: 27:16
@@ -55,12 +49,6 @@ fn full_tested_match2() -> () {
         StorageLive(_10);                // scope 3 at $DIR/match_false_edges.rs:29:24: 29:25
         _10 = _9;                        // scope 3 at $DIR/match_false_edges.rs:29:24: 29:25
         _1 = (const 2_i32, move _10);    // scope 3 at $DIR/match_false_edges.rs:29:20: 29:26
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:29:21: 29:22
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
         StorageDead(_10);                // scope 3 at $DIR/match_false_edges.rs:29:25: 29:26
         StorageDead(_9);                 // scope 0 at $DIR/match_false_edges.rs:29:25: 29:26
         goto -> bb11;                    // scope 0 at $DIR/match_false_edges.rs:26:13: 30:6
@@ -97,12 +85,6 @@ fn full_tested_match2() -> () {
         StorageLive(_8);                 // scope 2 at $DIR/match_false_edges.rs:27:35: 27:36
         _8 = _5;                         // scope 2 at $DIR/match_false_edges.rs:27:35: 27:36
         _1 = (const 1_i32, move _8);     // scope 2 at $DIR/match_false_edges.rs:27:31: 27:37
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:27:32: 27:33
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
         StorageDead(_8);                 // scope 2 at $DIR/match_false_edges.rs:27:36: 27:37
         StorageDead(_5);                 // scope 0 at $DIR/match_false_edges.rs:27:36: 27:37
         StorageDead(_6);                 // scope 0 at $DIR/match_false_edges.rs:27:36: 27:37
@@ -117,18 +99,6 @@ fn full_tested_match2() -> () {
 
     bb10: {
         _1 = (const 3_i32, const 3_i32); // scope 0 at $DIR/match_false_edges.rs:28:17: 28:23
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:28:18: 28:19
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:28:21: 28:22
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
         goto -> bb11;                    // scope 0 at $DIR/match_false_edges.rs:26:13: 30:6
     }
 
index 5b449da93d49394466fdea462babbb31b7707b92..66cac95b7e87f81258c38acce5fd69e037377e1a 100644 (file)
@@ -37,12 +37,6 @@ fn main() -> () {
         StorageLive(_1);                 // scope 0 at $DIR/match_false_edges.rs:35:13: 40:6
         StorageLive(_2);                 // scope 0 at $DIR/match_false_edges.rs:35:19: 35:26
         _2 = std::option::Option::<i32>::Some(const 1_i32); // scope 0 at $DIR/match_false_edges.rs:35:19: 35:26
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:35:24: 35:25
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
         FakeRead(ForMatchedPlace, _2);   // scope 0 at $DIR/match_false_edges.rs:35:19: 35:26
         _4 = discriminant(_2);           // scope 0 at $DIR/match_false_edges.rs:36:9: 36:17
         switchInt(move _4) -> [1_isize: bb3, otherwise: bb2]; // scope 0 at $DIR/match_false_edges.rs:36:9: 36:17
@@ -64,12 +58,6 @@ fn main() -> () {
         StorageLive(_14);                // scope 0 at $DIR/match_false_edges.rs:39:9: 39:11
         _14 = _2;                        // scope 0 at $DIR/match_false_edges.rs:39:9: 39:11
         _1 = const 4_i32;                // scope 5 at $DIR/match_false_edges.rs:39:15: 39:16
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000004))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:39:15: 39:16
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000004)) }
         StorageDead(_14);                // scope 0 at $DIR/match_false_edges.rs:39:15: 39:16
         goto -> bb15;                    // scope 0 at $DIR/match_false_edges.rs:35:13: 40:6
     }
@@ -103,12 +91,6 @@ fn main() -> () {
         StorageLive(_6);                 // scope 0 at $DIR/match_false_edges.rs:36:14: 36:16
         _6 = ((_2 as Some).0: i32);      // scope 0 at $DIR/match_false_edges.rs:36:14: 36:16
         _1 = const 1_i32;                // scope 2 at $DIR/match_false_edges.rs:36:32: 36:33
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:36:32: 36:33
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
         StorageDead(_6);                 // scope 0 at $DIR/match_false_edges.rs:36:32: 36:33
         StorageDead(_7);                 // scope 0 at $DIR/match_false_edges.rs:36:32: 36:33
         goto -> bb15;                    // scope 0 at $DIR/match_false_edges.rs:35:13: 40:6
@@ -124,12 +106,6 @@ fn main() -> () {
         StorageLive(_9);                 // scope 0 at $DIR/match_false_edges.rs:37:9: 37:11
         _9 = _2;                         // scope 0 at $DIR/match_false_edges.rs:37:9: 37:11
         _1 = const 2_i32;                // scope 3 at $DIR/match_false_edges.rs:37:15: 37:16
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:37:15: 37:16
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
         StorageDead(_9);                 // scope 0 at $DIR/match_false_edges.rs:37:15: 37:16
         goto -> bb15;                    // scope 0 at $DIR/match_false_edges.rs:35:13: 40:6
     }
@@ -162,12 +138,6 @@ fn main() -> () {
         StorageLive(_10);                // scope 0 at $DIR/match_false_edges.rs:38:14: 38:15
         _10 = ((_2 as Some).0: i32);     // scope 0 at $DIR/match_false_edges.rs:38:14: 38:15
         _1 = const 3_i32;                // scope 4 at $DIR/match_false_edges.rs:38:33: 38:34
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/match_false_edges.rs:38:33: 38:34
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
         StorageDead(_10);                // scope 0 at $DIR/match_false_edges.rs:38:33: 38:34
         StorageDead(_11);                // scope 0 at $DIR/match_false_edges.rs:38:33: 38:34
         goto -> bb15;                    // scope 0 at $DIR/match_false_edges.rs:35:13: 40:6
index 16895942cb81ba1f6c0a06b828e77f46b29b4133..c72e6542470cf0436a8ca08c3c3d4d26ac1bf6ce 100644 (file)
@@ -21,42 +21,18 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/match_test.rs:7:9: 7:10
         _1 = const 3_i32;                // scope 0 at $DIR/match_test.rs:7:13: 7:14
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/match_test.rs:7:13: 7:14
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
         FakeRead(ForLet, _1);            // scope 0 at $DIR/match_test.rs:7:9: 7:10
         StorageLive(_2);                 // scope 1 at $DIR/match_test.rs:8:9: 8:10
         _2 = const true;                 // scope 1 at $DIR/match_test.rs:8:13: 8:17
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/match_test.rs:8:13: 8:17
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         FakeRead(ForLet, _2);            // scope 1 at $DIR/match_test.rs:8:9: 8:10
         StorageLive(_3);                 // scope 2 at $DIR/match_test.rs:12:5: 17:6
         FakeRead(ForMatchedPlace, _1);   // scope 2 at $DIR/match_test.rs:12:11: 12:12
         _6 = Le(const 0_i32, _1);        // scope 2 at $DIR/match_test.rs:13:9: 13:14
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/match_test.rs:13:9: 13:14
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
         switchInt(move _6) -> [false: bb4, otherwise: bb1]; // scope 2 at $DIR/match_test.rs:13:9: 13:14
     }
 
     bb1: {
         _7 = Lt(_1, const 10_i32);       // scope 2 at $DIR/match_test.rs:13:9: 13:14
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x0000000a))
-                                         // mir::Constant
-                                         // + span: $DIR/match_test.rs:13:9: 13:14
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x0000000a)) }
         switchInt(move _7) -> [false: bb4, otherwise: bb2]; // scope 2 at $DIR/match_test.rs:13:9: 13:14
     }
 
@@ -66,34 +42,16 @@ fn main() -> () {
 
     bb3: {
         _3 = const 3_i32;                // scope 2 at $DIR/match_test.rs:16:14: 16:15
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/match_test.rs:16:14: 16:15
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000003)) }
         goto -> bb14;                    // scope 2 at $DIR/match_test.rs:12:5: 17:6
     }
 
     bb4: {
         _4 = Le(const 10_i32, _1);       // scope 2 at $DIR/match_test.rs:14:9: 14:16
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x0000000a))
-                                         // mir::Constant
-                                         // + span: $DIR/match_test.rs:14:9: 14:16
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x0000000a)) }
         switchInt(move _4) -> [false: bb7, otherwise: bb5]; // scope 2 at $DIR/match_test.rs:14:9: 14:16
     }
 
     bb5: {
         _5 = Le(_1, const 20_i32);       // scope 2 at $DIR/match_test.rs:14:9: 14:16
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000014))
-                                         // mir::Constant
-                                         // + span: $DIR/match_test.rs:14:9: 14:16
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000014)) }
         switchInt(move _5) -> [false: bb7, otherwise: bb6]; // scope 2 at $DIR/match_test.rs:14:9: 14:16
     }
 
@@ -120,12 +78,6 @@ fn main() -> () {
         StorageDead(_9);                 // scope 2 at $DIR/match_test.rs:13:23: 13:24
         FakeRead(ForMatchGuard, _8);     // scope 2 at $DIR/match_test.rs:13:18: 13:19
         _3 = const 0_i32;                // scope 2 at $DIR/match_test.rs:13:23: 13:24
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/match_test.rs:13:23: 13:24
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
         goto -> bb14;                    // scope 2 at $DIR/match_test.rs:12:5: 17:6
     }
 
@@ -136,23 +88,11 @@ fn main() -> () {
 
     bb12: {
         _3 = const 1_i32;                // scope 2 at $DIR/match_test.rs:14:20: 14:21
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/match_test.rs:14:20: 14:21
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
         goto -> bb14;                    // scope 2 at $DIR/match_test.rs:12:5: 17:6
     }
 
     bb13: {
         _3 = const 2_i32;                // scope 2 at $DIR/match_test.rs:15:15: 15:16
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/match_test.rs:15:15: 15:16
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
         goto -> bb14;                    // scope 2 at $DIR/match_test.rs:12:5: 17:6
     }
 
index 968890e3a298c2ab0578145afb5a55ea2b19de3c..3f01719e01bfc9867264ced9ce1408b69bb27302 100644 (file)
           StorageLive(_6);                 // scope 4 at $DIR/matches_reduce_branches.rs:17:5: 32:6
 -         switchInt(_1) -> [7_i32: bb2, otherwise: bb1]; // scope 4 at $DIR/matches_reduce_branches.rs:18:9: 18:10
 +         _2 = Ne(_1, const 7_i32);        // scope 4 at $DIR/matches_reduce_branches.rs:19:13: 19:22
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000007))
-+                                          // mir::Constant
-+                                          // + span: $DIR/matches_reduce_branches.rs:1:1: 1:1
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000007)) }
 +         _3 = Eq(_1, const 7_i32);        // scope 4 at $DIR/matches_reduce_branches.rs:20:13: 20:21
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000007))
-+                                          // mir::Constant
-+                                          // + span: $DIR/matches_reduce_branches.rs:1:1: 1:1
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000007)) }
 +         _4 = const false;                // scope 4 at $DIR/matches_reduce_branches.rs:21:13: 21:22
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/matches_reduce_branches.rs:21:17: 21:22
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
 +         _5 = const true;                 // scope 4 at $DIR/matches_reduce_branches.rs:22:13: 22:21
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/matches_reduce_branches.rs:22:17: 22:21
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         goto -> bb3;                     // scope 4 at $DIR/matches_reduce_branches.rs:18:9: 18:10
       }
   
       bb1: {
           _2 = const true;                 // scope 4 at $DIR/matches_reduce_branches.rs:26:13: 26:21
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:26:17: 26:21
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           _3 = const false;                // scope 4 at $DIR/matches_reduce_branches.rs:27:13: 27:22
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:27:17: 27:22
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           _4 = const false;                // scope 4 at $DIR/matches_reduce_branches.rs:28:13: 28:22
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:28:17: 28:22
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           _5 = const true;                 // scope 4 at $DIR/matches_reduce_branches.rs:29:13: 29:21
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:29:17: 29:21
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           goto -> bb3;                     // scope 4 at $DIR/matches_reduce_branches.rs:17:5: 32:6
       }
   
       bb2: {
           _2 = const false;                // scope 4 at $DIR/matches_reduce_branches.rs:19:13: 19:22
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:19:17: 19:22
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           _3 = const true;                 // scope 4 at $DIR/matches_reduce_branches.rs:20:13: 20:21
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:20:17: 20:21
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           _4 = const false;                // scope 4 at $DIR/matches_reduce_branches.rs:21:13: 21:22
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:21:17: 21:22
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           _5 = const true;                 // scope 4 at $DIR/matches_reduce_branches.rs:22:13: 22:21
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:22:17: 22:21
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           goto -> bb3;                     // scope 4 at $DIR/matches_reduce_branches.rs:17:5: 32:6
       }
   
index 968890e3a298c2ab0578145afb5a55ea2b19de3c..3f01719e01bfc9867264ced9ce1408b69bb27302 100644 (file)
           StorageLive(_6);                 // scope 4 at $DIR/matches_reduce_branches.rs:17:5: 32:6
 -         switchInt(_1) -> [7_i32: bb2, otherwise: bb1]; // scope 4 at $DIR/matches_reduce_branches.rs:18:9: 18:10
 +         _2 = Ne(_1, const 7_i32);        // scope 4 at $DIR/matches_reduce_branches.rs:19:13: 19:22
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000007))
-+                                          // mir::Constant
-+                                          // + span: $DIR/matches_reduce_branches.rs:1:1: 1:1
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000007)) }
 +         _3 = Eq(_1, const 7_i32);        // scope 4 at $DIR/matches_reduce_branches.rs:20:13: 20:21
-+                                          // ty::Const
-+                                          // + ty: i32
-+                                          // + val: Value(Scalar(0x00000007))
-+                                          // mir::Constant
-+                                          // + span: $DIR/matches_reduce_branches.rs:1:1: 1:1
-+                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000007)) }
 +         _4 = const false;                // scope 4 at $DIR/matches_reduce_branches.rs:21:13: 21:22
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/matches_reduce_branches.rs:21:17: 21:22
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
 +         _5 = const true;                 // scope 4 at $DIR/matches_reduce_branches.rs:22:13: 22:21
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x01))
-+                                          // mir::Constant
-+                                          // + span: $DIR/matches_reduce_branches.rs:22:17: 22:21
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 +         goto -> bb3;                     // scope 4 at $DIR/matches_reduce_branches.rs:18:9: 18:10
       }
   
       bb1: {
           _2 = const true;                 // scope 4 at $DIR/matches_reduce_branches.rs:26:13: 26:21
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:26:17: 26:21
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           _3 = const false;                // scope 4 at $DIR/matches_reduce_branches.rs:27:13: 27:22
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:27:17: 27:22
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           _4 = const false;                // scope 4 at $DIR/matches_reduce_branches.rs:28:13: 28:22
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:28:17: 28:22
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           _5 = const true;                 // scope 4 at $DIR/matches_reduce_branches.rs:29:13: 29:21
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:29:17: 29:21
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           goto -> bb3;                     // scope 4 at $DIR/matches_reduce_branches.rs:17:5: 32:6
       }
   
       bb2: {
           _2 = const false;                // scope 4 at $DIR/matches_reduce_branches.rs:19:13: 19:22
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:19:17: 19:22
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           _3 = const true;                 // scope 4 at $DIR/matches_reduce_branches.rs:20:13: 20:21
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:20:17: 20:21
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           _4 = const false;                // scope 4 at $DIR/matches_reduce_branches.rs:21:13: 21:22
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:21:17: 21:22
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           _5 = const true;                 // scope 4 at $DIR/matches_reduce_branches.rs:22:13: 22:21
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_reduce_branches.rs:22:17: 22:21
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           goto -> bb3;                     // scope 4 at $DIR/matches_reduce_branches.rs:17:5: 32:6
       }
   
index a33db001f443825afa04d428fb934cc71d27b2e3..cff899bcb56714a4fac42d03f53ba8a6ba955da9 100644 (file)
           _3 = discriminant(_1);           // scope 0 at $DIR/matches_reduce_branches.rs:6:22: 6:26
 -         switchInt(move _3) -> [0_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/matches_reduce_branches.rs:6:22: 6:26
 +         _2 = Eq(_3, const 0_isize);      // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-+                                          // ty::Const
-+                                          // + ty: isize
-+                                          // + val: Value(Scalar(0x00000000))
-+                                          // mir::Constant
-+                                          // + span: $DIR/matches_reduce_branches.rs:1:1: 1:1
-+                                          // + literal: Const { ty: isize, val: Value(Scalar(0x00000000)) }
 +         goto -> bb3;                     // scope 0 at $DIR/matches_reduce_branches.rs:6:22: 6:26
       }
   
       bb1: {
           _2 = const false;                // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           goto -> bb3;                     // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
       }
   
       bb2: {
           _2 = const true;                 // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           goto -> bb3;                     // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
       }
   
index 3eb5b01fbf4960034dc09ef2ce9ff34e9a9394f5..cff899bcb56714a4fac42d03f53ba8a6ba955da9 100644 (file)
           _3 = discriminant(_1);           // scope 0 at $DIR/matches_reduce_branches.rs:6:22: 6:26
 -         switchInt(move _3) -> [0_isize: bb2, otherwise: bb1]; // scope 0 at $DIR/matches_reduce_branches.rs:6:22: 6:26
 +         _2 = Eq(_3, const 0_isize);      // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-+                                          // ty::Const
-+                                          // + ty: isize
-+                                          // + val: Value(Scalar(0x0000000000000000))
-+                                          // mir::Constant
-+                                          // + span: $DIR/matches_reduce_branches.rs:1:1: 1:1
-+                                          // + literal: Const { ty: isize, val: Value(Scalar(0x0000000000000000)) }
 +         goto -> bb3;                     // scope 0 at $DIR/matches_reduce_branches.rs:6:22: 6:26
       }
   
       bb1: {
           _2 = const false;                // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           goto -> bb3;                     // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
       }
   
       bb2: {
           _2 = const true;                 // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           goto -> bb3;                     // scope 0 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
       }
   
index c41bd999dc9fc0cec5afe931891a62ead8f1389c..9fde4888809d165972579a47539fb615341c9a95 100644 (file)
   
       bb1: {
           _0 = const 1_u8;                 // scope 0 at $DIR/matches_u8.rs:14:17: 14:18
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_u8.rs:14:17: 14:18
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x01)) }
           goto -> bb3;                     // scope 0 at $DIR/matches_u8.rs:12:5: 15:6
       }
   
       bb2: {
           _0 = const 0_u8;                 // scope 0 at $DIR/matches_u8.rs:13:17: 13:18
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_u8.rs:13:17: 13:18
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           goto -> bb3;                     // scope 0 at $DIR/matches_u8.rs:12:5: 15:6
       }
   
index c41bd999dc9fc0cec5afe931891a62ead8f1389c..9fde4888809d165972579a47539fb615341c9a95 100644 (file)
   
       bb1: {
           _0 = const 1_u8;                 // scope 0 at $DIR/matches_u8.rs:14:17: 14:18
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_u8.rs:14:17: 14:18
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x01)) }
           goto -> bb3;                     // scope 0 at $DIR/matches_u8.rs:12:5: 15:6
       }
   
       bb2: {
           _0 = const 0_u8;                 // scope 0 at $DIR/matches_u8.rs:13:17: 13:18
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_u8.rs:13:17: 13:18
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           goto -> bb3;                     // scope 0 at $DIR/matches_u8.rs:12:5: 15:6
       }
   
index 2c4bbc8095e9af7fbc1762ff4692aae9131f7dce..2dd0a3edb479a9c9db3c774a25391cdbb73e72c3 100644 (file)
   
       bb1: {
           _0 = const 1_i8;                 // scope 0 at $DIR/matches_u8.rs:22:17: 22:18
-                                           // ty::Const
-                                           // + ty: i8
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_u8.rs:22:17: 22:18
-                                           // + literal: Const { ty: i8, val: Value(Scalar(0x01)) }
           goto -> bb3;                     // scope 0 at $DIR/matches_u8.rs:20:5: 23:6
       }
   
       bb2: {
           _0 = const 0_i8;                 // scope 0 at $DIR/matches_u8.rs:21:17: 21:18
-                                           // ty::Const
-                                           // + ty: i8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_u8.rs:21:17: 21:18
-                                           // + literal: Const { ty: i8, val: Value(Scalar(0x00)) }
           goto -> bb3;                     // scope 0 at $DIR/matches_u8.rs:20:5: 23:6
       }
   
index 2c4bbc8095e9af7fbc1762ff4692aae9131f7dce..2dd0a3edb479a9c9db3c774a25391cdbb73e72c3 100644 (file)
   
       bb1: {
           _0 = const 1_i8;                 // scope 0 at $DIR/matches_u8.rs:22:17: 22:18
-                                           // ty::Const
-                                           // + ty: i8
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_u8.rs:22:17: 22:18
-                                           // + literal: Const { ty: i8, val: Value(Scalar(0x01)) }
           goto -> bb3;                     // scope 0 at $DIR/matches_u8.rs:20:5: 23:6
       }
   
       bb2: {
           _0 = const 0_i8;                 // scope 0 at $DIR/matches_u8.rs:21:17: 21:18
-                                           // ty::Const
-                                           // + ty: i8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/matches_u8.rs:21:17: 21:18
-                                           // + literal: Const { ty: i8, val: Value(Scalar(0x00)) }
           goto -> bb3;                     // scope 0 at $DIR/matches_u8.rs:20:5: 23:6
       }
   
index dcfb069b84aad17a803994a6757006d7f59209c0..bfc85e98786b86f0e49d20c9a81dc61e87d25698 100644 (file)
@@ -43,12 +43,6 @@ fn use_x(_1: &'_#6r mut i32, _2: &'_#7r u32, _3: &'_#8r u32, _4: &'_#9r u32) ->
 
     bb0: {
         _0 = const Const(Value(Scalar(0x01)): bool); // bb0[0]: scope 0 at $DIR/named-lifetimes-basic.rs:12:88: 12:92
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/named-lifetimes-basic.rs:12:88: 12:92
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         return;                          // bb0[1]: scope 0 at $DIR/named-lifetimes-basic.rs:12:94: 12:94
     }
 }
index e3f113fea285140937976d3d49bc7e56d7ee0c8f..3a8426a41a34f2991f160d892ce25886f561493f 100644 (file)
@@ -46,34 +46,10 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // bb0[0]: scope 0 at $DIR/region-subtyping-basic.rs:17:9: 17:14
         _1 = [const Const(Value(Scalar(0x00000001)): usize), const Const(Value(Scalar(0x00000002)): usize), const Const(Value(Scalar(0x00000003)): usize)]; // bb0[1]: scope 0 at $DIR/region-subtyping-basic.rs:17:17: 17:26
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:17:18: 17:19
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:17:21: 17:22
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000002)) }
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:17:24: 17:25
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000003)) }
         FakeRead(ForLet, _1);            // bb0[2]: scope 0 at $DIR/region-subtyping-basic.rs:17:9: 17:14
         StorageLive(_2);                 // bb0[3]: scope 1 at $DIR/region-subtyping-basic.rs:18:9: 18:10
         StorageLive(_3);                 // bb0[4]: scope 1 at $DIR/region-subtyping-basic.rs:18:16: 18:17
         _3 = const Const(Value(Scalar(0x00000000)): usize); // bb0[5]: scope 1 at $DIR/region-subtyping-basic.rs:18:16: 18:17
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:18:16: 18:17
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000000)) }
         _4 = Len(_1);                    // bb0[6]: scope 1 at $DIR/region-subtyping-basic.rs:18:14: 18:18
         _5 = Lt(_3, _4);                 // bb0[7]: scope 1 at $DIR/region-subtyping-basic.rs:18:14: 18:18
         assert(move _5, "index out of bounds: the len is {} but the index is {}", move _4, _3) -> [success: bb2, unwind: bb1]; // bb0[8]: scope 1 at $DIR/region-subtyping-basic.rs:18:14: 18:18
@@ -91,12 +67,6 @@ fn main() -> () {
         FakeRead(ForLet, _6);            // bb2[4]: scope 2 at $DIR/region-subtyping-basic.rs:19:9: 19:10
         StorageLive(_7);                 // bb2[5]: scope 3 at $DIR/region-subtyping-basic.rs:20:8: 20:12
         _7 = const Const(Value(Scalar(0x01)): bool); // bb2[6]: scope 3 at $DIR/region-subtyping-basic.rs:20:8: 20:12
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:20:8: 20:12
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         FakeRead(ForMatchedPlace, _7);   // bb2[7]: scope 3 at $DIR/region-subtyping-basic.rs:20:8: 20:12
         switchInt(_7) -> [Const(Value(Scalar(0x00)): bool): bb4, otherwise: bb3]; // bb2[8]: scope 3 at $DIR/region-subtyping-basic.rs:20:5: 24:6
     }
@@ -114,12 +84,6 @@ fn main() -> () {
                                          // mir::Constant
                                          // + span: $DIR/region-subtyping-basic.rs:23:9: 23:14
                                          // + literal: Const { ty: fn(usize) -> bool {use_x}, val: Value(Scalar(<ZST>)) }
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000016))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:23:15: 23:17
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000016)) }
     }
 
     bb5: {
index a69952ff07f34990079cad845b9004f00785e740..5220ab4cae8f1d8a0e75f31608497e241e53a98d 100644 (file)
@@ -46,34 +46,10 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // bb0[0]: scope 0 at $DIR/region-subtyping-basic.rs:17:9: 17:14
         _1 = [const Const(Value(Scalar(0x0000000000000001)): usize), const Const(Value(Scalar(0x0000000000000002)): usize), const Const(Value(Scalar(0x0000000000000003)): usize)]; // bb0[1]: scope 0 at $DIR/region-subtyping-basic.rs:17:17: 17:26
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000001))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:17:18: 17:19
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000002))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:17:21: 17:22
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000002)) }
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000003))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:17:24: 17:25
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000003)) }
         FakeRead(ForLet, _1);            // bb0[2]: scope 0 at $DIR/region-subtyping-basic.rs:17:9: 17:14
         StorageLive(_2);                 // bb0[3]: scope 1 at $DIR/region-subtyping-basic.rs:18:9: 18:10
         StorageLive(_3);                 // bb0[4]: scope 1 at $DIR/region-subtyping-basic.rs:18:16: 18:17
         _3 = const Const(Value(Scalar(0x0000000000000000)): usize); // bb0[5]: scope 1 at $DIR/region-subtyping-basic.rs:18:16: 18:17
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000000))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:18:16: 18:17
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000000)) }
         _4 = Len(_1);                    // bb0[6]: scope 1 at $DIR/region-subtyping-basic.rs:18:14: 18:18
         _5 = Lt(_3, _4);                 // bb0[7]: scope 1 at $DIR/region-subtyping-basic.rs:18:14: 18:18
         assert(move _5, "index out of bounds: the len is {} but the index is {}", move _4, _3) -> [success: bb2, unwind: bb1]; // bb0[8]: scope 1 at $DIR/region-subtyping-basic.rs:18:14: 18:18
@@ -91,12 +67,6 @@ fn main() -> () {
         FakeRead(ForLet, _6);            // bb2[4]: scope 2 at $DIR/region-subtyping-basic.rs:19:9: 19:10
         StorageLive(_7);                 // bb2[5]: scope 3 at $DIR/region-subtyping-basic.rs:20:8: 20:12
         _7 = const Const(Value(Scalar(0x01)): bool); // bb2[6]: scope 3 at $DIR/region-subtyping-basic.rs:20:8: 20:12
-                                         // ty::Const
-                                         // + ty: bool
-                                         // + val: Value(Scalar(0x01))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:20:8: 20:12
-                                         // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
         FakeRead(ForMatchedPlace, _7);   // bb2[7]: scope 3 at $DIR/region-subtyping-basic.rs:20:8: 20:12
         switchInt(_7) -> [Const(Value(Scalar(0x00)): bool): bb4, otherwise: bb3]; // bb2[8]: scope 3 at $DIR/region-subtyping-basic.rs:20:5: 24:6
     }
@@ -114,12 +84,6 @@ fn main() -> () {
                                          // mir::Constant
                                          // + span: $DIR/region-subtyping-basic.rs:23:9: 23:14
                                          // + literal: Const { ty: fn(usize) -> bool {use_x}, val: Value(Scalar(<ZST>)) }
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000016))
-                                         // mir::Constant
-                                         // + span: $DIR/region-subtyping-basic.rs:23:15: 23:17
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000016)) }
     }
 
     bb5: {
index 18fbffb463067b4fbbce55941619f35e18078bd0..924e87ea8c0add79d6e1f8b22c0857405fa43857 100644 (file)
 -         StorageLive(_2);                 // scope 0 at $DIR/nrvo-simple.rs:3:9: 3:16
 -         _2 = [const 0_u8; 1024];         // scope 0 at $DIR/nrvo-simple.rs:3:19: 3:28
 +         _0 = [const 0_u8; 1024];         // scope 0 at $DIR/nrvo-simple.rs:3:19: 3:28
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/nrvo-simple.rs:3:20: 3:21
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           StorageLive(_3);                 // scope 1 at $DIR/nrvo-simple.rs:4:5: 4:19
           StorageLive(_5);                 // scope 1 at $DIR/nrvo-simple.rs:4:10: 4:18
           StorageLive(_6);                 // scope 1 at $DIR/nrvo-simple.rs:4:10: 4:18
index 075c7647c671fc94e8cc1630809859a5c389e792..a0214e5b9c501060104828aa1557287c9cf0e25d 100644 (file)
@@ -17,12 +17,6 @@ fn main() -> () {
         StorageLive(_2);                 // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:24: 6:42
         StorageLive(_3);                 // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:32: 6:41
         _3 = Droppy(const 0_usize);      // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:32: 6:41
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/packed-struct-drop-aligned.rs:6:39: 6:40
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000000)) }
         _2 = Aligned(move _3);           // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:24: 6:42
         StorageDead(_3);                 // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:41: 6:42
         _1 = Packed(move _2);            // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:17: 6:43
@@ -30,12 +24,6 @@ fn main() -> () {
         StorageLive(_4);                 // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:11: 7:29
         StorageLive(_5);                 // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:19: 7:28
         _5 = Droppy(const 0_usize);      // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:19: 7:28
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/packed-struct-drop-aligned.rs:7:26: 7:27
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000000)) }
         _4 = Aligned(move _5);           // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:11: 7:29
         StorageDead(_5);                 // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:28: 7:29
         StorageLive(_6);                 // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:5: 7:8
index 99a74b6b24f7fd5f4e913c6e245c5c9f88564f42..a0214e5b9c501060104828aa1557287c9cf0e25d 100644 (file)
@@ -17,12 +17,6 @@ fn main() -> () {
         StorageLive(_2);                 // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:24: 6:42
         StorageLive(_3);                 // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:32: 6:41
         _3 = Droppy(const 0_usize);      // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:32: 6:41
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000000))
-                                         // mir::Constant
-                                         // + span: $DIR/packed-struct-drop-aligned.rs:6:39: 6:40
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000000)) }
         _2 = Aligned(move _3);           // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:24: 6:42
         StorageDead(_3);                 // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:41: 6:42
         _1 = Packed(move _2);            // scope 0 at $DIR/packed-struct-drop-aligned.rs:6:17: 6:43
@@ -30,12 +24,6 @@ fn main() -> () {
         StorageLive(_4);                 // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:11: 7:29
         StorageLive(_5);                 // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:19: 7:28
         _5 = Droppy(const 0_usize);      // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:19: 7:28
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000000))
-                                         // mir::Constant
-                                         // + span: $DIR/packed-struct-drop-aligned.rs:7:26: 7:27
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000000)) }
         _4 = Aligned(move _5);           // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:11: 7:29
         StorageDead(_5);                 // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:28: 7:29
         StorageLive(_6);                 // scope 1 at $DIR/packed-struct-drop-aligned.rs:7:5: 7:8
index 0822d8cc03c60ef12fa82597267e55cbdfe74538..2b7e4bbffe9e0478799266c4e1b295730e7e17f2 100644 (file)
   
       bb1: {
           _0 = const 1_i32;                // scope 0 at $DIR/remove_fake_borrows.rs:9:14: 9:15
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/remove_fake_borrows.rs:9:14: 9:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           goto -> bb7;                     // scope 0 at $DIR/remove_fake_borrows.rs:7:5: 10:6
       }
   
 +         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:8:20: 8:21
 +         nop;                             // scope 0 at $DIR/remove_fake_borrows.rs:8:20: 8:21
           _0 = const 0_i32;                // scope 0 at $DIR/remove_fake_borrows.rs:8:25: 8:26
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/remove_fake_borrows.rs:8:25: 8:26
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           goto -> bb7;                     // scope 0 at $DIR/remove_fake_borrows.rs:7:5: 10:6
       }
   
index b61d936837512fd9be5cb80c312ea538df198abe..5521ead29dbe82d631633f2d6b81931c50f0f08b 100644 (file)
@@ -57,23 +57,11 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/retag.rs:30:9: 30:14
         _1 = const 0_i32;                // scope 0 at $DIR/retag.rs:30:17: 30:18
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/retag.rs:30:17: 30:18
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
         StorageLive(_2);                 // scope 1 at $DIR/retag.rs:31:5: 37:6
         StorageLive(_3);                 // scope 1 at $DIR/retag.rs:32:13: 32:14
         StorageLive(_4);                 // scope 1 at $DIR/retag.rs:32:17: 32:24
         StorageLive(_5);                 // scope 1 at $DIR/retag.rs:32:17: 32:24
         _5 = Test(const 0_i32);          // scope 1 at $DIR/retag.rs:32:17: 32:24
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/retag.rs:32:22: 32:23
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
         _4 = &_5;                        // scope 1 at $DIR/retag.rs:32:17: 32:24
         Retag(_4);                       // scope 1 at $DIR/retag.rs:32:17: 32:24
         StorageLive(_6);                 // scope 1 at $DIR/retag.rs:32:29: 32:35
@@ -171,12 +159,6 @@ fn main() -> () {
         StorageLive(_20);                // scope 7 at $DIR/retag.rs:47:5: 47:12
         StorageLive(_21);                // scope 7 at $DIR/retag.rs:47:5: 47:12
         _21 = Test(const 0_i32);         // scope 7 at $DIR/retag.rs:47:5: 47:12
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/retag.rs:47:10: 47:11
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
         _20 = &_21;                      // scope 7 at $DIR/retag.rs:47:5: 47:12
         Retag(_20);                      // scope 7 at $DIR/retag.rs:47:5: 47:12
         StorageLive(_22);                // scope 7 at $DIR/retag.rs:47:21: 47:23
index da3191554f0e067b88069b127875bdcaa1739a63..64ca4b578036df9dfb30e26cf5c450918f9e69b9 100644 (file)
@@ -19,23 +19,11 @@ fn match_bool(_1: bool) -> usize {
 
     bb3: {
         _0 = const 20_usize;             // scope 0 at $DIR/simple-match.rs:8:14: 8:16
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000014))
-                                         // mir::Constant
-                                         // + span: $DIR/simple-match.rs:8:14: 8:16
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000014)) }
         goto -> bb5;                     // scope 0 at $DIR/simple-match.rs:6:5: 9:6
     }
 
     bb4: {
         _0 = const 10_usize;             // scope 0 at $DIR/simple-match.rs:7:17: 7:19
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000a))
-                                         // mir::Constant
-                                         // + span: $DIR/simple-match.rs:7:17: 7:19
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000a)) }
         goto -> bb5;                     // scope 0 at $DIR/simple-match.rs:6:5: 9:6
     }
 
index 55b51a899bc507a33fe996a25a174cd98d66e7a0..64ca4b578036df9dfb30e26cf5c450918f9e69b9 100644 (file)
@@ -19,23 +19,11 @@ fn match_bool(_1: bool) -> usize {
 
     bb3: {
         _0 = const 20_usize;             // scope 0 at $DIR/simple-match.rs:8:14: 8:16
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000014))
-                                         // mir::Constant
-                                         // + span: $DIR/simple-match.rs:8:14: 8:16
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000014)) }
         goto -> bb5;                     // scope 0 at $DIR/simple-match.rs:6:5: 9:6
     }
 
     bb4: {
         _0 = const 10_usize;             // scope 0 at $DIR/simple-match.rs:7:17: 7:19
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x000000000000000a))
-                                         // mir::Constant
-                                         // + span: $DIR/simple-match.rs:7:17: 7:19
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x000000000000000a)) }
         goto -> bb5;                     // scope 0 at $DIR/simple-match.rs:6:5: 9:6
     }
 
index b7b239ea414d6f6b8ce64e94819059f163e1b095..db42c5ad8ba8af7f0648755e7659e3097e9c1bb3 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/simplify-arm-identity.rs:18:9: 18:10
           ((_1 as Foo).0: u8) = const 0_u8; // scope 0 at $DIR/simplify-arm-identity.rs:18:18: 18:29
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/simplify-arm-identity.rs:18:27: 18:28
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           discriminant(_1) = 0;            // scope 0 at $DIR/simplify-arm-identity.rs:18:18: 18:29
           StorageLive(_2);                 // scope 1 at $DIR/simplify-arm-identity.rs:19:18: 22:6
           _3 = const 0_isize;              // scope 1 at $DIR/simplify-arm-identity.rs:20:9: 20:20
-                                           // ty::Const
-                                           // + ty: isize
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/simplify-arm-identity.rs:20:9: 20:20
-                                           // + literal: Const { ty: isize, val: Value(Scalar(0x00000000)) }
           goto -> bb3;                     // scope 1 at $DIR/simplify-arm-identity.rs:20:9: 20:20
       }
   
       bb1: {
           ((_2 as Foo).0: u8) = const 0_u8; // scope 1 at $DIR/simplify-arm-identity.rs:21:21: 21:32
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/simplify-arm-identity.rs:21:30: 21:31
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           discriminant(_2) = 0;            // scope 1 at $DIR/simplify-arm-identity.rs:21:21: 21:32
           goto -> bb4;                     // scope 1 at $DIR/simplify-arm-identity.rs:19:18: 22:6
       }
index 34282526da0fa920f05d7fab3b1724014353ad87..db42c5ad8ba8af7f0648755e7659e3097e9c1bb3 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/simplify-arm-identity.rs:18:9: 18:10
           ((_1 as Foo).0: u8) = const 0_u8; // scope 0 at $DIR/simplify-arm-identity.rs:18:18: 18:29
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/simplify-arm-identity.rs:18:27: 18:28
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           discriminant(_1) = 0;            // scope 0 at $DIR/simplify-arm-identity.rs:18:18: 18:29
           StorageLive(_2);                 // scope 1 at $DIR/simplify-arm-identity.rs:19:18: 22:6
           _3 = const 0_isize;              // scope 1 at $DIR/simplify-arm-identity.rs:20:9: 20:20
-                                           // ty::Const
-                                           // + ty: isize
-                                           // + val: Value(Scalar(0x0000000000000000))
-                                           // mir::Constant
-                                           // + span: $DIR/simplify-arm-identity.rs:20:9: 20:20
-                                           // + literal: Const { ty: isize, val: Value(Scalar(0x0000000000000000)) }
           goto -> bb3;                     // scope 1 at $DIR/simplify-arm-identity.rs:20:9: 20:20
       }
   
       bb1: {
           ((_2 as Foo).0: u8) = const 0_u8; // scope 1 at $DIR/simplify-arm-identity.rs:21:21: 21:32
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/simplify-arm-identity.rs:21:30: 21:31
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x00)) }
           discriminant(_2) = 0;            // scope 1 at $DIR/simplify-arm-identity.rs:21:21: 21:32
           goto -> bb4;                     // scope 1 at $DIR/simplify-arm-identity.rs:19:18: 22:6
       }
index e94e49bf0cb4fca56b5c7750e0d7ab57a36caa2b..44bf4400e159e1604532b1183566a75a84feda68 100644 (file)
@@ -9,19 +9,7 @@
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/simplify_if.rs:6:8: 6:13
           _1 = const false;                // scope 0 at $DIR/simplify_if.rs:6:8: 6:13
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/simplify_if.rs:6:8: 6:13
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
 -         switchInt(const false) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_if.rs:6:5: 8:6
--                                          // ty::Const
--                                          // + ty: bool
--                                          // + val: Value(Scalar(0x00))
--                                          // mir::Constant
--                                          // + span: $DIR/simplify_if.rs:6:5: 8:6
--                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
 +         goto -> bb1;                     // scope 0 at $DIR/simplify_if.rs:6:5: 8:6
       }
   
index 720296a2c66b0c9bcde98f0bd05c876482ee4f94..8a3fd7d9709443e95f9e869cc1bf1b8e306d0bc3 100644 (file)
           StorageLive(_8);                 // scope 1 at $DIR/simplify-locals-fixedpoint.rs:5:12: 5:13
           _8 = _6;                         // scope 1 at $DIR/simplify-locals-fixedpoint.rs:5:12: 5:13
           _7 = Gt(move _8, const 42_u8);   // scope 1 at $DIR/simplify-locals-fixedpoint.rs:5:12: 5:20
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x2a))
-                                           // mir::Constant
-                                           // + span: $DIR/simplify-locals-fixedpoint.rs:5:16: 5:20
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x2a)) }
           StorageDead(_8);                 // scope 1 at $DIR/simplify-locals-fixedpoint.rs:5:19: 5:20
           switchInt(_7) -> [false: bb4, otherwise: bb5]; // scope 1 at $DIR/simplify-locals-fixedpoint.rs:5:9: 7:10
       }
index 8b5936116b3a734237b94b98321b6e19adc21dbc..99b38f3c57a998ed247fa6b0d9940a9e7454a961 100644 (file)
 -         StorageLive(_10);                // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:12: 16:30
 -         StorageLive(_11);                // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:12: 16:28
 -         (_11.0: u8) = const 40_u8;       // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:12: 16:28
-+         StorageDead(_1);                 // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:14:22: 14:23
-+         StorageLive(_2);                 // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:5: 16:35
-+         _2 = const use_u8(const 42_u8) -> bb2; // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:5: 16:35
-                                           // ty::Const
--                                          // + ty: u8
--                                          // + val: Value(Scalar(0x28))
--                                          // mir::Constant
--                                          // + span: $DIR/simplify-locals-removes-unused-consts.rs:16:23: 16:25
--                                          // + literal: Const { ty: u8, val: Value(Scalar(0x28)) }
 -         _10 = const 40_u8;               // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:12: 16:30
--                                          // ty::Const
--                                          // + ty: u8
--                                          // + val: Value(Scalar(0x28))
--                                          // mir::Constant
--                                          // + span: $DIR/simplify-locals-removes-unused-consts.rs:16:12: 16:30
--                                          // + literal: Const { ty: u8, val: Value(Scalar(0x28)) }
 -         _9 = const 42_u8;                // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:12: 16:34
--                                          // ty::Const
--                                          // + ty: u8
--                                          // + val: Value(Scalar(0x2a))
--                                          // mir::Constant
--                                          // + span: $DIR/simplify-locals-removes-unused-consts.rs:16:12: 16:34
--                                          // + literal: Const { ty: u8, val: Value(Scalar(0x2a)) }
 -         StorageDead(_10);                // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:33: 16:34
 -         _8 = const use_u8(const 42_u8) -> bb2; // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:5: 16:35
--                                          // ty::Const
++         StorageDead(_1);                 // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:14:22: 14:23
++         StorageLive(_2);                 // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:5: 16:35
++         _2 = const use_u8(const 42_u8) -> bb2; // scope 1 at $DIR/simplify-locals-removes-unused-consts.rs:16:5: 16:35
+                                           // ty::Const
                                            // + ty: fn(u8) {use_u8}
                                            // + val: Value(Scalar(<ZST>))
                                            // mir::Constant
                                            // + span: $DIR/simplify-locals-removes-unused-consts.rs:16:5: 16:11
                                            // + literal: Const { ty: fn(u8) {use_u8}, val: Value(Scalar(<ZST>)) }
-                                           // ty::Const
-                                           // + ty: u8
-                                           // + val: Value(Scalar(0x2a))
-                                           // mir::Constant
-                                           // + span: $DIR/simplify-locals-removes-unused-consts.rs:16:5: 16:35
-                                           // + literal: Const { ty: u8, val: Value(Scalar(0x2a)) }
       }
   
       bb2: {
index 9e840553ecabd9d58b657f22e0f8324083401404..4418c9f12b392a6f3c298f82b96684aea866c396 100644 (file)
   
       bb0: {
 -         _5 = const false;                // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
--                                          // ty::Const
--                                          // + ty: bool
--                                          // + val: Value(Scalar(0x00))
--                                          // mir::Constant
--                                          // + span: $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
--                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
 -         _5 = const true;                 // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
--                                          // ty::Const
--                                          // + ty: bool
--                                          // + val: Value(Scalar(0x01))
--                                          // mir::Constant
--                                          // + span: $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
--                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 -         _2 = discriminant(_1);           // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
           _0 = move _1;                    // scope 1 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:4:20: 4:27
 -         _6 = discriminant(_1);           // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:1: 6:2
index 9e840553ecabd9d58b657f22e0f8324083401404..4418c9f12b392a6f3c298f82b96684aea866c396 100644 (file)
   
       bb0: {
 -         _5 = const false;                // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
--                                          // ty::Const
--                                          // + ty: bool
--                                          // + val: Value(Scalar(0x00))
--                                          // mir::Constant
--                                          // + span: $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
--                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
 -         _5 = const true;                 // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
--                                          // ty::Const
--                                          // + ty: bool
--                                          // + val: Value(Scalar(0x01))
--                                          // mir::Constant
--                                          // + span: $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
--                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 -         _2 = discriminant(_1);           // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:3:9: 3:13
           _0 = move _1;                    // scope 1 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:4:20: 4:27
 -         _6 = discriminant(_1);           // scope 0 at $DIR/simplify-locals-removes-unused-discriminant-reads.rs:6:1: 6:2
index 8003112c46c4bbc2776209bb87a76edc3f843cbd..aba5fafa3a47626618a5965ce3bde08658121ec8 100644 (file)
           StorageLive(_1);                 // scope 0 at $DIR/simplify_match.rs:6:11: 6:31
           StorageLive(_2);                 // scope 0 at $DIR/simplify_match.rs:6:17: 6:18
           _2 = const false;                // scope 0 at $DIR/simplify_match.rs:6:21: 6:26
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x00))
-                                           // mir::Constant
-                                           // + span: $DIR/simplify_match.rs:6:21: 6:26
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
 -         _1 = _2;                         // scope 1 at $DIR/simplify_match.rs:6:28: 6:29
 +         _1 = const false;                // scope 1 at $DIR/simplify_match.rs:6:28: 6:29
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/simplify_match.rs:6:28: 6:29
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
           StorageDead(_2);                 // scope 0 at $DIR/simplify_match.rs:6:30: 6:31
 -         switchInt(_1) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:7:9: 7:13
 +         switchInt(const false) -> [false: bb1, otherwise: bb2]; // scope 0 at $DIR/simplify_match.rs:7:9: 7:13
-+                                          // ty::Const
-+                                          // + ty: bool
-+                                          // + val: Value(Scalar(0x00))
-+                                          // mir::Constant
-+                                          // + span: $DIR/simplify_match.rs:7:9: 7:13
-+                                          // + literal: Const { ty: bool, val: Value(Scalar(0x00)) }
       }
   
       bb1: {
index b3ee08c3e033e64f0fa99cbba0f252843eed1c0e..50cfe19974a7cdd08c962d421df0e76dfc0b268f 100644 (file)
@@ -32,12 +32,6 @@ fn std::intrinsics::drop_in_place(_1: *mut [std::string::String]) -> () {
     bb3 (cleanup): {
         _5 = &raw mut (*_1)[_4];         // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
         _4 = Add(move _4, const 1_usize); // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
         drop((*_5)) -> bb4;              // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
     }
 
@@ -49,12 +43,6 @@ fn std::intrinsics::drop_in_place(_1: *mut [std::string::String]) -> () {
     bb5: {
         _7 = &raw mut (*_1)[_4];         // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
         _4 = Add(move _4, const 1_usize); // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
         drop((*_7)) -> [return: bb6, unwind: bb4]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
     }
 
@@ -65,12 +53,6 @@ fn std::intrinsics::drop_in_place(_1: *mut [std::string::String]) -> () {
 
     bb7: {
         _4 = const 0_usize;              // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000000)) }
         goto -> bb6;                     // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
     }
 
@@ -81,12 +63,6 @@ fn std::intrinsics::drop_in_place(_1: *mut [std::string::String]) -> () {
     bb9 (cleanup): {
         _11 = _9;                        // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
         _9 = Offset(move _9, const 1_usize); // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
         drop((*_11)) -> bb10;            // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
     }
 
@@ -98,12 +74,6 @@ fn std::intrinsics::drop_in_place(_1: *mut [std::string::String]) -> () {
     bb11: {
         _13 = _9;                        // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
         _9 = Offset(move _9, const 1_usize); // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x00000001)) }
         drop((*_13)) -> [return: bb12, unwind: bb10]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
     }
 
index ea22af65dda4ff2eb0bdefd8c952fcc359ef2188..50cfe19974a7cdd08c962d421df0e76dfc0b268f 100644 (file)
@@ -32,12 +32,6 @@ fn std::intrinsics::drop_in_place(_1: *mut [std::string::String]) -> () {
     bb3 (cleanup): {
         _5 = &raw mut (*_1)[_4];         // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
         _4 = Add(move _4, const 1_usize); // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000001))
-                                         // mir::Constant
-                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
         drop((*_5)) -> bb4;              // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
     }
 
@@ -49,12 +43,6 @@ fn std::intrinsics::drop_in_place(_1: *mut [std::string::String]) -> () {
     bb5: {
         _7 = &raw mut (*_1)[_4];         // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
         _4 = Add(move _4, const 1_usize); // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000001))
-                                         // mir::Constant
-                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
         drop((*_7)) -> [return: bb6, unwind: bb4]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
     }
 
@@ -65,12 +53,6 @@ fn std::intrinsics::drop_in_place(_1: *mut [std::string::String]) -> () {
 
     bb7: {
         _4 = const 0_usize;              // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000000))
-                                         // mir::Constant
-                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000000)) }
         goto -> bb6;                     // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
     }
 
@@ -81,12 +63,6 @@ fn std::intrinsics::drop_in_place(_1: *mut [std::string::String]) -> () {
     bb9 (cleanup): {
         _11 = _9;                        // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
         _9 = Offset(move _9, const 1_usize); // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000001))
-                                         // mir::Constant
-                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
         drop((*_11)) -> bb10;            // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
     }
 
@@ -98,12 +74,6 @@ fn std::intrinsics::drop_in_place(_1: *mut [std::string::String]) -> () {
     bb11: {
         _13 = _9;                        // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
         _9 = Offset(move _9, const 1_usize); // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // ty::Const
-                                         // + ty: usize
-                                         // + val: Value(Scalar(0x0000000000000001))
-                                         // mir::Constant
-                                         // + span: $SRC_DIR/core/src/ptr/mod.rs:LL:COL
-                                         // + literal: Const { ty: usize, val: Value(Scalar(0x0000000000000001)) }
         drop((*_13)) -> [return: bb12, unwind: bb10]; // scope 0 at $SRC_DIR/core/src/ptr/mod.rs:LL:COL
     }
 
index d7f73a22c26fd4ad03348d28a0f313a4c861cf0b..09ce2bdc95da148542d03c4eb4e7480530f02b26 100644 (file)
@@ -60,592 +60,88 @@ static XXX: &Foo = {
         StorageLive(_6);                 // scope 0 at $DIR/storage_live_dead_in_statics.rs:7:12: 22:6
         StorageLive(_7);                 // scope 0 at $DIR/storage_live_dead_in_statics.rs:8:9: 8:15
         _7 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:8:9: 8:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:8:10: 8:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:8:13: 8:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_8);                 // scope 0 at $DIR/storage_live_dead_in_statics.rs:8:17: 8:23
         _8 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:8:17: 8:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:8:18: 8:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:8:21: 8:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_9);                 // scope 0 at $DIR/storage_live_dead_in_statics.rs:8:25: 8:31
         _9 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:8:25: 8:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:8:26: 8:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:8:29: 8:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_10);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:9:9: 9:15
         _10 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:9:9: 9:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:9:10: 9:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:9:13: 9:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_11);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:9:17: 9:23
         _11 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:9:17: 9:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:9:18: 9:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:9:21: 9:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_12);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:9:25: 9:31
         _12 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:9:25: 9:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:9:26: 9:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:9:29: 9:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_13);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:10:9: 10:15
         _13 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:10:9: 10:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:10:10: 10:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:10:13: 10:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_14);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:10:17: 10:23
         _14 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:10:17: 10:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:10:18: 10:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:10:21: 10:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_15);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:10:25: 10:31
         _15 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:10:25: 10:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:10:26: 10:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:10:29: 10:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_16);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:11:9: 11:15
         _16 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:11:9: 11:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:11:10: 11:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:11:13: 11:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_17);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:11:17: 11:23
         _17 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:11:17: 11:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:11:18: 11:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:11:21: 11:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_18);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:11:25: 11:31
         _18 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:11:25: 11:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:11:26: 11:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:11:29: 11:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_19);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:12:9: 12:15
         _19 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:12:9: 12:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:12:10: 12:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:12:13: 12:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_20);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:12:17: 12:23
         _20 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:12:17: 12:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:12:18: 12:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:12:21: 12:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_21);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:12:25: 12:31
         _21 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:12:25: 12:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:12:26: 12:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:12:29: 12:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_22);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:13:9: 13:15
         _22 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:13:9: 13:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:13:10: 13:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:13:13: 13:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_23);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:13:17: 13:23
         _23 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:13:17: 13:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:13:18: 13:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:13:21: 13:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_24);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:13:25: 13:31
         _24 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:13:25: 13:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:13:26: 13:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:13:29: 13:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_25);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:14:9: 14:15
         _25 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:14:9: 14:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:14:10: 14:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:14:13: 14:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_26);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:14:17: 14:23
         _26 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:14:17: 14:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:14:18: 14:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:14:21: 14:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_27);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:14:25: 14:31
         _27 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:14:25: 14:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:14:26: 14:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:14:29: 14:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_28);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:15:9: 15:15
         _28 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:15:9: 15:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:15:10: 15:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:15:13: 15:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_29);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:15:17: 15:23
         _29 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:15:17: 15:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:15:18: 15:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:15:21: 15:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_30);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:15:25: 15:31
         _30 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:15:25: 15:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:15:26: 15:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:15:29: 15:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_31);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:16:9: 16:15
         _31 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:16:9: 16:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:16:10: 16:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:16:13: 16:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_32);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:16:17: 16:23
         _32 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:16:17: 16:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:16:18: 16:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:16:21: 16:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_33);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:16:25: 16:31
         _33 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:16:25: 16:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:16:26: 16:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:16:29: 16:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_34);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:17:9: 17:15
         _34 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:17:9: 17:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:17:10: 17:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:17:13: 17:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_35);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:17:17: 17:23
         _35 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:17:17: 17:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:17:18: 17:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:17:21: 17:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_36);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:17:25: 17:31
         _36 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:17:25: 17:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:17:26: 17:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:17:29: 17:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_37);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:18:9: 18:15
         _37 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:18:9: 18:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:18:10: 18:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:18:13: 18:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_38);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:18:17: 18:23
         _38 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:18:17: 18:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:18:18: 18:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:18:21: 18:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_39);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:18:25: 18:31
         _39 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:18:25: 18:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:18:26: 18:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:18:29: 18:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_40);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:19:9: 19:15
         _40 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:19:9: 19:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:19:10: 19:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:19:13: 19:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_41);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:19:17: 19:23
         _41 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:19:17: 19:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:19:18: 19:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:19:21: 19:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_42);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:19:25: 19:31
         _42 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:19:25: 19:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:19:26: 19:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:19:29: 19:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_43);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:20:9: 20:15
         _43 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:20:9: 20:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:20:10: 20:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:20:13: 20:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_44);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:20:17: 20:23
         _44 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:20:17: 20:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:20:18: 20:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:20:21: 20:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_45);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:20:25: 20:31
         _45 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:20:25: 20:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:20:26: 20:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:20:29: 20:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         StorageLive(_46);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:21:9: 21:15
         _46 = (const 0_u32, const 1_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:21:9: 21:15
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:21:10: 21:11
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:21:13: 21:14
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000001)) }
         StorageLive(_47);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:21:17: 21:23
         _47 = (const 0_u32, const 2_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:21:17: 21:23
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:21:18: 21:19
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:21:21: 21:22
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000002)) }
         StorageLive(_48);                // scope 0 at $DIR/storage_live_dead_in_statics.rs:21:25: 21:31
         _48 = (const 0_u32, const 3_u32); // scope 0 at $DIR/storage_live_dead_in_statics.rs:21:25: 21:31
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:21:26: 21:27
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000000)) }
-                                         // ty::Const
-                                         // + ty: u32
-                                         // + val: Value(Scalar(0x00000003))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_live_dead_in_statics.rs:21:29: 21:30
-                                         // + literal: Const { ty: u32, val: Value(Scalar(0x00000003)) }
         _6 = [move _7, move _8, move _9, move _10, move _11, move _12, move _13, move _14, move _15, move _16, move _17, move _18, move _19, move _20, move _21, move _22, move _23, move _24, move _25, move _26, move _27, move _28, move _29, move _30, move _31, move _32, move _33, move _34, move _35, move _36, move _37, move _38, move _39, move _40, move _41, move _42, move _43, move _44, move _45, move _46, move _47, move _48]; // scope 0 at $DIR/storage_live_dead_in_statics.rs:7:12: 22:6
         _5 = &_6;                        // scope 0 at $DIR/storage_live_dead_in_statics.rs:7:11: 22:6
         _4 = &(*_5);                     // scope 0 at $DIR/storage_live_dead_in_statics.rs:7:11: 22:6
index 099535c0ad279e4a2648d91fae6927288e43dde9..d51afe3d9030764c0febbdfcef828c30ba12b5cf 100644 (file)
@@ -39,12 +39,6 @@ fn main() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/storage_ranges.rs:4:9: 4:10
         _1 = const 0_i32;                // scope 0 at $DIR/storage_ranges.rs:4:13: 4:14
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_ranges.rs:4:13: 4:14
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
         FakeRead(ForLet, _1);            // scope 0 at $DIR/storage_ranges.rs:4:9: 4:10
         StorageLive(_2);                 // scope 1 at $DIR/storage_ranges.rs:5:5: 7:6
         StorageLive(_3);                 // scope 1 at $DIR/storage_ranges.rs:6:13: 6:14
@@ -67,12 +61,6 @@ fn main() -> () {
         StorageDead(_2);                 // scope 1 at $DIR/storage_ranges.rs:7:5: 7:6
         StorageLive(_6);                 // scope 1 at $DIR/storage_ranges.rs:8:9: 8:10
         _6 = const 1_i32;                // scope 1 at $DIR/storage_ranges.rs:8:13: 8:14
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/storage_ranges.rs:8:13: 8:14
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
         FakeRead(ForLet, _6);            // scope 1 at $DIR/storage_ranges.rs:8:9: 8:10
         _0 = const ();                   // scope 0 at $DIR/storage_ranges.rs:3:11: 9:2
                                          // ty::Const
index 5ceca2d091e30fa88ae7c226d5e36ca932878f49..6591328423f5a7bb20654324847d4f66b6c1541d 100644 (file)
@@ -19,12 +19,6 @@ fn main() -> () {
         StorageLive(_3);                 // scope 2 at $DIR/tls-access.rs:9:9: 9:12
         _3 = &/*tls*/ mut FOO;           // scope 2 at $DIR/tls-access.rs:9:9: 9:12
         (*_3) = const 42_u8;             // scope 2 at $DIR/tls-access.rs:9:9: 9:17
-                                         // ty::Const
-                                         // + ty: u8
-                                         // + val: Value(Scalar(0x2a))
-                                         // mir::Constant
-                                         // + span: $DIR/tls-access.rs:9:15: 9:17
-                                         // + literal: Const { ty: u8, val: Value(Scalar(0x2a)) }
         StorageDead(_3);                 // scope 2 at $DIR/tls-access.rs:9:17: 9:18
         _0 = const ();                   // scope 1 at $DIR/tls-access.rs:7:5: 10:6
                                          // ty::Const
index eb40baa2000f8cd7aa8025029f43e8f40b46ce6d..41d4f75bd3aadc703e9e1db45e3b1a7827388788 100644 (file)
@@ -21,12 +21,6 @@ fn move_out_by_subslice() -> () {
         StorageLive(_3);                 // scope 0 at $DIR/uniform_array_move_out.rs:11:14: 11:19
         _3 = Box(i32);                   // scope 0 at $DIR/uniform_array_move_out.rs:11:14: 11:19
         (*_3) = const 1_i32;             // scope 0 at $DIR/uniform_array_move_out.rs:11:18: 11:19
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/uniform_array_move_out.rs:11:18: 11:19
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
         _2 = move _3;                    // scope 0 at $DIR/uniform_array_move_out.rs:11:14: 11:19
         drop(_3) -> [return: bb4, unwind: bb2]; // scope 0 at $DIR/uniform_array_move_out.rs:11:18: 11:19
     }
@@ -49,12 +43,6 @@ fn move_out_by_subslice() -> () {
         StorageLive(_5);                 // scope 0 at $DIR/uniform_array_move_out.rs:11:21: 11:26
         _5 = Box(i32);                   // scope 0 at $DIR/uniform_array_move_out.rs:11:21: 11:26
         (*_5) = const 2_i32;             // scope 0 at $DIR/uniform_array_move_out.rs:11:25: 11:26
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/uniform_array_move_out.rs:11:25: 11:26
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
         _4 = move _5;                    // scope 0 at $DIR/uniform_array_move_out.rs:11:21: 11:26
         drop(_5) -> [return: bb7, unwind: bb5]; // scope 0 at $DIR/uniform_array_move_out.rs:11:25: 11:26
     }
index 7beceb66577fe82ce1be0d36d7699ff1ea76794f..1f29ea152b03fbf87fa074361163bcd75a193fdb 100644 (file)
@@ -21,12 +21,6 @@ fn move_out_from_end() -> () {
         StorageLive(_3);                 // scope 0 at $DIR/uniform_array_move_out.rs:5:14: 5:19
         _3 = Box(i32);                   // scope 0 at $DIR/uniform_array_move_out.rs:5:14: 5:19
         (*_3) = const 1_i32;             // scope 0 at $DIR/uniform_array_move_out.rs:5:18: 5:19
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000001))
-                                         // mir::Constant
-                                         // + span: $DIR/uniform_array_move_out.rs:5:18: 5:19
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
         _2 = move _3;                    // scope 0 at $DIR/uniform_array_move_out.rs:5:14: 5:19
         drop(_3) -> [return: bb4, unwind: bb2]; // scope 0 at $DIR/uniform_array_move_out.rs:5:18: 5:19
     }
@@ -49,12 +43,6 @@ fn move_out_from_end() -> () {
         StorageLive(_5);                 // scope 0 at $DIR/uniform_array_move_out.rs:5:21: 5:26
         _5 = Box(i32);                   // scope 0 at $DIR/uniform_array_move_out.rs:5:21: 5:26
         (*_5) = const 2_i32;             // scope 0 at $DIR/uniform_array_move_out.rs:5:25: 5:26
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/uniform_array_move_out.rs:5:25: 5:26
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
         _4 = move _5;                    // scope 0 at $DIR/uniform_array_move_out.rs:5:21: 5:26
         drop(_5) -> [return: bb7, unwind: bb5]; // scope 0 at $DIR/uniform_array_move_out.rs:5:25: 5:26
     }
index e7abf57880047d9a8237c92fe694b8981873d16c..16c27fff7e62f5101abe3f7ddb07f197eba81c61 100644 (file)
 -         StorageLive(_5);                 // scope 2 at $DIR/unreachable.rs:12:9: 16:10
 -         StorageLive(_6);                 // scope 2 at $DIR/unreachable.rs:12:12: 12:16
 -         _6 = const true;                 // scope 2 at $DIR/unreachable.rs:12:12: 12:16
--                                          // ty::Const
--                                          // + ty: bool
--                                          // + val: Value(Scalar(0x01))
--                                          // mir::Constant
--                                          // + span: $DIR/unreachable.rs:12:12: 12:16
--                                          // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
 -         switchInt(_6) -> [false: bb4, otherwise: bb5]; // scope 2 at $DIR/unreachable.rs:12:9: 16:10
 -     }
 - 
 -     bb4: {
 -         _4 = const 42_i32;               // scope 2 at $DIR/unreachable.rs:15:13: 15:20
--                                          // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x0000002a))
--                                          // mir::Constant
--                                          // + span: $DIR/unreachable.rs:15:18: 15:20
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
 -         _5 = const ();                   // scope 2 at $DIR/unreachable.rs:14:16: 16:10
 -                                          // ty::Const
 -                                          // + ty: ()
 - 
 -     bb5: {
 -         _4 = const 21_i32;               // scope 2 at $DIR/unreachable.rs:13:13: 13:20
--                                          // ty::Const
--                                          // + ty: i32
--                                          // + val: Value(Scalar(0x00000015))
--                                          // mir::Constant
--                                          // + span: $DIR/unreachable.rs:13:18: 13:20
--                                          // + literal: Const { ty: i32, val: Value(Scalar(0x00000015)) }
 -         _5 = const ();                   // scope 2 at $DIR/unreachable.rs:12:17: 14:10
 -                                          // ty::Const
 -                                          // + ty: ()
index 50694900024a081e5da0cacb68a056474b9817f1..bd5346f663fe9196218fe770f03116d9fefe6aae 100644 (file)
           StorageLive(_5);                 // scope 2 at $DIR/unreachable_asm.rs:14:9: 18:10
           StorageLive(_6);                 // scope 2 at $DIR/unreachable_asm.rs:14:12: 14:16
           _6 = const true;                 // scope 2 at $DIR/unreachable_asm.rs:14:12: 14:16
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/unreachable_asm.rs:14:12: 14:16
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           switchInt(_6) -> [false: bb4, otherwise: bb5]; // scope 2 at $DIR/unreachable_asm.rs:14:9: 18:10
       }
   
       bb4: {
           _4 = const 42_i32;               // scope 2 at $DIR/unreachable_asm.rs:17:13: 17:20
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/unreachable_asm.rs:17:18: 17:20
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
           _5 = const ();                   // scope 2 at $DIR/unreachable_asm.rs:16:16: 18:10
                                            // ty::Const
                                            // + ty: ()
   
       bb5: {
           _4 = const 21_i32;               // scope 2 at $DIR/unreachable_asm.rs:15:13: 15:20
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000015))
-                                           // mir::Constant
-                                           // + span: $DIR/unreachable_asm.rs:15:18: 15:20
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000015)) }
           _5 = const ();                   // scope 2 at $DIR/unreachable_asm.rs:14:17: 16:10
                                            // ty::Const
                                            // + ty: ()
index 9be05aefcf69e678eeb8782d054bb01ceef8df37..41c60b9c95784b5864931eeb204e317af139fe7b 100644 (file)
           StorageLive(_5);                 // scope 2 at $DIR/unreachable_asm_2.rs:14:9: 22:10
           StorageLive(_6);                 // scope 2 at $DIR/unreachable_asm_2.rs:14:12: 14:16
           _6 = const true;                 // scope 2 at $DIR/unreachable_asm_2.rs:14:12: 14:16
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/unreachable_asm_2.rs:14:12: 14:16
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           switchInt(_6) -> [false: bb4, otherwise: bb5]; // scope 2 at $DIR/unreachable_asm_2.rs:14:9: 22:10
       }
   
                                            // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
           StorageDead(_8);                 // scope 2 at $DIR/unreachable_asm_2.rs:20:40: 20:41
           _4 = const 42_i32;               // scope 2 at $DIR/unreachable_asm_2.rs:21:13: 21:20
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x0000002a))
-                                           // mir::Constant
-                                           // + span: $DIR/unreachable_asm_2.rs:21:18: 21:20
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x0000002a)) }
           _5 = const ();                   // scope 2 at $DIR/unreachable_asm_2.rs:18:16: 22:10
                                            // ty::Const
                                            // + ty: ()
                                            // + literal: Const { ty: (), val: Value(Scalar(<ZST>)) }
           StorageDead(_7);                 // scope 2 at $DIR/unreachable_asm_2.rs:16:40: 16:41
           _4 = const 21_i32;               // scope 2 at $DIR/unreachable_asm_2.rs:17:13: 17:20
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000015))
-                                           // mir::Constant
-                                           // + span: $DIR/unreachable_asm_2.rs:17:18: 17:20
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000015)) }
           _5 = const ();                   // scope 2 at $DIR/unreachable_asm_2.rs:14:17: 18:10
                                            // ty::Const
                                            // + ty: ()
index e7886f683c07e12971935aa33a42203318bdcc03..e1c195ad303e4598557a614a3d8109ce47f2057a 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/unreachable_diverging.rs:13:9: 13:10
           _1 = const true;                 // scope 0 at $DIR/unreachable_diverging.rs:13:13: 13:17
-                                           // ty::Const
-                                           // + ty: bool
-                                           // + val: Value(Scalar(0x01))
-                                           // mir::Constant
-                                           // + span: $DIR/unreachable_diverging.rs:13:13: 13:17
-                                           // + literal: Const { ty: bool, val: Value(Scalar(0x01)) }
           StorageLive(_2);                 // scope 1 at $DIR/unreachable_diverging.rs:14:25: 14:32
           _2 = const empty() -> bb1;       // scope 1 at $DIR/unreachable_diverging.rs:14:25: 14:32
                                            // ty::Const
index 7f0266d65899231ab90766c6d29dc4b29bc1f5ed..315525e08c21c96b263d9d2c120412877192d07d 100644 (file)
@@ -5,12 +5,6 @@ E::V::{{constant}}#0: isize = {
 
     bb0: {
         _0 = const 5_isize;              // scope 0 at $DIR/unusual-item-types.rs:22:9: 22:10
-                                         // ty::Const
-                                         // + ty: isize
-                                         // + val: Value(Scalar(0x00000005))
-                                         // mir::Constant
-                                         // + span: $DIR/unusual-item-types.rs:22:9: 22:10
-                                         // + literal: Const { ty: isize, val: Value(Scalar(0x00000005)) }
         return;                          // scope 0 at $DIR/unusual-item-types.rs:22:9: 22:10
     }
 
index f2c1e9c97ddfef10de6dd7ac715e98be5f883abe..315525e08c21c96b263d9d2c120412877192d07d 100644 (file)
@@ -5,12 +5,6 @@ E::V::{{constant}}#0: isize = {
 
     bb0: {
         _0 = const 5_isize;              // scope 0 at $DIR/unusual-item-types.rs:22:9: 22:10
-                                         // ty::Const
-                                         // + ty: isize
-                                         // + val: Value(Scalar(0x0000000000000005))
-                                         // mir::Constant
-                                         // + span: $DIR/unusual-item-types.rs:22:9: 22:10
-                                         // + literal: Const { ty: isize, val: Value(Scalar(0x0000000000000005)) }
         return;                          // scope 0 at $DIR/unusual-item-types.rs:22:9: 22:10
     }
 
index 4af856c654eedc8ca4bc32eb9f7841078a8fb844..fd3d707d539696d3b379f1ed67b7cf265343de9e 100644 (file)
@@ -5,12 +5,6 @@ const <impl at $DIR/unusual-item-types.rs:9:1: 11:2>::ASSOCIATED_CONSTANT: i32 =
 
     bb0: {
         _0 = const 2_i32;                // scope 0 at $DIR/unusual-item-types.rs:10:38: 10:39
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/unusual-item-types.rs:10:38: 10:39
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
         return;                          // scope 0 at $DIR/unusual-item-types.rs:10:5: 10:40
     }
 
index 4af856c654eedc8ca4bc32eb9f7841078a8fb844..fd3d707d539696d3b379f1ed67b7cf265343de9e 100644 (file)
@@ -5,12 +5,6 @@ const <impl at $DIR/unusual-item-types.rs:9:1: 11:2>::ASSOCIATED_CONSTANT: i32 =
 
     bb0: {
         _0 = const 2_i32;                // scope 0 at $DIR/unusual-item-types.rs:10:38: 10:39
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000002))
-                                         // mir::Constant
-                                         // + span: $DIR/unusual-item-types.rs:10:38: 10:39
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000002)) }
         return;                          // scope 0 at $DIR/unusual-item-types.rs:10:5: 10:40
     }
 
index ff98b0e32268a22103fdc1ab18d51c732f91e5b1..4705309e746244cfe293a228c2383116622902f2 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/while_let_loops.rs:6:9: 6:15
           _1 = const 0_i32;                // scope 0 at $DIR/while_let_loops.rs:6:18: 6:19
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/while_let_loops.rs:6:18: 6:19
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           StorageLive(_3);                 // scope 1 at $DIR/while_let_loops.rs:7:28: 7:32
           discriminant(_3) = 0;            // scope 1 at $DIR/while_let_loops.rs:7:28: 7:32
 -         _4 = discriminant(_3);           // scope 1 at $DIR/while_let_loops.rs:7:15: 7:25
 -         switchInt(move _4) -> [1_isize: bb2, otherwise: bb1]; // scope 1 at $DIR/while_let_loops.rs:7:15: 7:25
 +         _4 = const 0_isize;              // scope 1 at $DIR/while_let_loops.rs:7:15: 7:25
-+                                          // ty::Const
-+                                          // + ty: isize
-+                                          // + val: Value(Scalar(0x00000000))
-+                                          // mir::Constant
-+                                          // + span: $DIR/while_let_loops.rs:7:15: 7:25
-+                                          // + literal: Const { ty: isize, val: Value(Scalar(0x00000000)) }
 +         switchInt(const 0_isize) -> [1_isize: bb2, otherwise: bb1]; // scope 1 at $DIR/while_let_loops.rs:7:15: 7:25
-+                                          // ty::Const
-+                                          // + ty: isize
-+                                          // + val: Value(Scalar(0x00000000))
-+                                          // mir::Constant
-+                                          // + span: $DIR/while_let_loops.rs:7:15: 7:25
-+                                          // + literal: Const { ty: isize, val: Value(Scalar(0x00000000)) }
       }
   
       bb1: {
   
       bb3: {
           _1 = const 1_i32;                // scope 1 at $DIR/while_let_loops.rs:8:9: 8:15
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/while_let_loops.rs:8:14: 8:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           _0 = const ();                   // scope 1 at $DIR/while_let_loops.rs:9:9: 9:14
                                            // ty::Const
                                            // + ty: ()
index 612d44f413fe715579a9c025c135fd3701b640cd..4705309e746244cfe293a228c2383116622902f2 100644 (file)
       bb0: {
           StorageLive(_1);                 // scope 0 at $DIR/while_let_loops.rs:6:9: 6:15
           _1 = const 0_i32;                // scope 0 at $DIR/while_let_loops.rs:6:18: 6:19
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000000))
-                                           // mir::Constant
-                                           // + span: $DIR/while_let_loops.rs:6:18: 6:19
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
           StorageLive(_3);                 // scope 1 at $DIR/while_let_loops.rs:7:28: 7:32
           discriminant(_3) = 0;            // scope 1 at $DIR/while_let_loops.rs:7:28: 7:32
 -         _4 = discriminant(_3);           // scope 1 at $DIR/while_let_loops.rs:7:15: 7:25
 -         switchInt(move _4) -> [1_isize: bb2, otherwise: bb1]; // scope 1 at $DIR/while_let_loops.rs:7:15: 7:25
 +         _4 = const 0_isize;              // scope 1 at $DIR/while_let_loops.rs:7:15: 7:25
-+                                          // ty::Const
-+                                          // + ty: isize
-+                                          // + val: Value(Scalar(0x0000000000000000))
-+                                          // mir::Constant
-+                                          // + span: $DIR/while_let_loops.rs:7:15: 7:25
-+                                          // + literal: Const { ty: isize, val: Value(Scalar(0x0000000000000000)) }
 +         switchInt(const 0_isize) -> [1_isize: bb2, otherwise: bb1]; // scope 1 at $DIR/while_let_loops.rs:7:15: 7:25
-+                                          // ty::Const
-+                                          // + ty: isize
-+                                          // + val: Value(Scalar(0x0000000000000000))
-+                                          // mir::Constant
-+                                          // + span: $DIR/while_let_loops.rs:7:15: 7:25
-+                                          // + literal: Const { ty: isize, val: Value(Scalar(0x0000000000000000)) }
       }
   
       bb1: {
   
       bb3: {
           _1 = const 1_i32;                // scope 1 at $DIR/while_let_loops.rs:8:9: 8:15
-                                           // ty::Const
-                                           // + ty: i32
-                                           // + val: Value(Scalar(0x00000001))
-                                           // mir::Constant
-                                           // + span: $DIR/while_let_loops.rs:8:14: 8:15
-                                           // + literal: Const { ty: i32, val: Value(Scalar(0x00000001)) }
           _0 = const ();                   // scope 1 at $DIR/while_let_loops.rs:9:9: 9:14
                                            // ty::Const
                                            // + ty: ()
index f6fe12489199daf378f4cf4c65df0f502b2030ca..5c4b18e6f522f40461fc96d30f75d715597afda0 100644 (file)
@@ -11,12 +11,6 @@ fn change_loop_body() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/while_let_loops.rs:6:9: 6:15
         _1 = const 0_i32;                // scope 0 at $DIR/while_let_loops.rs:6:18: 6:19
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/while_let_loops.rs:6:18: 6:19
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
         StorageLive(_2);                 // scope 1 at $DIR/while_let_loops.rs:7:28: 7:32
         discriminant(_2) = 0;            // scope 1 at $DIR/while_let_loops.rs:7:28: 7:32
         _0 = const ();                   // scope 1 at $DIR/while_let_loops.rs:7:5: 10:6
index f6fe12489199daf378f4cf4c65df0f502b2030ca..5c4b18e6f522f40461fc96d30f75d715597afda0 100644 (file)
@@ -11,12 +11,6 @@ fn change_loop_body() -> () {
     bb0: {
         StorageLive(_1);                 // scope 0 at $DIR/while_let_loops.rs:6:9: 6:15
         _1 = const 0_i32;                // scope 0 at $DIR/while_let_loops.rs:6:18: 6:19
-                                         // ty::Const
-                                         // + ty: i32
-                                         // + val: Value(Scalar(0x00000000))
-                                         // mir::Constant
-                                         // + span: $DIR/while_let_loops.rs:6:18: 6:19
-                                         // + literal: Const { ty: i32, val: Value(Scalar(0x00000000)) }
         StorageLive(_2);                 // scope 1 at $DIR/while_let_loops.rs:7:28: 7:32
         discriminant(_2) = 0;            // scope 1 at $DIR/while_let_loops.rs:7:28: 7:32
         _0 = const ();                   // scope 1 at $DIR/while_let_loops.rs:7:5: 10:6