Skip to content

Commit 10ec949

Browse files
cjgillotcjgillot
committed
Bless tests.
1 parent 134d819 commit 10ec949

File tree

61 files changed

+234
-406
lines changed

Some content is hidden

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

61 files changed

+234
-406
lines changed

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,7 @@
6161

6262
bb3: {
6363
StorageDead(_9); // scope 0 at $DIR/combine_clone_of_primitives.rs:10:15: 10:16
64-
Deinit(_0); // scope 0 at $DIR/combine_clone_of_primitives.rs:+0:10: +0:15
65-
(_0.0: T) = move _2; // scope 0 at $DIR/combine_clone_of_primitives.rs:+0:10: +0:15
66-
(_0.1: u64) = move _5; // scope 0 at $DIR/combine_clone_of_primitives.rs:+0:10: +0:15
67-
(_0.2: [f32; 3]) = move _8; // scope 0 at $DIR/combine_clone_of_primitives.rs:+0:10: +0:15
64+
_0 = MyThing::<T> { v: move _2, i: move _5, a: move _8 }; // scope 0 at $DIR/combine_clone_of_primitives.rs:+0:10: +0:15
6865
StorageDead(_8); // scope 0 at $DIR/combine_clone_of_primitives.rs:+0:14: +0:15
6966
StorageDead(_5); // scope 0 at $DIR/combine_clone_of_primitives.rs:+0:14: +0:15
7067
StorageDead(_2); // scope 0 at $DIR/combine_clone_of_primitives.rs:+0:14: +0:15

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

+28-45
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
let mut _6: u8; // in scope 0 at $DIR/const_debuginfo.rs:+4:15: +4:16
99
let mut _7: u8; // in scope 0 at $DIR/const_debuginfo.rs:+4:19: +4:20
1010
let mut _8: u8; // in scope 0 at $DIR/const_debuginfo.rs:+4:23: +4:24
11-
let mut _12: u32; // in scope 0 at $DIR/const_debuginfo.rs:+13:13: +13:16
12-
let mut _13: u32; // in scope 0 at $DIR/const_debuginfo.rs:+13:19: +13:22
11+
let mut _14: u32; // in scope 0 at $DIR/const_debuginfo.rs:+13:13: +13:16
12+
let mut _15: u32; // in scope 0 at $DIR/const_debuginfo.rs:+13:19: +13:22
1313
scope 1 {
1414
- debug x => _1; // in scope 1 at $DIR/const_debuginfo.rs:+1:9: +1:10
1515
+ debug x => const 1_u8; // in scope 1 at $DIR/const_debuginfo.rs:+1:9: +1:10
@@ -29,21 +29,18 @@
2929
scope 5 {
3030
- debug s => _9; // in scope 5 at $DIR/const_debuginfo.rs:+6:9: +6:10
3131
+ debug s => const "hello, world!"; // in scope 5 at $DIR/const_debuginfo.rs:+6:9: +6:10
32-
let _14: bool; // in scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
33-
let _15: bool; // in scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
34-
let _16: u32; // in scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
32+
let _10: (bool, bool, u32); // in scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
3533
scope 6 {
36-
debug f => (bool, bool, u32){ .0 => _14, .1 => _15, .2 => _16, }; // in scope 6 at $DIR/const_debuginfo.rs:+8:9: +8:10
37-
let _10: std::option::Option<u16>; // in scope 6 at $DIR/const_debuginfo.rs:+10:9: +10:10
34+
debug f => _10; // in scope 6 at $DIR/const_debuginfo.rs:+8:9: +8:10
35+
let _11: std::option::Option<u16>; // in scope 6 at $DIR/const_debuginfo.rs:+10:9: +10:10
3836
scope 7 {
39-
debug o => _10; // in scope 7 at $DIR/const_debuginfo.rs:+10:9: +10:10
40-
let _17: u32; // in scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
41-
let _18: u32; // in scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
37+
debug o => _11; // in scope 7 at $DIR/const_debuginfo.rs:+10:9: +10:10
38+
let _12: Point; // in scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
4239
scope 8 {
43-
debug p => Point{ .0 => _17, .1 => _18, }; // in scope 8 at $DIR/const_debuginfo.rs:+12:9: +12:10
44-
let _11: u32; // in scope 8 at $DIR/const_debuginfo.rs:+13:9: +13:10
40+
debug p => _12; // in scope 8 at $DIR/const_debuginfo.rs:+12:9: +12:10
41+
let _13: u32; // in scope 8 at $DIR/const_debuginfo.rs:+13:9: +13:10
4542
scope 9 {
46-
- debug a => _11; // in scope 9 at $DIR/const_debuginfo.rs:+13:9: +13:10
43+
- debug a => _13; // in scope 9 at $DIR/const_debuginfo.rs:+13:9: +13:10
4744
+ debug a => const 64_u32; // in scope 9 at $DIR/const_debuginfo.rs:+13:9: +13:10
4845
}
4946
}
@@ -69,38 +66,24 @@
6966
// mir::Constant
7067
// + span: $DIR/const_debuginfo.rs:14:13: 14:28
7168
// + literal: Const { ty: &str, val: Value(Slice(..)) }
72-
StorageLive(_14); // scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
73-
StorageLive(_15); // scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
74-
StorageLive(_16); // scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
75-
Deinit(_14); // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
76-
Deinit(_15); // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
77-
Deinit(_16); // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
78-
_14 = const true; // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
79-
_15 = const false; // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
80-
_16 = const 123_u32; // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
81-
StorageLive(_10); // scope 6 at $DIR/const_debuginfo.rs:+10:9: +10:10
82-
_10 = Option::<u16>::Some(const 99_u16); // scope 6 at $DIR/const_debuginfo.rs:+10:13: +10:24
83-
StorageLive(_17); // scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
84-
StorageLive(_18); // scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
85-
Deinit(_17); // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
86-
Deinit(_18); // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
87-
_17 = const 32_u32; // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
88-
_18 = const 32_u32; // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
89-
StorageLive(_11); // scope 8 at $DIR/const_debuginfo.rs:+13:9: +13:10
90-
StorageLive(_12); // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:16
91-
_12 = const 32_u32; // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:16
92-
StorageLive(_13); // scope 8 at $DIR/const_debuginfo.rs:+13:19: +13:22
93-
_13 = const 32_u32; // scope 8 at $DIR/const_debuginfo.rs:+13:19: +13:22
94-
_11 = const 64_u32; // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:22
95-
StorageDead(_13); // scope 8 at $DIR/const_debuginfo.rs:+13:21: +13:22
96-
StorageDead(_12); // scope 8 at $DIR/const_debuginfo.rs:+13:21: +13:22
97-
StorageDead(_11); // scope 8 at $DIR/const_debuginfo.rs:+14:1: +14:2
98-
StorageDead(_17); // scope 7 at $DIR/const_debuginfo.rs:+14:1: +14:2
99-
StorageDead(_18); // scope 7 at $DIR/const_debuginfo.rs:+14:1: +14:2
100-
StorageDead(_10); // scope 6 at $DIR/const_debuginfo.rs:+14:1: +14:2
101-
StorageDead(_14); // scope 5 at $DIR/const_debuginfo.rs:+14:1: +14:2
102-
StorageDead(_15); // scope 5 at $DIR/const_debuginfo.rs:+14:1: +14:2
103-
StorageDead(_16); // scope 5 at $DIR/const_debuginfo.rs:+14:1: +14:2
69+
StorageLive(_10); // scope 5 at $DIR/const_debuginfo.rs:+8:9: +8:10
70+
_10 = (const true, const false, const 123_u32); // scope 5 at $DIR/const_debuginfo.rs:+8:13: +8:34
71+
StorageLive(_11); // scope 6 at $DIR/const_debuginfo.rs:+10:9: +10:10
72+
_11 = Option::<u16>::Some(const 99_u16); // scope 6 at $DIR/const_debuginfo.rs:+10:13: +10:24
73+
StorageLive(_12); // scope 7 at $DIR/const_debuginfo.rs:+12:9: +12:10
74+
_12 = Point { x: const 32_u32, y: const 32_u32 }; // scope 7 at $DIR/const_debuginfo.rs:+12:13: +12:35
75+
StorageLive(_13); // scope 8 at $DIR/const_debuginfo.rs:+13:9: +13:10
76+
StorageLive(_14); // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:16
77+
_14 = const 32_u32; // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:16
78+
StorageLive(_15); // scope 8 at $DIR/const_debuginfo.rs:+13:19: +13:22
79+
_15 = const 32_u32; // scope 8 at $DIR/const_debuginfo.rs:+13:19: +13:22
80+
_13 = const 64_u32; // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:22
81+
StorageDead(_15); // scope 8 at $DIR/const_debuginfo.rs:+13:21: +13:22
82+
StorageDead(_14); // scope 8 at $DIR/const_debuginfo.rs:+13:21: +13:22
83+
StorageDead(_13); // scope 8 at $DIR/const_debuginfo.rs:+14:1: +14:2
84+
StorageDead(_12); // scope 7 at $DIR/const_debuginfo.rs:+14:1: +14:2
85+
StorageDead(_11); // scope 6 at $DIR/const_debuginfo.rs:+14:1: +14:2
86+
StorageDead(_10); // scope 5 at $DIR/const_debuginfo.rs:+14:1: +14:2
10487
StorageDead(_9); // scope 4 at $DIR/const_debuginfo.rs:+14:1: +14:2
10588
StorageDead(_4); // scope 3 at $DIR/const_debuginfo.rs:+14:1: +14:2
10689
return; // scope 0 at $DIR/const_debuginfo.rs:+14:2: +14:2

‎tests/mir-opt/const_goto_storage.match_nested_if.ConstGoto.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
bb0: {
1818
StorageLive(_1); // scope 0 at $DIR/const_goto_storage.rs:+1:9: +1:12
1919
- StorageLive(_2); // scope 0 at $DIR/const_goto_storage.rs:+1:21: +1:23
20-
- Deinit(_2); // scope 0 at $DIR/const_goto_storage.rs:+1:21: +1:23
20+
- _2 = (); // scope 0 at $DIR/const_goto_storage.rs:+1:21: +1:23
2121
- StorageLive(_3); // scope 0 at $DIR/const_goto_storage.rs:+2:15: +6:10
2222
- StorageLive(_4); // scope 0 at $DIR/const_goto_storage.rs:+2:18: +2:76
2323
- StorageLive(_5); // scope 0 at $DIR/const_goto_storage.rs:+2:21: +2:52

‎tests/mir-opt/const_prop/aggregate.main.ConstProp.diff

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
StorageLive(_1); // scope 0 at $DIR/aggregate.rs:+1:9: +1:10
1515
StorageLive(_2); // scope 0 at $DIR/aggregate.rs:+1:13: +1:24
1616
StorageLive(_3); // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
17-
Deinit(_3); // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
18-
(_3.0: i32) = const 0_i32; // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
19-
(_3.1: i32) = const 1_i32; // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
20-
(_3.2: i32) = const 2_i32; // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
17+
_3 = (const 0_i32, const 1_i32, const 2_i32); // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
2118
- _2 = (_3.1: i32); // scope 0 at $DIR/aggregate.rs:+1:13: +1:24
2219
- _1 = Add(move _2, const 0_i32); // scope 0 at $DIR/aggregate.rs:+1:13: +1:28
2320
+ _2 = const 1_i32; // scope 0 at $DIR/aggregate.rs:+1:13: +1:24

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

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ fn main() -> () {
1313
StorageLive(_1); // scope 0 at $DIR/aggregate.rs:+1:9: +1:10
1414
StorageLive(_2); // scope 0 at $DIR/aggregate.rs:+1:13: +1:24
1515
StorageLive(_3); // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
16-
Deinit(_3); // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
17-
(_3.0: i32) = const 0_i32; // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
18-
(_3.1: i32) = const 1_i32; // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
19-
(_3.2: i32) = const 2_i32; // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
16+
_3 = (const 0_i32, const 1_i32, const 2_i32); // scope 0 at $DIR/aggregate.rs:+1:13: +1:22
2017
_2 = const 1_i32; // scope 0 at $DIR/aggregate.rs:+1:13: +1:24
2118
_1 = const 1_i32; // scope 0 at $DIR/aggregate.rs:+1:13: +1:28
2219
StorageDead(_2); // scope 0 at $DIR/aggregate.rs:+1:27: +1:28

‎tests/mir-opt/const_prop/invalid_constant.main.ConstProp.diff

+2-4
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,14 @@
3232
bb0: {
3333
StorageLive(_1); // scope 0 at $DIR/invalid_constant.rs:+6:9: +6:22
3434
StorageLive(_2); // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:63
35-
Deinit(_2); // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:63
36-
(_2.0: u32) = const 1114113_u32; // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:63
35+
_2 = InvalidChar { int: const 1114113_u32 }; // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:63
3736
- _1 = (_2.1: char); // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:67
3837
+ _1 = const {transmute(0x00110001): char}; // scope 2 at $DIR/invalid_constant.rs:+6:34: +6:67
3938
StorageDead(_2); // scope 0 at $DIR/invalid_constant.rs:+6:69: +6:70
4039
StorageLive(_3); // scope 1 at $DIR/invalid_constant.rs:+13:9: +13:21
4140
StorageLive(_4); // scope 1 at $DIR/invalid_constant.rs:+13:25: +13:59
4241
StorageLive(_5); // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:55
43-
Deinit(_5); // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:55
44-
(_5.0: u32) = const 4_u32; // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:55
42+
_5 = InvalidTag { int: const 4_u32 }; // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:55
4543
- _4 = (_5.1: E); // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:57
4644
- _3 = [move _4]; // scope 1 at $DIR/invalid_constant.rs:+13:24: +13:60
4745
+ _4 = const Scalar(0x00000004): E; // scope 4 at $DIR/invalid_constant.rs:+13:34: +13:57

‎tests/mir-opt/const_prop/issue_66971.main.ConstProp.diff

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
let mut _0: (); // return place in scope 0 at $DIR/issue_66971.rs:+0:11: +0:11
66
let _1: (); // in scope 0 at $DIR/issue_66971.rs:+1:5: +1:23
77
let mut _2: ((), u8, u8); // in scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
8+
let mut _3: (); // in scope 0 at $DIR/issue_66971.rs:+1:13: +1:15
89

910
bb0: {
1011
StorageLive(_1); // scope 0 at $DIR/issue_66971.rs:+1:5: +1:23
1112
StorageLive(_2); // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
12-
Deinit(_2); // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
13-
(_2.1: u8) = const 0_u8; // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
14-
(_2.2: u8) = const 0_u8; // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
13+
StorageLive(_3); // scope 0 at $DIR/issue_66971.rs:+1:13: +1:15
14+
_2 = (move _3, const 0_u8, const 0_u8); // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
15+
StorageDead(_3); // scope 0 at $DIR/issue_66971.rs:+1:21: +1:22
1516
_1 = encode(move _2) -> bb1; // scope 0 at $DIR/issue_66971.rs:+1:5: +1:23
1617
// mir::Constant
1718
// + span: $DIR/issue_66971.rs:17:5: 17:11

‎tests/mir-opt/const_prop/issue_67019.main.ConstProp.diff

+3-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
StorageLive(_1); // scope 0 at $DIR/issue_67019.rs:+1:5: +1:20
1212
StorageLive(_2); // scope 0 at $DIR/issue_67019.rs:+1:10: +1:19
1313
StorageLive(_3); // scope 0 at $DIR/issue_67019.rs:+1:11: +1:17
14-
Deinit(_3); // scope 0 at $DIR/issue_67019.rs:+1:11: +1:17
15-
(_3.0: u8) = const 1_u8; // scope 0 at $DIR/issue_67019.rs:+1:11: +1:17
16-
(_3.1: u8) = const 2_u8; // scope 0 at $DIR/issue_67019.rs:+1:11: +1:17
17-
Deinit(_2); // scope 0 at $DIR/issue_67019.rs:+1:10: +1:19
18-
- (_2.0: (u8, u8)) = move _3; // scope 0 at $DIR/issue_67019.rs:+1:10: +1:19
19-
+ (_2.0: (u8, u8)) = const (1_u8, 2_u8); // scope 0 at $DIR/issue_67019.rs:+1:10: +1:19
14+
- _3 = (const 1_u8, const 2_u8); // scope 0 at $DIR/issue_67019.rs:+1:11: +1:17
15+
+ _3 = const (1_u8, 2_u8); // scope 0 at $DIR/issue_67019.rs:+1:11: +1:17
16+
_2 = (move _3,); // scope 0 at $DIR/issue_67019.rs:+1:10: +1:19
2017
StorageDead(_3); // scope 0 at $DIR/issue_67019.rs:+1:18: +1:19
2118
_1 = test(move _2) -> bb1; // scope 0 at $DIR/issue_67019.rs:+1:5: +1:20
2219
// mir::Constant

‎tests/mir-opt/const_prop/mutable_variable_aggregate.main.ConstProp.diff

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414

1515
bb0: {
1616
StorageLive(_1); // scope 0 at $DIR/mutable_variable_aggregate.rs:+1:9: +1:14
17-
Deinit(_1); // scope 0 at $DIR/mutable_variable_aggregate.rs:+1:17: +1:25
18-
(_1.0: i32) = const 42_i32; // scope 0 at $DIR/mutable_variable_aggregate.rs:+1:17: +1:25
19-
(_1.1: i32) = const 43_i32; // scope 0 at $DIR/mutable_variable_aggregate.rs:+1:17: +1:25
17+
- _1 = (const 42_i32, const 43_i32); // scope 0 at $DIR/mutable_variable_aggregate.rs:+1:17: +1:25
18+
+ _1 = const (42_i32, 43_i32); // scope 0 at $DIR/mutable_variable_aggregate.rs:+1:17: +1:25
2019
(_1.1: i32) = const 99_i32; // scope 1 at $DIR/mutable_variable_aggregate.rs:+2:5: +2:13
2120
StorageLive(_2); // scope 1 at $DIR/mutable_variable_aggregate.rs:+3:9: +3:10
2221
- _2 = _1; // scope 1 at $DIR/mutable_variable_aggregate.rs:+3:13: +3:14

‎tests/mir-opt/const_prop/mutable_variable_aggregate_mut_ref.main.ConstProp.diff

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@
1818

1919
bb0: {
2020
StorageLive(_1); // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:+1:9: +1:14
21-
Deinit(_1); // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:+1:17: +1:25
22-
(_1.0: i32) = const 42_i32; // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:+1:17: +1:25
23-
(_1.1: i32) = const 43_i32; // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:+1:17: +1:25
21+
_1 = (const 42_i32, const 43_i32); // scope 0 at $DIR/mutable_variable_aggregate_mut_ref.rs:+1:17: +1:25
2422
StorageLive(_2); // scope 1 at $DIR/mutable_variable_aggregate_mut_ref.rs:+2:9: +2:10
2523
_2 = &mut _1; // scope 1 at $DIR/mutable_variable_aggregate_mut_ref.rs:+2:13: +2:19
2624
((*_2).1: i32) = const 99_i32; // scope 2 at $DIR/mutable_variable_aggregate_mut_ref.rs:+3:5: +3:13

0 commit comments

Comments
 (0)