From c6817ffb2cadae7f80414e13d99e89ec83db9a77 Mon Sep 17 00:00:00 2001 From: Amanieu d'Antras Date: Tue, 31 Mar 2020 23:41:45 +0100 Subject: [PATCH] Fix test --- src/test/mir-opt/generator-tiny.rs | 1 + ...tc.main-{{closure}}.generator_resume.0.mir | 82 +++++++++---------- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/src/test/mir-opt/generator-tiny.rs b/src/test/mir-opt/generator-tiny.rs index 80a34395ef1..c86e2865ca8 100644 --- a/src/test/mir-opt/generator-tiny.rs +++ b/src/test/mir-opt/generator-tiny.rs @@ -2,6 +2,7 @@ //! panic branches. // compile-flags: -C panic=abort +// no-prefer-dynamic #![feature(generators, generator_trait)] diff --git a/src/test/mir-opt/generator-tiny/rustc.main-{{closure}}.generator_resume.0.mir b/src/test/mir-opt/generator-tiny/rustc.main-{{closure}}.generator_resume.0.mir index 84b8af5d6b7..75c2fb3d130 100644 --- a/src/test/mir-opt/generator-tiny/rustc.main-{{closure}}.generator_resume.0.mir +++ b/src/test/mir-opt/generator-tiny/rustc.main-{{closure}}.generator_resume.0.mir @@ -1,78 +1,78 @@ // MIR for `main::{{closure}}#0` 0 generator_resume // generator_layout = GeneratorLayout { field_tys: [HasDrop], variant_fields: [[], [], [], [_0]], storage_conflicts: BitMatrix { num_rows: 1, num_columns: 1, words: [1], marker: PhantomData } } -fn main::{{closure}}#0(_1: std::pin::Pin<&mut [generator@$DIR/generator-tiny.rs:18:16: 24:6 {u8, HasDrop, ()}]>, _2: u8) -> std::ops::GeneratorState<(), ()> { - debug _x => _10; // in scope 0 at $DIR/generator-tiny.rs:18:17: 18:19 - let mut _0: std::ops::GeneratorState<(), ()>; // return place in scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 - let _3: HasDrop; // in scope 0 at $DIR/generator-tiny.rs:19:13: 19:15 - let mut _4: !; // in scope 0 at $DIR/generator-tiny.rs:20:9: 23:10 - let mut _5: (); // in scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 - let _6: u8; // in scope 0 at $DIR/generator-tiny.rs:21:13: 21:18 - let mut _7: (); // in scope 0 at $DIR/generator-tiny.rs:21:13: 21:18 - let _8: (); // in scope 0 at $DIR/generator-tiny.rs:22:13: 22:21 - let mut _9: (); // in scope 0 at $DIR/generator-tiny.rs:18:25: 18:25 - let _10: u8; // in scope 0 at $DIR/generator-tiny.rs:18:17: 18:19 - let mut _11: isize; // in scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 +fn main::{{closure}}#0(_1: std::pin::Pin<&mut [generator@$DIR/generator-tiny.rs:19:16: 25:6 {u8, HasDrop, ()}]>, _2: u8) -> std::ops::GeneratorState<(), ()> { + debug _x => _10; // in scope 0 at $DIR/generator-tiny.rs:19:17: 19:19 + let mut _0: std::ops::GeneratorState<(), ()>; // return place in scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 + let _3: HasDrop; // in scope 0 at $DIR/generator-tiny.rs:20:13: 20:15 + let mut _4: !; // in scope 0 at $DIR/generator-tiny.rs:21:9: 24:10 + let mut _5: (); // in scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 + let _6: u8; // in scope 0 at $DIR/generator-tiny.rs:22:13: 22:18 + let mut _7: (); // in scope 0 at $DIR/generator-tiny.rs:22:13: 22:18 + let _8: (); // in scope 0 at $DIR/generator-tiny.rs:23:13: 23:21 + let mut _9: (); // in scope 0 at $DIR/generator-tiny.rs:19:25: 19:25 + let _10: u8; // in scope 0 at $DIR/generator-tiny.rs:19:17: 19:19 + let mut _11: isize; // in scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 scope 1 { - debug _d => (((*(_1.0: &mut [generator@$DIR/generator-tiny.rs:18:16: 24:6 {u8, HasDrop, ()}])) as variant#3).0: HasDrop); // in scope 1 at $DIR/generator-tiny.rs:19:13: 19:15 + debug _d => (((*(_1.0: &mut [generator@$DIR/generator-tiny.rs:19:16: 25:6 {u8, HasDrop, ()}])) as variant#3).0: HasDrop); // in scope 1 at $DIR/generator-tiny.rs:20:13: 20:15 } bb0: { - _11 = discriminant((*(_1.0: &mut [generator@$DIR/generator-tiny.rs:18:16: 24:6 {u8, HasDrop, ()}]))); // scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 - switchInt(move _11) -> [0u32: bb1, 3u32: bb5, otherwise: bb6]; // scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 + _11 = discriminant((*(_1.0: &mut [generator@$DIR/generator-tiny.rs:19:16: 25:6 {u8, HasDrop, ()}]))); // scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 + switchInt(move _11) -> [0u32: bb1, 3u32: bb5, otherwise: bb6]; // scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 } bb1: { - _10 = move _2; // scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 - nop; // scope 0 at $DIR/generator-tiny.rs:19:13: 19:15 - (((*(_1.0: &mut [generator@$DIR/generator-tiny.rs:18:16: 24:6 {u8, HasDrop, ()}])) as variant#3).0: HasDrop) = HasDrop; // scope 0 at $DIR/generator-tiny.rs:19:18: 19:25 - StorageLive(_4); // scope 1 at $DIR/generator-tiny.rs:20:9: 23:10 - goto -> bb2; // scope 1 at $DIR/generator-tiny.rs:20:9: 23:10 + _10 = move _2; // scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 + nop; // scope 0 at $DIR/generator-tiny.rs:20:13: 20:15 + (((*(_1.0: &mut [generator@$DIR/generator-tiny.rs:19:16: 25:6 {u8, HasDrop, ()}])) as variant#3).0: HasDrop) = HasDrop; // scope 0 at $DIR/generator-tiny.rs:20:18: 20:25 + StorageLive(_4); // scope 1 at $DIR/generator-tiny.rs:21:9: 24:10 + goto -> bb2; // scope 1 at $DIR/generator-tiny.rs:21:9: 24:10 } bb2: { - StorageLive(_6); // scope 1 at $DIR/generator-tiny.rs:21:13: 21:18 - StorageLive(_7); // scope 1 at $DIR/generator-tiny.rs:21:13: 21:18 - _7 = (); // scope 1 at $DIR/generator-tiny.rs:21:13: 21:18 - _0 = std::ops::GeneratorState::<(), ()>::Yielded(move _7); // scope 1 at $DIR/generator-tiny.rs:21:13: 21:18 - discriminant((*(_1.0: &mut [generator@$DIR/generator-tiny.rs:18:16: 24:6 {u8, HasDrop, ()}]))) = 3; // scope 1 at $DIR/generator-tiny.rs:21:13: 21:18 - return; // scope 1 at $DIR/generator-tiny.rs:21:13: 21:18 + StorageLive(_6); // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18 + StorageLive(_7); // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18 + _7 = (); // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18 + _0 = std::ops::GeneratorState::<(), ()>::Yielded(move _7); // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18 + discriminant((*(_1.0: &mut [generator@$DIR/generator-tiny.rs:19:16: 25:6 {u8, HasDrop, ()}]))) = 3; // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18 + return; // scope 1 at $DIR/generator-tiny.rs:22:13: 22:18 } bb3: { - StorageDead(_7); // scope 1 at $DIR/generator-tiny.rs:21:17: 21:18 - StorageDead(_6); // scope 1 at $DIR/generator-tiny.rs:21:18: 21:19 - StorageLive(_8); // scope 1 at $DIR/generator-tiny.rs:22:13: 22:21 - _8 = const callee() -> bb4; // scope 1 at $DIR/generator-tiny.rs:22:13: 22:21 + StorageDead(_7); // scope 1 at $DIR/generator-tiny.rs:22:17: 22:18 + StorageDead(_6); // scope 1 at $DIR/generator-tiny.rs:22:18: 22:19 + StorageLive(_8); // scope 1 at $DIR/generator-tiny.rs:23:13: 23:21 + _8 = const callee() -> bb4; // scope 1 at $DIR/generator-tiny.rs:23:13: 23:21 // ty::Const // + ty: fn() {callee} // + val: Value(Scalar()) // mir::Constant - // + span: $DIR/generator-tiny.rs:22:13: 22:19 + // + span: $DIR/generator-tiny.rs:23:13: 23:19 // + literal: Const { ty: fn() {callee}, val: Value(Scalar()) } } bb4: { - StorageDead(_8); // scope 1 at $DIR/generator-tiny.rs:22:21: 22:22 - _5 = const (); // scope 1 at $DIR/generator-tiny.rs:20:14: 23:10 + StorageDead(_8); // scope 1 at $DIR/generator-tiny.rs:23:21: 23:22 + _5 = const (); // scope 1 at $DIR/generator-tiny.rs:21:14: 24:10 // ty::Const // + ty: () // + val: Value(Scalar()) // mir::Constant - // + span: $DIR/generator-tiny.rs:20:14: 23:10 + // + span: $DIR/generator-tiny.rs:21:14: 24:10 // + literal: Const { ty: (), val: Value(Scalar()) } - goto -> bb2; // scope 1 at $DIR/generator-tiny.rs:20:9: 23:10 + goto -> bb2; // scope 1 at $DIR/generator-tiny.rs:21:9: 24:10 } bb5: { - StorageLive(_4); // scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 - StorageLive(_6); // scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 - StorageLive(_7); // scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 - _6 = move _2; // scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 - goto -> bb3; // scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 + StorageLive(_4); // scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 + StorageLive(_6); // scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 + StorageLive(_7); // scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 + _6 = move _2; // scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 + goto -> bb3; // scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 } bb6: { - unreachable; // scope 0 at $DIR/generator-tiny.rs:18:16: 24:6 + unreachable; // scope 0 at $DIR/generator-tiny.rs:19:16: 25:6 } }