Skip to content

Commit c71c246

Browse files
borsbors
committed
Auto merge of #118550 - cjgillot:filecheck-const-prop, r=Mark-Simulacrum
Add FileCheck annotations to const_prop tests Unblocks #116012 Advances #116971
2 parents f7253f2 + 30a95b7 commit c71c246

File tree

52 files changed

+290
-253
lines changed

Some content is hidden

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

52 files changed

+290
-253
lines changed

‎tests/mir-opt/const_prop/address_of_pair.rs

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,21 @@
1-
// skip-filecheck
21
// unit-test: ConstProp
32

43
// EMIT_MIR address_of_pair.fn0.ConstProp.diff
54
pub fn fn0() -> bool {
5+
// CHECK-LABEL: fn fn0(
6+
// CHECK: debug pair => [[pair:_.*]];
7+
// CHECK: debug ptr => [[ptr:_.*]];
8+
// CHECK: debug ret => [[ret:_.*]];
9+
// CHECK: (*[[ptr]]) = const true;
10+
// CHECK-NOT: = const false;
11+
// CHECK-NOT: = const true;
12+
// CHECK: [[tmp:_.*]] = ([[pair]].1: bool);
13+
// CHECK-NOT: = const false;
14+
// CHECK-NOT: = const true;
15+
// CHECK: [[ret]] = Not(move [[tmp]]);
16+
// CHECK-NOT: = const false;
17+
// CHECK-NOT: = const true;
18+
// CHECK: _0 = [[ret]];
619
let mut pair = (1, false);
720
let ptr = core::ptr::addr_of_mut!(pair.1);
821
pair = (1, false);

‎tests/mir-opt/const_prop/aggregate.foo.PreCodegen.after.panic-abort.mir

-49
This file was deleted.

‎tests/mir-opt/const_prop/aggregate.foo.PreCodegen.after.panic-unwind.mir

-49
This file was deleted.

‎tests/mir-opt/const_prop/aggregate.main.PreCodegen.after.panic-abort.mir

-36
This file was deleted.

‎tests/mir-opt/const_prop/aggregate.main.PreCodegen.after.panic-unwind.mir

-36
This file was deleted.

‎tests/mir-opt/const_prop/aggregate.rs

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,29 @@
1-
// skip-filecheck
21
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
32
// unit-test: ConstProp
43
// compile-flags: -O
54

65
// EMIT_MIR aggregate.main.ConstProp.diff
7-
// EMIT_MIR aggregate.main.PreCodegen.after.mir
86
fn main() {
7+
// CHECK-LABEL: fn main(
8+
// CHECK: debug x => [[x:_.*]];
9+
// CHECK-NOT: = Add(
10+
// CHECK: [[x]] = const 1_u8;
11+
// CHECK-NOT: = Add(
12+
// CHECK: foo(const 1_u8)
913
let x = (0, 1, 2).1 + 0;
1014
foo(x);
1115
}
1216

17+
// Verify that we still propagate if part of the aggregate is not known.
1318
// EMIT_MIR aggregate.foo.ConstProp.diff
14-
// EMIT_MIR aggregate.foo.PreCodegen.after.mir
1519
fn foo(x: u8) {
16-
// Verify that we still propagate if part of the aggregate is not known.
20+
// CHECK-LABEL: fn foo(
21+
// CHECK: debug first => [[first:_.*]];
22+
// CHECK: debug second => [[second:_.*]];
23+
// CHECK-NOT: = Add(
24+
// CHECK: [[first]] = const 1_i32;
25+
// CHECK-NOT: = Add(
26+
// CHECK: [[second]] = const 3_i32;
1727
let first = (0, x).0 + 1;
1828
let second = (x, 1).1 + 2;
1929
}

‎tests/mir-opt/const_prop/array_index.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
// skip-filecheck
2-
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
31
// unit-test: ConstProp
2+
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
43
// EMIT_MIR_FOR_EACH_BIT_WIDTH
54

65
// EMIT_MIR array_index.main.ConstProp.diff
76
fn main() {
7+
// CHECK-LABEL: fn main(
8+
// CHECK: debug x => [[x:_.*]];
9+
// CHECK: [[x]] = const 2_u32;
810
let x: u32 = [0, 1, 2, 3][2];
911
}

‎tests/mir-opt/const_prop/bad_op_div_by_zero.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
// skip-filecheck
2-
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
31
// unit-test: ConstProp
2+
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
3+
44
// EMIT_MIR bad_op_div_by_zero.main.ConstProp.diff
55
#[allow(unconditional_panic)]
66
fn main() {
7+
// CHECK-LABEL: fn main(
8+
// CHECK: debug y => [[y:_.*]];
9+
// CHECK: debug _z => [[z:_.*]];
10+
// CHECK: assert(!const true, "attempt to divide `{}` by zero", const 1_i32)
11+
// CHECK: assert(!const false, "attempt to compute `{} / {}`, which would overflow", const 1_i32, const 0_i32)
12+
// CHECK: [[z]] = Div(const 1_i32, const 0_i32);
713
let y = 0;
814
let _z = 1 / y;
915
}

‎tests/mir-opt/const_prop/bad_op_mod_by_zero.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
1-
// skip-filecheck
21
// unit-test: ConstProp
32
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
3+
44
// EMIT_MIR bad_op_mod_by_zero.main.ConstProp.diff
55
#[allow(unconditional_panic)]
66
fn main() {
7+
// CHECK-LABEL: fn main(
8+
// CHECK: debug y => [[y:_.*]];
9+
// CHECK: debug _z => [[z:_.*]];
10+
// CHECK: assert(!const true, "attempt to calculate the remainder of `{}` with a divisor of
11+
// zero", const 1_i32)
12+
// CHECK: assert(!const false, "attempt to compute the remainder of `{} % {}`, which would overflow", const 1_i32, const 0_i32)
13+
// CHECK: [[z]] = Rem(const 1_i32, const 0_i32);
714
let y = 0;
815
let _z = 1 % y;
916
}

‎tests/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
// skip-filecheck
21
// unit-test: ConstProp
32
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
43
// EMIT_MIR_FOR_EACH_BIT_WIDTH
54

65
// EMIT_MIR bad_op_unsafe_oob_for_slices.main.ConstProp.diff
76
#[allow(unconditional_panic)]
87
fn main() {
8+
// CHECK-LABEL: fn main(
9+
// CHECK: debug a => [[a:_.*]];
10+
// CHECK: debug _b => [[b:_.*]];
11+
// CHECK: [[b]] = (*[[a]])[3 of 4];
912
let a: *const [_] = &[1, 2, 3];
1013
unsafe {
1114
let _b = (*a)[3];

‎tests/mir-opt/const_prop/boolean_identities.rs

+9-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1-
// skip-filecheck
21
// unit-test: ConstProp
3-
// compile-flags: -O -Zmir-opt-level=4
42

53
// EMIT_MIR boolean_identities.test.ConstProp.diff
64
pub fn test(x: bool, y: bool) -> bool {
7-
(y | true) & (x & false)
5+
// CHECK-LABEL: fn test(
6+
// CHECK: debug a => [[a:_.*]];
7+
// CHECK: debug b => [[b:_.*]];
8+
// CHECK: [[a]] = const true;
9+
// CHECK: [[b]] = const false;
10+
// CHECK: _0 = const false;
11+
let a = (y | true);
12+
let b = (x & false);
13+
a & b
814
}
915

1016
fn main() {

‎tests/mir-opt/const_prop/boolean_identities.test.ConstProp.diff

+27-5
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,42 @@
55
debug x => _1;
66
debug y => _2;
77
let mut _0: bool;
8-
let mut _3: bool;
8+
let _3: bool;
99
let mut _4: bool;
10-
let mut _5: bool;
1110
let mut _6: bool;
11+
let mut _7: bool;
12+
let mut _8: bool;
13+
scope 1 {
14+
debug a => _3;
15+
let _5: bool;
16+
scope 2 {
17+
debug b => _5;
18+
}
19+
}
1220

1321
bb0: {
1422
StorageLive(_3);
15-
- _3 = BitOr(_2, const true);
23+
StorageLive(_4);
24+
_4 = _2;
25+
- _3 = BitOr(move _4, const true);
1626
+ _3 = const true;
27+
StorageDead(_4);
1728
StorageLive(_5);
18-
- _5 = BitAnd(_1, const false);
19-
- _0 = BitAnd(move _3, move _5);
29+
StorageLive(_6);
30+
_6 = _1;
31+
- _5 = BitAnd(move _6, const false);
2032
+ _5 = const false;
33+
StorageDead(_6);
34+
StorageLive(_7);
35+
- _7 = _3;
36+
+ _7 = const true;
37+
StorageLive(_8);
38+
- _8 = _5;
39+
- _0 = BitAnd(move _7, move _8);
40+
+ _8 = const false;
2141
+ _0 = const false;
42+
StorageDead(_8);
43+
StorageDead(_7);
2244
StorageDead(_5);
2345
StorageDead(_3);
2446
return;

‎tests/mir-opt/const_prop/boxes.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// skip-filecheck
21
// unit-test: ConstProp
32
// compile-flags: -O
43
// EMIT_MIR_FOR_EACH_PANIC_STRATEGY
@@ -9,6 +8,11 @@
98

109
// EMIT_MIR boxes.main.ConstProp.diff
1110
fn main() {
11+
// CHECK-LABEL: fn main(
12+
// CHECK: debug x => [[x:_.*]];
13+
// CHECK: (*{{_.*}}) = const 42_i32;
14+
// CHECK: [[tmp:_.*]] = (*{{_.*}});
15+
// CHECK: [[x]] = Add(move [[tmp]], const 0_i32);
1216
let x = *(#[rustc_box]
1317
Box::new(42))
1418
+ 0;

‎tests/mir-opt/const_prop/cast.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
// skip-filecheck
21
// unit-test: ConstProp
32
// EMIT_MIR cast.main.ConstProp.diff
43

54
fn main() {
5+
// CHECK-LABEL: fn main(
6+
// CHECK: debug x => [[x:_.*]];
7+
// CHECK: debug y => [[y:_.*]];
8+
// CHECK: [[x]] = const 42_u32;
9+
// CHECK: [[y]] = const 42_u8;
610
let x = 42u8 as u32;
7-
811
let y = 42u32 as u8;
912
}

0 commit comments

Comments
 (0)