diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_ty/needs_drop.rs | 6 | ||||
| -rw-r--r-- | src/test/mir-opt/generator-drop-cleanup.rs | 1 | ||||
| -rw-r--r-- | src/test/mir-opt/generator-drop-cleanup/rustc.main-{{closure}}.generator_drop.0.mir | 79 |
3 files changed, 57 insertions, 29 deletions
diff --git a/src/librustc_ty/needs_drop.rs b/src/librustc_ty/needs_drop.rs index 515cf6f2911..97994b465b5 100644 --- a/src/librustc_ty/needs_drop.rs +++ b/src/librustc_ty/needs_drop.rs @@ -99,13 +99,13 @@ where } } - ty::Generator(def_id, substs, _) => { + ty::Generator(_, substs, _) => { let substs = substs.as_generator(); - for upvar_ty in substs.upvar_tys(def_id, tcx) { + for upvar_ty in substs.upvar_tys() { queue_type(self, upvar_ty); } - let witness = substs.witness(def_id, tcx); + let witness = substs.witness(); let interior_tys = match &witness.kind { ty::GeneratorWitness(tys) => tcx.erase_late_bound_regions(tys), _ => bug!(), diff --git a/src/test/mir-opt/generator-drop-cleanup.rs b/src/test/mir-opt/generator-drop-cleanup.rs index 1c3025d5e3f..0cfc2c28cb2 100644 --- a/src/test/mir-opt/generator-drop-cleanup.rs +++ b/src/test/mir-opt/generator-drop-cleanup.rs @@ -6,6 +6,7 @@ // EMIT_MIR rustc.main-{{closure}}.generator_drop.0.mir fn main() { let gen = || { + let _s = String::new(); yield; }; } diff --git a/src/test/mir-opt/generator-drop-cleanup/rustc.main-{{closure}}.generator_drop.0.mir b/src/test/mir-opt/generator-drop-cleanup/rustc.main-{{closure}}.generator_drop.0.mir index 05ed0a641af..8cc90d01c34 100644 --- a/src/test/mir-opt/generator-drop-cleanup/rustc.main-{{closure}}.generator_drop.0.mir +++ b/src/test/mir-opt/generator-drop-cleanup/rustc.main-{{closure}}.generator_drop.0.mir @@ -1,53 +1,80 @@ // MIR for `main::{{closure}}#0` 0 generator_drop -// generator_layout = GeneratorLayout { field_tys: [], variant_fields: [[], [], [], []], storage_conflicts: BitMatrix { num_rows: 0, num_columns: 0, words: [], marker: PhantomData } } +// generator_layout = GeneratorLayout { field_tys: [std::string::String], variant_fields: [[], [], [], [_0]], storage_conflicts: BitMatrix { num_rows: 1, num_columns: 1, words: [1], marker: PhantomData } } -fn main::{{closure}}#0(_1: *mut [generator@$DIR/generator-drop-cleanup.rs:8:15: 10:6 {()}]) -> () { - let mut _0: (); // return place in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 - let mut _2: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 - let _3: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:9:9: 9:14 - let mut _4: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:9:9: 9:14 - let mut _5: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:18: 8:18 - let mut _6: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 - let mut _7: isize; // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 +fn main::{{closure}}#0(_1: *mut [generator@$DIR/generator-drop-cleanup.rs:8:15: 11:6 {std::string::String, ()}]) -> () { + let mut _0: (); // return place in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 + let mut _2: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 + let _3: std::string::String; // in scope 0 at $DIR/generator-drop-cleanup.rs:9:13: 9:15 + let _4: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:10:9: 10:14 + let mut _5: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:10:9: 10:14 + let mut _7: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:18: 8:18 + let mut _8: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 + let mut _9: isize; // in scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 + scope 1 { + debug _s => (((*_1) as variant#3).0: std::string::String); // in scope 1 at $DIR/generator-drop-cleanup.rs:9:13: 9:15 + } + scope 2 { + let mut _6: std::vec::Vec<u8>; // in scope 2 at $DIR/generator-drop-cleanup.rs:9:18: 9:31 + scope 3 { + } + } bb0: { - _7 = discriminant((*_1)); // bb0[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 - switchInt(move _7) -> [0u32: bb4, 3u32: bb7, otherwise: bb8]; // bb0[1]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 + _9 = discriminant((*_1)); // bb0[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 + switchInt(move _9) -> [0u32: bb7, 3u32: bb11, otherwise: bb12]; // bb0[1]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 } - bb1: { - StorageDead(_4); // bb1[0]: scope 0 at $DIR/generator-drop-cleanup.rs:9:13: 9:14 - StorageDead(_3); // bb1[1]: scope 0 at $DIR/generator-drop-cleanup.rs:9:14: 9:15 - goto -> bb5; // bb1[2]: scope 0 at $DIR/generator-drop-cleanup.rs:10:5: 10:6 + bb1 (cleanup): { + resume; // bb1[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 } - bb2: { - return; // bb2[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 + bb2 (cleanup): { + nop; // bb2[0]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6 + goto -> bb8; // bb2[1]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6 } bb3: { - return; // bb3[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 + StorageDead(_5); // bb3[0]: scope 1 at $DIR/generator-drop-cleanup.rs:10:13: 10:14 + StorageDead(_4); // bb3[1]: scope 1 at $DIR/generator-drop-cleanup.rs:10:14: 10:15 + 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 } bb4: { - goto -> bb6; // bb4[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 + nop; // bb4[0]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6 + goto -> bb9; // bb4[1]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6 } bb5: { - goto -> bb2; // bb5[0]: scope 0 at $DIR/generator-drop-cleanup.rs:10:5: 10:6 + return; // bb5[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 } bb6: { - goto -> bb3; // bb6[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 + return; // bb6[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 } bb7: { - StorageLive(_3); // bb7[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 - StorageLive(_4); // bb7[1]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 - goto -> bb1; // bb7[2]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 + goto -> bb10; // bb7[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 + } + + bb8 (cleanup): { + goto -> bb1; // bb8[0]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6 + } + + bb9: { + goto -> bb5; // bb9[0]: scope 0 at $DIR/generator-drop-cleanup.rs:11:5: 11:6 + } + + bb10: { + goto -> bb6; // bb10[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 + } + + bb11: { + StorageLive(_4); // bb11[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 + StorageLive(_5); // bb11[1]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 + goto -> bb3; // bb11[2]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 } - bb8: { - return; // bb8[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 10:6 + bb12: { + return; // bb12[0]: scope 0 at $DIR/generator-drop-cleanup.rs:8:15: 11:6 } } |