Skip to content

Commit 352dcd0

Browse files
ohadravidohadravid
committed
rerun and bless again after rebase (reordered storage statements)
1 parent 045917c commit 352dcd0

19 files changed

+47
-60
lines changed

‎tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.32bit.panic-abort.diff‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@
7878
- _12 = AlignOf(());
7979
+ _11 = const 0_usize;
8080
+ _12 = const 1_usize;
81-
StorageLive(_14);
8281
StorageLive(_16);
83-
StorageLive(_17);
82+
StorageLive(_14);
8483
StorageLive(_19);
8584
_19 = const false;
8685
- switchInt(move _19) -> [0: bb6, otherwise: bb5];
@@ -103,15 +102,16 @@
103102
}
104103

105104
bb4: {
105+
StorageLive(_17);
106106
_17 = copy ((_15 as Ok).0: std::ptr::NonNull<[u8]>);
107107
StorageLive(_22);
108108
_22 = copy _17 as *mut [u8] (Transmute);
109109
_13 = copy _22 as *mut u8 (PtrToPtr);
110110
StorageDead(_22);
111-
StorageDead(_15);
112111
StorageDead(_17);
113-
StorageDead(_16);
112+
StorageDead(_15);
114113
StorageDead(_14);
114+
StorageDead(_16);
115115
_3 = ShallowInitBox(move _13, ());
116116
StorageDead(_13);
117117
StorageDead(_12);

‎tests/mir-opt/dont_reset_cast_kind_without_updating_operand.test.GVN.64bit.panic-abort.diff‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,8 @@
7878
- _12 = AlignOf(());
7979
+ _11 = const 0_usize;
8080
+ _12 = const 1_usize;
81-
StorageLive(_14);
8281
StorageLive(_16);
83-
StorageLive(_17);
82+
StorageLive(_14);
8483
StorageLive(_19);
8584
_19 = const false;
8685
- switchInt(move _19) -> [0: bb6, otherwise: bb5];
@@ -103,15 +102,16 @@
103102
}
104103

105104
bb4: {
105+
StorageLive(_17);
106106
_17 = copy ((_15 as Ok).0: std::ptr::NonNull<[u8]>);
107107
StorageLive(_22);
108108
_22 = copy _17 as *mut [u8] (Transmute);
109109
_13 = copy _22 as *mut u8 (PtrToPtr);
110110
StorageDead(_22);
111-
StorageDead(_15);
112111
StorageDead(_17);
113-
StorageDead(_16);
112+
StorageDead(_15);
114113
StorageDead(_14);
114+
StorageDead(_16);
115115
_3 = ShallowInitBox(move _13, ());
116116
StorageDead(_13);
117117
StorageDead(_12);

‎tests/mir-opt/jump_threading.identity.JumpThreading.panic-abort.diff‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
StorageLive(_4);
4848
_4 = copy _1;
4949
StorageLive(_10);
50-
StorageLive(_11);
51-
StorageLive(_12);
5250
_10 = discriminant(_4);
5351
switchInt(move _10) -> [0: bb7, 1: bb6, otherwise: bb1];
5452
}
@@ -92,8 +90,6 @@
9290
}
9391

9492
bb5: {
95-
StorageDead(_12);
96-
StorageDead(_11);
9793
StorageDead(_10);
9894
StorageDead(_4);
9995
_5 = discriminant(_3);
@@ -102,24 +98,26 @@
10298
}
10399

104100
bb6: {
101+
StorageLive(_12);
105102
_12 = move ((_4 as Err).0: i32);
106103
StorageLive(_13);
107104
_13 = Result::<Infallible, i32>::Err(copy _12);
108105
_3 = ControlFlow::<Result<Infallible, i32>, i32>::Break(move _13);
109106
StorageDead(_13);
107+
StorageDead(_12);
110108
- goto -> bb5;
111109
+ goto -> bb8;
112110
}
113111

114112
bb7: {
113+
StorageLive(_11);
115114
_11 = move ((_4 as Ok).0: i32);
116115
_3 = ControlFlow::<Result<Infallible, i32>, i32>::Continue(copy _11);
116+
StorageDead(_11);
117117
goto -> bb5;
118118
+ }
119119
+
120120
+ bb8: {
121-
+ StorageDead(_12);
122-
+ StorageDead(_11);
123121
+ StorageDead(_10);
124122
+ StorageDead(_4);
125123
+ _5 = discriminant(_3);

‎tests/mir-opt/jump_threading.identity.JumpThreading.panic-unwind.diff‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
StorageLive(_4);
4848
_4 = copy _1;
4949
StorageLive(_10);
50-
StorageLive(_11);
51-
StorageLive(_12);
5250
_10 = discriminant(_4);
5351
switchInt(move _10) -> [0: bb7, 1: bb6, otherwise: bb1];
5452
}
@@ -92,8 +90,6 @@
9290
}
9391

9492
bb5: {
95-
StorageDead(_12);
96-
StorageDead(_11);
9793
StorageDead(_10);
9894
StorageDead(_4);
9995
_5 = discriminant(_3);
@@ -102,24 +98,26 @@
10298
}
10399

104100
bb6: {
101+
StorageLive(_12);
105102
_12 = move ((_4 as Err).0: i32);
106103
StorageLive(_13);
107104
_13 = Result::<Infallible, i32>::Err(copy _12);
108105
_3 = ControlFlow::<Result<Infallible, i32>, i32>::Break(move _13);
109106
StorageDead(_13);
107+
StorageDead(_12);
110108
- goto -> bb5;
111109
+ goto -> bb8;
112110
}
113111

114112
bb7: {
113+
StorageLive(_11);
115114
_11 = move ((_4 as Ok).0: i32);
116115
_3 = ControlFlow::<Result<Infallible, i32>, i32>::Continue(copy _11);
116+
StorageDead(_11);
117117
goto -> bb5;
118118
+ }
119119
+
120120
+ bb8: {
121-
+ StorageDead(_12);
122-
+ StorageDead(_11);
123121
+ StorageDead(_10);
124122
+ StorageDead(_4);
125123
+ _5 = discriminant(_3);

‎tests/mir-opt/pre-codegen/derived_ord.demo_le.PreCodegen.after.mir‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ fn demo_le(_1: &MultiField, _2: &MultiField) -> bool {
3737
}
3838

3939
bb0: {
40-
StorageLive(_12);
4140
StorageLive(_11);
4241
StorageLive(_5);
4342
StorageLive(_7);
@@ -80,13 +79,14 @@ fn demo_le(_1: &MultiField, _2: &MultiField) -> bool {
8079
}
8180

8281
bb3: {
82+
StorageLive(_12);
8383
_12 = move ((_11 as Some).0: std::cmp::Ordering);
8484
StorageLive(_13);
8585
_13 = discriminant(_12);
8686
_0 = Le(move _13, const 0_i8);
8787
StorageDead(_13);
88-
StorageDead(_11);
8988
StorageDead(_12);
89+
StorageDead(_11);
9090
return;
9191
}
9292
}

‎tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,20 @@
8383
StorageDead(_8);
8484
StorageDead(_7);
8585
StorageLive(_12);
86-
StorageLive(_16);
8786
_12 = discriminant(_6);
8887
switchInt(move _12) -> [0: bb6, 1: bb5, otherwise: bb1];
8988
}
9089

9190
bb5: {
9291
StorageLive(_15);
92+
StorageLive(_16);
9393
_16 = &_13;
9494
_15 = copy _16 as &dyn std::fmt::Debug (PointerCoercion(Unsize, Implicit));
9595
_14 = result::unwrap_failed(const "called `Result::unwrap()` on an `Err` value", move _15) -> unwind unreachable;
9696
}
9797

9898
bb6: {
9999
_5 = move ((_6 as Ok).0: std::ptr::NonNull<[u8]>);
100-
StorageDead(_16);
101100
StorageDead(_12);
102101
StorageDead(_6);
103102
_4 = copy _5 as *mut [u8] (Transmute);

‎tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,20 @@
8383
StorageDead(_8);
8484
StorageDead(_7);
8585
StorageLive(_12);
86-
StorageLive(_16);
8786
_12 = discriminant(_6);
8887
switchInt(move _12) -> [0: bb6, 1: bb5, otherwise: bb1];
8988
}
9089

9190
bb5: {
9291
StorageLive(_15);
92+
StorageLive(_16);
9393
_16 = &_13;
9494
_15 = copy _16 as &dyn std::fmt::Debug (PointerCoercion(Unsize, Implicit));
9595
_14 = result::unwrap_failed(const "called `Result::unwrap()` on an `Err` value", move _15) -> unwind unreachable;
9696
}
9797

9898
bb6: {
9999
_5 = move ((_6 as Ok).0: std::ptr::NonNull<[u8]>);
100-
StorageDead(_16);
101100
StorageDead(_12);
102101
StorageDead(_6);
103102
_4 = copy _5 as *mut [u8] (Transmute);

‎tests/mir-opt/pre-codegen/loops.int_range.PreCodegen.after.mir‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ fn int_range(_1: usize, _2: usize) -> () {
6262
bb1: {
6363
StorageLive(_13);
6464
_5 = &mut _4;
65-
StorageLive(_11);
6665
StorageLive(_10);
6766
StorageLive(_6);
6867
_6 = &(_4.0: usize);
@@ -82,7 +81,6 @@ fn int_range(_1: usize, _2: usize) -> () {
8281
StorageDead(_7);
8382
StorageDead(_6);
8483
StorageDead(_10);
85-
StorageDead(_11);
8684
StorageDead(_13);
8785
StorageDead(_4);
8886
return;
@@ -91,14 +89,15 @@ fn int_range(_1: usize, _2: usize) -> () {
9189
bb3: {
9290
StorageDead(_7);
9391
StorageDead(_6);
92+
StorageLive(_11);
9493
_11 = copy (_4.0: usize);
9594
StorageLive(_12);
9695
_12 = AddUnchecked(copy _11, const 1_usize);
9796
(_4.0: usize) = move _12;
9897
StorageDead(_12);
9998
_13 = Option::<usize>::Some(copy _11);
100-
StorageDead(_10);
10199
StorageDead(_11);
100+
StorageDead(_10);
102101
StorageLive(_14);
103102
_14 = copy ((_13 as Some).0: usize);
104103
_15 = opaque::<usize>(move _14) -> [return: bb4, unwind continue];

‎tests/mir-opt/pre-codegen/loops.mapped.PreCodegen.after.mir‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ fn mapped(_1: impl Iterator<Item = T>, _2: impl Fn(T) -> U) -> () {
5454
bb2: {
5555
StorageLive(_13);
5656
_5 = &mut _4;
57-
StorageLive(_8);
5857
StorageLive(_7);
5958
StorageLive(_6);
6059
_6 = &mut (_4.0: impl Iterator<Item = T>);
@@ -63,18 +62,17 @@ fn mapped(_1: impl Iterator<Item = T>, _2: impl Fn(T) -> U) -> () {
6362

6463
bb3: {
6564
StorageDead(_6);
65+
StorageLive(_8);
6666
_8 = &mut (_4.1: impl Fn(T) -> U);
6767
StorageLive(_9);
68-
StorageLive(_10);
6968
_9 = discriminant(_7);
7069
switchInt(move _9) -> [0: bb4, 1: bb6, otherwise: bb9];
7170
}
7271

7372
bb4: {
74-
StorageDead(_10);
7573
StorageDead(_9);
76-
StorageDead(_7);
7774
StorageDead(_8);
75+
StorageDead(_7);
7876
StorageDead(_13);
7977
drop(_4) -> [return: bb5, unwind continue];
8078
}
@@ -85,6 +83,7 @@ fn mapped(_1: impl Iterator<Item = T>, _2: impl Fn(T) -> U) -> () {
8583
}
8684

8785
bb6: {
86+
StorageLive(_10);
8887
_10 = move ((_7 as Some).0: T);
8988
StorageLive(_12);
9089
StorageLive(_11);
@@ -98,8 +97,8 @@ fn mapped(_1: impl Iterator<Item = T>, _2: impl Fn(T) -> U) -> () {
9897
StorageDead(_12);
9998
StorageDead(_10);
10099
StorageDead(_9);
101-
StorageDead(_7);
102100
StorageDead(_8);
101+
StorageDead(_7);
103102
StorageLive(_14);
104103
_14 = move ((_13 as Some).0: U);
105104
_15 = opaque::<U>(move _14) -> [return: bb8, unwind: bb10];

‎tests/mir-opt/pre-codegen/range_iter.forward_loop.PreCodegen.after.panic-abort.mir‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
4949

5050
bb1: {
5151
StorageLive(_9);
52-
StorageLive(_7);
5352
StorageLive(_6);
5453
StorageLive(_5);
5554
_5 = copy _4;
@@ -60,7 +59,6 @@ fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
6059

6160
bb2: {
6261
StorageDead(_6);
63-
StorageDead(_7);
6462
StorageDead(_9);
6563
StorageDead(_4);
6664
drop(_3) -> [return: bb3, unwind unreachable];
@@ -71,14 +69,15 @@ fn forward_loop(_1: u32, _2: u32, _3: impl Fn(u32)) -> () {
7169
}
7270

7371
bb4: {
72+
StorageLive(_7);
7473
_7 = copy _4;
7574
StorageLive(_8);
7675
_8 = AddUnchecked(copy _7, const 1_u32);
7776
_4 = move _8;
7877
StorageDead(_8);
7978
_9 = Option::<u32>::Some(copy _7);
80-
StorageDead(_6);
8179
StorageDead(_7);
80+
StorageDead(_6);
8281
StorageLive(_10);
8382
_10 = copy ((_9 as Some).0: u32);
8483
StorageLive(_11);

0 commit comments

Comments
 (0)