Skip to content

Commit 4e7aaf1

Browse files
RalfJungRalfJung
committed
tweak names and output and bless
1 parent ac265cd commit 4e7aaf1

File tree

124 files changed

+241
-231
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+241
-231
lines changed

‎compiler/rustc_codegen_cranelift/src/constant.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ pub(crate) fn codegen_const_value<'tcx>(
167167
}
168168

169169
match const_val {
170-
ConstValue::Zst => unreachable!(), // we already handles ZST above
170+
ConstValue::ZeroSized => unreachable!(), // we already handles ZST above
171171
ConstValue::Scalar(x) => match x {
172172
Scalar::Int(int) => {
173173
if fx.clif_type(layout.ty).is_some() {

‎compiler/rustc_codegen_ssa/src/mir/operand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl<'a, 'tcx, V: CodegenObject> OperandRef<'tcx, V> {
8484
let llval = bx.scalar_to_backend(x, scalar, bx.immediate_backend_type(layout));
8585
OperandValue::Immediate(llval)
8686
}
87-
ConstValue::Zst => {
87+
ConstValue::ZeroSized => {
8888
let llval = bx.zst_to_backend(bx.immediate_backend_type(layout));
8989
OperandValue::Immediate(llval)
9090
}

‎compiler/rustc_const_eval/src/const_eval/eval_queries.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ pub(super) fn op_to_const<'tcx>(
157157
"this MPlaceTy must come from a validated constant, thus we can assume the \
158158
alignment is correct",
159159
);
160-
ConstValue::Zst
160+
ConstValue::ZeroSized
161161
}
162162
}
163163
};

‎compiler/rustc_const_eval/src/const_eval/valtrees.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ pub fn valtree_to_const_value<'tcx>(
272272
match ty.kind() {
273273
ty::FnDef(..) => {
274274
assert!(valtree.unwrap_branch().is_empty());
275-
ConstValue::Zst
275+
ConstValue::ZeroSized
276276
}
277277
ty::Bool | ty::Int(_) | ty::Uint(_) | ty::Float(_) | ty::Char => match valtree {
278278
ty::ValTree::Leaf(scalar_int) => ConstValue::Scalar(Scalar::Int(scalar_int)),

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
709709
Operand::Indirect(MemPlace::from_ptr(ptr.into()))
710710
}
711711
ConstValue::Scalar(x) => Operand::Immediate(tag_scalar(x)?.into()),
712-
ConstValue::Zst => Operand::Immediate(Immediate::Uninit),
712+
ConstValue::ZeroSized => Operand::Immediate(Immediate::Uninit),
713713
ConstValue::Slice { data, start, end } => {
714714
// We rely on mutability being set correctly in `data` to prevent writes
715715
// where none should happen.

‎compiler/rustc_middle/src/mir/interpret/value.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub enum ConstValue<'tcx> {
3535
Scalar(Scalar),
3636

3737
/// Only used for ZSTs.
38-
Zst,
38+
ZeroSized,
3939

4040
/// Used only for `&[u8]` and `&str`
4141
Slice { data: ConstAllocation<'tcx>, start: usize, end: usize },
@@ -58,7 +58,7 @@ impl<'a, 'tcx> Lift<'tcx> for ConstValue<'a> {
5858
fn lift_to_tcx(self, tcx: TyCtxt<'tcx>) -> Option<ConstValue<'tcx>> {
5959
Some(match self {
6060
ConstValue::Scalar(s) => ConstValue::Scalar(s),
61-
ConstValue::Zst => ConstValue::Zst,
61+
ConstValue::ZeroSized => ConstValue::ZeroSized,
6262
ConstValue::Slice { data, start, end } => {
6363
ConstValue::Slice { data: tcx.lift(data)?, start, end }
6464
}
@@ -73,7 +73,7 @@ impl<'tcx> ConstValue<'tcx> {
7373
#[inline]
7474
pub fn try_to_scalar(&self) -> Option<Scalar<AllocId>> {
7575
match *self {
76-
ConstValue::ByRef { .. } | ConstValue::Slice { .. } | ConstValue::Zst => None,
76+
ConstValue::ByRef { .. } | ConstValue::Slice { .. } | ConstValue::ZeroSized => None,
7777
ConstValue::Scalar(val) => Some(val),
7878
}
7979
}

‎compiler/rustc_middle/src/mir/mod.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,7 @@ impl<'tcx> Operand<'tcx> {
17111711
Operand::Constant(Box::new(Constant {
17121712
span,
17131713
user_ty: None,
1714-
literal: ConstantKind::Val(ConstValue::Zst, ty),
1714+
literal: ConstantKind::Val(ConstValue::ZeroSized, ty),
17151715
}))
17161716
}
17171717

@@ -2196,7 +2196,7 @@ impl<'tcx> ConstantKind<'tcx> {
21962196

21972197
#[inline]
21982198
pub fn zero_sized(ty: Ty<'tcx>) -> Self {
2199-
let cv = ConstValue::Zst;
2199+
let cv = ConstValue::ZeroSized;
22002200
Self::Val(cv, ty)
22012201
}
22022202

@@ -2772,6 +2772,13 @@ fn pretty_print_const_value<'tcx>(
27722772
fmt.write_str(&cx.into_buffer())?;
27732773
return Ok(());
27742774
}
2775+
(ConstValue::ZeroSized, ty::FnDef(d, s)) => {
2776+
let mut cx = FmtPrinter::new(tcx, Namespace::ValueNS);
2777+
cx.print_alloc_ids = true;
2778+
let cx = cx.print_value_path(*d, s)?;
2779+
fmt.write_str(&cx.into_buffer())?;
2780+
return Ok(());
2781+
}
27752782
// FIXME(oli-obk): also pretty print arrays and other aggregate constants by reading
27762783
// their fields instead of just dumping the memory.
27772784
_ => {}

‎compiler/rustc_middle/src/mir/pretty.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,9 @@ impl<'tcx> Visitor<'tcx> for ExtraComments<'tcx> {
448448
self.push(&format!("+ user_ty: {:?}", user_ty));
449449
}
450450

451+
// FIXME: this is a poor version of `pretty_print_const_value`.
451452
let fmt_val = |val: &ConstValue<'tcx>| match val {
452-
ConstValue::Zst => format!("ZST"),
453+
ConstValue::ZeroSized => format!("<ZST>"),
453454
ConstValue::Scalar(s) => format!("Scalar({:?})", s),
454455
ConstValue::Slice { .. } => format!("Slice(..)"),
455456
ConstValue::ByRef { .. } => format!("ByRef(..)"),
@@ -680,7 +681,7 @@ pub fn write_allocations<'tcx>(
680681
ConstValue::Scalar(interpret::Scalar::Int { .. }) => {
681682
Either::Left(Either::Right(std::iter::empty()))
682683
}
683-
ConstValue::Zst => Either::Left(Either::Right(std::iter::empty())),
684+
ConstValue::ZeroSized => Either::Left(Either::Right(std::iter::empty())),
684685
ConstValue::ByRef { alloc, .. } | ConstValue::Slice { data: alloc, .. } => {
685686
Either::Right(alloc_ids_from_alloc(alloc))
686687
}

‎compiler/rustc_mir_build/src/build/expr/as_constant.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
6161
inferred_ty: ty,
6262
})
6363
});
64-
let literal = ConstantKind::Val(ConstValue::Zst, ty);
64+
let literal = ConstantKind::Val(ConstValue::ZeroSized, ty);
6565

6666
Constant { span, user_ty: user_ty, literal }
6767
}

‎src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.32bit.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn main() -> () {
3939
_5 = foo(move _6) -> bb1; // scope 4 at $DIR/array-index-is-temporary.rs:16:21: 16:27
4040
// mir::Constant
4141
// + span: $DIR/array-index-is-temporary.rs:16:21: 16:24
42-
// + literal: Const { ty: unsafe fn(*mut usize) -> u32 {foo}, val: Value(Scalar(<ZST>)) }
42+
// + literal: Const { ty: unsafe fn(*mut usize) -> u32 {foo}, val: Value(<ZST>) }
4343
}
4444

4545
bb1: {

‎src/test/mir-opt/array_index_is_temporary.main.SimplifyCfg-elaborate-drops.after.64bit.mir

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ fn main() -> () {
3939
_5 = foo(move _6) -> bb1; // scope 4 at $DIR/array-index-is-temporary.rs:16:21: 16:27
4040
// mir::Constant
4141
// + span: $DIR/array-index-is-temporary.rs:16:21: 16:24
42-
// + literal: Const { ty: unsafe fn(*mut usize) -> u32 {foo}, val: Value(Scalar(<ZST>)) }
42+
// + literal: Const { ty: unsafe fn(*mut usize) -> u32 {foo}, val: Value(<ZST>) }
4343
}
4444

4545
bb1: {

‎src/test/mir-opt/box_expr.main.ElaborateDrops.before.mir

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fn main() -> () {
2222
_4 = alloc::alloc::exchange_malloc(move _2, move _3) -> bb1; // scope 2 at $DIR/box_expr.rs:7:13: 7:25
2323
// mir::Constant
2424
// + span: $DIR/box_expr.rs:7:13: 7:25
25-
// + literal: Const { ty: unsafe fn(usize, usize) -> *mut u8 {alloc::alloc::exchange_malloc}, val: Value(Scalar(<ZST>)) }
25+
// + literal: Const { ty: unsafe fn(usize, usize) -> *mut u8 {alloc::alloc::exchange_malloc}, val: Value(<ZST>) }
2626
}
2727

2828
bb1: {
@@ -31,7 +31,7 @@ fn main() -> () {
3131
(*_5) = S::new() -> [return: bb2, unwind: bb8]; // scope 0 at $DIR/box_expr.rs:7:17: 7:25
3232
// mir::Constant
3333
// + span: $DIR/box_expr.rs:7:17: 7:23
34-
// + literal: Const { ty: fn() -> S {S::new}, val: Value(Scalar(<ZST>)) }
34+
// + literal: Const { ty: fn() -> S {S::new}, val: Value(<ZST>) }
3535
}
3636

3737
bb2: {
@@ -47,7 +47,7 @@ fn main() -> () {
4747
_6 = std::mem::drop::<Box<S>>(move _7) -> [return: bb4, unwind: bb6]; // scope 1 at $DIR/box_expr.rs:8:5: 8:12
4848
// mir::Constant
4949
// + span: $DIR/box_expr.rs:8:5: 8:9
50-
// + literal: Const { ty: fn(Box<S>) {std::mem::drop::<Box<S>>}, val: Value(Scalar(<ZST>)) }
50+
// + literal: Const { ty: fn(Box<S>) {std::mem::drop::<Box<S>>}, val: Value(<ZST>) }
5151
}
5252

5353
bb4: {

‎src/test/mir-opt/combine_clone_of_primitives.{impl#0}-clone.InstCombine.diff

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
_2 = <T as Clone>::clone(move _3) -> bb1; // scope 0 at $DIR/combine_clone_of_primitives.rs:8:5: 8:9
2525
// mir::Constant
2626
// + span: $DIR/combine_clone_of_primitives.rs:8:5: 8:9
27-
// + literal: Const { ty: for<'r> fn(&'r T) -> T {<T as Clone>::clone}, val: Value(Scalar(<ZST>)) }
27+
// + literal: Const { ty: for<'r> fn(&'r T) -> T {<T as Clone>::clone}, val: Value(<ZST>) }
2828
}
2929

3030
bb1: {
@@ -37,7 +37,7 @@
3737
- _5 = <u64 as Clone>::clone(move _6) -> [return: bb2, unwind: bb4]; // scope 0 at $DIR/combine_clone_of_primitives.rs:9:5: 9:11
3838
- // mir::Constant
3939
- // + span: $DIR/combine_clone_of_primitives.rs:9:5: 9:11
40-
- // + literal: Const { ty: for<'r> fn(&'r u64) -> u64 {<u64 as Clone>::clone}, val: Value(Scalar(<ZST>)) }
40+
- // + literal: Const { ty: for<'r> fn(&'r u64) -> u64 {<u64 as Clone>::clone}, val: Value(<ZST>) }
4141
+ _6 = _7; // scope 0 at $DIR/combine_clone_of_primitives.rs:9:5: 9:11
4242
+ _5 = (*_6); // scope 0 at $DIR/combine_clone_of_primitives.rs:9:5: 9:11
4343
+ goto -> bb2; // scope 0 at $DIR/combine_clone_of_primitives.rs:9:5: 9:11
@@ -53,7 +53,7 @@
5353
- _8 = <[f32; 3] as Clone>::clone(move _9) -> [return: bb3, unwind: bb4]; // scope 0 at $DIR/combine_clone_of_primitives.rs:10:5: 10:16
5454
- // mir::Constant
5555
- // + span: $DIR/combine_clone_of_primitives.rs:10:5: 10:16
56-
- // + literal: Const { ty: for<'r> fn(&'r [f32; 3]) -> [f32; 3] {<[f32; 3] as Clone>::clone}, val: Value(Scalar(<ZST>)) }
56+
- // + literal: Const { ty: for<'r> fn(&'r [f32; 3]) -> [f32; 3] {<[f32; 3] as Clone>::clone}, val: Value(<ZST>) }
5757
+ _9 = _10; // scope 0 at $DIR/combine_clone_of_primitives.rs:10:5: 10:16
5858
+ _8 = (*_9); // scope 0 at $DIR/combine_clone_of_primitives.rs:10:5: 10:16
5959
+ goto -> bb3; // scope 0 at $DIR/combine_clone_of_primitives.rs:10:5: 10:16

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
_0 = core::slice::<impl [&i32]>::as_ptr(move _1) -> [return: bb1, unwind: bb2]; // scope 0 at $DIR/const-promotion-extern-static.rs:9:31: 9:44
3434
// mir::Constant
3535
// + span: $DIR/const-promotion-extern-static.rs:9:36: 9:42
36-
// + literal: Const { ty: for<'r> fn(&'r [&i32]) -> *const &i32 {core::slice::<impl [&i32]>::as_ptr}, val: Value(Scalar(<ZST>)) }
36+
// + literal: Const { ty: for<'r> fn(&'r [&i32]) -> *const &i32 {core::slice::<impl [&i32]>::as_ptr}, val: Value(<ZST>) }
3737
}
3838

3939
bb1: {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
_0 = core::slice::<impl [&i32]>::as_ptr(move _1) -> [return: bb1, unwind: bb2]; // scope 0 at $DIR/const-promotion-extern-static.rs:13:31: 13:55
3636
// mir::Constant
3737
// + span: $DIR/const-promotion-extern-static.rs:13:47: 13:53
38-
// + literal: Const { ty: for<'r> fn(&'r [&i32]) -> *const &i32 {core::slice::<impl [&i32]>::as_ptr}, val: Value(Scalar(<ZST>)) }
38+
// + literal: Const { ty: for<'r> fn(&'r [&i32]) -> *const &i32 {core::slice::<impl [&i32]>::as_ptr}, val: Value(<ZST>) }
3939
}
4040

4141
bb1: {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
+ _6 = alloc::alloc::exchange_malloc(const 4_usize, const 4_usize) -> bb1; // scope 2 at $DIR/boxes.rs:12:14: 12:22
3333
// mir::Constant
3434
// + span: $DIR/boxes.rs:12:14: 12:22
35-
// + literal: Const { ty: unsafe fn(usize, usize) -> *mut u8 {alloc::alloc::exchange_malloc}, val: Value(Scalar(<ZST>)) }
35+
// + literal: Const { ty: unsafe fn(usize, usize) -> *mut u8 {alloc::alloc::exchange_malloc}, val: Value(<ZST>) }
3636
}
3737

3838
bb1: {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
_4 = read(move _5) -> bb1; // scope 1 at $DIR/const_prop_fails_gracefully.rs:8:5: 8:12
3131
// mir::Constant
3232
// + span: $DIR/const_prop_fails_gracefully.rs:8:5: 8:9
33-
// + literal: Const { ty: fn(usize) {read}, val: Value(Scalar(<ZST>)) }
33+
// + literal: Const { ty: fn(usize) {read}, val: Value(<ZST>) }
3434
}
3535

3636
bb1: {

‎src/test/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
_2 = begin_panic::<&str>(const "explicit panic"); // scope 0 at $SRC_DIR/std/src/panic.rs:LL:COL
2020
// mir::Constant
2121
// + span: $SRC_DIR/std/src/panic.rs:LL:COL
22-
// + literal: Const { ty: fn(&str) -> ! {begin_panic::<&str>}, val: Value(Scalar(<ZST>)) }
22+
// + literal: Const { ty: fn(&str) -> ! {begin_panic::<&str>}, val: Value(<ZST>) }
2323
// mir::Constant
2424
// + span: $SRC_DIR/std/src/panic.rs:LL:COL
2525
// + literal: Const { ty: &str, val: Value(Slice(..)) }

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
_1 = encode(move _2) -> bb1; // scope 0 at $DIR/issue-66971.rs:16:5: 16:23
2121
// mir::Constant
2222
// + span: $DIR/issue-66971.rs:16:5: 16:11
23-
// + literal: Const { ty: fn(((), u8, u8)) {encode}, val: Value(Scalar(<ZST>)) }
23+
// + literal: Const { ty: fn(((), u8, u8)) {encode}, val: Value(<ZST>) }
2424
}
2525

2626
bb1: {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
_1 = test(move _2) -> bb1; // scope 0 at $DIR/issue-67019.rs:11:5: 11:20
2222
// mir::Constant
2323
// + span: $DIR/issue-67019.rs:11:5: 11:9
24-
// + literal: Const { ty: fn(((u8, u8),)) {test}, val: Value(Scalar(<ZST>)) }
24+
// + literal: Const { ty: fn(((u8, u8),)) {test}, val: Value(<ZST>) }
2525
}
2626

2727
bb1: {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
_1 = foo() -> bb1; // scope 0 at $DIR/mutable_variable_aggregate_partial_read.rs:5:29: 5:34
1818
// mir::Constant
1919
// + span: $DIR/mutable_variable_aggregate_partial_read.rs:5:29: 5:32
20-
// + literal: Const { ty: fn() -> (i32, i32) {foo}, val: Value(Scalar(<ZST>)) }
20+
// + literal: Const { ty: fn() -> (i32, i32) {foo}, val: Value(<ZST>) }
2121
}
2222

2323
bb1: {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
_1 = foo() -> bb1; // scope 0 at $DIR/mutable_variable_unprop_assign.rs:5:13: 5:18
2727
// mir::Constant
2828
// + span: $DIR/mutable_variable_unprop_assign.rs:5:13: 5:16
29-
// + literal: Const { ty: fn() -> i32 {foo}, val: Value(Scalar(<ZST>)) }
29+
// + literal: Const { ty: fn() -> i32 {foo}, val: Value(<ZST>) }
3030
}
3131

3232
bb1: {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
_3 = main as fn() (Pointer(ReifyFnPointer)); // scope 0 at $DIR/reify_fn_ptr.rs:4:13: 4:17
1717
// mir::Constant
1818
// + span: $DIR/reify_fn_ptr.rs:4:13: 4:17
19-
// + literal: Const { ty: fn() {main}, val: Value(Scalar(<ZST>)) }
19+
// + literal: Const { ty: fn() {main}, val: Value(<ZST>) }
2020
_2 = move _3 as usize (PointerExposeAddress); // scope 0 at $DIR/reify_fn_ptr.rs:4:13: 4:26
2121
StorageDead(_3); // scope 0 at $DIR/reify_fn_ptr.rs:4:25: 4:26
2222
_1 = move _2 as *const fn() (PointerFromExposedAddress); // scope 0 at $DIR/reify_fn_ptr.rs:4:13: 4:41

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
+ _2 = consume(const 1_u32) -> bb1; // scope 1 at $DIR/scalar_literal_propagation.rs:4:5: 4:15
2222
// mir::Constant
2323
// + span: $DIR/scalar_literal_propagation.rs:4:5: 4:12
24-
// + literal: Const { ty: fn(u32) {consume}, val: Value(Scalar(<ZST>)) }
24+
// + literal: Const { ty: fn(u32) {consume}, val: Value(<ZST>) }
2525
}
2626

2727
bb1: {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
_0 = foo(const -1_i32) -> bb3; // scope 0 at $DIR/switch_int.rs:9:14: 9:21
1717
// mir::Constant
1818
// + span: $DIR/switch_int.rs:9:14: 9:17
19-
// + literal: Const { ty: fn(i32) {foo}, val: Value(Scalar(<ZST>)) }
19+
// + literal: Const { ty: fn(i32) {foo}, val: Value(<ZST>) }
2020
}
2121

2222
bb2: {
2323
_0 = foo(const 0_i32) -> bb3; // scope 0 at $DIR/switch_int.rs:8:14: 8:20
2424
// mir::Constant
2525
// + span: $DIR/switch_int.rs:8:14: 8:17
26-
// + literal: Const { ty: fn(i32) {foo}, val: Value(Scalar(<ZST>)) }
26+
// + literal: Const { ty: fn(i32) {foo}, val: Value(<ZST>) }
2727
}
2828

2929
bb3: {

‎src/test/mir-opt/const_prop/switch_int.main.SimplifyConstCondition-after-const-prop.diff

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
_0 = foo(const -1_i32) -> bb3; // scope 0 at $DIR/switch_int.rs:9:14: 9:21
1717
// mir::Constant
1818
// + span: $DIR/switch_int.rs:9:14: 9:17
19-
// + literal: Const { ty: fn(i32) {foo}, val: Value(Scalar(<ZST>)) }
19+
// + literal: Const { ty: fn(i32) {foo}, val: Value(<ZST>) }
2020
}
2121

2222
bb2: {
2323
_0 = foo(const 0_i32) -> bb3; // scope 0 at $DIR/switch_int.rs:8:14: 8:20
2424
// mir::Constant
2525
// + span: $DIR/switch_int.rs:8:14: 8:17
26-
// + literal: Const { ty: fn(i32) {foo}, val: Value(Scalar(<ZST>)) }
26+
// + literal: Const { ty: fn(i32) {foo}, val: Value(<ZST>) }
2727
}
2828

2929
bb3: {

0 commit comments

Comments
 (0)