diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-12-18 08:16:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 08:16:30 +0100 |
| commit | 816cda7e1b0cc9a08baa5e44e1e3875b2a70c96e (patch) | |
| tree | 70cc474134e87ce02a5851b5236fd85b03252c10 /src | |
| parent | fcc59794a73f3181e196f65e6f7bba536edd09b0 (diff) | |
| parent | d48dbdc080f45f36ffc756de35c1443f2e05f527 (diff) | |
| download | rust-816cda7e1b0cc9a08baa5e44e1e3875b2a70c96e.tar.gz rust-816cda7e1b0cc9a08baa5e44e1e3875b2a70c96e.zip | |
Rollup merge of #91975 - cjgillot:noinline-generator, r=jackh726
Move generator check earlier in inlining. Inlining into generator may create references to other generators. For instance, inlining `Pin::<&mut from_generator::GenFuture<[generator1]>>::new_unchecked` into `generator2`. This cross reference can then create cycles when computing inlining for `generator1`. In order to avoid this kind of surprises, we forbid all inlining into generators, and rely on LLVM to do the right thing. The existing `remove-zst-query-cycle` already ICEs in inline-mir mode, so we use it as test. Split from #91743.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.mir | 15 | ||||
| -rw-r--r-- | src/test/ui/mir/remove-zsts-query-cycle.rs | 2 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/test/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.mir b/src/test/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.mir index d19229aabad..84ccf25ef75 100644 --- a/src/test/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.mir +++ b/src/test/mir-opt/generator_drop_cleanup.main-{closure#0}.generator_drop.0.mir @@ -20,21 +20,16 @@ fn main::{closure#0}(_1: *mut [generator@$DIR/generator-drop-cleanup.rs:10:15: 1 let _3: std::string::String; // in scope 0 at $DIR/generator-drop-cleanup.rs:11:13: 11:15 let _4: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:12:9: 12:14 let mut _5: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:12:9: 12:14 - let mut _7: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:10:18: 10:18 - let mut _8: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6 - let mut _9: u32; // in scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6 + let mut _6: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:10:18: 10:18 + let mut _7: (); // in scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6 + let mut _8: u32; // in scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6 scope 1 { debug _s => (((*_1) as variant#3).0: std::string::String); // in scope 1 at $DIR/generator-drop-cleanup.rs:11:13: 11:15 } - scope 2 (inlined String::new) { // at $DIR/generator-drop-cleanup.rs:11:18: 11:31 - let mut _6: std::vec::Vec<u8>; // in scope 2 at $DIR/generator-drop-cleanup.rs:11:18: 11:31 - scope 3 (inlined Vec::<u8>::new) { // at $DIR/generator-drop-cleanup.rs:11:18: 11:31 - } - } bb0: { - _9 = discriminant((*_1)); // scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6 - switchInt(move _9) -> [0_u32: bb7, 3_u32: bb10, otherwise: bb11]; // scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6 + _8 = discriminant((*_1)); // scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6 + switchInt(move _8) -> [0_u32: bb7, 3_u32: bb10, otherwise: bb11]; // scope 0 at $DIR/generator-drop-cleanup.rs:10:15: 13:6 } bb1: { diff --git a/src/test/ui/mir/remove-zsts-query-cycle.rs b/src/test/ui/mir/remove-zsts-query-cycle.rs index 8f93c6cadff..be4d68f2de7 100644 --- a/src/test/ui/mir/remove-zsts-query-cycle.rs +++ b/src/test/ui/mir/remove-zsts-query-cycle.rs @@ -2,7 +2,7 @@ // optimized mir -> remove zsts -> layout of a generator -> optimized mir. // // edition:2018 -// compile-flags: --crate-type=lib +// compile-flags: --crate-type=lib -Zinline-mir=yes // build-pass pub async fn listen() -> Result<(), std::io::Error> { |