Rollup merge of #139699 - compiler-errors:coroutine-drop-phase, r=scottmcm
Proactively update coroutine drop shim's phase to account for later passes applied during shim query See comments in the pass and on test. Also see https://github.com/rust-lang/rust/pull/137264#issuecomment-2669706718. Fixes https://github.com/rust-lang/rust/issues/137243 Fixes https://github.com/rust-lang/rust/issues/139698 r? scottmcm
This commit is contained in:
commit
c0ad72ef6a
2 changed files with 26 additions and 0 deletions
|
@ -1169,6 +1169,13 @@ fn create_coroutine_drop_shim<'tcx>(
|
|||
dump_mir(tcx, false, "coroutine_drop", &0, &body, |_, _| Ok(()));
|
||||
body.source.instance = drop_instance;
|
||||
|
||||
// Creating a coroutine drop shim happens on `Analysis(PostCleanup) -> Runtime(Initial)`
|
||||
// but the pass manager doesn't update the phase of the coroutine drop shim. Update the
|
||||
// phase of the drop shim so that later on when we run the pass manager on the shim, in
|
||||
// the `mir_shims` query, we don't ICE on the intra-pass validation before we've updated
|
||||
// the phase of the body from analysis.
|
||||
body.phase = MirPhase::Runtime(RuntimePhase::Initial);
|
||||
|
||||
body
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue