Skip to content

Commit

Permalink
Ignore a test on wasm, because that changes landing pads
Browse files Browse the repository at this point in the history
  • Loading branch information
@oli-obk
oli-obk committed Jan 25, 2021
1 parent 03c6364 commit d38553c
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 37 deletions.
38 changes: 19 additions & 19 deletions src/test/mir-opt/inline/cycle.f.Inline.diff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,41 @@
+ // MIR for `f` after Inline

fn f(_1: impl Fn()) -> () {
debug g => _1; // in scope 0 at $DIR/cycle.rs:3:6: 3:7
let mut _0: (); // return place in scope 0 at $DIR/cycle.rs:3:20: 3:20
let _2: (); // in scope 0 at $DIR/cycle.rs:4:5: 4:8
let mut _3: &impl Fn(); // in scope 0 at $DIR/cycle.rs:4:5: 4:6
let mut _4: (); // in scope 0 at $DIR/cycle.rs:4:5: 4:8
debug g => _1; // in scope 0 at $DIR/cycle.rs:5:6: 5:7
let mut _0: (); // return place in scope 0 at $DIR/cycle.rs:5:20: 5:20
let _2: (); // in scope 0 at $DIR/cycle.rs:6:5: 6:8
let mut _3: &impl Fn(); // in scope 0 at $DIR/cycle.rs:6:5: 6:6
let mut _4: (); // in scope 0 at $DIR/cycle.rs:6:5: 6:8

bb0: {
StorageLive(_2); // scope 0 at $DIR/cycle.rs:4:5: 4:8
StorageLive(_3); // scope 0 at $DIR/cycle.rs:4:5: 4:6
_3 = &_1; // scope 0 at $DIR/cycle.rs:4:5: 4:6
StorageLive(_4); // scope 0 at $DIR/cycle.rs:4:5: 4:8
_2 = <impl Fn() as Fn<()>>::call(move _3, move _4) -> [return: bb1, unwind: bb3]; // scope 0 at $DIR/cycle.rs:4:5: 4:8
StorageLive(_2); // scope 0 at $DIR/cycle.rs:6:5: 6:8
StorageLive(_3); // scope 0 at $DIR/cycle.rs:6:5: 6:6
_3 = &_1; // scope 0 at $DIR/cycle.rs:6:5: 6:6
StorageLive(_4); // scope 0 at $DIR/cycle.rs:6:5: 6:8
_2 = <impl Fn() as Fn<()>>::call(move _3, move _4) -> [return: bb1, unwind: bb3]; // scope 0 at $DIR/cycle.rs:6:5: 6:8
// mir::Constant
// + span: $DIR/cycle.rs:4:5: 4:6
// + span: $DIR/cycle.rs:6:5: 6:6
// + literal: Const { ty: for<'r> extern "rust-call" fn(&'r impl Fn(), ()) -> <impl Fn() as std::ops::FnOnce<()>>::Output {<impl Fn() as std::ops::Fn<()>>::call}, val: Value(Scalar(<ZST>)) }
}

bb1: {
StorageDead(_4); // scope 0 at $DIR/cycle.rs:4:7: 4:8
StorageDead(_3); // scope 0 at $DIR/cycle.rs:4:7: 4:8
StorageDead(_2); // scope 0 at $DIR/cycle.rs:4:8: 4:9
_0 = const (); // scope 0 at $DIR/cycle.rs:3:20: 5:2
drop(_1) -> [return: bb2, unwind: bb4]; // scope 0 at $DIR/cycle.rs:5:1: 5:2
StorageDead(_4); // scope 0 at $DIR/cycle.rs:6:7: 6:8
StorageDead(_3); // scope 0 at $DIR/cycle.rs:6:7: 6:8
StorageDead(_2); // scope 0 at $DIR/cycle.rs:6:8: 6:9
_0 = const (); // scope 0 at $DIR/cycle.rs:5:20: 7:2
drop(_1) -> [return: bb2, unwind: bb4]; // scope 0 at $DIR/cycle.rs:7:1: 7:2
}

bb2: {
return; // scope 0 at $DIR/cycle.rs:5:2: 5:2
return; // scope 0 at $DIR/cycle.rs:7:2: 7:2
}

bb3 (cleanup): {
drop(_1) -> bb4; // scope 0 at $DIR/cycle.rs:5:1: 5:2
drop(_1) -> bb4; // scope 0 at $DIR/cycle.rs:7:1: 7:2
}

bb4 (cleanup): {
resume; // scope 0 at $DIR/cycle.rs:3:1: 5:2
resume; // scope 0 at $DIR/cycle.rs:5:1: 7:2
}
}

18 changes: 9 additions & 9 deletions src/test/mir-opt/inline/cycle.g.Inline.diff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
+ // MIR for `g` after Inline

fn g() -> () {
let mut _0: (); // return place in scope 0 at $DIR/cycle.rs:9:8: 9:8
let _1: (); // in scope 0 at $DIR/cycle.rs:10:5: 10:12
let mut _0: (); // return place in scope 0 at $DIR/cycle.rs:11:8: 11:8
let _1: (); // in scope 0 at $DIR/cycle.rs:12:5: 12:12

bb0: {
StorageLive(_1); // scope 0 at $DIR/cycle.rs:10:5: 10:12
_1 = f::<fn() {main}>(main) -> bb1; // scope 0 at $DIR/cycle.rs:10:5: 10:12
StorageLive(_1); // scope 0 at $DIR/cycle.rs:12:5: 12:12
_1 = f::<fn() {main}>(main) -> bb1; // scope 0 at $DIR/cycle.rs:12:5: 12:12
// mir::Constant
// + span: $DIR/cycle.rs:10:5: 10:6
// + span: $DIR/cycle.rs:12:5: 12:6
// + literal: Const { ty: fn(fn() {main}) {f::<fn() {main}>}, val: Value(Scalar(<ZST>)) }
// mir::Constant
// + span: $DIR/cycle.rs:10:7: 10:11
// + span: $DIR/cycle.rs:12:7: 12:11
// + literal: Const { ty: fn() {main}, val: Value(Scalar(<ZST>)) }
}

bb1: {
StorageDead(_1); // scope 0 at $DIR/cycle.rs:10:12: 10:13
_0 = const (); // scope 0 at $DIR/cycle.rs:9:8: 11:2
return; // scope 0 at $DIR/cycle.rs:11:2: 11:2
StorageDead(_1); // scope 0 at $DIR/cycle.rs:12:12: 12:13
_0 = const (); // scope 0 at $DIR/cycle.rs:11:8: 13:2
return; // scope 0 at $DIR/cycle.rs:13:2: 13:2
}
}

18 changes: 9 additions & 9 deletions src/test/mir-opt/inline/cycle.main.Inline.diff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,24 @@
+ // MIR for `main` after Inline

fn main() -> () {
let mut _0: (); // return place in scope 0 at $DIR/cycle.rs:14:11: 14:11
let _1: (); // in scope 0 at $DIR/cycle.rs:15:5: 15:9
let mut _0: (); // return place in scope 0 at $DIR/cycle.rs:16:11: 16:11
let _1: (); // in scope 0 at $DIR/cycle.rs:17:5: 17:9

bb0: {
StorageLive(_1); // scope 0 at $DIR/cycle.rs:15:5: 15:9
_1 = f::<fn() {g}>(g) -> bb1; // scope 0 at $DIR/cycle.rs:15:5: 15:9
StorageLive(_1); // scope 0 at $DIR/cycle.rs:17:5: 17:9
_1 = f::<fn() {g}>(g) -> bb1; // scope 0 at $DIR/cycle.rs:17:5: 17:9
// mir::Constant
// + span: $DIR/cycle.rs:15:5: 15:6
// + span: $DIR/cycle.rs:17:5: 17:6
// + literal: Const { ty: fn(fn() {g}) {f::<fn() {g}>}, val: Value(Scalar(<ZST>)) }
// mir::Constant
// + span: $DIR/cycle.rs:15:7: 15:8
// + span: $DIR/cycle.rs:17:7: 17:8
// + literal: Const { ty: fn() {g}, val: Value(Scalar(<ZST>)) }
}

bb1: {
StorageDead(_1); // scope 0 at $DIR/cycle.rs:15:9: 15:10
_0 = const (); // scope 0 at $DIR/cycle.rs:14:11: 16:2
return; // scope 0 at $DIR/cycle.rs:16:2: 16:2
StorageDead(_1); // scope 0 at $DIR/cycle.rs:17:9: 17:10
_0 = const (); // scope 0 at $DIR/cycle.rs:16:11: 18:2
return; // scope 0 at $DIR/cycle.rs:18:2: 18:2
}
}

2 changes: 2 additions & 0 deletions src/test/mir-opt/inline/cycle.rs
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// ignore-wasm32-bare compiled with panic=abort by default

// EMIT_MIR cycle.f.Inline.diff
#[inline(always)]
fn f(g: impl Fn()) {
Expand Down

0 comments on commit d38553c

Please sign in to comment.