Skip to content

Make async drop code more consistent with regular drop code #126594

New issue

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

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

Already on GitHub? # to your account

Merged
merged 2 commits into from
Jun 19, 2024

Conversation

zetanumbers
Copy link
Contributor

Fixes #126573

Relates to #126482

r? @petrochenkov

@rustbot rustbot added PG-exploit-mitigations Project group: Exploit mitigations 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 Jun 17, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 17, 2024

Some changes occurred in compiler/rustc_sanitizers

cc @rust-lang/project-exploit-mitigations, @rcvalle

@zetanumbers
Copy link
Contributor Author

Couldn't reproduce the linking error using std, only reproduced with simple tokio::task::JoinHandle.

@petrochenkov
Copy link
Contributor

r? @oli-obk

@rustbot rustbot assigned oli-obk and unassigned petrochenkov Jun 17, 2024
@bors
Copy link
Collaborator

bors commented Jun 17, 2024

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

zetanumbers and others added 2 commits June 18, 2024 14:17
@zetanumbers zetanumbers force-pushed the fix-cross-crate-async-drop-glue branch from 023acf6 to 1a8eae1 Compare June 18, 2024 11:33
@oli-obk
Copy link
Contributor

oli-obk commented Jun 18, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Jun 18, 2024

📌 Commit 1a8eae1 has been approved by oli-obk

It is now in the queue for this repository.

@bors 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 Jun 18, 2024
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 18, 2024
…drop-glue, r=oli-obk

Make async drop code more consistent with regular drop code

Fixes rust-lang#126573

Relates to rust-lang#126482

r? `@petrochenkov`
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
…drop-glue, r=oli-obk

Make async drop code more consistent with regular drop code

Fixes rust-lang#126573

Relates to rust-lang#126482

r? ``@petrochenkov``
fmease added a commit to fmease/rust that referenced this pull request Jun 19, 2024
…drop-glue, r=oli-obk

Make async drop code more consistent with regular drop code

Fixes rust-lang#126573

Relates to rust-lang#126482

r? ```@petrochenkov```
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
Rollup of 7 pull requests

Successful merges:

 - rust-lang#123782 (Test that opaque types can't have themselves as a hidden type with incompatible lifetimes)
 - rust-lang#124580 (Suggest removing unused tuple fields if they are the last fields)
 - rust-lang#125787 (Migrate `bin-emit-no-symbols` `run-make` test to `rmake`)
 - rust-lang#126553 (match lowering: expand or-candidates mixed with candidates above)
 - rust-lang#126594 (Make async drop code more consistent with regular drop code)
 - rust-lang#126654 (Make pretty printing for `f16` and `f128` consistent)
 - rust-lang#126656 (rustc_type_ir: Omit some struct fields from Debug output)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ef062ea into rust-lang:master Jun 19, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 19, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 19, 2024
Rollup merge of rust-lang#126594 - zetanumbers:fix-cross-crate-async-drop-glue, r=oli-obk

Make async drop code more consistent with regular drop code

Fixes rust-lang#126573

Relates to rust-lang#126482

r? ````@petrochenkov````
@zetanumbers zetanumbers deleted the fix-cross-crate-async-drop-glue branch June 19, 2024 11:11
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

compile fail when using async_drop
5 participants