Skip to content

Prereq1 for async drop - drop & async_fut fields in Drop terminator - #129734

Closed
azhogin wants to merge 1 commit into
rust-lang:masterfrom
azhogin:azhogin/async-drop-prereq1-new-drop-term-fields
Closed

Prereq1 for async drop - drop & async_fut fields in Drop terminator#129734
azhogin wants to merge 1 commit into
rust-lang:masterfrom
azhogin:azhogin/async-drop-prereq1-new-drop-term-fields

Conversation

@azhogin

Copy link
Copy Markdown
Contributor

This is subpart 1 PR of #123948, just for review purposes.

Added Option drop and async_fut fields in Drop terminator for use when Drop terminator is async drop.

drop field has the same meaning as drop field in Yield terminator. We need it because async drop is a hidden Yield, expanded into yield-point in StateTransform (later commits).

async_fut contains local for async drop future, generated by async_fut = async_drop_in_place(droppee) in drop elaboration (later commits).

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 29, 2024
@rustbot

Copy link
Copy Markdown
Collaborator

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

This PR changes MIR

cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras

Comment threadcompiler/rustc_const_eval/src/interpret/step.rs Outdated
/// StateTransform pass. In `expand_async_drops` async drops are expanded
/// into one or two yield points with poll ready/pending switch.
/// When a coroutine has any internal async drop, the coroutine drop function will be async
/// (generated by `create_coroutine_drop_shim_async`, not `create_coroutine_drop_shim`).

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be worth also discussing async drop in the MirPhase docs. And if any new MIR phase restrictions are added, please make sure to update the MIR validator.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment about async drops added in MirPhase:

/// - Async drops: after drop elaboration some drops may become async (`drop`, `async_fut` fields).
/// StateTransform pass will expand those async drops or reset to sync.

Could you, pls, be more specific about "update the MIR validator"? Async drop terminators live from ElaborateDrops to StateTransform pass in transition to MirPhase::Runtime(..). What MIR validator changes do you recommend?

@azhoginazhogin mentioned this pull request Aug 29, 2024
@azhogin
azhogin marked this pull request as draft August 29, 2024 13:08
@azhogin
azhoginforce-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from 1cffd92 to 482c2c3CompareAugust 30, 2024 06:58
@azhogin
azhoginforce-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch 2 times, most recently from b45015f to f954f0cCompareSeptember 8, 2024 12:00
@bors

bors commented Sep 23, 2024

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #130724) made this pull request unmergeable. Please resolve the merge conflicts.

@davidtwco

Copy link
Copy Markdown
Member

r? @nikomatsakis is going to look into this

@rustbotrustbot assigned nikomatsakis and unassigned davidtwcoOct 1, 2024
@azhogin
azhoginforce-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from f954f0c to d5844bfCompareFebruary 8, 2025 13:09
@rust-log-analyzer

This comment has been minimized.

@azhogin
azhoginforce-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from d5844bf to e8f28c1CompareFebruary 8, 2025 14:48
@bors

bors commented Feb 9, 2025

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #136751) made this pull request unmergeable. Please resolve the merge conflicts.

@azhogin
azhoginforce-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from e8f28c1 to 7097c0cCompareFebruary 10, 2025 12:05
@bors

bors commented Feb 14, 2025

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #137030) made this pull request unmergeable. Please resolve the merge conflicts.

@azhogin
azhoginforce-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from 7097c0c to e448c13CompareFebruary 23, 2025 15:16
@rust-log-analyzer

This comment has been minimized.

@azhogin
azhoginforce-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from e448c13 to 6109ee3CompareFebruary 23, 2025 16:32
@rust-log-analyzer

This comment has been minimized.

@bors

bors commented Mar 12, 2025

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #138366) made this pull request unmergeable. Please resolve the merge conflicts.

@oli-obkoli-obk assigned oli-obk and unassigned nikomatsakisMar 12, 2025
@azhogin
azhoginforce-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from 6109ee3 to 09344aeCompareMarch 30, 2025 16:26
@rust-log-analyzer

This comment has been minimized.

@azhogin
azhoginforce-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from 09344ae to aa82115CompareApril 6, 2025 07:50
@rust-log-analyzer

This comment has been minimized.

@azhogin
azhoginforce-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from aa82115 to f8f9f26CompareApril 6, 2025 09:58
@oli-obkoli-obk closed this Apr 28, 2025
@petrochenkovpetrochenkov added the F-async_drop `#![feature(async_drop)]` label Jun 6, 2025
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

F-async_drop`#![feature(async_drop)]`S-waiting-on-reviewStatus: Awaiting review from the assignee but also interested parties.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants

@azhogin@rustbot@bors@davidtwco@rust-log-analyzer@RalfJung@nikomatsakis@oli-obk@petrochenkov