Skip to content

Do not lifetime-extend array/slice indices #147083

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+31 −32
Open

Do not lifetime-extend array/slice indices #147083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions compiler/rustc_mir_build/src/builder/expr/as_place.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
index,
mutability,
fake_borrow_temps,
expr.temp_lifetime,
expr_span,
source_info,
),
Expand Down Expand Up @@ -625,7 +624,6 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
index: ExprId,
mutability: Mutability,
fake_borrow_temps: Option<&mut Vec<Local>>,
temp_lifetime: TempLifetime,
expr_span: Span,
source_info: SourceInfo,
) -> BlockAnd<PlaceBuilder<'tcx>> {
Expand All @@ -639,7 +637,8 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
// Making this a *fresh* temporary means we do not have to worry about
// the index changing later: Nothing will ever change this temporary.
// The "retagging" transformation (for Stacked Borrows) relies on this.
let idx = unpack!(block = self.as_temp(block, temp_lifetime, index, Mutability::Not));
let index_lifetime = self.thir[index].temp_lifetime;
let idx = unpack!(block = self.as_temp(block, index_lifetime, index, Mutability::Not));

block = self.bounds_check(block, &base_place, idx, expr_span, source_info);

Expand Down
2 changes: 1 addition & 1 deletion tests/mir-opt/gvn.dereference_indexing.GVN.panic-abort.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
- StorageDead(_4);
+ _3 = &_1[_4];
+ nop;
StorageDead(_6);
StorageLive(_8);
StorageLive(_9);
_9 = copy (*_3);
Expand All @@ -51,7 +52,6 @@
StorageDead(_9);
StorageDead(_8);
_0 = const ();
StorageDead(_6);
StorageDead(_3);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/mir-opt/gvn.dereference_indexing.GVN.panic-unwind.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
- StorageDead(_4);
+ _3 = &_1[_4];
+ nop;
StorageDead(_6);
StorageLive(_8);
StorageLive(_9);
_9 = copy (*_3);
Expand All @@ -51,7 +52,6 @@
StorageDead(_9);
StorageDead(_8);
_0 = const ();
StorageDead(_6);
StorageDead(_3);
return;
}
Expand Down
4 changes: 2 additions & 2 deletions tests/mir-opt/gvn.wide_ptr_same_provenance.GVN.panic-abort.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
- StorageDead(_4);
+ _3 = copy _4;
+ nop;
StorageDead(_8);
StorageDead(_7);
StorageDead(_5);
StorageLive(_10);
Expand Down Expand Up @@ -116,6 +117,7 @@
- StorageDead(_11);
+ _10 = copy _11;
+ nop;
StorageDead(_15);
StorageDead(_14);
StorageDead(_12);
StorageLive(_17);
Expand Down Expand Up @@ -251,9 +253,7 @@
StorageDead(_43);
StorageDead(_42);
_0 = const ();
StorageDead(_15);
StorageDead(_10);
StorageDead(_8);
StorageDead(_3);
StorageDead(_1);
return;
Expand Down
4 changes: 2 additions & 2 deletions tests/mir-opt/gvn.wide_ptr_same_provenance.GVN.panic-unwind.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
- StorageDead(_4);
+ _3 = copy _4;
+ nop;
StorageDead(_8);
StorageDead(_7);
StorageDead(_5);
StorageLive(_10);
Expand Down Expand Up @@ -116,6 +117,7 @@
- StorageDead(_11);
+ _10 = copy _11;
+ nop;
StorageDead(_15);
StorageDead(_14);
StorageDead(_12);
StorageLive(_17);
Expand Down Expand Up @@ -251,9 +253,7 @@
StorageDead(_43);
StorageDead(_42);
_0 = const ();
StorageDead(_15);
StorageDead(_10);
StorageDead(_8);
StorageDead(_3);
StorageDead(_1);
return;
Expand Down
2 changes: 1 addition & 1 deletion tests/mir-opt/issue_91633.fun.built.after.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ fn fun(_1: &[T]) -> &T {
bb1: {
_2 = &(*_1)[_3];
FakeRead(ForLet(None), _2);
_0 = &(*_2);
StorageDead(_3);
_0 = &(*_2);
StorageDead(_2);
return;
}
Expand Down
22 changes: 11 additions & 11 deletions tests/mir-opt/nll/region_subtyping_basic.main.nll.0.32bit.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
| '?1 | Local | ['?1]
|
| Inferred Region Values
| '?0 | U0 | {bb0[0..=8], bb1[0..=7], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=5], bb7[0], '?0, '?1}
| '?1 | U0 | {bb0[0..=8], bb1[0..=7], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=5], bb7[0], '?1}
| '?2 | U0 | {bb1[0..=7], bb2[0..=2]}
| '?3 | U0 | {bb1[1..=7], bb2[0..=2]}
| '?4 | U0 | {bb1[4..=7], bb2[0..=2]}
| '?0 | U0 | {bb0[0..=8], bb1[0..=8], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=4], bb7[0], '?0, '?1}
| '?1 | U0 | {bb0[0..=8], bb1[0..=8], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=4], bb7[0], '?1}
| '?2 | U0 | {bb1[0..=8], bb2[0..=2]}
| '?3 | U0 | {bb1[1..=8], bb2[0..=2]}
| '?4 | U0 | {bb1[5..=8], bb2[0..=2]}
|
| Inference Constraints
| '?0 live at {bb0[0..=8], bb1[0..=7], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=5], bb7[0]}
| '?1 live at {bb0[0..=8], bb1[0..=7], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=5], bb7[0]}
| '?0 live at {bb0[0..=8], bb1[0..=8], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=4], bb7[0]}
| '?1 live at {bb0[0..=8], bb1[0..=8], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=4], bb7[0]}
| '?2 live at {bb1[0]}
| '?3 live at {bb1[1..=3]}
| '?4 live at {bb1[4..=7], bb2[0..=2]}
| '?3 live at {bb1[1..=4]}
| '?4 live at {bb1[5..=8], bb2[0..=2]}
| '?2: '?3 due to Assignment at Single(bb1[0]) ($DIR/region_subtyping_basic.rs:19:13: 19:18 (#0)
| '?3: '?4 due to Assignment at Single(bb1[3]) ($DIR/region_subtyping_basic.rs:20:13: 20:14 (#0)
| '?3: '?4 due to Assignment at Single(bb1[4]) ($DIR/region_subtyping_basic.rs:20:13: 20:14 (#0)
|
| Borrows
| bw0: issued at bb1[0] in '?2
Expand Down Expand Up @@ -59,6 +59,7 @@ fn main() -> () {
bb1: {
_2 = &'?2 _1[_3];
FakeRead(ForLet(None), _2);
StorageDead(_3);
StorageLive(_5);
_5 = copy _2;
FakeRead(ForLet(None), _5);
Expand Down Expand Up @@ -95,7 +96,6 @@ fn main() -> () {
bb6: {
StorageDead(_6);
StorageDead(_5);
StorageDead(_3);
StorageDead(_2);
StorageDead(_1);
return;
Expand Down
22 changes: 11 additions & 11 deletions tests/mir-opt/nll/region_subtyping_basic.main.nll.0.64bit.mir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
| '?1 | Local | ['?1]
|
| Inferred Region Values
| '?0 | U0 | {bb0[0..=8], bb1[0..=7], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=5], bb7[0], '?0, '?1}
| '?1 | U0 | {bb0[0..=8], bb1[0..=7], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=5], bb7[0], '?1}
| '?2 | U0 | {bb1[0..=7], bb2[0..=2]}
| '?3 | U0 | {bb1[1..=7], bb2[0..=2]}
| '?4 | U0 | {bb1[4..=7], bb2[0..=2]}
| '?0 | U0 | {bb0[0..=8], bb1[0..=8], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=4], bb7[0], '?0, '?1}
| '?1 | U0 | {bb0[0..=8], bb1[0..=8], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=4], bb7[0], '?1}
| '?2 | U0 | {bb1[0..=8], bb2[0..=2]}
| '?3 | U0 | {bb1[1..=8], bb2[0..=2]}
| '?4 | U0 | {bb1[5..=8], bb2[0..=2]}
|
| Inference Constraints
| '?0 live at {bb0[0..=8], bb1[0..=7], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=5], bb7[0]}
| '?1 live at {bb0[0..=8], bb1[0..=7], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=5], bb7[0]}
| '?0 live at {bb0[0..=8], bb1[0..=8], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=4], bb7[0]}
| '?1 live at {bb0[0..=8], bb1[0..=8], bb2[0..=3], bb3[0..=3], bb4[0..=1], bb5[0..=2], bb6[0..=4], bb7[0]}
| '?2 live at {bb1[0]}
| '?3 live at {bb1[1..=3]}
| '?4 live at {bb1[4..=7], bb2[0..=2]}
| '?3 live at {bb1[1..=4]}
| '?4 live at {bb1[5..=8], bb2[0..=2]}
| '?2: '?3 due to Assignment at Single(bb1[0]) ($DIR/region_subtyping_basic.rs:19:13: 19:18 (#0)
| '?3: '?4 due to Assignment at Single(bb1[3]) ($DIR/region_subtyping_basic.rs:20:13: 20:14 (#0)
| '?3: '?4 due to Assignment at Single(bb1[4]) ($DIR/region_subtyping_basic.rs:20:13: 20:14 (#0)
|
| Borrows
| bw0: issued at bb1[0] in '?2
Expand Down Expand Up @@ -59,6 +59,7 @@ fn main() -> () {
bb1: {
_2 = &'?2 _1[_3];
FakeRead(ForLet(None), _2);
StorageDead(_3);
StorageLive(_5);
_5 = copy _2;
FakeRead(ForLet(None), _5);
Expand Down Expand Up @@ -95,7 +96,6 @@ fn main() -> () {
bb6: {
StorageDead(_6);
StorageDead(_5);
StorageDead(_3);
StorageDead(_2);
StorageDead(_1);
return;
Expand Down
Loading