Skip to content

Commit 19a8bb1

Browse files
cjgillotcjgillot
committed
Generalize operation.
1 parent 63ce733 commit 19a8bb1

27 files changed

+127
-123
lines changed

‎compiler/rustc_mir_transform/src/remove_zsts.rs‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -110,21 +110,34 @@ impl<'tcx> MutVisitor<'tcx> for Replacer<'_, 'tcx> {
110110
}
111111

112112
fn visit_statement(&mut self, statement: &mut Statement<'tcx>, loc: Location) {
113-
if let StatementKind::Assign(box (place, _)) | StatementKind::Deinit(box place) =
114-
statement.kind
115-
{
116-
let place_ty = place.ty(self.local_decls, self.tcx).ty;
117-
if self.known_to_be_zst(place_ty)
118-
&& self.tcx.consider_optimizing(|| {
119-
format!(
120-
"RemoveZsts - Place: {:?} SourceInfo: {:?}",
121-
place, statement.source_info
122-
)
123-
})
124-
{
125-
statement.make_nop();
113+
let place_for_ty = match statement.kind {
114+
StatementKind::Assign(box (place, ref rvalue)) => {
115+
rvalue.is_safe_to_remove().then_some(place)
116+
}
117+
StatementKind::Deinit(box place)
118+
| StatementKind::SetDiscriminant { box place, variant_index: _ }
119+
| StatementKind::AscribeUserType(box (place, _), _)
120+
| StatementKind::Retag(_, box place)
121+
| StatementKind::PlaceMention(box place)
122+
| StatementKind::FakeRead(box (_, place)) => Some(place),
123+
StatementKind::StorageLive(local) | StatementKind::StorageDead(local) => {
124+
Some(local.into())
126125
}
126+
StatementKind::Coverage(_)
127+
| StatementKind::Intrinsic(_)
128+
| StatementKind::Nop
129+
| StatementKind::ConstEvalCounter => None,
130+
};
131+
if let Some(place_for_ty) = place_for_ty
132+
&& let ty = place_for_ty.ty(self.local_decls, self.tcx).ty
133+
&& self.known_to_be_zst(ty)
134+
&& self.tcx.consider_optimizing(|| {
135+
format!("RemoveZsts - Place: {:?} SourceInfo: {:?}", place_for_ty, statement.source_info)
136+
})
137+
{
138+
statement.make_nop();
139+
} else {
140+
self.super_statement(statement, loc);
127141
}
128-
self.super_statement(statement, loc);
129142
}
130143
}

‎tests/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
}
1515

1616
bb1: {
17-
StorageLive(_2); // scope 0 at $SRC_DIR/std/src/panic.rs:LL:COL
1817
_2 = begin_panic::<&str>(const "explicit panic"); // scope 0 at $SRC_DIR/std/src/panic.rs:LL:COL
1918
// mir::Constant
2019
// + span: $SRC_DIR/std/src/panic.rs:LL:COL

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,27 @@
4747
_3 = [move _4]; // scope 1 at $DIR/invalid_constant.rs:+13:24: +13:60
4848
StorageDead(_4); // scope 1 at $DIR/invalid_constant.rs:+13:59: +13:60
4949
StorageDead(_5); // scope 1 at $DIR/invalid_constant.rs:+13:60: +13:61
50-
StorageLive(_6); // scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
51-
StorageLive(_7); // scope 3 at $DIR/invalid_constant.rs:+20:35: +20:73
50+
- StorageLive(_6); // scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
51+
- StorageLive(_7); // scope 3 at $DIR/invalid_constant.rs:+20:35: +20:73
52+
+ nop; // scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
53+
+ nop; // scope 3 at $DIR/invalid_constant.rs:+20:35: +20:73
5254
StorageLive(_8); // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:65
5355
_8 = NoVariants { int: const 0_u32 }; // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:65
5456
- _7 = (_8.1: Empty); // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:71
5557
- _6 = [move _7]; // scope 3 at $DIR/invalid_constant.rs:+20:34: +20:74
58+
- StorageDead(_7); // scope 3 at $DIR/invalid_constant.rs:+20:73: +20:74
5659
+ nop; // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:71
5760
+ nop; // scope 3 at $DIR/invalid_constant.rs:+20:34: +20:74
58-
StorageDead(_7); // scope 3 at $DIR/invalid_constant.rs:+20:73: +20:74
61+
+ nop; // scope 3 at $DIR/invalid_constant.rs:+20:73: +20:74
5962
StorageDead(_8); // scope 3 at $DIR/invalid_constant.rs:+20:74: +20:75
60-
StorageLive(_9); // scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
63+
- StorageLive(_9); // scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
6164
- _0 = const (); // scope 0 at $DIR/invalid_constant.rs:+0:11: +27:2
65+
- StorageDead(_9); // scope 5 at $DIR/invalid_constant.rs:+27:1: +27:2
66+
- StorageDead(_6); // scope 3 at $DIR/invalid_constant.rs:+27:1: +27:2
67+
+ nop; // scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
6268
+ nop; // scope 0 at $DIR/invalid_constant.rs:+0:11: +27:2
63-
StorageDead(_9); // scope 5 at $DIR/invalid_constant.rs:+27:1: +27:2
64-
StorageDead(_6); // scope 3 at $DIR/invalid_constant.rs:+27:1: +27:2
69+
+ nop; // scope 5 at $DIR/invalid_constant.rs:+27:1: +27:2
70+
+ nop; // scope 3 at $DIR/invalid_constant.rs:+27:1: +27:2
6571
StorageDead(_3); // scope 1 at $DIR/invalid_constant.rs:+27:1: +27:2
6672
StorageDead(_1); // scope 0 at $DIR/invalid_constant.rs:+27:1: +27:2
6773
return; // scope 0 at $DIR/invalid_constant.rs:+27:2: +27:2

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
let mut _2: ((), u8, u8); // in scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
88

99
bb0: {
10-
StorageLive(_1); // scope 0 at $DIR/issue_66971.rs:+1:5: +1:23
1110
StorageLive(_2); // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
1211
_2 = (const (), const 0_u8, const 0_u8); // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
1312
_1 = encode(move _2) -> bb1; // scope 0 at $DIR/issue_66971.rs:+1:5: +1:23
@@ -18,7 +17,6 @@
1817

1918
bb1: {
2019
StorageDead(_2); // scope 0 at $DIR/issue_66971.rs:+1:22: +1:23
21-
StorageDead(_1); // scope 0 at $DIR/issue_66971.rs:+1:23: +1:24
2220
return; // scope 0 at $DIR/issue_66971.rs:+2:2: +2:2
2321
}
2422
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
let mut _3: (u8, u8); // in scope 0 at $DIR/issue_67019.rs:+1:11: +1:17
99

1010
bb0: {
11-
StorageLive(_1); // scope 0 at $DIR/issue_67019.rs:+1:5: +1:20
1211
StorageLive(_2); // scope 0 at $DIR/issue_67019.rs:+1:10: +1:19
1312
StorageLive(_3); // scope 0 at $DIR/issue_67019.rs:+1:11: +1:17
1413
- _3 = (const 1_u8, const 2_u8); // scope 0 at $DIR/issue_67019.rs:+1:11: +1:17
@@ -23,7 +22,6 @@
2322

2423
bb1: {
2524
StorageDead(_2); // scope 0 at $DIR/issue_67019.rs:+1:19: +1:20
26-
StorageDead(_1); // scope 0 at $DIR/issue_67019.rs:+1:20: +1:21
2725
return; // scope 0 at $DIR/issue_67019.rs:+2:2: +2:2
2826
}
2927
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
bb0: {
1414
_1 = const 1_u32; // scope 0 at $DIR/scalar_literal_propagation.rs:+1:13: +1:14
15-
StorageLive(_2); // scope 1 at $DIR/scalar_literal_propagation.rs:+2:5: +2:15
1615
- _2 = consume(_1) -> bb1; // scope 1 at $DIR/scalar_literal_propagation.rs:+2:5: +2:15
1716
+ _2 = consume(const 1_u32) -> bb1; // scope 1 at $DIR/scalar_literal_propagation.rs:+2:5: +2:15
1817
// mir::Constant
@@ -21,7 +20,6 @@
2120
}
2221

2322
bb1: {
24-
StorageDead(_2); // scope 1 at $DIR/scalar_literal_propagation.rs:+2:15: +2:16
2523
return; // scope 0 at $DIR/scalar_literal_propagation.rs:+3:2: +3:2
2624
}
2725
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@
1313
bb0: {
1414
- _1 = (const 1_u32, const 2_u32); // scope 0 at $DIR/tuple_literal_propagation.rs:+1:13: +1:19
1515
+ _1 = const (1_u32, 2_u32); // scope 0 at $DIR/tuple_literal_propagation.rs:+1:13: +1:19
16-
StorageLive(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:+3:5: +3:15
1716
_2 = consume(_1) -> bb1; // scope 1 at $DIR/tuple_literal_propagation.rs:+3:5: +3:15
1817
// mir::Constant
1918
// + span: $DIR/tuple_literal_propagation.rs:5:5: 5:12
2019
// + literal: Const { ty: fn((u32, u32)) {consume}, val: Value(<ZST>) }
2120
}
2221

2322
bb1: {
24-
StorageDead(_2); // scope 1 at $DIR/tuple_literal_propagation.rs:+3:15: +3:16
2523
return; // scope 0 at $DIR/tuple_literal_propagation.rs:+4:2: +4:2
2624
}
2725
}

‎tests/mir-opt/inline/asm_unwind.main.Inline.diff‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
- // mir::Constant
2020
- // + span: $DIR/asm_unwind.rs:21:5: 21:8
2121
- // + literal: Const { ty: fn() {foo}, val: Value(<ZST>) }
22-
+ StorageLive(_2); // scope 1 at $DIR/asm_unwind.rs:15:9: 15:11
23-
+ asm!("", options(MAY_UNWIND)) -> [return: bb1, unwind: bb3]; // scope 3 at $DIR/asm_unwind.rs:16:14: 16:54
22+
+ StorageLive(_2); // scope 0 at $DIR/asm_unwind.rs:+1:5: +1:10
23+
+ asm!("", options(MAY_UNWIND)) -> [return: bb2, unwind: bb3]; // scope 3 at $DIR/asm_unwind.rs:16:14: 16:54
2424
}
2525

2626
bb1: {
27-
+ drop(_2) -> bb2; // scope 1 at $DIR/asm_unwind.rs:17:1: 17:2
28-
+ }
29-
+
30-
+ bb2: {
31-
+ StorageDead(_2); // scope 1 at $DIR/asm_unwind.rs:17:1: 17:2
27+
+ StorageDead(_2); // scope 0 at $DIR/asm_unwind.rs:+1:5: +1:10
3228
StorageDead(_1); // scope 0 at $DIR/asm_unwind.rs:+1:10: +1:11
3329
_0 = const (); // scope 0 at $DIR/asm_unwind.rs:+0:15: +2:2
3430
return; // scope 0 at $DIR/asm_unwind.rs:+2:2: +2:2
3531
+ }
3632
+
33+
+ bb2: {
34+
+ drop(_2) -> bb1; // scope 1 at $DIR/asm_unwind.rs:17:1: 17:2
35+
+ }
36+
+
3737
+ bb3 (cleanup): {
3838
+ drop(_2) -> bb4; // scope 1 at $DIR/asm_unwind.rs:17:1: 17:2
3939
+ }

‎tests/mir-opt/inline/cycle.g.Inline.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
- // mir::Constant
2626
// + span: $DIR/cycle.rs:12:7: 12:11
2727
// + literal: Const { ty: fn() {main}, val: Value(<ZST>) }
28-
+ StorageLive(_3); // scope 1 at $DIR/cycle.rs:6:5: 6:8
28+
+ StorageLive(_3); // scope 0 at $DIR/cycle.rs:+1:5: +1:12
2929
+ StorageLive(_4); // scope 1 at $DIR/cycle.rs:6:5: 6:6
3030
+ _4 = &_2; // scope 1 at $DIR/cycle.rs:6:5: 6:6
3131
+ StorageLive(_5); // scope 1 at $DIR/cycle.rs:6:5: 6:8
@@ -34,6 +34,7 @@
3434
}
3535

3636
bb1: {
37+
+ StorageDead(_3); // scope 0 at $DIR/cycle.rs:+1:5: +1:12
3738
+ StorageDead(_2); // scope 0 at $DIR/cycle.rs:+1:5: +1:12
3839
StorageDead(_1); // scope 0 at $DIR/cycle.rs:+1:12: +1:13
3940
_0 = const (); // scope 0 at $DIR/cycle.rs:+0:8: +2:2
@@ -51,7 +52,6 @@
5152
+ bb4: {
5253
+ StorageDead(_5); // scope 1 at $DIR/cycle.rs:6:5: 6:8
5354
+ StorageDead(_4); // scope 1 at $DIR/cycle.rs:6:7: 6:8
54-
+ StorageDead(_3); // scope 1 at $DIR/cycle.rs:6:8: 6:9
5555
+ drop(_2) -> bb1; // scope 1 at $DIR/cycle.rs:7:1: 7:2
5656
}
5757
}

‎tests/mir-opt/inline/cycle.main.Inline.diff‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
- // mir::Constant
2626
// + span: $DIR/cycle.rs:17:7: 17:8
2727
// + literal: Const { ty: fn() {g}, val: Value(<ZST>) }
28-
+ StorageLive(_3); // scope 1 at $DIR/cycle.rs:6:5: 6:8
28+
+ StorageLive(_3); // scope 0 at $DIR/cycle.rs:+1:5: +1:9
2929
+ StorageLive(_4); // scope 1 at $DIR/cycle.rs:6:5: 6:6
3030
+ _4 = &_2; // scope 1 at $DIR/cycle.rs:6:5: 6:6
3131
+ StorageLive(_5); // scope 1 at $DIR/cycle.rs:6:5: 6:8
@@ -34,6 +34,7 @@
3434
}
3535

3636
bb1: {
37+
+ StorageDead(_3); // scope 0 at $DIR/cycle.rs:+1:5: +1:9
3738
+ StorageDead(_2); // scope 0 at $DIR/cycle.rs:+1:5: +1:9
3839
StorageDead(_1); // scope 0 at $DIR/cycle.rs:+1:9: +1:10
3940
_0 = const (); // scope 0 at $DIR/cycle.rs:+0:11: +2:2
@@ -51,7 +52,6 @@
5152
+ bb4: {
5253
+ StorageDead(_5); // scope 1 at $DIR/cycle.rs:6:5: 6:8
5354
+ StorageDead(_4); // scope 1 at $DIR/cycle.rs:6:7: 6:8
54-
+ StorageDead(_3); // scope 1 at $DIR/cycle.rs:6:8: 6:9
5555
+ drop(_2) -> bb1; // scope 1 at $DIR/cycle.rs:7:1: 7:2
5656
}
5757
}

0 commit comments

Comments
 (0)