Skip to content

Commit 29c0364

Browse files
b-naberb-naber
committed
rebase
1 parent db9a2d2 commit 29c0364

22 files changed

+25
-56
lines changed

‎compiler/rustc_const_eval/src/interpret/operand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
583583
pub fn uneval_to_op(
584584
&self,
585585
uneval: &ty::Unevaluated<'tcx>,
586-
) -> InterpResult<'tcx, OpTy<'tcx, M::PointerTag>> {
586+
) -> InterpResult<'tcx, OpTy<'tcx, M::Provenance>> {
587587
let instance = self.resolve(uneval.def, uneval.substs)?;
588588
Ok(self.eval_to_allocation(GlobalId { instance, promoted: uneval.promoted })?.into())
589589
}

‎compiler/rustc_infer/src/infer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1717,7 +1717,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
17171717
// Postpone the evaluation of constants whose substs depend on inference
17181718
// variables
17191719
if substs.has_infer_types_or_consts() {
1720-
let ac = AbstractConst::new(self.tcx, unevaluated.shrink());
1720+
let ac = AbstractConst::new(self.tcx, unevaluated);
17211721
match ac {
17221722
Ok(None) => {
17231723
substs = InternalSubsts::identity_for_item(self.tcx, unevaluated.def.did);

‎compiler/rustc_ty_utils/src/consts.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -222,17 +222,6 @@ impl<'a, 'tcx> AbstractConstBuilder<'a, 'tcx> {
222222
debug!("AbstractConstBuilder::build: body={:?}", &*self.body);
223223
self.recurse_build(self.body_id)?;
224224

225-
for n in self.nodes.iter() {
226-
if let Node::Leaf(ct) = n {
227-
if let ty::ConstKind::Unevaluated(ct) = ct.kind() {
228-
// `AbstractConst`s should not contain any promoteds as they require references which
229-
// are not allowed.
230-
assert_eq!(ct.promoted, None);
231-
assert_eq!(ct, self.tcx.erase_regions(ct));
232-
}
233-
}
234-
}
235-
236225
Ok(self.tcx.arena.alloc_from_iter(self.nodes.into_iter()))
237226
}
238227

‎src/librustdoc/clean/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ pub(crate) fn print_const(cx: &DocContext<'_>, n: ty::Const<'_>) -> String {
236236
match n.kind() {
237237
ty::ConstKind::Unevaluated(ty::Unevaluated { def, substs: _, promoted }) => {
238238
assert_eq!(promoted, ());
239-
let mut s = if let Some(def) = def.as_local() {
239+
let s = if let Some(def) = def.as_local() {
240240
print_const_expr(cx.tcx, cx.tcx.hir().body_owned_by(def.did))
241241
} else {
242242
inline::print_inlined_const(cx.tcx, def.did)

‎src/test/mir-opt/const_promotion_extern_static.BAR.PromoteTemps.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
- StorageLive(_4); // scope 0 at $DIR/const-promotion-extern-static.rs:+0:32: +0:34
1818
- StorageLive(_5); // scope 0 at $DIR/const-promotion-extern-static.rs:+0:33: +0:34
1919
- _5 = const {alloc1: &i32}; // scope 0 at $DIR/const-promotion-extern-static.rs:+0:33: +0:34
20-
+ _6 = const BAR::promoted[0]; // scope 0 at $DIR/const-promotion-extern-static.rs:+0:31: +0:44
20+
+ _6 = const _; // scope 0 at $DIR/const-promotion-extern-static.rs:+0:31: +0:44
2121
// mir::Constant
2222
- // + span: $DIR/const-promotion-extern-static.rs:9:33: 9:34
2323
- // + literal: Const { ty: &i32, val: Value(Scalar(alloc1)) }

‎src/test/mir-opt/const_promotion_extern_static.FOO.PromoteTemps.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
- StorageLive(_4); // scope 0 at $DIR/const-promotion-extern-static.rs:+0:32: +0:45
2020
- StorageLive(_5); // scope 1 at $DIR/const-promotion-extern-static.rs:+0:42: +0:43
2121
- _5 = const {alloc3: *const i32}; // scope 1 at $DIR/const-promotion-extern-static.rs:+0:42: +0:43
22-
+ _6 = const FOO::promoted[0]; // scope 0 at $DIR/const-promotion-extern-static.rs:+0:31: +0:55
22+
+ _6 = const _; // scope 0 at $DIR/const-promotion-extern-static.rs:+0:31: +0:55
2323
// mir::Constant
2424
- // + span: $DIR/const-promotion-extern-static.rs:13:42: 13:43
2525
- // + literal: Const { ty: *const i32, val: Value(Scalar(alloc3)) }

‎src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
StorageLive(_1); // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:9: +1:10
2626
StorageLive(_2); // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
2727
StorageLive(_3); // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
28-
_9 = const main::promoted[0]; // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
28+
_9 = const _; // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
2929
// mir::Constant
3030
// + span: $DIR/bad_op_unsafe_oob_for_slices.rs:5:25: 5:35
3131
// + literal: Const { ty: &[i32; 3], val: Unevaluated(main, [], Some(promoted[0])) }

‎src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
StorageLive(_1); // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:9: +1:10
2626
StorageLive(_2); // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
2727
StorageLive(_3); // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
28-
_9 = const main::promoted[0]; // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
28+
_9 = const _; // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+1:25: +1:35
2929
// mir::Constant
3030
// + span: $DIR/bad_op_unsafe_oob_for_slices.rs:5:25: 5:35
3131
// + literal: Const { ty: &[i32; 3], val: Unevaluated(main, [], Some(promoted[0])) }

‎src/test/mir-opt/const_prop/const_prop_fails_gracefully.main.ConstProp.diff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
StorageLive(_3); // scope 0 at $DIR/const_prop_fails_gracefully.rs:+2:13: +2:16
1919
_3 = const FOO; // scope 0 at $DIR/const_prop_fails_gracefully.rs:+2:13: +2:16
2020
// mir::Constant
21-
// + span: $DIR/const_prop_fails_gracefully.rs:8:13: 8:16
22-
// + literal: Const { ty: &i32, val: Unevaluated(FOO, [], None) }
21+
// + span: $DIR/const_prop_fails_gracefully.rs:7:13: 7:16
22+
// + literal: Const { ty: &i32, val: Unevaluated(FOO, [], ()) }
2323
_2 = &raw const (*_3); // scope 0 at $DIR/const_prop_fails_gracefully.rs:+2:13: +2:16
2424
_1 = move _2 as usize (PointerExposeAddress); // scope 0 at $DIR/const_prop_fails_gracefully.rs:+2:13: +2:39
2525
StorageDead(_2); // scope 0 at $DIR/const_prop_fails_gracefully.rs:+2:38: +2:39

‎src/test/mir-opt/const_prop/ref_deref.main.ConstProp.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
bb0: {
1212
StorageLive(_1); // scope 0 at $DIR/ref_deref.rs:+1:5: +1:10
1313
StorageLive(_2); // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
14-
_4 = const main::promoted[0]; // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
14+
_4 = const _; // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
1515
// mir::Constant
1616
// + span: $DIR/ref_deref.rs:5:6: 5:10
1717
// + literal: Const { ty: &i32, val: Unevaluated(main, [], Some(promoted[0])) }

‎src/test/mir-opt/const_prop/ref_deref.main.PromoteTemps.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
- StorageLive(_3); // scope 0 at $DIR/ref_deref.rs:+1:8: +1:9
1515
- _3 = const 4_i32; // scope 0 at $DIR/ref_deref.rs:+1:8: +1:9
1616
- _2 = &_3; // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
17-
+ _4 = const main::promoted[0]; // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
17+
+ _4 = const _; // scope 0 at $DIR/ref_deref.rs:+1:6: +1:10
1818
+ // mir::Constant
1919
+ // + span: $DIR/ref_deref.rs:5:6: 5:10
2020
+ // + literal: Const { ty: &i32, val: Unevaluated(main, [], Some(promoted[0])) }

‎src/test/mir-opt/const_prop/ref_deref_project.main.ConstProp.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
bb0: {
1212
StorageLive(_1); // scope 0 at $DIR/ref_deref_project.rs:+1:5: +1:17
1313
StorageLive(_2); // scope 0 at $DIR/ref_deref_project.rs:+1:6: +1:17
14-
_4 = const main::promoted[0]; // scope 0 at $DIR/ref_deref_project.rs:+1:6: +1:17
14+
_4 = const _; // scope 0 at $DIR/ref_deref_project.rs:+1:6: +1:17
1515
// mir::Constant
1616
// + span: $DIR/ref_deref_project.rs:6:6: 6:17
1717
// + literal: Const { ty: &(i32, i32), val: Unevaluated(main, [], Some(promoted[0])) }

‎src/test/mir-opt/const_prop/ref_deref_project.main.PromoteTemps.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
- StorageLive(_3); // scope 0 at $DIR/ref_deref_project.rs:+1:8: +1:14
1515
- _3 = (const 4_i32, const 5_i32); // scope 0 at $DIR/ref_deref_project.rs:+1:8: +1:14
1616
- _2 = &(_3.1: i32); // scope 0 at $DIR/ref_deref_project.rs:+1:6: +1:17
17-
+ _4 = const main::promoted[0]; // scope 0 at $DIR/ref_deref_project.rs:+1:6: +1:17
17+
+ _4 = const _; // scope 0 at $DIR/ref_deref_project.rs:+1:6: +1:17
1818
+ // mir::Constant
1919
+ // + span: $DIR/ref_deref_project.rs:6:6: 6:17
2020
+ // + literal: Const { ty: &(i32, i32), val: Unevaluated(main, [], Some(promoted[0])) }

‎src/test/mir-opt/const_prop/slice_len.main.ConstProp.32bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
StorageLive(_2); // scope 0 at $DIR/slice_len.rs:+1:5: +1:30
2020
StorageLive(_3); // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
2121
StorageLive(_4); // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
22-
_9 = const main::promoted[0]; // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
22+
_9 = const _; // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
2323
// mir::Constant
2424
// + span: $DIR/slice_len.rs:5:6: 5:19
2525
// + literal: Const { ty: &[u32; 3], val: Unevaluated(main, [], Some(promoted[0])) }

‎src/test/mir-opt/const_prop/slice_len.main.ConstProp.64bit.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
StorageLive(_2); // scope 0 at $DIR/slice_len.rs:+1:5: +1:30
2020
StorageLive(_3); // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
2121
StorageLive(_4); // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
22-
_9 = const main::promoted[0]; // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
22+
_9 = const _; // scope 0 at $DIR/slice_len.rs:+1:6: +1:19
2323
// mir::Constant
2424
// + span: $DIR/slice_len.rs:5:6: 5:19
2525
// + literal: Const { ty: &[u32; 3], val: Unevaluated(main, [], Some(promoted[0])) }

‎src/test/mir-opt/derefer_complex_case.main.Derefer.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
bb0: {
2929
StorageLive(_1); // scope 0 at $DIR/derefer_complex_case.rs:+1:17: +1:26
3030
StorageLive(_2); // scope 0 at $DIR/derefer_complex_case.rs:+1:17: +1:26
31-
_14 = const main::promoted[0]; // scope 0 at $DIR/derefer_complex_case.rs:+1:17: +1:26
31+
_14 = const _; // scope 0 at $DIR/derefer_complex_case.rs:+1:17: +1:26
3232
// mir::Constant
3333
// + span: $DIR/derefer_complex_case.rs:6:17: 6:26
3434
// + literal: Const { ty: &[i32; 2], val: Unevaluated(main, [], Some(promoted[0])) }

‎src/test/mir-opt/inline/inline_retag.bar.Inline.after.mir

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ fn bar() -> bool {
3232
_2 = _1; // scope 1 at $DIR/inline-retag.rs:+2:5: +2:6
3333
StorageLive(_3); // scope 1 at $DIR/inline-retag.rs:+2:7: +2:9
3434
StorageLive(_4); // scope 1 at $DIR/inline-retag.rs:+2:7: +2:9
35-
_10 = const bar::promoted[1]; // scope 1 at $DIR/inline-retag.rs:+2:7: +2:9
35+
_10 = const _; // scope 1 at $DIR/inline-retag.rs:+2:7: +2:9
3636
// mir::Constant
3737
// + span: $DIR/inline-retag.rs:12:7: 12:9
3838
// + literal: Const { ty: &i32, val: Unevaluated(bar, [], Some(promoted[1])) }
@@ -43,7 +43,7 @@ fn bar() -> bool {
4343
Retag(_3); // scope 1 at $DIR/inline-retag.rs:+2:7: +2:9
4444
StorageLive(_6); // scope 1 at $DIR/inline-retag.rs:+2:11: +2:14
4545
StorageLive(_7); // scope 1 at $DIR/inline-retag.rs:+2:11: +2:14
46-
_9 = const bar::promoted[0]; // scope 1 at $DIR/inline-retag.rs:+2:11: +2:14
46+
_9 = const _; // scope 1 at $DIR/inline-retag.rs:+2:11: +2:14
4747
// mir::Constant
4848
// + span: $DIR/inline-retag.rs:12:11: 12:14
4949
// + literal: Const { ty: &i32, val: Unevaluated(bar, [], Some(promoted[0])) }

‎src/test/mir-opt/issue_73223.main.SimplifyArmIdentity.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
StorageLive(_10); // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
8888
_10 = &_1; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
8989
StorageLive(_11); // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
90-
_28 = _; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
90+
_28 = const _; // scope 3 at $SRC_DIR/core/src/macros/mod.rs:LL:COL
9191
// mir::Constant
9292
// + span: $SRC_DIR/core/src/macros/mod.rs:LL:COL
9393
// + literal: Const { ty: &i32, val: Unevaluated(main, [], Some(promoted[0])) }

‎src/test/mir-opt/issue_99325.main.mir_map.0.mir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
| User Type Annotations
44
| 0: user_ty: Canonical { max_universe: U0, variables: [], value: TypeOf(DefId(0:3 ~ issue_99325[8f58]::function_with_bytes), UserSubsts { substs: [Const { ty: &'static [u8; 4], kind: Value(Branch([Leaf(0x41), Leaf(0x41), Leaf(0x41), Leaf(0x41)])) }], user_self_ty: None }) }, span: $DIR/issue-99325.rs:10:16: 10:46, inferred_ty: fn() -> &'static [u8] {function_with_bytes::<&*b"AAAA">}
5-
| 1: user_ty: Canonical { max_universe: U0, variables: [], value: TypeOf(DefId(0:3 ~ issue_99325[8f58]::function_with_bytes), UserSubsts { substs: [Const { ty: &'static [u8; 4], kind: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:8 ~ issue_99325[8f58]::main::{constant#1}), const_param_did: Some(DefId(0:4 ~ issue_99325[8f58]::function_with_bytes::BYTES)) }, substs: [], promoted: None }) }], user_self_ty: None }) }, span: $DIR/issue-99325.rs:11:16: 11:68, inferred_ty: fn() -> &'static [u8] {function_with_bytes::<&*b"AAAA">}
5+
| 1: user_ty: Canonical { max_universe: U0, variables: [], value: TypeOf(DefId(0:3 ~ issue_99325[8f58]::function_with_bytes), UserSubsts { substs: [Const { ty: &'static [u8; 4], kind: Unevaluated(Unevaluated { def: WithOptConstParam { did: DefId(0:8 ~ issue_99325[8f58]::main::{constant#1}), const_param_did: Some(DefId(0:4 ~ issue_99325[8f58]::function_with_bytes::BYTES)) }, substs: [], promoted: () }) }], user_self_ty: None }) }, span: $DIR/issue-99325.rs:11:16: 11:68, inferred_ty: fn() -> &'static [u8] {function_with_bytes::<&*b"AAAA">}
66
|
77
fn main() -> () {
88
let mut _0: (); // return place in scope 0 at $DIR/issue-99325.rs:+0:15: +0:15

‎src/test/mir-opt/lower_intrinsics.discriminant.LowerIntrinsics.diff

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
StorageLive(_5); // scope 0 at $DIR/lower_intrinsics.rs:+2:5: +2:45
4545
StorageLive(_6); // scope 0 at $DIR/lower_intrinsics.rs:+2:42: +2:44
4646
StorageLive(_7); // scope 0 at $DIR/lower_intrinsics.rs:+2:42: +2:44
47-
_19 = const discriminant::<T>::promoted[2]; // scope 0 at $DIR/lower_intrinsics.rs:+2:42: +2:44
47+
_19 = const _; // scope 0 at $DIR/lower_intrinsics.rs:+2:42: +2:44
4848
// mir::Constant
4949
// + span: $DIR/lower_intrinsics.rs:50:42: 50:44
5050
// + literal: Const { ty: &i32, val: Unevaluated(discriminant, [T], Some(promoted[2])) }
@@ -59,23 +59,13 @@
5959
}
6060

6161
bb2: {
62-
<<<<<<< HEAD
6362
StorageDead(_6); // scope 0 at $DIR/lower_intrinsics.rs:+2:44: +2:45
6463
StorageDead(_7); // scope 0 at $DIR/lower_intrinsics.rs:+2:45: +2:46
6564
StorageDead(_5); // scope 0 at $DIR/lower_intrinsics.rs:+2:45: +2:46
6665
StorageLive(_9); // scope 0 at $DIR/lower_intrinsics.rs:+3:5: +3:46
6766
StorageLive(_10); // scope 0 at $DIR/lower_intrinsics.rs:+3:42: +3:45
6867
StorageLive(_11); // scope 0 at $DIR/lower_intrinsics.rs:+3:42: +3:45
69-
_18 = const discriminant::<T>::promoted[1]; // scope 0 at $DIR/lower_intrinsics.rs:+3:42: +3:45
70-
=======
71-
StorageDead(_6); // scope 0 at $DIR/lower_intrinsics.rs:75:44: 75:45
72-
StorageDead(_7); // scope 0 at $DIR/lower_intrinsics.rs:75:45: 75:46
73-
StorageDead(_5); // scope 0 at $DIR/lower_intrinsics.rs:75:45: 75:46
74-
StorageLive(_9); // scope 0 at $DIR/lower_intrinsics.rs:76:5: 76:46
75-
StorageLive(_10); // scope 0 at $DIR/lower_intrinsics.rs:76:42: 76:45
76-
StorageLive(_11); // scope 0 at $DIR/lower_intrinsics.rs:76:42: 76:45
77-
_18 = const _; // scope 0 at $DIR/lower_intrinsics.rs:76:42: 76:45
78-
>>>>>>> 631a70cb406 (bless tests)
68+
_18 = const _; // scope 0 at $DIR/lower_intrinsics.rs:+3:42: +3:45
7969
// mir::Constant
8070
// + span: $DIR/lower_intrinsics.rs:51:42: 51:45
8171
// + literal: Const { ty: &(), val: Unevaluated(discriminant, [T], Some(promoted[1])) }
@@ -90,23 +80,13 @@
9080
}
9181

9282
bb3: {
93-
<<<<<<< HEAD
9483
StorageDead(_10); // scope 0 at $DIR/lower_intrinsics.rs:+3:45: +3:46
9584
StorageDead(_11); // scope 0 at $DIR/lower_intrinsics.rs:+3:46: +3:47
9685
StorageDead(_9); // scope 0 at $DIR/lower_intrinsics.rs:+3:46: +3:47
9786
StorageLive(_13); // scope 0 at $DIR/lower_intrinsics.rs:+4:5: +4:48
9887
StorageLive(_14); // scope 0 at $DIR/lower_intrinsics.rs:+4:42: +4:47
9988
StorageLive(_15); // scope 0 at $DIR/lower_intrinsics.rs:+4:42: +4:47
100-
_17 = const discriminant::<T>::promoted[0]; // scope 0 at $DIR/lower_intrinsics.rs:+4:42: +4:47
101-
=======
102-
StorageDead(_10); // scope 0 at $DIR/lower_intrinsics.rs:76:45: 76:46
103-
StorageDead(_11); // scope 0 at $DIR/lower_intrinsics.rs:76:46: 76:47
104-
StorageDead(_9); // scope 0 at $DIR/lower_intrinsics.rs:76:46: 76:47
105-
StorageLive(_13); // scope 0 at $DIR/lower_intrinsics.rs:77:5: 77:48
106-
StorageLive(_14); // scope 0 at $DIR/lower_intrinsics.rs:77:42: 77:47
107-
StorageLive(_15); // scope 0 at $DIR/lower_intrinsics.rs:77:42: 77:47
108-
_17 = const _; // scope 0 at $DIR/lower_intrinsics.rs:77:42: 77:47
109-
>>>>>>> 631a70cb406 (bless tests)
89+
_17 = const _; // scope 0 at $DIR/lower_intrinsics.rs:+4:42: +4:47
11090
// mir::Constant
11191
// + span: $DIR/lower_intrinsics.rs:52:42: 52:47
11292
// + literal: Const { ty: &E, val: Unevaluated(discriminant, [T], Some(promoted[0])) }

0 commit comments

Comments
 (0)