Skip to content

Commit 2645b96

Browse files
beepster4096beepster4096
committed
trivial test blessings
1 parent 47008d7 commit 2645b96

12 files changed

+76
-79
lines changed

‎tests/mir-opt/building/coroutine.main-{closure#0}.StateTransform.after.mir‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2
5050
let mut _25: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18};
5151

5252
bb0: {
53-
_18 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
53+
_18 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
5454
_17 = discriminant((*_18));
5555
switchInt(move _17) -> [0: bb1, 1: bb19, 3: bb17, 4: bb18, otherwise: bb20];
5656
}
5757

5858
bb1: {
59-
_19 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
59+
_19 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
6060
(((*_19) as variant#4).0: std::string::String) = move _2;
6161
StorageLive(_3);
6262
StorageLive(_4);
6363
StorageLive(_5);
6464
StorageLive(_6);
65-
_20 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
65+
_20 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
6666
_6 = &(((*_20) as variant#4).0: std::string::String);
6767
_5 = <String as Clone>::clone(move _6) -> [return: bb2, unwind unreachable];
6868
}
@@ -84,7 +84,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2
8484
_0 = CoroutineState::<(&str, String, &Location<'_>), ()>::Yielded(move _4);
8585
StorageDead(_3);
8686
StorageDead(_4);
87-
_21 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
87+
_21 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
8888
discriminant((*_21)) = 3;
8989
return;
9090
}
@@ -108,7 +108,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2
108108
_10 = &(*_11);
109109
StorageLive(_12);
110110
StorageLive(_13);
111-
_22 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
111+
_22 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
112112
_13 = &(((*_22) as variant#4).0: std::string::String);
113113
_12 = <String as Clone>::clone(move _13) -> [return: bb8, unwind unreachable];
114114
}
@@ -135,7 +135,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2
135135
StorageDead(_9);
136136
StorageDead(_11);
137137
StorageDead(_15);
138-
_23 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
138+
_23 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
139139
discriminant((*_23)) = 4;
140140
return;
141141
}
@@ -154,7 +154,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2
154154
StorageDead(_11);
155155
StorageDead(_8);
156156
_16 = const ();
157-
_24 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
157+
_24 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
158158
drop((((*_24) as variant#4).0: std::string::String)) -> [return: bb14, unwind unreachable];
159159
}
160160

@@ -164,7 +164,7 @@ fn main::{closure#0}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:18:5: 18:18}>, _2
164164

165165
bb15: {
166166
_0 = CoroutineState::<(&str, String, &Location<'_>), ()>::Complete(move _16);
167-
_25 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
167+
_25 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:18:5: 18:18});
168168
discriminant((*_25)) = 1;
169169
return;
170170
}

‎tests/mir-opt/building/coroutine.main-{closure#1}.StateTransform.after.mir‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2
5050
let mut _25: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18};
5151

5252
bb0: {
53-
_18 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
53+
_18 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
5454
_17 = discriminant((*_18));
5555
switchInt(move _17) -> [0: bb1, 1: bb19, 3: bb17, 4: bb18, otherwise: bb20];
5656
}
5757

5858
bb1: {
59-
_19 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
59+
_19 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
6060
(((*_19) as variant#4).0: std::string::String) = move _2;
6161
StorageLive(_3);
6262
StorageLive(_4);
6363
StorageLive(_5);
6464
StorageLive(_6);
65-
_20 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
65+
_20 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
6666
_6 = &(((*_20) as variant#4).0: std::string::String);
6767
_5 = <String as Clone>::clone(move _6) -> [return: bb2, unwind unreachable];
6868
}
@@ -84,7 +84,7 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2
8484
_0 = CoroutineState::<(&str, String, &Location<'_>), ()>::Yielded(move _4);
8585
StorageDead(_3);
8686
StorageDead(_4);
87-
_21 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
87+
_21 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
8888
discriminant((*_21)) = 3;
8989
return;
9090
}
@@ -108,7 +108,7 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2
108108
_10 = &(*_11);
109109
StorageLive(_12);
110110
StorageLive(_13);
111-
_22 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
111+
_22 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
112112
_13 = &(((*_22) as variant#4).0: std::string::String);
113113
_12 = <String as Clone>::clone(move _13) -> [return: bb8, unwind unreachable];
114114
}
@@ -135,7 +135,7 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2
135135
StorageDead(_9);
136136
StorageDead(_11);
137137
StorageDead(_15);
138-
_23 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
138+
_23 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
139139
discriminant((*_23)) = 4;
140140
return;
141141
}
@@ -154,7 +154,7 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2
154154
StorageDead(_11);
155155
StorageDead(_8);
156156
_16 = const ();
157-
_24 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
157+
_24 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
158158
drop((((*_24) as variant#4).0: std::string::String)) -> [return: bb14, unwind unreachable];
159159
}
160160

@@ -164,7 +164,7 @@ fn main::{closure#1}(_1: Pin<&mut {coroutine@$DIR/coroutine.rs:25:5: 25:18}>, _2
164164

165165
bb15: {
166166
_0 = CoroutineState::<(&str, String, &Location<'_>), ()>::Complete(move _16);
167-
_25 = deref_copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
167+
_25 = copy (_1.0: &mut {coroutine@$DIR/coroutine.rs:25:5: 25:18});
168168
discriminant((*_25)) = 1;
169169
return;
170170
}

‎tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.32bit.diff‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@
112112
StorageDead(_10);
113113
StorageLive(_14);
114114
_14 = const {ALLOC0: &&SmallStruct};
115-
_31 = deref_copy (*_14);
115+
_31 = copy (*_14);
116116
StorageLive(_11);
117-
_32 = deref_copy (*_14);
117+
_32 = copy (*_14);
118118
- _11 = copy ((*_32).0: f32);
119119
+ _11 = const 9f32;
120120
StorageLive(_12);
121-
_33 = deref_copy (*_14);
121+
_33 = copy (*_14);
122122
_12 = copy ((*_33).1: std::option::Option<S>);
123123
StorageLive(_13);
124-
_34 = deref_copy (*_14);
124+
_34 = copy (*_14);
125125
_13 = copy ((*_34).2: &[f32]);
126126
StorageDead(_14);
127127
StorageLive(_15);
@@ -149,16 +149,16 @@
149149
StorageDead(_22);
150150
StorageLive(_26);
151151
_26 = const {ALLOC1: &&BigStruct};
152-
_35 = deref_copy (*_26);
152+
_35 = copy (*_26);
153153
StorageLive(_23);
154-
_36 = deref_copy (*_26);
154+
_36 = copy (*_26);
155155
- _23 = copy ((*_36).0: f32);
156156
+ _23 = const 82f32;
157157
StorageLive(_24);
158-
_37 = deref_copy (*_26);
158+
_37 = copy (*_26);
159159
_24 = copy ((*_37).1: std::option::Option<S>);
160160
StorageLive(_25);
161-
_38 = deref_copy (*_26);
161+
_38 = copy (*_26);
162162
_25 = copy ((*_38).2: &[f32]);
163163
StorageDead(_26);
164164
StorageLive(_27);

‎tests/mir-opt/dataflow-const-prop/struct.main.DataflowConstProp.64bit.diff‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@
112112
StorageDead(_10);
113113
StorageLive(_14);
114114
_14 = const {ALLOC0: &&SmallStruct};
115-
_31 = deref_copy (*_14);
115+
_31 = copy (*_14);
116116
StorageLive(_11);
117-
_32 = deref_copy (*_14);
117+
_32 = copy (*_14);
118118
- _11 = copy ((*_32).0: f32);
119119
+ _11 = const 9f32;
120120
StorageLive(_12);
121-
_33 = deref_copy (*_14);
121+
_33 = copy (*_14);
122122
_12 = copy ((*_33).1: std::option::Option<S>);
123123
StorageLive(_13);
124-
_34 = deref_copy (*_14);
124+
_34 = copy (*_14);
125125
_13 = copy ((*_34).2: &[f32]);
126126
StorageDead(_14);
127127
StorageLive(_15);
@@ -149,16 +149,16 @@
149149
StorageDead(_22);
150150
StorageLive(_26);
151151
_26 = const {ALLOC1: &&BigStruct};
152-
_35 = deref_copy (*_26);
152+
_35 = copy (*_26);
153153
StorageLive(_23);
154-
_36 = deref_copy (*_26);
154+
_36 = copy (*_26);
155155
- _23 = copy ((*_36).0: f32);
156156
+ _23 = const 82f32;
157157
StorageLive(_24);
158-
_37 = deref_copy (*_26);
158+
_37 = copy (*_26);
159159
_24 = copy ((*_37).1: std::option::Option<S>);
160160
StorageLive(_25);
161-
_38 = deref_copy (*_26);
161+
_38 = copy (*_26);
162162
_25 = copy ((*_38).2: &[f32]);
163163
StorageDead(_26);
164164
StorageLive(_27);

‎tests/mir-opt/early_otherwise_branch_68867.try_sum.EarlyOtherwiseBranch.diff‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
_4 = (move _5, move _6);
7777
StorageDead(_6);
7878
StorageDead(_5);
79-
_34 = deref_copy (_4.0: &ViewportPercentageLength);
79+
_34 = copy (_4.0: &ViewportPercentageLength);
8080
_11 = discriminant((*_34));
8181
switchInt(move _11) -> [0: bb2, 1: bb3, 2: bb4, 3: bb5, otherwise: bb12];
8282
}
@@ -92,35 +92,35 @@
9292
}
9393

9494
bb2: {
95-
_35 = deref_copy (_4.1: &ViewportPercentageLength);
95+
_35 = copy (_4.1: &ViewportPercentageLength);
9696
_7 = discriminant((*_35));
9797
switchInt(move _7) -> [0: bb9, otherwise: bb1];
9898
}
9999

100100
bb3: {
101-
_36 = deref_copy (_4.1: &ViewportPercentageLength);
101+
_36 = copy (_4.1: &ViewportPercentageLength);
102102
_8 = discriminant((*_36));
103103
switchInt(move _8) -> [1: bb8, otherwise: bb1];
104104
}
105105

106106
bb4: {
107-
_37 = deref_copy (_4.1: &ViewportPercentageLength);
107+
_37 = copy (_4.1: &ViewportPercentageLength);
108108
_9 = discriminant((*_37));
109109
switchInt(move _9) -> [2: bb7, otherwise: bb1];
110110
}
111111

112112
bb5: {
113-
_38 = deref_copy (_4.1: &ViewportPercentageLength);
113+
_38 = copy (_4.1: &ViewportPercentageLength);
114114
_10 = discriminant((*_38));
115115
switchInt(move _10) -> [3: bb6, otherwise: bb1];
116116
}
117117

118118
bb6: {
119119
StorageLive(_27);
120-
_39 = deref_copy (_4.0: &ViewportPercentageLength);
120+
_39 = copy (_4.0: &ViewportPercentageLength);
121121
_27 = copy (((*_39) as Vmax).0: f32);
122122
StorageLive(_28);
123-
_40 = deref_copy (_4.1: &ViewportPercentageLength);
123+
_40 = copy (_4.1: &ViewportPercentageLength);
124124
_28 = copy (((*_40) as Vmax).0: f32);
125125
StorageLive(_29);
126126
StorageLive(_30);
@@ -139,10 +139,10 @@
139139

140140
bb7: {
141141
StorageLive(_22);
142-
_41 = deref_copy (_4.0: &ViewportPercentageLength);
142+
_41 = copy (_4.0: &ViewportPercentageLength);
143143
_22 = copy (((*_41) as Vmin).0: f32);
144144
StorageLive(_23);
145-
_42 = deref_copy (_4.1: &ViewportPercentageLength);
145+
_42 = copy (_4.1: &ViewportPercentageLength);
146146
_23 = copy (((*_42) as Vmin).0: f32);
147147
StorageLive(_24);
148148
StorageLive(_25);
@@ -161,10 +161,10 @@
161161

162162
bb8: {
163163
StorageLive(_17);
164-
_43 = deref_copy (_4.0: &ViewportPercentageLength);
164+
_43 = copy (_4.0: &ViewportPercentageLength);
165165
_17 = copy (((*_43) as Vh).0: f32);
166166
StorageLive(_18);
167-
_44 = deref_copy (_4.1: &ViewportPercentageLength);
167+
_44 = copy (_4.1: &ViewportPercentageLength);
168168
_18 = copy (((*_44) as Vh).0: f32);
169169
StorageLive(_19);
170170
StorageLive(_20);
@@ -183,10 +183,10 @@
183183

184184
bb9: {
185185
StorageLive(_12);
186-
_45 = deref_copy (_4.0: &ViewportPercentageLength);
186+
_45 = copy (_4.0: &ViewportPercentageLength);
187187
_12 = copy (((*_45) as Vw).0: f32);
188188
StorageLive(_13);
189-
_46 = deref_copy (_4.1: &ViewportPercentageLength);
189+
_46 = copy (_4.1: &ViewportPercentageLength);
190190
_13 = copy (((*_46) as Vw).0: f32);
191191
StorageLive(_14);
192192
StorageLive(_15);

‎tests/mir-opt/early_otherwise_branch_soundness.no_downcast.EarlyOtherwiseBranch.diff‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717

1818
bb1: {
19-
_4 = deref_copy (((*_1) as Some).0: &E<'_>);
19+
_4 = copy (((*_1) as Some).0: &E<'_>);
2020
_2 = discriminant((*_4));
2121
switchInt(move _2) -> [1: bb2, 0: bb3, otherwise: bb5];
2222
}

‎tests/mir-opt/gvn_copy_aggregate.all_copy_2.GVN.diff‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@
2525

2626
bb0: {
2727
- StorageLive(_2);
28-
- _8 = deref_copy (*_1);
2928
+ nop;
30-
+ _8 = copy (*_1);
29+
_8 = copy (*_1);
3130
_2 = copy ((*_8).0: i32);
3231
- StorageLive(_3);
33-
- _9 = deref_copy (*_1);
32+
- _9 = copy (*_1);
3433
- _3 = copy ((*_9).1: u64);
3534
- StorageLive(_4);
36-
- _10 = deref_copy (*_1);
35+
- _10 = copy (*_1);
3736
- _4 = copy ((*_10).2: [i8; 3]);
3837
+ nop;
3938
+ _9 = copy _8;

0 commit comments

Comments
 (0)