Skip to content

Commit 05f84c6

Browse files
simonvandelsimonvandel
committed
Ignore test on wasm as it does not unwind
1 parent ff24163 commit 05f84c6

5 files changed

+47
-46
lines changed

‎src/test/mir-opt/remove_unneeded_drops.cannot_opt_generic.RemoveUnneededDrops.diff

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
+ // MIR for `cannot_opt_generic` after RemoveUnneededDrops
33

44
fn cannot_opt_generic(_1: T) -> () {
5-
debug x => _1; // in scope 0 at $DIR/remove_unneeded_drops.rs:19:26: 19:27
6-
let mut _0: (); // return place in scope 0 at $DIR/remove_unneeded_drops.rs:19:32: 19:32
7-
let _2: (); // in scope 0 at $DIR/remove_unneeded_drops.rs:20:5: 20:12
8-
let mut _3: T; // in scope 0 at $DIR/remove_unneeded_drops.rs:20:10: 20:11
5+
debug x => _1; // in scope 0 at $DIR/remove_unneeded_drops.rs:20:26: 20:27
6+
let mut _0: (); // return place in scope 0 at $DIR/remove_unneeded_drops.rs:20:32: 20:32
7+
let _2: (); // in scope 0 at $DIR/remove_unneeded_drops.rs:21:5: 21:12
8+
let mut _3: T; // in scope 0 at $DIR/remove_unneeded_drops.rs:21:10: 21:11
99
scope 1 {
1010
debug _x => _3; // in scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1111
}
1212

1313
bb0: {
14-
StorageLive(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:20:5: 20:12
15-
StorageLive(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:20:10: 20:11
16-
_3 = move _1; // scope 0 at $DIR/remove_unneeded_drops.rs:20:10: 20:11
14+
StorageLive(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:21:5: 21:12
15+
StorageLive(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:21:10: 21:11
16+
_3 = move _1; // scope 0 at $DIR/remove_unneeded_drops.rs:21:10: 21:11
1717
_2 = const (); // scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1818
drop(_3) -> [return: bb2, unwind: bb1]; // scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1919
}
2020

2121
bb1 (cleanup): {
22-
resume; // scope 0 at $DIR/remove_unneeded_drops.rs:19:1: 21:2
22+
resume; // scope 0 at $DIR/remove_unneeded_drops.rs:20:1: 22:2
2323
}
2424

2525
bb2: {
26-
StorageDead(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:20:11: 20:12
27-
StorageDead(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:20:12: 20:13
28-
_0 = const (); // scope 0 at $DIR/remove_unneeded_drops.rs:19:32: 21:2
29-
return; // scope 0 at $DIR/remove_unneeded_drops.rs:21:2: 21:2
26+
StorageDead(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:21:11: 21:12
27+
StorageDead(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:21:12: 21:13
28+
_0 = const (); // scope 0 at $DIR/remove_unneeded_drops.rs:20:32: 22:2
29+
return; // scope 0 at $DIR/remove_unneeded_drops.rs:22:2: 22:2
3030
}
3131
}
3232

‎src/test/mir-opt/remove_unneeded_drops.dont_opt.RemoveUnneededDrops.diff

+12-12
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
+ // MIR for `dont_opt` after RemoveUnneededDrops
33

44
fn dont_opt(_1: Vec<bool>) -> () {
5-
debug x => _1; // in scope 0 at $DIR/remove_unneeded_drops.rs:7:13: 7:14
6-
let mut _0: (); // return place in scope 0 at $DIR/remove_unneeded_drops.rs:7:27: 7:27
7-
let _2: (); // in scope 0 at $DIR/remove_unneeded_drops.rs:8:5: 8:12
8-
let mut _3: std::vec::Vec<bool>; // in scope 0 at $DIR/remove_unneeded_drops.rs:8:10: 8:11
5+
debug x => _1; // in scope 0 at $DIR/remove_unneeded_drops.rs:8:13: 8:14
6+
let mut _0: (); // return place in scope 0 at $DIR/remove_unneeded_drops.rs:8:27: 8:27
7+
let _2: (); // in scope 0 at $DIR/remove_unneeded_drops.rs:9:5: 9:12
8+
let mut _3: std::vec::Vec<bool>; // in scope 0 at $DIR/remove_unneeded_drops.rs:9:10: 9:11
99
scope 1 {
1010
debug _x => _3; // in scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1111
}
1212

1313
bb0: {
14-
StorageLive(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:8:5: 8:12
15-
StorageLive(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:8:10: 8:11
16-
_3 = move _1; // scope 0 at $DIR/remove_unneeded_drops.rs:8:10: 8:11
14+
StorageLive(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:9:5: 9:12
15+
StorageLive(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:9:10: 9:11
16+
_3 = move _1; // scope 0 at $DIR/remove_unneeded_drops.rs:9:10: 9:11
1717
_2 = const (); // scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1818
drop(_3) -> [return: bb2, unwind: bb1]; // scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1919
}
2020

2121
bb1 (cleanup): {
22-
resume; // scope 0 at $DIR/remove_unneeded_drops.rs:7:1: 9:2
22+
resume; // scope 0 at $DIR/remove_unneeded_drops.rs:8:1: 10:2
2323
}
2424

2525
bb2: {
26-
StorageDead(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:8:11: 8:12
27-
StorageDead(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:8:12: 8:13
28-
_0 = const (); // scope 0 at $DIR/remove_unneeded_drops.rs:7:27: 9:2
29-
return; // scope 0 at $DIR/remove_unneeded_drops.rs:9:2: 9:2
26+
StorageDead(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:9:11: 9:12
27+
StorageDead(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:9:12: 9:13
28+
_0 = const (); // scope 0 at $DIR/remove_unneeded_drops.rs:8:27: 10:2
29+
return; // scope 0 at $DIR/remove_unneeded_drops.rs:10:2: 10:2
3030
}
3131
}
3232

‎src/test/mir-opt/remove_unneeded_drops.opt.RemoveUnneededDrops.diff

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
+ // MIR for `opt` after RemoveUnneededDrops
33

44
fn opt(_1: bool) -> () {
5-
debug x => _1; // in scope 0 at $DIR/remove_unneeded_drops.rs:2:8: 2:9
6-
let mut _0: (); // return place in scope 0 at $DIR/remove_unneeded_drops.rs:2:17: 2:17
7-
let _2: (); // in scope 0 at $DIR/remove_unneeded_drops.rs:3:5: 3:12
8-
let mut _3: bool; // in scope 0 at $DIR/remove_unneeded_drops.rs:3:10: 3:11
5+
debug x => _1; // in scope 0 at $DIR/remove_unneeded_drops.rs:3:8: 3:9
6+
let mut _0: (); // return place in scope 0 at $DIR/remove_unneeded_drops.rs:3:17: 3:17
7+
let _2: (); // in scope 0 at $DIR/remove_unneeded_drops.rs:4:5: 4:12
8+
let mut _3: bool; // in scope 0 at $DIR/remove_unneeded_drops.rs:4:10: 4:11
99
scope 1 {
1010
debug _x => _3; // in scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1111
}
1212

1313
bb0: {
14-
StorageLive(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:3:5: 3:12
15-
StorageLive(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:3:10: 3:11
16-
_3 = _1; // scope 0 at $DIR/remove_unneeded_drops.rs:3:10: 3:11
14+
StorageLive(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:4:5: 4:12
15+
StorageLive(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:4:10: 4:11
16+
_3 = _1; // scope 0 at $DIR/remove_unneeded_drops.rs:4:10: 4:11
1717
_2 = const (); // scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1818
- drop(_3) -> bb1; // scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1919
- }
2020
-
2121
- bb1: {
22-
StorageDead(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:3:11: 3:12
23-
StorageDead(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:3:12: 3:13
24-
_0 = const (); // scope 0 at $DIR/remove_unneeded_drops.rs:2:17: 4:2
25-
return; // scope 0 at $DIR/remove_unneeded_drops.rs:4:2: 4:2
22+
StorageDead(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:4:11: 4:12
23+
StorageDead(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:4:12: 4:13
24+
_0 = const (); // scope 0 at $DIR/remove_unneeded_drops.rs:3:17: 5:2
25+
return; // scope 0 at $DIR/remove_unneeded_drops.rs:5:2: 5:2
2626
}
2727
}
2828

‎src/test/mir-opt/remove_unneeded_drops.opt_generic_copy.RemoveUnneededDrops.diff

+11-11
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
+ // MIR for `opt_generic_copy` after RemoveUnneededDrops
33

44
fn opt_generic_copy(_1: T) -> () {
5-
debug x => _1; // in scope 0 at $DIR/remove_unneeded_drops.rs:12:30: 12:31
6-
let mut _0: (); // return place in scope 0 at $DIR/remove_unneeded_drops.rs:12:36: 12:36
7-
let _2: (); // in scope 0 at $DIR/remove_unneeded_drops.rs:13:5: 13:12
8-
let mut _3: T; // in scope 0 at $DIR/remove_unneeded_drops.rs:13:10: 13:11
5+
debug x => _1; // in scope 0 at $DIR/remove_unneeded_drops.rs:13:30: 13:31
6+
let mut _0: (); // return place in scope 0 at $DIR/remove_unneeded_drops.rs:13:36: 13:36
7+
let _2: (); // in scope 0 at $DIR/remove_unneeded_drops.rs:14:5: 14:12
8+
let mut _3: T; // in scope 0 at $DIR/remove_unneeded_drops.rs:14:10: 14:11
99
scope 1 {
1010
debug _x => _3; // in scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1111
}
1212

1313
bb0: {
14-
StorageLive(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:13:5: 13:12
15-
StorageLive(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:13:10: 13:11
16-
_3 = _1; // scope 0 at $DIR/remove_unneeded_drops.rs:13:10: 13:11
14+
StorageLive(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:14:5: 14:12
15+
StorageLive(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:14:10: 14:11
16+
_3 = _1; // scope 0 at $DIR/remove_unneeded_drops.rs:14:10: 14:11
1717
_2 = const (); // scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1818
- drop(_3) -> bb1; // scope 1 at $SRC_DIR/core/src/mem/mod.rs:LL:COL
1919
- }
2020
-
2121
- bb1: {
22-
StorageDead(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:13:11: 13:12
23-
StorageDead(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:13:12: 13:13
24-
_0 = const (); // scope 0 at $DIR/remove_unneeded_drops.rs:12:36: 14:2
25-
return; // scope 0 at $DIR/remove_unneeded_drops.rs:14:2: 14:2
22+
StorageDead(_3); // scope 0 at $DIR/remove_unneeded_drops.rs:14:11: 14:12
23+
StorageDead(_2); // scope 0 at $DIR/remove_unneeded_drops.rs:14:12: 14:13
24+
_0 = const (); // scope 0 at $DIR/remove_unneeded_drops.rs:13:36: 15:2
25+
return; // scope 0 at $DIR/remove_unneeded_drops.rs:15:2: 15:2
2626
}
2727
}
2828

‎src/test/mir-opt/remove_unneeded_drops.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// ignore-wasm32-bare compiled with panic=abort by default
12
// EMIT_MIR remove_unneeded_drops.opt.RemoveUnneededDrops.diff
23
fn opt(x: bool) {
34
drop(x);

0 commit comments

Comments
 (0)