forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#111441 - cjgillot:issue-111422, r=JakobDegen
Verify copies of mutable pointers in 2 stages in ReferencePropagation Fixes rust-lang#111422 In the first stage, we mark the copies as reborrows, to be checked later. In the second stage, we walk the reborrow chains to verify that all stages are fully replacable. The replacement itself mirrors the check, and iterates through the reborrow chain. r? `@RalfJung` cc `@JakobDegen`
- Loading branch information
Showing
5 changed files
with
230 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
tests/mir-opt/reference_prop.mut_raw_then_mut_shr.ReferencePropagation.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| - // MIR for `mut_raw_then_mut_shr` before ReferencePropagation | ||
| + // MIR for `mut_raw_then_mut_shr` after ReferencePropagation | ||
|
|
||
| fn mut_raw_then_mut_shr() -> (i32, i32) { | ||
| let mut _0: (i32, i32); // return place in scope 0 at $DIR/reference_prop.rs:+0:30: +0:40 | ||
| let mut _1: i32; // in scope 0 at $DIR/reference_prop.rs:+1:9: +1:14 | ||
| let mut _4: *mut i32; // in scope 0 at $DIR/reference_prop.rs:+3:16: +3:36 | ||
| let mut _5: &mut i32; // in scope 0 at $DIR/reference_prop.rs:+3:16: +3:26 | ||
| let _8: (); // in scope 0 at $DIR/reference_prop.rs:+7:5: +7:26 | ||
| let mut _9: i32; // in scope 0 at $DIR/reference_prop.rs:+8:6: +8:7 | ||
| let mut _10: i32; // in scope 0 at $DIR/reference_prop.rs:+8:9: +8:10 | ||
| scope 1 { | ||
| debug x => _1; // in scope 1 at $DIR/reference_prop.rs:+1:9: +1:14 | ||
| let _2: &mut i32; // in scope 1 at $DIR/reference_prop.rs:+2:9: +2:13 | ||
| scope 2 { | ||
| debug xref => _2; // in scope 2 at $DIR/reference_prop.rs:+2:9: +2:13 | ||
| let _3: *mut i32; // in scope 2 at $DIR/reference_prop.rs:+3:9: +3:13 | ||
| scope 3 { | ||
| debug xraw => _3; // in scope 3 at $DIR/reference_prop.rs:+3:9: +3:13 | ||
| let _6: &i32; // in scope 3 at $DIR/reference_prop.rs:+4:9: +4:13 | ||
| scope 4 { | ||
| debug xshr => _6; // in scope 4 at $DIR/reference_prop.rs:+4:9: +4:13 | ||
| let _7: i32; // in scope 4 at $DIR/reference_prop.rs:+6:9: +6:10 | ||
| scope 5 { | ||
| debug a => _7; // in scope 5 at $DIR/reference_prop.rs:+6:9: +6:10 | ||
| scope 6 { | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| bb0: { | ||
| StorageLive(_1); // scope 0 at $DIR/reference_prop.rs:+1:9: +1:14 | ||
| _1 = const 2_i32; // scope 0 at $DIR/reference_prop.rs:+1:17: +1:18 | ||
| - StorageLive(_2); // scope 1 at $DIR/reference_prop.rs:+2:9: +2:13 | ||
| _2 = &mut _1; // scope 1 at $DIR/reference_prop.rs:+2:16: +2:22 | ||
| StorageLive(_3); // scope 2 at $DIR/reference_prop.rs:+3:9: +3:13 | ||
| - StorageLive(_4); // scope 2 at $DIR/reference_prop.rs:+3:16: +3:36 | ||
| - StorageLive(_5); // scope 2 at $DIR/reference_prop.rs:+3:16: +3:26 | ||
| - _5 = &mut (*_2); // scope 2 at $DIR/reference_prop.rs:+3:16: +3:26 | ||
| - _4 = &raw mut (*_5); // scope 2 at $DIR/reference_prop.rs:+3:16: +3:26 | ||
| + _4 = &raw mut _1; // scope 2 at $DIR/reference_prop.rs:+3:16: +3:26 | ||
| _3 = _4; // scope 2 at $DIR/reference_prop.rs:+3:16: +3:36 | ||
| - StorageDead(_5); // scope 2 at $DIR/reference_prop.rs:+3:36: +3:37 | ||
| - StorageDead(_4); // scope 2 at $DIR/reference_prop.rs:+3:36: +3:37 | ||
| StorageLive(_6); // scope 3 at $DIR/reference_prop.rs:+4:9: +4:13 | ||
| - _6 = &(*_2); // scope 3 at $DIR/reference_prop.rs:+4:16: +4:22 | ||
| + _6 = &_1; // scope 3 at $DIR/reference_prop.rs:+4:16: +4:22 | ||
| StorageLive(_7); // scope 4 at $DIR/reference_prop.rs:+6:9: +6:10 | ||
| - _7 = (*_6); // scope 4 at $DIR/reference_prop.rs:+6:13: +6:18 | ||
| - StorageLive(_8); // scope 5 at $DIR/reference_prop.rs:+7:5: +7:26 | ||
| - (*_3) = const 4_i32; // scope 6 at $DIR/reference_prop.rs:+7:14: +7:23 | ||
| - _8 = const (); // scope 6 at $DIR/reference_prop.rs:+7:5: +7:26 | ||
| - StorageDead(_8); // scope 5 at $DIR/reference_prop.rs:+7:25: +7:26 | ||
| + _7 = _1; // scope 4 at $DIR/reference_prop.rs:+6:13: +6:18 | ||
| + _1 = const 4_i32; // scope 6 at $DIR/reference_prop.rs:+7:14: +7:23 | ||
| StorageLive(_9); // scope 5 at $DIR/reference_prop.rs:+8:6: +8:7 | ||
| _9 = _7; // scope 5 at $DIR/reference_prop.rs:+8:6: +8:7 | ||
| StorageLive(_10); // scope 5 at $DIR/reference_prop.rs:+8:9: +8:10 | ||
| _10 = _1; // scope 5 at $DIR/reference_prop.rs:+8:9: +8:10 | ||
| _0 = (move _9, move _10); // scope 5 at $DIR/reference_prop.rs:+8:5: +8:11 | ||
| StorageDead(_10); // scope 5 at $DIR/reference_prop.rs:+8:10: +8:11 | ||
| StorageDead(_9); // scope 5 at $DIR/reference_prop.rs:+8:10: +8:11 | ||
| StorageDead(_7); // scope 4 at $DIR/reference_prop.rs:+9:1: +9:2 | ||
| StorageDead(_6); // scope 3 at $DIR/reference_prop.rs:+9:1: +9:2 | ||
| StorageDead(_3); // scope 2 at $DIR/reference_prop.rs:+9:1: +9:2 | ||
| - StorageDead(_2); // scope 1 at $DIR/reference_prop.rs:+9:1: +9:2 | ||
| StorageDead(_1); // scope 0 at $DIR/reference_prop.rs:+9:1: +9:2 | ||
| return; // scope 0 at $DIR/reference_prop.rs:+9:2: +9:2 | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
tests/mir-opt/reference_prop.unique_with_copies.ReferencePropagation.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| - // MIR for `unique_with_copies` before ReferencePropagation | ||
| + // MIR for `unique_with_copies` after ReferencePropagation | ||
|
|
||
| fn unique_with_copies() -> () { | ||
| let mut _0: (); // return place in scope 0 at $DIR/reference_prop.rs:+0:25: +0:25 | ||
| let _1: *mut i32; // in scope 0 at $DIR/reference_prop.rs:+1:9: +1:10 | ||
| let mut _2: i32; // in scope 0 at $DIR/reference_prop.rs:+2:13: +2:18 | ||
| let _4: (); // in scope 0 at $DIR/reference_prop.rs:+5:18: +5:28 | ||
| let mut _5: i32; // in scope 0 at $DIR/reference_prop.rs:+5:25: +5:27 | ||
| let _6: (); // in scope 0 at $DIR/reference_prop.rs:+9:14: +9:24 | ||
| let mut _7: i32; // in scope 0 at $DIR/reference_prop.rs:+9:21: +9:23 | ||
| scope 1 { | ||
| debug y => _1; // in scope 1 at $DIR/reference_prop.rs:+1:9: +1:10 | ||
| scope 5 { | ||
| } | ||
| } | ||
| scope 2 { | ||
| debug a => _2; // in scope 2 at $DIR/reference_prop.rs:+2:13: +2:18 | ||
| let _3: *mut i32; // in scope 2 at $DIR/reference_prop.rs:+3:13: +3:14 | ||
| scope 3 { | ||
| debug x => _3; // in scope 3 at $DIR/reference_prop.rs:+3:13: +3:14 | ||
| scope 4 { | ||
| } | ||
| } | ||
| } | ||
|
|
||
| bb0: { | ||
| StorageLive(_1); // scope 0 at $DIR/reference_prop.rs:+1:9: +1:10 | ||
| StorageLive(_2); // scope 0 at $DIR/reference_prop.rs:+2:13: +2:18 | ||
| _2 = const 0_i32; // scope 0 at $DIR/reference_prop.rs:+2:21: +2:22 | ||
| - StorageLive(_3); // scope 2 at $DIR/reference_prop.rs:+3:13: +3:14 | ||
| _3 = &raw mut _2; // scope 2 at $DIR/reference_prop.rs:+3:17: +3:27 | ||
| StorageLive(_4); // scope 3 at $DIR/reference_prop.rs:+5:9: +5:30 | ||
| StorageLive(_5); // scope 4 at $DIR/reference_prop.rs:+5:25: +5:27 | ||
| _5 = (*_3); // scope 4 at $DIR/reference_prop.rs:+5:25: +5:27 | ||
| _4 = opaque::<i32>(move _5) -> bb1; // scope 4 at $DIR/reference_prop.rs:+5:18: +5:28 | ||
| // mir::Constant | ||
| // + span: $DIR/reference_prop.rs:452:18: 452:24 | ||
| // + literal: Const { ty: fn(i32) {opaque::<i32>}, val: Value(<ZST>) } | ||
| } | ||
|
|
||
| bb1: { | ||
| StorageDead(_5); // scope 4 at $DIR/reference_prop.rs:+5:27: +5:28 | ||
| StorageDead(_4); // scope 3 at $DIR/reference_prop.rs:+5:30: +5:31 | ||
| _1 = _3; // scope 3 at $DIR/reference_prop.rs:+6:9: +6:10 | ||
| - StorageDead(_3); // scope 2 at $DIR/reference_prop.rs:+7:5: +7:6 | ||
| StorageDead(_2); // scope 0 at $DIR/reference_prop.rs:+7:5: +7:6 | ||
| StorageLive(_6); // scope 1 at $DIR/reference_prop.rs:+9:5: +9:26 | ||
| StorageLive(_7); // scope 5 at $DIR/reference_prop.rs:+9:21: +9:23 | ||
| - _7 = (*_1); // scope 5 at $DIR/reference_prop.rs:+9:21: +9:23 | ||
| + _7 = (*_3); // scope 5 at $DIR/reference_prop.rs:+9:21: +9:23 | ||
| _6 = opaque::<i32>(move _7) -> bb2; // scope 5 at $DIR/reference_prop.rs:+9:14: +9:24 | ||
| // mir::Constant | ||
| // + span: $DIR/reference_prop.rs:456:14: 456:20 | ||
| // + literal: Const { ty: fn(i32) {opaque::<i32>}, val: Value(<ZST>) } | ||
| } | ||
|
|
||
| bb2: { | ||
| StorageDead(_7); // scope 5 at $DIR/reference_prop.rs:+9:23: +9:24 | ||
| StorageDead(_6); // scope 1 at $DIR/reference_prop.rs:+9:26: +9:27 | ||
| _0 = const (); // scope 0 at $DIR/reference_prop.rs:+0:25: +10:2 | ||
| StorageDead(_1); // scope 0 at $DIR/reference_prop.rs:+10:1: +10:2 | ||
| return; // scope 0 at $DIR/reference_prop.rs:+10:2: +10:2 | ||
| } | ||
| } | ||
|
|