mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix mir-opt NLL tests -- variable '_#0r is now 'static

Browse Source
This commit is contained in:
Niko Matsakis 2017-11-07 06:16:09 -05:00
parent 9da54c1ac8
commit 8cea0539d1
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/mir-opt/nll/named-lifetimes-basic.rs
View File

@ -26,9 +26,9 @@ fn main() {
// END RUST SOURCE
// START rustc.use_x.nll.0.mir
// | '_#0r: {bb0[0], bb0[1], '_#0r}
// | '_#1r: {bb0[0], bb0[1], '_#0r, '_#1r}
// | '_#2r: {bb0[0], bb0[1], '_#2r}
// ...
// fn use_x(_1: &'_#0r mut i32, _2: &'_#1r u32, _3: &'_#0r u32, _4: &'_#2r u32) -> bool {
// | '_#0r: {bb0[0], bb0[1], '_#0r, '_#1r, '_#2r, '_#3r}
// | '_#1r: {bb0[0], bb0[1], '_#1r}
// | '_#2r: {bb0[0], bb0[1], '_#1r, '_#2r}
// | '_#3r: {bb0[0], bb0[1], '_#3r}
// fn use_x(_1: &'_#1r mut i32, _2: &'_#2r u32, _3: &'_#1r u32, _4: &'_#3r u32) -> bool {
// END rustc.use_x.nll.0.mir

8
src/test/mir-opt/nll/reborrow-basic.rs
View File

@ -28,12 +28,12 @@ fn main() {
// END RUST SOURCE
// START rustc.main.nll.0.mir
// | '_#5r: {bb0[6], bb0[7], bb0[8], bb0[9], bb0[10], bb0[11], bb0[12], bb0[13], bb0[14]}
// | '_#6r: {bb0[6], bb0[7], bb0[8], bb0[9], bb0[10], bb0[11], bb0[12], bb0[13], bb0[14]}
// ...
// | '_#7r: {bb0[11], bb0[12], bb0[13], bb0[14]}
// | '_#8r: {bb0[11], bb0[12], bb0[13], bb0[14]}
// END rustc.main.nll.0.mir
// START rustc.main.nll.0.mir
// let _2: &'_#5r mut i32;
// let _2: &'_#6r mut i32;
// ...
// let _4: &'_#7r mut i32;
// let _4: &'_#8r mut i32;
// END rustc.main.nll.0.mir

6
src/test/mir-opt/nll/region-liveness-basic.rs
View File

@ -31,15 +31,15 @@ fn main() {
// END RUST SOURCE
// START rustc.main.nll.0.mir
// | '_#0r: {bb1[1], bb2[0], bb2[1]}
// | '_#1r: {bb1[1], bb2[0], bb2[1]}
// | '_#2r: {bb1[1], bb2[0], bb2[1]}
// ...
// let _2: &'_#1r usize;
// let _2: &'_#2r usize;
// END rustc.main.nll.0.mir
// START rustc.main.nll.0.mir
// bb1: {
// | Live variables at bb1[0]: [_1, _3]
// _2 = &'_#0r _1[_3];
// _2 = &'_#1r _1[_3];
// | Live variables at bb1[1]: [_2]
// switchInt(const true) -> [0u8: bb3, otherwise: bb2];
// }

2
src/test/mir-opt/nll/region-liveness-drop-may-dangle.rs
View File

@ -44,5 +44,5 @@ fn drop(&mut self) { }
// END RUST SOURCE
// START rustc.main.nll.0.mir
// | '_#4r: {bb1[3], bb1[4], bb1[5], bb2[0], bb2[1]}
// | '_#5r: {bb1[3], bb1[4], bb1[5], bb2[0], bb2[1]}
// END rustc.main.nll.0.mir

2
src/test/mir-opt/nll/region-liveness-drop-no-may-dangle.rs
View File

@ -46,5 +46,5 @@ fn drop(&mut self) { }
// END RUST SOURCE
// START rustc.main.nll.0.mir
// | '_#4r: {bb1[3], bb1[4], bb1[5], bb2[0], bb2[1], bb2[2], bb3[0], bb3[1], bb3[2], bb4[0], bb4[1], bb4[2], bb6[0], bb7[0], bb7[1], bb7[2], bb8[0]}
// | '_#5r: {bb1[3], bb1[4], bb1[5], bb2[0], bb2[1], bb2[2], bb3[0], bb3[1], bb3[2], bb4[0], bb4[1], bb4[2], bb6[0], bb7[0], bb7[1], bb7[2], bb8[0]}
// END rustc.main.nll.0.mir

12
src/test/mir-opt/nll/region-liveness-two-disjoint-uses.rs
View File

@ -36,14 +36,14 @@ fn main() {
// END RUST SOURCE
// START rustc.main.nll.0.mir
// | '_#0r: {bb1[1], bb2[0], bb2[1]}
// | '_#1r: {bb1[1], bb2[0], bb2[1]}
// ...
// | '_#2r: {bb7[2], bb7[3], bb7[4]}
// | '_#3r: {bb1[1], bb2[0], bb2[1], bb7[2], bb7[3], bb7[4]}
// | '_#3r: {bb7[2], bb7[3], bb7[4]}
// | '_#4r: {bb1[1], bb2[0], bb2[1], bb7[2], bb7[3], bb7[4]}
// ...
// let mut _2: &'_#3r usize;
// let mut _2: &'_#4r usize;
// ...
// _2 = &'_#0r _1[_3];
// _2 = &'_#1r _1[_3];
// ...
// _2 = &'_#2r (*_11);
// _2 = &'_#3r (*_11);
// END rustc.main.nll.0.mir

10
src/test/mir-opt/nll/region-subtyping-basic.rs
View File

@ -32,16 +32,16 @@ fn main() {
// END RUST SOURCE
// START rustc.main.nll.0.mir
// | '_#0r: {bb1[1], bb1[2], bb1[3], bb1[4], bb1[5], bb1[6], bb2[0], bb2[1]}
// | '_#1r: {bb1[1], bb1[2], bb1[3], bb1[4], bb1[5], bb1[6], bb2[0], bb2[1]}
// | '_#2r: {bb1[5], bb1[6], bb2[0], bb2[1]}
// | '_#2r: {bb1[1], bb1[2], bb1[3], bb1[4], bb1[5], bb1[6], bb2[0], bb2[1]}
// | '_#3r: {bb1[5], bb1[6], bb2[0], bb2[1]}
// END rustc.main.nll.0.mir
// START rustc.main.nll.0.mir
// let _2: &'_#1r usize;
// let _2: &'_#2r usize;
// ...
// let _6: &'_#2r usize;
// let _6: &'_#3r usize;
// ...
// _2 = &'_#0r _1[_3];
// _2 = &'_#1r _1[_3];
// ...
// _7 = _2;
// ...