Skip to content

Share the naked asm impl between cg_ssa and cg_clif #134232

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
Merged
merged 12 commits into from
Apr 30, 2025
Merged

Share the naked asm impl between cg_ssa and cg_clif #134232

merged 12 commits into from
Apr 30, 2025
+333 −397

Conversation

bjorn3
Copy link
Member

@bjorn3 bjorn3 commented Dec 12, 2024 •
edited
Loading

This was introduced in #128004.

@bjorn3 bjorn3 added the A-cranelift Things relevant to the [future] cranelift backend label Dec 12, 2024
@bjorn3
Copy link
Member Author

bjorn3 commented Dec 12, 2024

cc @folkertdev

@rustbot
Copy link
Collaborator

rustbot commented Dec 12, 2024

r? @chenyukang

rustbot has assigned @chenyukang.
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 12, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bjorn3 bjorn3 force-pushed the naked_asm_improvements branch 2 times, most recently from b8677a2 to d6b3c06 Compare December 13, 2024 08:55
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bjorn3 bjorn3 force-pushed the naked_asm_improvements branch from d6b3c06 to 0dd4292 Compare December 13, 2024 09:30
@bjorn3 bjorn3 marked this pull request as ready for review December 13, 2024 09:30
@rustbot
Copy link
Collaborator

rustbot commented Dec 13, 2024

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

@bjorn3 bjorn3 added A-inline-assembly Area: Inline assembly (`asm!(…)`) A-naked Area: `#[naked]`, prologue and epilogue-free, functions, https://git.io/vAzzS F-naked_functions `#![feature(naked_functions)]` labels Dec 13, 2024
@bors
Copy link
Collaborator

bors commented Dec 17, 2024

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

@bjorn3 bjorn3 force-pushed the naked_asm_improvements branch from 42ae211 to 1358f53 Compare December 18, 2024 17:13
@bjorn3 bjorn3 force-pushed the naked_asm_improvements branch from 1358f53 to dcf8b87 Compare January 9, 2025 17:36
@chenyukang
Copy link
Member

r? compiler

@rustbot rustbot assigned estebank and unassigned chenyukang Jan 12, 2025
@bors
Copy link
Collaborator

bors commented Jan 24, 2025

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

@bjorn3 bjorn3 force-pushed the naked_asm_improvements branch from dcf8b87 to 0b43964 Compare January 24, 2025 09:21
@bors
Copy link
Collaborator

bors commented Jan 31, 2025

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

@bjorn3 bjorn3 force-pushed the naked_asm_improvements branch from 0b43964 to b250776 Compare February 3, 2025 17:51
@bors
Copy link
Collaborator

bors commented Feb 17, 2025

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

@bjorn3 bjorn3 force-pushed the naked_asm_improvements branch from b250776 to 1341f83 Compare February 18, 2025 09:13
@bjorn3 bjorn3 force-pushed the naked_asm_improvements branch from ef86f9d to 3066da8 Compare April 14, 2025 09:38
@rustbot
Copy link
Collaborator

rustbot commented Apr 14, 2025

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

wesleywiser
wesleywiser approved these changes Apr 29, 2025
View reviewed changes
Copy link
Member

@wesleywiser wesleywiser left a comment •
edited
Loading

Choose a reason for hiding this comment

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

The cg_clif changes seem fine but I don't know enough about that part to thoroughly review. The rest lgmt!

@wesleywiser
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 29, 2025

📌 Commit 3066da8 has been approved by wesleywiser

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 Apr 29, 2025
tgross35 added a commit to tgross35/rust that referenced this pull request Apr 29, 2025
@tgross35
Rollup merge of rust-lang#134232 - bjorn3:naked_asm_improvements, r=w…
40ebd1b 
…esleywiser

Share the naked asm impl between cg_ssa and cg_clif

This was introduced in rust-lang#128004.
@tgross35 tgross35 mentioned this pull request Apr 29, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 29, 2025
@bors
Auto merge of rust-lang#140475 - tgross35:rollup-mdp98bb, r=tgross35
7405ad3 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#134232 (Share the naked asm impl between cg_ssa and cg_clif)
 - rust-lang#140312 (Improve pretty-printing of braces)
 - rust-lang#140437 (enable msa feature for mips in codegen tests)
 - rust-lang#140438 (Add `rust.debug-assertions-tools` option)
 - rust-lang#140439 (miri: algebraic intrinsics: bring back float non-determinism)
 - rust-lang#140445 (Treat ManuallyDrop as ~const Destruct)
 - rust-lang#140446 (chore: fix some tests)
 - rust-lang#140448 (Rename `rustc_query_append!` to `rustc_with_all_queries!`)

r? `@ghost`
`@rustbot` modify labels: rollup
@tgross35
Copy link
Contributor

@bors r-

Seems to have failed in #140475 (comment)

@bors 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 Apr 29, 2025
@bjorn3
Copy link
Member Author

bjorn3 commented Apr 30, 2025

@bors try

@bors
Copy link
Collaborator

bors commented Apr 30, 2025

⌛ Trying commit 3e174d4 with merge 441699d...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 30, 2025
@bors
Auto merge of rust-lang#134232 - bjorn3:naked_asm_improvements, r=<try>
441699d 
Share the naked asm impl between cg_ssa and cg_clif

This was introduced in rust-lang#128004.

try-job: x86_64-apple-1
@bors
Copy link
Collaborator

bors commented Apr 30, 2025

☀️ Try build successful - checks-actions
Build commit: 441699d (441699d9883cba27f02528dc03073968ed38d398)

@bjorn3
Copy link
Member Author

bjorn3 commented Apr 30, 2025

@bors r=wesleywiser

Just a minor cg_clif change since the last approval.

@bors
Copy link
Collaborator

bors commented Apr 30, 2025

📌 Commit 3e174d4 has been approved by wesleywiser

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 30, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 30, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 30, 2025
@bors
Auto merge of rust-lang#140520 - matthiaskrgr:rollup-7aoqcnp, r=matth…
251cda5 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#134232 (Share the naked asm impl between cg_ssa and cg_clif)
 - rust-lang#139624 (Don't allow flattened format_args in const.)
 - rust-lang#140090 (Check bare function idents for non snake-case name)
 - rust-lang#140203 (Issue an error when using `no_mangle` on language items)
 - rust-lang#140450 (ast: Remove token visiting from AST visitor)
 - rust-lang#140498 (Misc tweaks to HIR typeck (mostly w.r.t. checking calls))
 - rust-lang#140504 (transmutability: ensure_sufficient_stack when answering query)
 - rust-lang#140506 (unstable-book: fix capitalization)
 - rust-lang#140516 (Replace use of rustc_type_ir by rustc_middle)

Failed merges:

 - rust-lang#140374 (Resolve instance for SymFn in global/naked asm)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 555df30 into rust-lang:master Apr 30, 2025
7 checks passed
@rustbot rustbot added this to the 1.88.0 milestone Apr 30, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 30, 2025
@rust-timer
Unrolled build for rust-lang#134232
c59d699 
Rollup merge of rust-lang#134232 - bjorn3:naked_asm_improvements, r=wesleywiser

Share the naked asm impl between cg_ssa and cg_clif

This was introduced in rust-lang#128004.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@folkertdev folkertdev folkertdev left review comments

@wesleywiser wesleywiser wesleywiser approved these changes

Assignees

@wesleywiser wesleywiser

Labels
A-cranelift Things relevant to the [future] cranelift backend A-inline-assembly Area: Inline assembly (`asm!(…)`) A-naked Area: `#[naked]`, prologue and epilogue-free, functions, https://git.io/vAzzS F-naked_functions `#![feature(naked_functions)]` 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
Milestone
1.88.0
Development

Successfully merging this pull request may close these issues.
9 participants
@bjorn3 @rustbot @rust-log-analyzer @bors @chenyukang @wesleywiser @tgross35 @folkertdev @estebank