Temp: More test changes

Author: matthewjasper

src/test/codegen/drop.rs

@@ -23,13 +23,13 @@ pub fn droppy() {
 // FIXME(eddyb) the `void @` forces a match on the instruction, instead of the
 // comment, that's `; call core::ptr::real_drop_in_place::<drop::SomeUniqueName>`
 // for the `v0` mangling, should switch to matching on that once `legacy` is gone.
+// CHECK-NOT: call void @{{.*}}drop_in_place{{.*}}SomeUniqueName
+// CHECK: invoke void @{{.*}}drop_in_place{{.*}}SomeUniqueName
+// CHECK: invoke void @{{.*}}drop_in_place{{.*}}SomeUniqueName
 // CHECK-NOT: invoke void @{{.*}}drop_in_place{{.*}}SomeUniqueName
 // CHECK: call void @{{.*}}drop_in_place{{.*}}SomeUniqueName
 // CHECK: call void @{{.*}}drop_in_place{{.*}}SomeUniqueName
-// CHECK-NOT: call void @{{.*}}drop_in_place{{.*}}SomeUniqueName
-// CHECK: invoke void @{{.*}}drop_in_place{{.*}}SomeUniqueName
 // CHECK: call void @{{.*}}drop_in_place{{.*}}SomeUniqueName
-// CHECK: invoke void @{{.*}}drop_in_place{{.*}}SomeUniqueName
 // CHECK: call void @{{.*}}drop_in_place{{.*}}SomeUniqueName
 // CHECK-NOT: {{(call|invoke) void @.*}}drop_in_place{{.*}}SomeUniqueName
 // The next line checks for the } that ends the function definition

src/test/mir-opt/generator-storage-dead-unwind.rs

@@ -54,60 +54,60 @@ fn main() {
 //     StorageLive(_6);
 //     StorageLive(_7);
 //     _7 = move _2;
-//     _6 = const take::<Foo>(move _7) -> [return: bb2, unwind: bb11];
+//     _6 = const take::<Foo>(move _7) -> [return: bb2, unwind: bb9];
 // }
 // bb2: {
 //     StorageDead(_7);
 //     StorageDead(_6);
 //     StorageLive(_8);
 //     StorageLive(_9);
 //     _9 = move _3;
-//     _8 = const take::<Bar>(move _9) -> [return: bb3, unwind: bb10];
+//     _8 = const take::<Bar>(move _9) -> [return: bb3, unwind: bb8];
 // }
 // bb3: {
 //     StorageDead(_9);
 //     StorageDead(_8);
 //     ...
 //     StorageDead(_3);
 //     StorageDead(_2);
-//     drop(_1) -> [return: bb4, unwind: bb9];
+//     drop(_1) -> [return: bb4, unwind: bb11];
 // }
 // bb4: {
 //     return;
 // }
 // bb5: {
 //     ...
 //     StorageDead(_3);
-//     drop(_2) -> [return: bb6, unwind: bb8];
+//     drop(_2) -> [return: bb6, unwind: bb12];
 // }
 // bb6: {
 //     StorageDead(_2);
-//     drop(_1) -> [return: bb7, unwind: bb9];
+//     drop(_1) -> [return: bb7, unwind: bb11];
 // }
 // bb7: {
 //     generator_drop;
 // }
 // bb8 (cleanup): {
-//     StorageDead(_2);
-//     drop(_1) -> bb9;
+//     StorageDead(_9);
+//     StorageDead(_8);
+//     goto -> bb10;
 // }
 // bb9 (cleanup): {
-//     resume;
+//     StorageDead(_7);
+//     StorageDead(_6);
+//     goto -> bb10;
 // }
 // bb10 (cleanup): {
-//     StorageDead(_9);
-//     StorageDead(_8);
-//     goto -> bb12;
+//     StorageDead(_3);
+//     StorageDead(_2);
+//     drop(_1) -> bb11;
 // }
 // bb11 (cleanup): {
-//     StorageDead(_7);
-//     StorageDead(_6);
-//     goto -> bb12;
+//     resume;
 // }
 // bb12 (cleanup): {
-//     StorageDead(_3);
 //     StorageDead(_2);
-//     drop(_1) -> bb9;
+//     drop(_1) -> bb11;
 // }
 
 // END rustc.main-{{closure}}.StateTransform.before.mir