]> git.lizzy.rs Git - rust.git/commitdiff
Swap inserts to keep the original ordering
authorJonas Schievink <jonasschievink@gmail.com>
Sat, 14 Mar 2020 14:46:57 +0000 (15:46 +0100)
committerJonas Schievink <jonasschievink@gmail.com>
Sat, 14 Mar 2020 14:46:57 +0000 (15:46 +0100)
src/librustc_mir/transform/generator.rs

index b386582947f1a17c9942830faa6772dd1bd61c70..0001bb0536365e0affe9ec97b17c385af0abbb6e 100644 (file)
@@ -1099,17 +1099,17 @@ fn create_generator_resume_function<'tcx>(
     // Panic when resumed on the returned or poisoned state
     let generator_kind = body.generator_kind.unwrap();
 
-    if can_return {
+    if can_unwind {
         cases.insert(
             1,
-            (RETURNED, insert_panic_block(tcx, body, ResumedAfterReturn(generator_kind))),
+            (POISONED, insert_panic_block(tcx, body, ResumedAfterPanic(generator_kind))),
         );
     }
 
-    if can_unwind {
+    if can_return {
         cases.insert(
             1,
-            (POISONED, insert_panic_block(tcx, body, ResumedAfterPanic(generator_kind))),
+            (RETURNED, insert_panic_block(tcx, body, ResumedAfterReturn(generator_kind))),
         );
     }