user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Swap inserts to keep the original ordering

Browse source
This commit is contained in:
Jonas Schievink 2020-03-14 15:46:57 +01:00
parent cb58de8165
commit 38fa3783ce
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/librustc_mir/transform/generator.rs
View file

@ -1099,13 +1099,6 @@ 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 {
cases.insert(
1,
(RETURNED, insert_panic_block(tcx, body, ResumedAfterReturn(generator_kind))),
);
}
if can_unwind {
cases.insert(
1,
@ -1113,6 +1106,13 @@ fn create_generator_resume_function<'tcx>(
);
}
if can_return {
cases.insert(
1,
(RETURNED, insert_panic_block(tcx, body, ResumedAfterReturn(generator_kind))),
);
}
insert_switch(body, cases, &transform, TerminatorKind::Unreachable);
make_generator_state_argument_indirect(tcx, def_id, body);