Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 05f453b

Browse files
Dylan-DPCDylan-DPC
authoredAug 10, 2022
Rollup merge of rust-lang#100192 - tmiasko:rm-duplicated-locals, r=nagisa
 Remove duplicated temporaries creating during box derefs elaboration Temporaries created with `MirPatch::new_temp` will be declared after patch application. Remove manually created duplicate declarations. Removing duplicates exposes another issue. Visitor elaborates terminator twice and attempts to access new, but not yet available, local declarations. Remove duplicated call to `visit_terminator`. Extracted from rust-lang#99946.
2 parents 2f952b8 + 7d2131a commit 05f453b

File tree

4 files changed

+22
-34
lines changed

4 files changed

+22
-34
lines changed
 

‎compiler/rustc_mir_transform/src/elaborate_box_derefs.rs

-8
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ impl<'tcx, 'a> MutVisitor<'tcx> for ElaborateBoxDerefVisitor<'tcx, 'a> {
7070
build_ptr_tys(tcx, base_ty.boxed_ty(), self.unique_did, self.nonnull_did);
7171

7272
let ptr_local = self.patch.new_temp(ptr_ty, source_info.span);
73-
self.local_decls.push(LocalDecl::new(ptr_ty, source_info.span));
7473

7574
self.patch.add_statement(location, StatementKind::StorageLive(ptr_local));
7675

@@ -125,13 +124,6 @@ impl<'tcx> MirPass<'tcx> for ElaborateBoxDerefs {
125124
index += 1;
126125
}
127126

128-
if let Some(terminator) = terminator
129-
&& !matches!(terminator.kind, TerminatorKind::Yield{..})
130-
{
131-
let location = Location { block, statement_index: index };
132-
visitor.visit_terminator(terminator, location);
133-
}
134-
135127
let location = Location { block, statement_index: index };
136128
match terminator {
137129
// yielding into a box is handled when lowering generators

‎src/test/mir-opt/const_prop/boxes.main.ConstProp.diff

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
let mut _7: std::boxed::Box<i32>; // in scope 0 at $DIR/boxes.rs:+1:14: +1:22
1313
let mut _8: *const i32; // in scope 0 at $DIR/boxes.rs:+1:14: +1:22
1414
let mut _9: *const i32; // in scope 0 at $DIR/boxes.rs:+1:14: +1:22
15-
let mut _10: *const i32; // in scope 0 at $DIR/boxes.rs:+1:14: +1:22
16-
let mut _11: *const i32; // in scope 0 at $DIR/boxes.rs:+1:14: +1:22
1715
scope 1 {
1816
debug x => _1; // in scope 1 at $DIR/boxes.rs:+1:9: +1:10
1917
}

‎src/test/mir-opt/inline/inline_into_box_place.main.Inline.32bit.diff

+11-12
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010
let mut _5: std::boxed::Box<std::vec::Vec<u32>>; // in scope 0 at $DIR/inline-into-box-place.rs:+1:29: +1:43
1111
let mut _6: (); // in scope 0 at $DIR/inline-into-box-place.rs:+1:42: +1:43
1212
let mut _7: *const std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:+1:29: +1:43
13-
let mut _8: *const std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:+1:29: +1:43
14-
+ let mut _9: &mut std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
13+
+ let mut _8: &mut std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
1514
scope 1 {
1615
debug _x => _1; // in scope 1 at $DIR/inline-into-box-place.rs:+1:9: +1:11
1716
}
1817
scope 2 {
1918
}
2019
+ scope 3 (inlined Vec::<u32>::new) { // at $DIR/inline-into-box-place.rs:8:33: 8:43
21-
+ let mut _10: alloc::raw_vec::RawVec<u32>; // in scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
20+
+ let mut _9: alloc::raw_vec::RawVec<u32>; // in scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
2221
+ }
2322

2423
bb0: {
@@ -37,10 +36,10 @@
3736
StorageLive(_7); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
3837
_7 = (((_5.0: std::ptr::Unique<std::vec::Vec<u32>>).0: std::ptr::NonNull<std::vec::Vec<u32>>).0: *const std::vec::Vec<u32>); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
3938
- (*_7) = Vec::<u32>::new() -> [return: bb2, unwind: bb4]; // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
40-
+ StorageLive(_9); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
41-
+ _9 = &mut (*_7); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
42-
+ StorageLive(_10); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
43-
+ _10 = const alloc::raw_vec::RawVec::<u32>::NEW; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
39+
+ StorageLive(_8); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
40+
+ _8 = &mut (*_7); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
41+
+ StorageLive(_9); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
42+
+ _9 = const alloc::raw_vec::RawVec::<u32>::NEW; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
4443
// mir::Constant
4544
- // + span: $DIR/inline-into-box-place.rs:8:33: 8:41
4645
- // + user_ty: UserType(1)
@@ -51,11 +50,11 @@
5150
+ // + span: $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
5251
+ // + user_ty: UserType(0)
5352
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Unevaluated(alloc::raw_vec::RawVec::<T>::NEW, [u32], None) }
54-
+ Deinit((*_9)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
55-
+ ((*_9).0: alloc::raw_vec::RawVec<u32>) = move _10; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
56-
+ ((*_9).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
57-
+ StorageDead(_10); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
58-
+ StorageDead(_9); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
53+
+ Deinit((*_8)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
54+
+ ((*_8).0: alloc::raw_vec::RawVec<u32>) = move _9; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
55+
+ ((*_8).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
56+
+ StorageDead(_9); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
57+
+ StorageDead(_8); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
5958
StorageDead(_7); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
6059
_1 = move _5; // scope 0 at $DIR/inline-into-box-place.rs:+1:29: +1:43
6160
StorageDead(_5); // scope 0 at $DIR/inline-into-box-place.rs:+1:42: +1:43

‎src/test/mir-opt/inline/inline_into_box_place.main.Inline.64bit.diff

+11-12
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,14 @@
1010
let mut _5: std::boxed::Box<std::vec::Vec<u32>>; // in scope 0 at $DIR/inline-into-box-place.rs:+1:29: +1:43
1111
let mut _6: (); // in scope 0 at $DIR/inline-into-box-place.rs:+1:42: +1:43
1212
let mut _7: *const std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:+1:29: +1:43
13-
let mut _8: *const std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:+1:29: +1:43
14-
+ let mut _9: &mut std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
13+
+ let mut _8: &mut std::vec::Vec<u32>; // in scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
1514
scope 1 {
1615
debug _x => _1; // in scope 1 at $DIR/inline-into-box-place.rs:+1:9: +1:11
1716
}
1817
scope 2 {
1918
}
2019
+ scope 3 (inlined Vec::<u32>::new) { // at $DIR/inline-into-box-place.rs:8:33: 8:43
21-
+ let mut _10: alloc::raw_vec::RawVec<u32>; // in scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
20+
+ let mut _9: alloc::raw_vec::RawVec<u32>; // in scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
2221
+ }
2322

2423
bb0: {
@@ -37,10 +36,10 @@
3736
StorageLive(_7); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
3837
_7 = (((_5.0: std::ptr::Unique<std::vec::Vec<u32>>).0: std::ptr::NonNull<std::vec::Vec<u32>>).0: *const std::vec::Vec<u32>); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
3938
- (*_7) = Vec::<u32>::new() -> [return: bb2, unwind: bb4]; // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
40-
+ StorageLive(_9); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
41-
+ _9 = &mut (*_7); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
42-
+ StorageLive(_10); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
43-
+ _10 = const alloc::raw_vec::RawVec::<u32>::NEW; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
39+
+ StorageLive(_8); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
40+
+ _8 = &mut (*_7); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
41+
+ StorageLive(_9); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
42+
+ _9 = const alloc::raw_vec::RawVec::<u32>::NEW; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
4443
// mir::Constant
4544
- // + span: $DIR/inline-into-box-place.rs:8:33: 8:41
4645
- // + user_ty: UserType(1)
@@ -51,11 +50,11 @@
5150
+ // + span: $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
5251
+ // + user_ty: UserType(0)
5352
+ // + literal: Const { ty: alloc::raw_vec::RawVec<u32>, val: Unevaluated(alloc::raw_vec::RawVec::<T>::NEW, [u32], None) }
54-
+ Deinit((*_9)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
55-
+ ((*_9).0: alloc::raw_vec::RawVec<u32>) = move _10; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
56-
+ ((*_9).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
57-
+ StorageDead(_10); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
58-
+ StorageDead(_9); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
53+
+ Deinit((*_8)); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
54+
+ ((*_8).0: alloc::raw_vec::RawVec<u32>) = move _9; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
55+
+ ((*_8).1: usize) = const 0_usize; // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
56+
+ StorageDead(_9); // scope 3 at $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
57+
+ StorageDead(_8); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
5958
StorageDead(_7); // scope 0 at $DIR/inline-into-box-place.rs:+1:33: +1:43
6059
_1 = move _5; // scope 0 at $DIR/inline-into-box-place.rs:+1:29: +1:43
6160
StorageDead(_5); // scope 0 at $DIR/inline-into-box-place.rs:+1:42: +1:43

0 commit comments

Comments
 (0)
Please sign in to comment.