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
Copy link
Collaborator

The job mingw-check-tidy failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
info: removing rustup binaries
info: rustup is uninstalled
##[group]Image checksum input
mingw-check-tidy
# We use the ghcr base image because ghcr doesn't have a rate limit
# and the mingw-check-tidy job doesn't cache docker images in CI.
FROM ghcr.io/rust-lang/ubuntu:22.04
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
  g++ \
  make \
---

COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
COPY host-x86_64/mingw-check/validate-error-codes.sh /scripts/

# NOTE: intentionally uses python2 for x.py so we can test it still works.
# validate-toolstate only runs in our CI, so it's ok for it to only support python3.
ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \
           --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp
# This file is autogenerated by pip-compile with Python 3.10
# by the following command:
#
#    pip-compile --allow-unsafe --generate-hashes reuse-requirements.in
---
#12 3.067 Building wheels for collected packages: reuse
#12 3.068   Building wheel for reuse (pyproject.toml): started
#12 3.283   Building wheel for reuse (pyproject.toml): finished with status 'done'
#12 3.284   Created wheel for reuse: filename=reuse-4.0.3-cp310-cp310-manylinux_2_35_x86_64.whl size=132720 sha256=0c2fd2aaf7b0bf8d6e131220aff14712a774c2ca462f3204d25460cbcf610b63
#12 3.284   Stored in directory: /tmp/pip-ephem-wheel-cache-4mte__nf/wheels/3d/8d/0a/e0fc6aba4494b28a967ab5eaf951c121d9c677958714e34532
#12 3.286 Installing collected packages: boolean-py, binaryornot, tomlkit, reuse, python-debian, markupsafe, license-expression, jinja2, chardet, attrs
#12 3.690 Successfully installed attrs-23.2.0 binaryornot-0.4.4 boolean-py-4.0 chardet-5.2.0 jinja2-3.1.4 license-expression-30.3.0 markupsafe-2.1.5 python-debian-0.1.49 reuse-4.0.3 tomlkit-0.13.0
#12 3.691 WARNING: Running pip as the 'root' user can result in broken permissions and conflicting behaviour with the system package manager. It is recommended to use a virtual environment instead: https://pip.pypa.io/warnings/venv
#12 4.228 Collecting virtualenv
#12 4.228 Collecting virtualenv
#12 4.270   Downloading virtualenv-20.29.2-py3-none-any.whl (4.3 MB)
#12 4.364      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 4.3/4.3 MB 46.7 MB/s eta 0:00:00
#12 4.405 Collecting distlib<1,>=0.3.7
#12 4.408   Downloading distlib-0.3.9-py2.py3-none-any.whl (468 kB)
#12 4.416      ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 469.0/469.0 KB 83.0 MB/s eta 0:00:00
#12 4.449 Collecting platformdirs<5,>=3.9.1
#12 4.453   Downloading platformdirs-4.3.6-py3-none-any.whl (18 kB)
#12 4.492 Collecting filelock<4,>=3.12.2
#12 4.495   Downloading filelock-3.17.0-py3-none-any.whl (16 kB)
#12 4.577 Installing collected packages: distlib, platformdirs, filelock, virtualenv
#12 4.760 Successfully installed distlib-0.3.9 filelock-3.17.0 platformdirs-4.3.6 virtualenv-20.29.2
#12 DONE 4.8s

#13 [7/8] COPY host-x86_64/mingw-check/validate-toolstate.sh /scripts/
#13 DONE 0.0s
---
DirectMap4k:      137152 kB
DirectMap2M:     9299968 kB
DirectMap1G:     9437184 kB
##[endgroup]
Executing TIDY_PRINT_DIFF=1 python2.7 ../x.py test            --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp
+ TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 src/tools/tidy tidyselftest --extra-checks=py,cpp
    Finished `dev` profile [unoptimized] target(s) in 0.05s
##[endgroup]
WARN: currently no CI rustc builds have rustc debug assertions enabled. Please either set `rust.debug-assertions` to `false` if you want to use download CI rustc or set `rust.download-rustc` to `false`.
downloading https://static.rust-lang.org/dist/2025-02-18/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz

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.

7 participants