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

compiler-errors · 2024-08-28T22:23:10Z

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 · 2024-08-28T22:23:18Z

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

rustbot · 2024-08-28T22:23:20Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

estebank · 2024-08-29T00:10:44Z

@bors r+

bors · 2024-08-29T00:10:46Z

📌 Commit 7f9318e has been approved by estebank

It is now in the queue for this repository.

compiler-errors · 2024-08-29T00:36:02Z

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

@bors r-

compiler-errors · 2024-08-29T00:37:15Z

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

compiler-errors · 2024-08-29T00:38:21Z

@rustbot ready

estebank · 2024-09-02T16:20:41Z

@bors r+

bors · 2024-09-02T16:20:44Z

📌 Commit 98106cf has been approved by estebank

It is now in the queue for this repository.

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`. Fixes rust-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}`.

…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

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`. Fixes rust-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}`.

…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 · 2024-09-03T17:12:59Z

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

compiler-errors · 2024-09-03T20:49:35Z

@bors r=estebank

bors · 2024-09-03T20:49:38Z

📌 Commit 955427f has been approved by estebank

It is now in the queue for this repository.

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`. Fixes rust-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}`.

…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 · 2024-09-04T03:08:56Z

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

compiler-errors · 2024-09-05T10:38:17Z

@bors r=estebank

bors · 2024-09-05T10:38:19Z

📌 Commit 8860008 has been approved by estebank

It is now in the queue for this repository.

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`. Fixes rust-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

…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

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`. Fixes rust-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

rustbot assigned estebank Aug 28, 2024

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

bors 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

bors 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 force-pushed the scratch branch from 7f9318e to 55f4495 Compare August 29, 2024 00:36

compiler-errors force-pushed the scratch branch from 55f4495 to 98106cf Compare August 29, 2024 00:38

rustbot 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

bors 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 mentioned this pull request Sep 2, 2024

Rollup of 8 pull requests #129900

Closed

matthiaskrgr mentioned this pull request Sep 3, 2024

Rollup of 9 pull requests #129933

Closed

bors 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

bors 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 added 2 commits September 3, 2024 16:22

Don't ICE when dumping MIR of a synthetic coroutine body

a4f2a31

Rename dump of coroutine by-move-body to be more consistent, adjust test

5525043

compiler-errors force-pushed the scratch branch from 98106cf to 955427f Compare September 3, 2024 20:48

bors 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 mentioned this pull request Sep 3, 2024

Rollup of 7 pull requests #129946

Closed

bors 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

Re-parent the by-move body

8860008

compiler-errors force-pushed the scratch branch from 955427f to 8860008 Compare September 4, 2024 10:28

bors 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

This was referenced Sep 5, 2024

Rollup of 9 pull requests #129993

Closed

Rollup of 8 pull requests #129994

Merged

bors merged commit 11085aa into rust-lang:master Sep 5, 2024
6 checks passed

rustbot added this to the 1.83.0 milestone Sep 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

compiler-errors commented Aug 28, 2024 •

edited by tgross35

Loading

rustbot commented Aug 28, 2024

rustbot commented Aug 28, 2024

estebank commented Aug 29, 2024

bors commented Aug 29, 2024

compiler-errors commented Aug 29, 2024

compiler-errors commented Aug 29, 2024

compiler-errors commented Aug 29, 2024

estebank commented Sep 2, 2024

bors commented Sep 2, 2024

matthiaskrgr commented Sep 3, 2024

compiler-errors commented Sep 3, 2024

bors commented Sep 3, 2024

tgross35 commented Sep 4, 2024

compiler-errors commented Sep 5, 2024

bors commented Sep 5, 2024

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

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

Conversation

compiler-errors commented Aug 28, 2024 • edited by tgross35 Loading

rustbot commented Aug 28, 2024

rustbot commented Aug 28, 2024

estebank commented Aug 29, 2024

bors commented Aug 29, 2024

compiler-errors commented Aug 29, 2024

compiler-errors commented Aug 29, 2024

compiler-errors commented Aug 29, 2024

estebank commented Sep 2, 2024

bors commented Sep 2, 2024

matthiaskrgr commented Sep 3, 2024

compiler-errors commented Sep 3, 2024

bors commented Sep 3, 2024

tgross35 commented Sep 4, 2024

compiler-errors commented Sep 5, 2024

bors commented Sep 5, 2024

compiler-errors commented Aug 28, 2024 •

edited by tgross35

Loading