Skip to content

Commit e300abb

Browse files
committed
Remove Nop in simplify_locals.
It's cheap and does not change anything.
1 parent 028b474 commit e300abb

File tree

36 files changed

+1
-54
lines changed

36 files changed

+1
-54
lines changed

compiler/rustc_mir_transform/src/simplify.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,7 @@ fn remove_unused_definitions(used_locals: &mut UsedLocals, body: &mut Body<'_>)
569569

570570
StatementKind::SetDiscriminant { ref place, .. }
571571
| StatementKind::Deinit(ref place) => used_locals.is_used(place.local),
572+
StatementKind::Nop => false,
572573
_ => true,
573574
};
574575

src/test/mir-opt/const_debuginfo.main.ConstDebugInfo.diff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
_11 = const 64_u32; // scope 8 at $DIR/const_debuginfo.rs:+13:13: +13:22
109109
StorageDead(_13); // scope 8 at $DIR/const_debuginfo.rs:+13:21: +13:22
110110
StorageDead(_12); // scope 8 at $DIR/const_debuginfo.rs:+13:21: +13:22
111-
nop; // scope 0 at $DIR/const_debuginfo.rs:+0:11: +14:2
112111
StorageDead(_11); // scope 8 at $DIR/const_debuginfo.rs:+14:1: +14:2
113112
StorageDead(_17); // scope 7 at $DIR/const_debuginfo.rs:+14:1: +14:2
114113
StorageDead(_18); // scope 7 at $DIR/const_debuginfo.rs:+14:1: +14:2

src/test/mir-opt/const_prop/bad_op_mod_by_zero.main.ConstProp.diff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
- _2 = Rem(const 1_i32, move _3); // scope 1 at $DIR/bad_op_mod_by_zero.rs:+2:14: +2:19
4646
+ _2 = Rem(const 1_i32, const 0_i32); // scope 1 at $DIR/bad_op_mod_by_zero.rs:+2:14: +2:19
4747
StorageDead(_3); // scope 1 at $DIR/bad_op_mod_by_zero.rs:+2:18: +2:19
48-
nop; // scope 0 at $DIR/bad_op_mod_by_zero.rs:+0:11: +3:2
4948
StorageDead(_2); // scope 1 at $DIR/bad_op_mod_by_zero.rs:+3:1: +3:2
5049
StorageDead(_1); // scope 0 at $DIR/bad_op_mod_by_zero.rs:+3:1: +3:2
5150
return; // scope 0 at $DIR/bad_op_mod_by_zero.rs:+3:2: +3:2

src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.32bit.diff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
bb1: {
4747
_4 = (*_1)[_5]; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
4848
StorageDead(_5); // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:25: +3:26
49-
nop; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+2:5: +4:6
5049
StorageDead(_4); // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+4:5: +4:6
5150
StorageDead(_1); // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+5:1: +5:2
5251
return; // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+5:2: +5:2

src/test/mir-opt/const_prop/bad_op_unsafe_oob_for_slices.main.ConstProp.64bit.diff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
bb1: {
4747
_4 = (*_1)[_5]; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:18: +3:25
4848
StorageDead(_5); // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+3:25: +3:26
49-
nop; // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+2:5: +4:6
5049
StorageDead(_4); // scope 2 at $DIR/bad_op_unsafe_oob_for_slices.rs:+4:5: +4:6
5150
StorageDead(_1); // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+5:1: +5:2
5251
return; // scope 0 at $DIR/bad_op_unsafe_oob_for_slices.rs:+5:2: +5:2

src/test/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
}
2626

2727
bb2: {
28-
nop; // scope 0 at $DIR/control_flow_simplification.rs:+3:6: +3:6
2928
StorageDead(_1); // scope 0 at $DIR/control_flow_simplification.rs:+3:5: +3:6
3029
return; // scope 0 at $DIR/control_flow_simplification.rs:+4:2: +4:2
3130
}

src/test/mir-opt/const_prop/invalid_constant.main.ConstProp.diff

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@
5555
StorageDead(_4); // scope 1 at $DIR/invalid_constant.rs:+13:59: +13:60
5656
StorageDead(_5); // scope 1 at $DIR/invalid_constant.rs:+13:60: +13:61
5757
StorageLive(_6); // scope 3 at $DIR/invalid_constant.rs:+20:9: +20:31
58-
nop; // scope 6 at $DIR/invalid_constant.rs:+20:44: +20:71
59-
nop; // scope 3 at $DIR/invalid_constant.rs:+20:34: +20:74
6058
StorageLive(_7); // scope 5 at $DIR/invalid_constant.rs:+24:9: +24:22
61-
nop; // scope 0 at $DIR/invalid_constant.rs:+0:11: +27:2
6259
StorageDead(_7); // scope 5 at $DIR/invalid_constant.rs:+27:1: +27:2
6360
StorageDead(_6); // scope 3 at $DIR/invalid_constant.rs:+27:1: +27:2
6461
StorageDead(_3); // scope 1 at $DIR/invalid_constant.rs:+27:1: +27:2

src/test/mir-opt/const_prop/issue_66971.main.ConstProp.diff

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
bb0: {
1010
StorageLive(_1); // scope 0 at $DIR/issue_66971.rs:+1:5: +1:23
1111
StorageLive(_2); // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
12-
nop; // scope 0 at $DIR/issue_66971.rs:+1:13: +1:15
1312
Deinit(_2); // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
14-
nop; // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
1513
(_2.1: u8) = const 0_u8; // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
1614
(_2.2: u8) = const 0_u8; // scope 0 at $DIR/issue_66971.rs:+1:12: +1:22
1715
_1 = encode(move _2) -> bb1; // scope 0 at $DIR/issue_66971.rs:+1:5: +1:23
@@ -23,7 +21,6 @@
2321
bb1: {
2422
StorageDead(_2); // scope 0 at $DIR/issue_66971.rs:+1:22: +1:23
2523
StorageDead(_1); // scope 0 at $DIR/issue_66971.rs:+1:23: +1:24
26-
nop; // scope 0 at $DIR/issue_66971.rs:+0:11: +2:2
2724
return; // scope 0 at $DIR/issue_66971.rs:+2:2: +2:2
2825
}
2926
}

src/test/mir-opt/const_prop/issue_67019.main.ConstProp.diff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
bb1: {
2828
StorageDead(_2); // scope 0 at $DIR/issue_67019.rs:+1:19: +1:20
2929
StorageDead(_1); // scope 0 at $DIR/issue_67019.rs:+1:20: +1:21
30-
nop; // scope 0 at $DIR/issue_67019.rs:+0:11: +2:2
3130
return; // scope 0 at $DIR/issue_67019.rs:+2:2: +2:2
3231
}
3332
}

src/test/mir-opt/const_prop/large_array_index.main.ConstProp.32bit.diff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
_1 = _2[_3]; // scope 0 at $DIR/large_array_index.rs:+2:17: +2:32
3030
StorageDead(_3); // scope 0 at $DIR/large_array_index.rs:+2:32: +2:33
3131
StorageDead(_2); // scope 0 at $DIR/large_array_index.rs:+2:32: +2:33
32-
nop; // scope 0 at $DIR/large_array_index.rs:+0:11: +3:2
3332
StorageDead(_1); // scope 0 at $DIR/large_array_index.rs:+3:1: +3:2
3433
return; // scope 0 at $DIR/large_array_index.rs:+3:2: +3:2
3534
}

0 commit comments

Comments
 (0)