./x.py test --bless

tmiasko · tmiasko · commit 2a7052439772 · 2023-02-23T14:05:03.000+01:00
diff --git a/tests/mir-opt/issue_41110.test.ElaborateDrops.diff b/tests/mir-opt/issue_41110.test.ElaborateDrops.diff
@@ -66,8 +66,7 @@
       }
   
       bb6 (cleanup): {
--         drop(_5) -> bb8;                 // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10
-+         goto -> bb8;                     // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10
+          drop(_5) -> bb8;                 // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10
       }
   
       bb7 (cleanup): {
@@ -91,7 +90,7 @@
 + 
 +     bb11 (cleanup): {
 +         _2 = move _5;                    // scope 2 at $DIR/issue_41110.rs:+4:5: +4:6
-+         goto -> bb6;                     // scope 2 at $DIR/issue_41110.rs:+4:5: +4:6
++         goto -> bb10;                    // scope 2 at $DIR/issue_41110.rs:+4:5: +4:6
 +     }
 + 
 +     bb12: {
diff --git a/tests/mir-opt/issue_41888.main.ElaborateDrops.diff b/tests/mir-opt/issue_41888.main.ElaborateDrops.diff
@@ -92,8 +92,7 @@
       }
   
       bb10 (cleanup): {
--         drop(_3) -> bb11;                // scope 1 at $DIR/issue_41888.rs:+3:19: +3:20
-+         goto -> bb11;                    // scope 1 at $DIR/issue_41888.rs:+3:19: +3:20
+          drop(_3) -> bb11;                // scope 1 at $DIR/issue_41888.rs:+3:19: +3:20
       }
   
       bb11 (cleanup): {
@@ -110,7 +109,7 @@
 +         _8 = const true;                 // scope 1 at $DIR/issue_41888.rs:+3:9: +3:10
 +         _9 = const true;                 // scope 1 at $DIR/issue_41888.rs:+3:9: +3:10
 +         _1 = move _3;                    // scope 1 at $DIR/issue_41888.rs:+3:9: +3:10
-+         goto -> bb10;                    // scope 1 at $DIR/issue_41888.rs:+3:9: +3:10
++         goto -> bb12;                    // scope 1 at $DIR/issue_41888.rs:+3:9: +3:10
 +     }
 + 
 +     bb14: {

Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,7 @@`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`bb6 (cleanup): {`
`69`		`-- drop(_5) -> bb8; // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10`
`70`		`-+ goto -> bb8; // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10`
	`69`	`+ drop(_5) -> bb8; // scope 2 at $DIR/issue_41110.rs:+4:9: +4:10`
`71`	`70`	`}`
`72`	`71`
`73`	`72`	`bb7 (cleanup): {`
`@@ -91,7 +90,7 @@`
`91`	`90`	`+`
`92`	`91`	`+ bb11 (cleanup): {`
`93`	`92`	`+ _2 = move _5; // scope 2 at $DIR/issue_41110.rs:+4:5: +4:6`
`94`		`-+ goto -> bb6; // scope 2 at $DIR/issue_41110.rs:+4:5: +4:6`
	`93`	`++ goto -> bb10; // scope 2 at $DIR/issue_41110.rs:+4:5: +4:6`
`95`	`94`	`+ }`
`96`	`95`	`+`
`97`	`96`	`+ bb12: {`
Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,7 @@`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`bb10 (cleanup): {`
`95`		`-- drop(_3) -> bb11; // scope 1 at $DIR/issue_41888.rs:+3:19: +3:20`
`96`		`-+ goto -> bb11; // scope 1 at $DIR/issue_41888.rs:+3:19: +3:20`
	`95`	`+ drop(_3) -> bb11; // scope 1 at $DIR/issue_41888.rs:+3:19: +3:20`
`97`	`96`	`}`
`98`	`97`
`99`	`98`	`bb11 (cleanup): {`
`@@ -110,7 +109,7 @@`
`110`	`109`	`+ _8 = const true; // scope 1 at $DIR/issue_41888.rs:+3:9: +3:10`
`111`	`110`	`+ _9 = const true; // scope 1 at $DIR/issue_41888.rs:+3:9: +3:10`
`112`	`111`	`+ _1 = move _3; // scope 1 at $DIR/issue_41888.rs:+3:9: +3:10`
`113`		`-+ goto -> bb10; // scope 1 at $DIR/issue_41888.rs:+3:9: +3:10`
	`112`	`++ goto -> bb12; // scope 1 at $DIR/issue_41888.rs:+3:9: +3:10`
`114`	`113`	`+ }`
`115`	`114`	`+`
`116`	`115`	`+ bb14: {`