Skip to content

Remove wasm legacy abi #133952

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove wasm legacy abi #133952

wants to merge 2 commits into from

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Dec 6, 2024 •
edited
Loading

Closes #122532
Closes #138762
Fixes #71871
#88152
Fixes #115666
Fixes #129486

@bjorn3 bjorn3 added O-wasm Target: WASM (WebAssembly), http://webassembly.org/ A-ABI Area: Concerning the application binary interface (ABI) labels Dec 6, 2024
@bjorn3 bjorn3 added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Dec 6, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 6, 2024

r? @cjgillot

rustbot has assigned @cjgillot.
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 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 Dec 6, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 6, 2024

These commits modify compiler targets.
(See the Target Tier Policy.)

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 6, 2024
@bjorn3 bjorn3 removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 6, 2024
@workingjubilee workingjubilee mentioned this pull request Dec 6, 2024
Merged
@bjorn3 bjorn3 force-pushed the remove_wasm_legacy_abi branch from 88f79ac to 26c9b6e Compare December 6, 2024 09:46
@rustbot
Copy link
Collaborator

rustbot commented Dec 6, 2024

There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged.

You can start a rebase with the following commands:

$ # rebase
$ git pull --rebase https://github.com/rust-lang/rust.git master
$ git push --force-with-lease

The following commits are merge commits:

@bjorn3 bjorn3 marked this pull request as draft December 6, 2024 09:48
@bjorn3 bjorn3 force-pushed the remove_wasm_legacy_abi branch from 26c9b6e to 16e660d Compare December 6, 2024 13:42
@daxpedda
Copy link
Contributor

#129630 needs to be reverted or adjusted as well.

@bjorn3
Copy link
Member Author

bjorn3 commented Dec 16, 2024

Removed the section in question.

@bjorn3 bjorn3 mentioned this pull request Dec 16, 2024
Open
RalfJung
RalfJung reviewed Jan 8, 2025
View reviewed changes
compiler/rustc_ty_utils/src/abi.rs Outdated

match spec_abi {
ExternAbi::Unadjusted => {}
ExternAbi::PtxKernel => {}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the PtxKernel exception not needed any more?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid conflicts I based this PR on #133932 which is the PR for making extern "ptx-kernel" have the right abi.

@bjorn3 bjorn3 mentioned this pull request Jan 17, 2025
Merged
@bjorn3 bjorn3 force-pushed the remove_wasm_legacy_abi branch from 6970f8d to e4c01de Compare January 26, 2025 14:21
@bors
Copy link
Collaborator

bors commented Feb 6, 2025

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

@bjorn3 bjorn3 force-pushed the remove_wasm_legacy_abi branch from e4c01de to e91711c Compare February 6, 2025 10:07
@bors
Copy link
Collaborator

bors commented Feb 7, 2025

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

@bjorn3 bjorn3 removed the has-merge-commits PR has merge commits, merge with caution. label Feb 21, 2025
@bjorn3 bjorn3 force-pushed the remove_wasm_legacy_abi branch from e91711c to 106301d Compare February 28, 2025 09:09
@bors
Copy link
Collaborator

bors commented Mar 2, 2025

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

@bjorn3 bjorn3 force-pushed the remove_wasm_legacy_abi branch from 106301d to 0fab17a Compare March 3, 2025 12:48
@bors
Copy link
Collaborator

bors commented Mar 26, 2025

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

@bjorn3 bjorn3 force-pushed the remove_wasm_legacy_abi branch from 0fab17a to 452998d Compare May 21, 2025 14:48
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Collaborator

bors commented May 23, 2025

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

@bjorn3 bjorn3 force-pushed the remove_wasm_legacy_abi branch from 452998d to 389527b Compare May 23, 2025 09:26
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bjorn3 bjorn3 force-pushed the remove_wasm_legacy_abi branch from 389527b to b2cd5f2 Compare May 23, 2025 09:57
@xangelix xangelix mentioned this pull request Jun 1, 2025
Open
@bors
Copy link
Collaborator

bors commented Jun 3, 2025

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

@bjorn3 bjorn3 force-pushed the remove_wasm_legacy_abi branch from b2cd5f2 to f7a9002 Compare June 5, 2025 09:10
@alexcrichton
Copy link
Member

Out of curiosity, @bjorn3 did you (or anyone else?) have an expected timeline of when to land this? In the blog post this was slated for "mid summer" which is IMO any time around now, so at least personally I'd be in support of merging this change at any point now. I'm not sure if there are other stakeholders and thoughts though so wanted to confirm.

@bjorn3
Copy link
Member Author

bjorn3 commented Jun 5, 2025

It seems like the future incompat lint only recently started warning in dependencies, so I think we should at least wait until that change lands on stable.

@alexcrichton
Copy link
Member

Oh? I thought that #138601, by nature of being a future-incompat lint, would warn on dependencies too, and that is on stable with 1.87 I believe. Was there a separate change though for specifically turning on the warning for dependencies? (or do you think it'd be best to wait another stable release or so?)

@bjorn3
Copy link
Member Author

bjorn3 commented Jun 5, 2025

It did. I think I got confused by the merge conflict caused by #141936.

@bjorn3 bjorn3 marked this pull request as ready for review June 5, 2025 17:04
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 5, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 5, 2025

Some changes occurred in src/doc/rustc/src/platform-support

cc @Noratrieb

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

alexcrichton
alexcrichton approved these changes Jun 5, 2025
View reviewed changes
Copy link
Member

@alexcrichton alexcrichton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me from my perspective as a maintainer of the wasm32-unknown-unknown target. I'm less certain that I have the authority to officially approve and equeue this, but I figure if no one else raises an objection or otherwise enqueues this in the next week or so I'm happy to send it to bors

@alexcrichton
Copy link
Member

Also, would it make sense to put "Closes #138762" in the PR description too?

@bjorn3
Copy link
Member Author

bjorn3 commented Jun 5, 2025

Added that issue and #88152.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RalfJung RalfJung RalfJung left review comments

@alexcrichton alexcrichton alexcrichton approved these changes

Assignees

@alexcrichton alexcrichton

@workingjubilee workingjubilee

Labels
A-ABI Area: Concerning the application binary interface (ABI) O-wasm Target: WASM (WebAssembly), http://webassembly.org/ S-blocked Status: Blocked on something else such as an RFC or other implementation work. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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
Milestone
No milestone
9 participants
@bjorn3 @rustbot @daxpedda @bors @rust-log-analyzer @alexcrichton @RalfJung @cjgillot @workingjubilee