Skip to content

Commit 7bbdd2d

Browse files
jonas-schievinkjonas-schievink
committed
Adjust mir-opt test and make it drop something
1 parent 50c1c29 commit 7bbdd2d

File tree

3 files changed

+57
-29
lines changed

3 files changed

+57
-29
lines changed

‎src/librustc_ty/needs_drop.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ where
9999
}
100100
}
101101

102-
ty::Generator(def_id, substs, _) => {
102+
ty::Generator(_, substs, _) => {
103103
let substs = substs.as_generator();
104-
for upvar_ty in substs.upvar_tys(def_id, tcx) {
104+
for upvar_ty in substs.upvar_tys() {
105105
queue_type(self, upvar_ty);
106106
}
107107

108-
let witness = substs.witness(def_id, tcx);
108+
let witness = substs.witness();
109109
let interior_tys = match &witness.kind {
110110
ty::GeneratorWitness(tys) => tcx.erase_late_bound_regions(tys),
111111
_ => bug!(),

‎src/test/mir-opt/generator-drop-cleanup.rs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// EMIT_MIR rustc.main-{{closure}}.generator_drop.0.mir
77
fn main() {
88
let gen = || {
9+
let _s = String::new();
910
yield;
1011
};
1112
}

‎src/test/mir-opt/generator-drop-cleanup/rustc.main-{{closure}}.generator_drop.0.mir

+53-26
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,80 @@
11
// MIR for `main::{{closure}}#0` 0 generator_drop
2-
// generator_layout = GeneratorLayout { field_tys: [], variant_fields: [[], [], [], []], storage_conflicts: BitMatrix { num_rows: 0, num_columns: 0, words: [], marker: PhantomData } }
2+
// generator_layout = GeneratorLayout { field_tys: [std::string::String], variant_fields: [[], [], [], [_0]], storage_conflicts: BitMatrix { num_rows: 1, num_columns: 1, words: [1], marker: PhantomData } }
33

4-
fn main::{{closure}}#0(_1: *mut [generator@$DIR/generator-drop-cleanup.rs:8:15: 10:6 {()}]) -> () {
5-
let mut _0: (); // return place in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
6-
let mut _2: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
7-
let _3: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:9:9: 9:14
8-
let mut _4: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:9:9: 9:14
9-
let mut _5: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:18: 8:18
10-
let mut _6: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
11-
let mut _7: isize; // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
4+
fn main::{{closure}}#0(_1: *mut [generator@$DIR/generator-drop-cleanup.rs:8:15: 11:6 {std::string::String, ()}]) -> () {
5+
let mut _0: (); // return place in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
6+
let mut _2: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
7+
let _3: std::string::String; // in scope 0 at $DIR/generator-drop-cleanup.rs:9:13: 9:15
8+
let _4: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:10:9: 10:14
9+
let mut _5: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:10:9: 10:14
10+
let mut _7: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:18: 8:18
11+
let mut _8: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
12+
let mut _9: isize; // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
13+
scope 1 {
14+
debug _s => (((*_1) as variant#3).0: std::string::String); // in scope 1 at $DIR/generator-drop-cleanup.rs:9:13: 9:15
15+
}
16+
scope 2 {
17+
let mut _6: std::vec::Vec<u8>; // in scope 2 at $DIR/generator-drop-cleanup.rs:9:18: 9:31
18+
scope 3 {
19+
}
20+
}
1221

1322
bb0: {
14-
_7 = discriminant((*_1)); // bb0[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
15-
switchInt(move _7) -> [0u32: bb4, 3u32: bb7, otherwise: bb8]; // bb0[1]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
23+
_9 = discriminant((*_1)); // bb0[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
24+
switchInt(move _9) -> [0u32: bb7, 3u32: bb11, otherwise: bb12]; // bb0[1]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
1625
}
1726

18-
bb1: {
19-
StorageDead(_4); // bb1[0]: scope 0 at $DIR/generator-drop-cleanup.rs:9:13: 9:14
20-
StorageDead(_3); // bb1[1]: scope 0 at $DIR/generator-drop-cleanup.rs:9:14: 9:15
21-
goto -> bb5; // bb1[2]: scope 0 at $DIR/generator-drop-cleanup.rs:10:5: 10:6
27+
bb1 (cleanup): {
28+
resume; // bb1[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
2229
}
2330

24-
bb2: {
25-
return; // bb2[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
31+
bb2 (cleanup): {
32+
nop; // bb2[0]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6
33+
goto -> bb8; // bb2[1]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6
2634
}
2735

2836
bb3: {
29-
return; // bb3[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
37+
StorageDead(_5); // bb3[0]: scope 1 at $DIR/generator-drop-cleanup.rs:10:13: 10:14
38+
StorageDead(_4); // bb3[1]: scope 1 at $DIR/generator-drop-cleanup.rs:10:14: 10:15
39+
drop((((*_1) as variant#3).0: std::string::String)) -> [return: bb4, unwind: bb2]; // bb3[2]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6
3040
}
3141

3242
bb4: {
33-
goto -> bb6; // bb4[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
43+
nop; // bb4[0]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6
44+
goto -> bb9; // bb4[1]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6
3445
}
3546

3647
bb5: {
37-
goto -> bb2; // bb5[0]: scope 0 at $DIR/generator-drop-cleanup.rs:10:5: 10:6
48+
return; // bb5[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
3849
}
3950

4051
bb6: {
41-
goto -> bb3; // bb6[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
52+
return; // bb6[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
4253
}
4354

4455
bb7: {
45-
StorageLive(_3); // bb7[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
46-
StorageLive(_4); // bb7[1]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
47-
goto -> bb1; // bb7[2]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
56+
goto -> bb10; // bb7[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
57+
}
58+
59+
bb8 (cleanup): {
60+
goto -> bb1; // bb8[0]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6
61+
}
62+
63+
bb9: {
64+
goto -> bb5; // bb9[0]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6
65+
}
66+
67+
bb10: {
68+
goto -> bb6; // bb10[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
69+
}
70+
71+
bb11: {
72+
StorageLive(_4); // bb11[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
73+
StorageLive(_5); // bb11[1]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
74+
goto -> bb3; // bb11[2]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
4875
}
4976

50-
bb8: {
51-
return; // bb8[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6
77+
bb12: {
78+
return; // bb12[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6
5279
}
5380
}

0 commit comments

Comments
 (0)