Fix FutureDropPoll shim for by-move async closures by KR-bluejay · Pull Request #158904 · rust-lang/rust

KR-bluejay · 2026-07-07T10:13:32Z

When the coroutine is coroutine-closures, build_adrop_for_coroutine_shim used the the ref of the coroutine body.

This PR uses coroutine_by_move_body_def_id to fetch the by-move body.
(matching the existing DropGlue behavior in shim.rs)

rustbot · 2026-07-07T13:14:10Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

rustbot · 2026-07-07T13:14:13Z

Thanks for the pull request, and welcome! The Rust Project is excited to review your changes, and you should hear from @nnethercote (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

@rustbot author: the review is finished, PR author should check the comments and take action accordingly
@rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: compiler
compiler expanded to 75 candidates
Random selection from 18 candidates

nnethercote · 2026-07-08T07:52:24Z

I don't know this code at all. Git blame suggests...

r? @cjgillot

oli-obk · 2026-08-06T11:19:28Z

@@ -0,0 +1,19 @@
+// Regression test for #142559
+//@ run-pass
+//@ compile-flags: -Clink-dead-code=true


We shouldn't use link-dead-code everywhere, it's rather buggy.

Suggested change

//@ compile-flags: -Clink-dead-code=true

//@ compile-flags: --crate-type=lib

View changes since the review

This suggestion would break the test build.

error: 1 errors occurred comparing output. status: exit status: 0 stdout: none --- stderr ------------------------------- warning: function `main` is never used --> ~/rust/tests/ui/async-await/async-drop/async-drop-future-drop-poll.rs:19:4 | LL | fn main() {} | ^^^^ | = note: `#[warn(dead_code)]` (part of `#[warn(unused)]`) on by default warning: 1 warning emitted ------------------------------------------ ---- [ui] tests/ui/async-await/async-drop/async-drop-future-drop-poll.rs stdout end ---- failures: [ui] tests/ui/async-await/async-drop/async-drop-future-drop-poll.rs

To pass the test,

Remove main function

Change -Clink-dead-code=true to --crate-type=lib

Change @ run-pass to @ build-pass

I’ll make another commit for the change

oli-obk

except for the test nit, the change lgtm

View changes since this review

rustbot · 2026-08-06T11:20:09Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

rustbot · 2026-08-06T12:36:16Z

⚠️ Warning ⚠️

This PR is based on an upstream commit that is older than 28 days.

It's recommended to update your branch according to the rustc-dev-guide.

KR-bluejay · 2026-08-06T12:44:09Z

@rustbot ready

oli-obk · 2026-08-06T15:21:32Z

@bors squash msg="Fix FutureDropPoll shim for by-move async closures"

rust-bors · 2026-08-06T15:21:55Z

🔨 2 commits were squashed into b9ad974.

oli-obk · 2026-08-06T15:22:31Z

Thanks!

@bors r+ rollup

rust-bors · 2026-08-06T15:22:34Z

📌 Commit b9ad974 has been approved by oli-obk

It is now in the queue for this repository.

…-obk Fix FutureDropPoll shim for by-move async closures Related rust-lang#142559 When the coroutine is coroutine-closures, `build_adrop_for_coroutine_shim` used the the ref of the coroutine body. This PR uses `coroutine_by_move_body_def_id` to fetch the by-move body. (matching the existing `DropGlue` behavior in `shim.rs`)

Rollup of 14 pull requests Successful merges: - #150885 (Revive L4Re target) - #159643 (Add support for splatted function pointers) - #160433 (delegation: add support for wrapping of the return value with `From::from`) - #160530 (refactor handling of target features in Session) - #160606 (bootstrap: Store and use an explicit CheckKind in `check::Rustc`) - #160628 (fix ICE in `suggest_add_reference_to_arg` for non-callable items) - #160634 (miri subtree update) - #158904 (Fix FutureDropPoll shim for by-move async closures) - #160335 (dlopen offload) - #160445 (codegen: classify localized MSVC linker progress as linker_info) - #160504 (cleanup borrowck, improve c-variadic handling) - #160587 (Add regression test for associated type outlives bound at call site) - #160625 (platform-support/netbsd.md: No longer mention 8.x, due to EoL.) - #160636 (derive(Diagnostic): link to proper docs)

…-obk Fix FutureDropPoll shim for by-move async closures Related rust-lang#142559 When the coroutine is coroutine-closures, `build_adrop_for_coroutine_shim` used the the ref of the coroutine body. This PR uses `coroutine_by_move_body_def_id` to fetch the by-move body. (matching the existing `DropGlue` behavior in `shim.rs`)

…uwer Rollup of 21 pull requests Successful merges: - #159784 (Hint that memchr returns an in-bounds index) - #150885 (Revive L4Re target) - #159643 (Add support for splatted function pointers) - #160433 (delegation: add support for wrapping of the return value with `From::from`) - #160530 (refactor handling of target features in Session) - #160606 (bootstrap: Store and use an explicit CheckKind in `check::Rustc`) - #160628 (fix ICE in `suggest_add_reference_to_arg` for non-callable items) - #160634 (miri subtree update) - #157641 (Do not promote extern statics) - #158904 (Fix FutureDropPoll shim for by-move async closures) - #160103 (Add regression test for GAT bound mismatched type error) - #160335 (dlopen offload) - #160445 (codegen: classify localized MSVC linker progress as linker_info) - #160499 (rustc_resolve: move diagnostic attribute linting to attr parsing) - #160504 (cleanup borrowck, improve c-variadic handling) - #160577 (expand: Feature gate AST-based attribute macros on expressions and statements) - #160587 (Add regression test for associated type outlives bound at call site) - #160625 (platform-support/netbsd.md: No longer mention 8.x, due to EoL.) - #160636 (derive(Diagnostic): link to proper docs) - #160644 (Clean up some manual debug impls) - #160649 (move naked function ui tests)

…-obk Fix FutureDropPoll shim for by-move async closures Related rust-lang#142559 When the coroutine is coroutine-closures, `build_adrop_for_coroutine_shim` used the the ref of the coroutine body. This PR uses `coroutine_by_move_body_def_id` to fetch the by-move body. (matching the existing `DropGlue` behavior in `shim.rs`)

…uwer Rollup of 20 pull requests Successful merges: - #159784 (Hint that memchr returns an in-bounds index) - #150885 (Revive L4Re target) - #159643 (Add support for splatted function pointers) - #160433 (delegation: add support for wrapping of the return value with `From::from`) - #160530 (refactor handling of target features in Session) - #160606 (bootstrap: Store and use an explicit CheckKind in `check::Rustc`) - #160628 (fix ICE in `suggest_add_reference_to_arg` for non-callable items) - #160634 (miri subtree update) - #157641 (Do not promote extern statics) - #158904 (Fix FutureDropPoll shim for by-move async closures) - #160103 (Add regression test for GAT bound mismatched type error) - #160335 (dlopen offload) - #160445 (codegen: classify localized MSVC linker progress as linker_info) - #160499 (rustc_resolve: move diagnostic attribute linting to attr parsing) - #160504 (cleanup borrowck, improve c-variadic handling) - #160577 (expand: Feature gate AST-based attribute macros on expressions and statements) - #160587 (Add regression test for associated type outlives bound at call site) - #160625 (platform-support/netbsd.md: No longer mention 8.x, due to EoL.) - #160636 (derive(Diagnostic): link to proper docs) - #160644 (Clean up some manual debug impls)

…-obk Fix FutureDropPoll shim for by-move async closures Related rust-lang#142559 When the coroutine is coroutine-closures, `build_adrop_for_coroutine_shim` used the the ref of the coroutine body. This PR uses `coroutine_by_move_body_def_id` to fetch the by-move body. (matching the existing `DropGlue` behavior in `shim.rs`)

…uwer Rollup of 28 pull requests Successful merges: - #159784 (Hint that memchr returns an in-bounds index) - #160673 (Improve `canonical_param_env_cache`) - #150885 (Revive L4Re target) - #159643 (Add support for splatted function pointers) - #160433 (delegation: add support for wrapping of the return value with `From::from`) - #160530 (refactor handling of target features in Session) - #160606 (bootstrap: Store and use an explicit CheckKind in `check::Rustc`) - #160628 (fix ICE in `suggest_add_reference_to_arg` for non-callable items) - #160683 (Add regression test for unknown feaeture name reported with other errors) - #157641 (Do not promote extern statics) - #158904 (Fix FutureDropPoll shim for by-move async closures) - #159816 (added note/help about iterator invalidation when mutating a collection inside a for loop) - #160103 (Add regression test for GAT bound mismatched type error) - #160335 (dlopen offload) - #160445 (codegen: classify localized MSVC linker progress as linker_info) - #160499 (rustc_resolve: move diagnostic attribute linting to attr parsing) - #160504 (cleanup borrowck, improve c-variadic handling) - #160577 (expand: Feature gate AST-based attribute macros on expressions and statements) - #160587 (Add regression test for associated type outlives bound at call site) - #160625 (platform-support/netbsd.md: No longer mention 8.x, due to EoL.) - #160633 (delegation: fix determining wrong `FnKind` when delegation is inside const arg) - #160636 (derive(Diagnostic): link to proper docs) - #160644 (Clean up some manual debug impls) - #160649 (move naked function ui tests) - #160672 (Improve `MaybeLiveLocals`) - #160693 (Add branch config for perf. unrolling in bors) - #160696 (rustc_codegen_llvm: handle sm_101* features being an alias) - #160706 (renovate: clarify that vulnerability PRs are opened automatically)

Rollup merge of #158904 - KR-bluejay:issue-142559-fix, r=oli-obk Fix FutureDropPoll shim for by-move async closures Related #142559 When the coroutine is coroutine-closures, `build_adrop_for_coroutine_shim` used the the ref of the coroutine body. This PR uses `coroutine_by_move_body_def_id` to fetch the by-move body. (matching the existing `DropGlue` behavior in `shim.rs`)

…uwer Rollup of 28 pull requests Successful merges: - rust-lang/rust#159784 (Hint that memchr returns an in-bounds index) - rust-lang/rust#160673 (Improve `canonical_param_env_cache`) - rust-lang/rust#150885 (Revive L4Re target) - rust-lang/rust#159643 (Add support for splatted function pointers) - rust-lang/rust#160433 (delegation: add support for wrapping of the return value with `From::from`) - rust-lang/rust#160530 (refactor handling of target features in Session) - rust-lang/rust#160606 (bootstrap: Store and use an explicit CheckKind in `check::Rustc`) - rust-lang/rust#160628 (fix ICE in `suggest_add_reference_to_arg` for non-callable items) - rust-lang/rust#160683 (Add regression test for unknown feaeture name reported with other errors) - rust-lang/rust#157641 (Do not promote extern statics) - rust-lang/rust#158904 (Fix FutureDropPoll shim for by-move async closures) - rust-lang/rust#159816 (added note/help about iterator invalidation when mutating a collection inside a for loop) - rust-lang/rust#160103 (Add regression test for GAT bound mismatched type error) - rust-lang/rust#160335 (dlopen offload) - rust-lang/rust#160445 (codegen: classify localized MSVC linker progress as linker_info) - rust-lang/rust#160499 (rustc_resolve: move diagnostic attribute linting to attr parsing) - rust-lang/rust#160504 (cleanup borrowck, improve c-variadic handling) - rust-lang/rust#160577 (expand: Feature gate AST-based attribute macros on expressions and statements) - rust-lang/rust#160587 (Add regression test for associated type outlives bound at call site) - rust-lang/rust#160625 (platform-support/netbsd.md: No longer mention 8.x, due to EoL.) - rust-lang/rust#160633 (delegation: fix determining wrong `FnKind` when delegation is inside const arg) - rust-lang/rust#160636 (derive(Diagnostic): link to proper docs) - rust-lang/rust#160644 (Clean up some manual debug impls) - rust-lang/rust#160649 (move naked function ui tests) - rust-lang/rust#160672 (Improve `MaybeLiveLocals`) - rust-lang/rust#160693 (Add branch config for perf. unrolling in bors) - rust-lang/rust#160696 (rustc_codegen_llvm: handle sm_101* features being an alias) - rust-lang/rust#160706 (renovate: clarify that vulnerability PRs are opened automatically)

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jul 7, 2026

This comment has been minimized.

Sign in to view

KR-bluejay marked this pull request as ready for review July 7, 2026 13:14

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 Jul 7, 2026

rustbot assigned nnethercote Jul 7, 2026

rustbot assigned cjgillot and unassigned nnethercote Jul 8, 2026

oli-obk reviewed Aug 6, 2026

View reviewed changes

oli-obk requested changes Aug 6, 2026

View reviewed changes

rustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 6, 2026

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 6, 2026

This comment has been minimized.

Sign in to view

Fix FutureDropPoll shim for by-move async closures

b9ad974

rust-bors Bot force-pushed the issue-142559-fix branch from f304aae to b9ad974 Compare August 6, 2026 15:21

rust-bors Bot 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 6, 2026

JonathanBrouwer mentioned this pull request Aug 6, 2026

Rollup of 11 pull requests #160647

Closed

JonathanBrouwer mentioned this pull request Aug 6, 2026

Rollup of 10 pull requests #160654

Closed

jhpratt mentioned this pull request Aug 7, 2026

Rollup of 14 pull requests #160661

Closed

jhpratt mentioned this pull request Aug 7, 2026

Rollup of 14 pull requests #160667

Closed

JonathanBrouwer mentioned this pull request Aug 7, 2026

Rollup of 21 pull requests #160678

Closed

JonathanBrouwer mentioned this pull request Aug 7, 2026

Rollup of 20 pull requests #160682

Closed

jhpratt mentioned this pull request Aug 7, 2026

Rollup of 30 pull requests #160721

Closed

JonathanBrouwer mentioned this pull request Aug 7, 2026

Rollup of 28 pull requests #160725

Merged

rust-bors Bot merged commit a87e770 into rust-lang:main Aug 8, 2026
11 of 13 checks passed

rustbot added this to the 1.99.0 milestone Aug 8, 2026

	//@ compile-flags: -Clink-dead-code=true
	//@ compile-flags: --crate-type=lib

Uh oh!

Uh oh!

Conversation

KR-bluejay commented Jul 7, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

rustbot commented Jul 7, 2026

Uh oh!

rustbot commented Jul 7, 2026

Uh oh!

nnethercote commented Jul 8, 2026

Uh oh!

oli-obk Aug 6, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KR-bluejay Aug 6, 2026

Choose a reason for hiding this comment

Uh oh!

KR-bluejay Aug 6, 2026

Choose a reason for hiding this comment

Uh oh!

oli-obk left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rustbot commented Aug 6, 2026

Uh oh!

rustbot commented Aug 6, 2026

Uh oh!

KR-bluejay commented Aug 6, 2026

Uh oh!

oli-obk commented Aug 6, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Aug 6, 2026

Uh oh!

oli-obk commented Aug 6, 2026

Uh oh!

rust-bors Bot commented Aug 6, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

KR-bluejay commented Jul 7, 2026 •

edited by rustbot

Loading

oli-obk Aug 6, 2026 •

edited by rustbot

Loading

oli-obk left a comment •

edited by rustbot

Loading