diff options
4 files changed, 10 insertions, 24 deletions
diff --git a/src/test/mir-opt/sroa.dropping.ScalarReplacementOfAggregates.diff b/src/test/mir-opt/sroa.dropping.ScalarReplacementOfAggregates.diff index 0cbd93ea460..eb88304466e 100644 --- a/src/test/mir-opt/sroa.dropping.ScalarReplacementOfAggregates.diff +++ b/src/test/mir-opt/sroa.dropping.ScalarReplacementOfAggregates.diff @@ -29,38 +29,22 @@ StorageDead(_4); // scope 0 at $DIR/sroa.rs:+1:29: +1:30 StorageDead(_3); // scope 0 at $DIR/sroa.rs:+1:29: +1:30 _1 = move (_2.1: Tag); // scope 0 at $DIR/sroa.rs:+1:5: +1:32 - drop(_1) -> [return: bb1, unwind: bb2]; // scope 0 at $DIR/sroa.rs:+1:32: +1:33 + drop(_1) -> bb1; // scope 0 at $DIR/sroa.rs:+1:32: +1:33 } bb1: { - drop((_2.0: Tag)) -> [return: bb6, unwind: bb5]; // scope 0 at $DIR/sroa.rs:+1:32: +1:33 + drop((_2.0: Tag)) -> bb3; // scope 0 at $DIR/sroa.rs:+1:32: +1:33 } - bb2 (cleanup): { - drop((_2.0: Tag)) -> bb7; // scope 0 at $DIR/sroa.rs:+1:32: +1:33 - } - - bb3 (cleanup): { - resume; // scope 0 at $DIR/sroa.rs:+0:1: +2:2 - } - - bb4: { + bb2: { StorageDead(_2); // scope 0 at $DIR/sroa.rs:+1:32: +1:33 StorageDead(_1); // scope 0 at $DIR/sroa.rs:+1:32: +1:33 _0 = const (); // scope 0 at $DIR/sroa.rs:+0:19: +2:2 return; // scope 0 at $DIR/sroa.rs:+2:2: +2:2 } - bb5 (cleanup): { - drop((_2.2: Tag)) -> bb3; // scope 0 at $DIR/sroa.rs:+1:32: +1:33 - } - - bb6: { - drop((_2.2: Tag)) -> [return: bb4, unwind: bb3]; // scope 0 at $DIR/sroa.rs:+1:32: +1:33 - } - - bb7 (cleanup): { - drop((_2.2: Tag)) -> bb3; // scope 0 at $DIR/sroa.rs:+1:32: +1:33 + bb3: { + drop((_2.2: Tag)) -> bb2; // scope 0 at $DIR/sroa.rs:+1:32: +1:33 } } diff --git a/src/test/mir-opt/sroa.escaping.ScalarReplacementOfAggregates.diff b/src/test/mir-opt/sroa.escaping.ScalarReplacementOfAggregates.diff index 917cccdcbee..64559b58f61 100644 --- a/src/test/mir-opt/sroa.escaping.ScalarReplacementOfAggregates.diff +++ b/src/test/mir-opt/sroa.escaping.ScalarReplacementOfAggregates.diff @@ -17,7 +17,7 @@ StorageLive(_5); // scope 0 at $DIR/sroa.rs:+2:34: +2:37 _5 = g() -> bb1; // scope 0 at $DIR/sroa.rs:+2:34: +2:37 // mir::Constant - // + span: $DIR/sroa.rs:76:34: 76:35 + // + span: $DIR/sroa.rs:78:34: 78:35 // + literal: Const { ty: fn() -> u32 {g}, val: Value(<ZST>) } } @@ -31,7 +31,7 @@ _2 = &raw const (*_3); // scope 0 at $DIR/sroa.rs:+2:7: +2:41 _1 = f(move _2) -> bb2; // scope 0 at $DIR/sroa.rs:+2:5: +2:42 // mir::Constant - // + span: $DIR/sroa.rs:76:5: 76:6 + // + span: $DIR/sroa.rs:78:5: 78:6 // + literal: Const { ty: fn(*const u32) {f}, val: Value(<ZST>) } } diff --git a/src/test/mir-opt/sroa.flat.ScalarReplacementOfAggregates.diff b/src/test/mir-opt/sroa.flat.ScalarReplacementOfAggregates.diff index cbae2506658..d4c04d5e68b 100644 --- a/src/test/mir-opt/sroa.flat.ScalarReplacementOfAggregates.diff +++ b/src/test/mir-opt/sroa.flat.ScalarReplacementOfAggregates.diff @@ -53,7 +53,7 @@ + _9 = move _6; // scope 0 at $DIR/sroa.rs:+1:30: +1:70 + _10 = const "a"; // scope 0 at $DIR/sroa.rs:+1:30: +1:70 // mir::Constant - // + span: $DIR/sroa.rs:55:52: 55:55 + // + span: $DIR/sroa.rs:57:52: 57:55 // + literal: Const { ty: &str, val: Value(Slice(..)) } - (_5.3: std::option::Option<isize>) = move _7; // scope 0 at $DIR/sroa.rs:+1:30: +1:70 + _11 = move _7; // scope 0 at $DIR/sroa.rs:+1:30: +1:70 diff --git a/src/test/mir-opt/sroa.rs b/src/test/mir-opt/sroa.rs index 32d0f120f02..ff8deb40d7d 100644 --- a/src/test/mir-opt/sroa.rs +++ b/src/test/mir-opt/sroa.rs @@ -1,4 +1,6 @@ // unit-test: ScalarReplacementOfAggregates +// compile-flags: -Cpanic=abort +// no-prefer-dynamic struct Tag(usize); |