Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

azhogin
Copy link
Contributor

@azhogin azhogin commented Aug 29, 2024

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).

@rustbot rustbot 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
Collaborator

rustbot commented Aug 29, 2024

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

/// 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
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
Contributor Author

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?

@azhogin azhogin mentioned this pull request Aug 29, 2024
@azhogin azhogin marked this pull request as draft August 29, 2024 13:08
@azhogin azhogin force-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from 1cffd92 to 482c2c3 Compare August 30, 2024 06:58
@azhogin azhogin force-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch 2 times, most recently from b45015f to f954f0c Compare September 8, 2024 12:00
@bors
Copy link
Contributor

bors commented Sep 23, 2024

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

@davidtwco
Copy link
Member

r? @nikomatsakis is going to look into this

@rustbot rustbot assigned nikomatsakis and unassigned davidtwco Oct 1, 2024
@azhogin azhogin force-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from f954f0c to d5844bf Compare February 8, 2025 13:09
@rust-log-analyzer

This comment has been minimized.

@azhogin azhogin force-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from d5844bf to e8f28c1 Compare February 8, 2025 14:48
@bors
Copy link
Contributor

bors commented Feb 9, 2025

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

@azhogin azhogin force-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from e8f28c1 to 7097c0c Compare February 10, 2025 12:05
@bors
Copy link
Contributor

bors commented Feb 14, 2025

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

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

This comment has been minimized.

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

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Mar 12, 2025

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

@oli-obk oli-obk assigned oli-obk and unassigned nikomatsakis Mar 12, 2025
@azhogin azhogin force-pushed the azhogin/async-drop-prereq1-new-drop-term-fields branch from 6109ee3 to 09344ae Compare March 30, 2025 16:26
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-18 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
#19 exporting to docker image format
#19 sending tarball 19.3s done
#19 DONE 26.5s
##[endgroup]
Setting extra environment values for docker:  --env ENABLE_GCC_CODEGEN=1 --env GCC_EXEC_PREFIX=/usr/lib/gcc/
[CI_JOB_NAME=x86_64-gnu-llvm-18]
[CI_JOB_NAME=x86_64-gnu-llvm-18]
debug: `DISABLE_CI_RUSTC_IF_INCOMPATIBLE` configured.
---
sccache: Listening on address 127.0.0.1:4226
##[group]Configure the build
configure: processing command line
configure: 
configure: build.configure-args := ['--build=x86_64-unknown-linux-gnu', '--llvm-root=/usr/lib/llvm-18', '--enable-llvm-link-shared', '--set', 'rust.randomize-layout=true', '--set', 'rust.thin-lto-import-instr-limit=10', '--set', 'build.print-step-timings', '--enable-verbose-tests', '--set', 'build.metrics', '--enable-verbose-configure', '--enable-sccache', '--disable-manage-submodules', '--enable-locked-deps', '--enable-cargo-native-static', '--set', 'rust.codegen-units-std=1', '--set', 'dist.compression-profile=balanced', '--dist-compression-formats=xz', '--set', 'rust.lld=false', '--disable-dist-src', '--release-channel=nightly', '--enable-debug-assertions', '--enable-overflow-checks', '--enable-llvm-assertions', '--set', 'rust.verify-llvm-ir', '--set', 'rust.codegen-backends=llvm,cranelift,gcc', '--set', 'llvm.static-libstdcpp', '--enable-new-symbol-mangling']
configure: build.build          := x86_64-unknown-linux-gnu
configure: target.x86_64-unknown-linux-gnu.llvm-config := /usr/lib/llvm-18/bin/llvm-config
configure: llvm.link-shared     := True
configure: rust.randomize-layout := True
configure: rust.thin-lto-import-instr-limit := 10
---
   Compiling rustc_borrowck v0.0.0 (/checkout/compiler/rustc_borrowck)
error[E0425]: cannot find value `body` in this scope
    --> compiler/rustc_borrowck/src/type_check/mod.rs:2090:39
     |
2090 |                 self.assert_iscleanup(body, block_data, target, is_cleanup);
     |                                       ^^^^
     |
help: you might have meant to use the available field
     |
2090 |                 self.assert_iscleanup(self.body, block_data, target, is_cleanup);
     |                                       +++++

error[E0425]: cannot find value `body` in this scope
    --> compiler/rustc_borrowck/src/type_check/mod.rs:2091:46
     |
2091 |                 self.assert_iscleanup_unwind(body, block_data, unwind, is_cleanup);
     |                                              ^^^^
     |
help: you might have meant to use the available field
     |
2091 |                 self.assert_iscleanup_unwind(self.body, block_data, unwind, is_cleanup);
     |                                              +++++

error[E0425]: cannot find value `body` in this scope
    --> compiler/rustc_borrowck/src/type_check/mod.rs:2093:43
     |
2093 |                     self.assert_iscleanup(body, block_data, drop, is_cleanup);
     |                                           ^^^^
     |
help: you might have meant to use the available field
     |
2093 |                     self.assert_iscleanup(self.body, block_data, drop, is_cleanup);
     |                                           +++++

error[E0061]: this method takes 3 arguments but 4 arguments were supplied
    --> compiler/rustc_borrowck/src/type_check/mod.rs:2090:22
     |
2090 |                 self.assert_iscleanup(body, block_data, target, is_cleanup);
     |                      ^^^^^^^^^^^^^^^^ ---- unexpected argument #1
     |
note: method defined here
    --> compiler/rustc_borrowck/src/type_check/mod.rs:2123:8
     |
2123 |     fn assert_iscleanup(&mut self, ctxt: &dyn fmt::Debug, bb: BasicBlock, iscleanuppad: bool) {
     |        ^^^^^^^^^^^^^^^^
help: remove the extra argument
     |
2090 -                 self.assert_iscleanup(body, block_data, target, is_cleanup);
2090 +                 self.assert_iscleanup(block_data, target, is_cleanup);
     |

error[E0061]: this method takes 3 arguments but 4 arguments were supplied
    --> compiler/rustc_borrowck/src/type_check/mod.rs:2091:22
     |
2091 |                 self.assert_iscleanup_unwind(body, block_data, unwind, is_cleanup);
     |                      ^^^^^^^^^^^^^^^^^^^^^^^ ---- unexpected argument #1
     |
note: method defined here
    --> compiler/rustc_borrowck/src/type_check/mod.rs:2129:8
     |
2129 |     fn assert_iscleanup_unwind(
     |        ^^^^^^^^^^^^^^^^^^^^^^^
help: remove the extra argument
     |
2091 -                 self.assert_iscleanup_unwind(body, block_data, unwind, is_cleanup);
2091 +                 self.assert_iscleanup_unwind(block_data, unwind, is_cleanup);
     |

error[E0061]: this method takes 3 arguments but 4 arguments were supplied
    --> compiler/rustc_borrowck/src/type_check/mod.rs:2093:26
     |
2093 |                     self.assert_iscleanup(body, block_data, drop, is_cleanup);
     |                          ^^^^^^^^^^^^^^^^ ---- unexpected argument #1
     |
note: method defined here
    --> compiler/rustc_borrowck/src/type_check/mod.rs:2123:8
     |
2123 |     fn assert_iscleanup(&mut self, ctxt: &dyn fmt::Debug, bb: BasicBlock, iscleanuppad: bool) {
     |        ^^^^^^^^^^^^^^^^
help: remove the extra argument
     |
2093 -                     self.assert_iscleanup(body, block_data, drop, is_cleanup);
2093 +                     self.assert_iscleanup(block_data, drop, is_cleanup);
     |

[RUSTC-TIMING] rustc_sanitizers test:false 5.560
   Compiling rustc_mir_build v0.0.0 (/checkout/compiler/rustc_mir_build)
Some errors have detailed explanations: E0061, E0425.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants