Skip to content

Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir - #129706

Merged
bors merged 3 commits into
rust-lang:masterfrom
compiler-errors:scratch
Sep 5, 2024
Merged

Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir#129706
bors merged 3 commits into
rust-lang:masterfrom
compiler-errors:scratch

Conversation

@compiler-errors

@compiler-errorscompiler-errors commented Aug 28, 2024

Copy link
Copy Markdown
Contributor

First, we add a missing match for DefKind::SyntheticCoroutineBody in dump_mir. Fixes#129703. The second commit (directly below) serves as a test.

Second, we reorder the dump_mir in coroutine_by_move_body_def_id to be after we adjust the body source, and change the disambiguator so it reads more like any other MIR body. This also serves as a test for the ICE, since we're dumping the MIR of a body with DefKind::SyntheticCoroutineBody.

Third, we change the parenting of the synthetic MIR body to have the coroutine-closure (i.e. async closure) as its parent, so we don't have long strings of {closure#0}-{closure#0}-{closure#0}.

try-job: test-various

@rustbot

Copy link
Copy Markdown
Collaborator

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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 28, 2024
@rustbot

Copy link
Copy Markdown
Collaborator

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

@estebank

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Aug 29, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 7f9318e has been approved by estebank

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 29, 2024
@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

Wait this doesn't even contain the change I wanted it to 💀

@bors r-

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 29, 2024
@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

This PR now actually contains the changes I noted in the description.

@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 29, 2024
@estebank

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Sep 2, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 98106cf has been approved by estebank

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 2, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 2, 2024
Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir
First, we add a missing match for `DefKind::SyntheticCoroutineBody` in `dump_mir`. Fixesrust-lang#129703. The second commit (directly below) serves as a test.
Second, we reorder the `dump_mir` in `coroutine_by_move_body_def_id` to be *after* we adjust the body source, and change the disambiguator so it reads more like any other MIR body. This also serves as a test for the ICE, since we're dumping the MIR of a body with `DefKind::SyntheticCoroutineBody`.
Third, we change the parenting of the synthetic MIR body to have the *coroutine-closure* (i.e. async closure) as its parent, so we don't have long strings of `{closure#0}-{closure#0}-{closure#0}`.
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 3, 2024
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#101339 (enable -Zrandomize-layout in debug CI builds )
- rust-lang#127021 (Add target support for RTEMS Arm)
- rust-lang#127692 (Suggest `impl Trait` for References to Bare Trait in Function Header)
- rust-lang#128701 (Don't Suggest Labeling `const` and `unsafe` Blocks )
- rust-lang#128871 (bypass linker configuration and cross target check for specific commands)
- rust-lang#129624 (Adjust `memchr` pinning and run `cargo update`)
- rust-lang#129706 (Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir)
- rust-lang#129789 (rustdoc: use strategic boxing to shrink `clean::Item`)
r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 3, 2024
Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir
First, we add a missing match for `DefKind::SyntheticCoroutineBody` in `dump_mir`. Fixesrust-lang#129703. The second commit (directly below) serves as a test.
Second, we reorder the `dump_mir` in `coroutine_by_move_body_def_id` to be *after* we adjust the body source, and change the disambiguator so it reads more like any other MIR body. This also serves as a test for the ICE, since we're dumping the MIR of a body with `DefKind::SyntheticCoroutineBody`.
Third, we change the parenting of the synthetic MIR body to have the *coroutine-closure* (i.e. async closure) as its parent, so we don't have long strings of `{closure#0}-{closure#0}-{closure#0}`.
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 3, 2024
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#127692 (Suggest `impl Trait` for References to Bare Trait in Function Header)
- rust-lang#128701 (Don't Suggest Labeling `const` and `unsafe` Blocks )
- rust-lang#128934 (Non-exhaustive structs may be empty)
- rust-lang#129630 (Document the broken C ABI of `wasm32-unknown-unknown`)
- rust-lang#129706 (Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir)
- rust-lang#129896 (do not attempt to prove unknowable goals)
- rust-lang#129926 (Move `SanityCheck` and `MirPass`)
- rust-lang#129928 (rustc_driver_impl: remove some old dead logic)
- rust-lang#129930 (include 1.80.1 release notes on master)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr

Copy link
Copy Markdown
Member

@bors r- I guess?
#129933 (comment)

@borsbors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 3, 2024
@borsbors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 3, 2024
@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

@bors r=estebank

@bors

bors commented Sep 3, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 955427f has been approved by estebank

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 3, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Sep 3, 2024
Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir
First, we add a missing match for `DefKind::SyntheticCoroutineBody` in `dump_mir`. Fixesrust-lang#129703. The second commit (directly below) serves as a test.
Second, we reorder the `dump_mir` in `coroutine_by_move_body_def_id` to be *after* we adjust the body source, and change the disambiguator so it reads more like any other MIR body. This also serves as a test for the ICE, since we're dumping the MIR of a body with `DefKind::SyntheticCoroutineBody`.
Third, we change the parenting of the synthetic MIR body to have the *coroutine-closure* (i.e. async closure) as its parent, so we don't have long strings of `{closure#0}-{closure#0}-{closure#0}`.
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 3, 2024
…llaumeGomez
Rollup of 7 pull requests
Successful merges:
- rust-lang#127021 (Add target support for RTEMS Arm)
- rust-lang#128871 (bypass linker configuration and cross target check for specific commands)
- rust-lang#129471 ([rustdoc] Sort impl associated items by kinds and then by appearance)
- rust-lang#129529 (Add test to build crates used by r-a on stable)
- rust-lang#129706 (Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir)
- rust-lang#129796 (Unify scraped examples with other code examples)
- rust-lang#129939 (explain why Rvalue::Len still exists)
r? `@ghost`
`@rustbot` modify labels: rollup
@tgross35

Copy link
Copy Markdown
Member

@bors r- similar failure, #129946 (comment)

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 4, 2024
@compiler-errors

Copy link
Copy Markdown
ContributorAuthor

@bors r=estebank

@bors

bors commented Sep 5, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 8860008 has been approved by estebank

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 5, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Sep 5, 2024
Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir
First, we add a missing match for `DefKind::SyntheticCoroutineBody` in `dump_mir`. Fixesrust-lang#129703. The second commit (directly below) serves as a test.
Second, we reorder the `dump_mir` in `coroutine_by_move_body_def_id` to be *after* we adjust the body source, and change the disambiguator so it reads more like any other MIR body. This also serves as a test for the ICE, since we're dumping the MIR of a body with `DefKind::SyntheticCoroutineBody`.
Third, we change the parenting of the synthetic MIR body to have the *coroutine-closure* (i.e. async closure) as its parent, so we don't have long strings of `{closure#0}-{closure#0}-{closure#0}`.
try-job: test-various
This was referenced Sep 5, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 5, 2024
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#128820 (fix: get llvm type of global val)
- rust-lang#129028 (`impl_trait_overcaptures`: Don't worry about uncaptured contravariant lifetimes if they outlive a captured lifetime)
- rust-lang#129471 ([rustdoc] Sort impl associated items by kinds and then by appearance)
- rust-lang#129706 (Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir)
- rust-lang#129720 (Simplify DestProp memory management)
- rust-lang#129796 (Unify scraped examples with other code examples)
- rust-lang#129938 (Elaborate on deriving vs implementing `Copy`)
- rust-lang#129973 (run_make_support: rename `Command::stdin` to `stdin_buf` and add `std{in,out,err}` config helpers)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 5, 2024
…iaskrgr
Rollup of 8 pull requests
Successful merges:
- rust-lang#128820 (fix: get llvm type of global val)
- rust-lang#129028 (`impl_trait_overcaptures`: Don't worry about uncaptured contravariant lifetimes if they outlive a captured lifetime)
- rust-lang#129471 ([rustdoc] Sort impl associated items by kinds and then by appearance)
- rust-lang#129706 (Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir)
- rust-lang#129720 (Simplify DestProp memory management)
- rust-lang#129796 (Unify scraped examples with other code examples)
- rust-lang#129938 (Elaborate on deriving vs implementing `Copy`)
- rust-lang#129973 (run_make_support: rename `Command::stdin` to `stdin_buf` and add `std{in,out,err}` config helpers)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 11085aa into rust-lang:masterSep 5, 2024
@rustbotrustbot added this to the 1.83.0 milestone Sep 5, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Sep 5, 2024
Rollup merge of rust-lang#129706 - compiler-errors:scratch, r=estebank
Rename dump of coroutine by-move-body to be more consistent, fix ICE in dump_mir
First, we add a missing match for `DefKind::SyntheticCoroutineBody` in `dump_mir`. Fixesrust-lang#129703. The second commit (directly below) serves as a test.
Second, we reorder the `dump_mir` in `coroutine_by_move_body_def_id` to be *after* we adjust the body source, and change the disambiguator so it reads more like any other MIR body. This also serves as a test for the ICE, since we're dumping the MIR of a body with `DefKind::SyntheticCoroutineBody`.
Third, we change the parenting of the synthetic MIR body to have the *coroutine-closure* (i.e. async closure) as its parent, so we don't have long strings of `{closure#0}-{closure#0}-{closure#0}`.
try-job: test-various
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.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.

unpretty: Unexpected def kind SyntheticCoroutineBody

6 participants

@compiler-errors@rustbot@estebank@bors@matthiaskrgr@tgross35