use cfg_select! to pick assembly in codegen test#148881
Merged
bors merged 1 commit intorust-lang:mainfrom Nov 16, 2025
Merged
Conversation
Collaborator
|
rustbot has assigned @Mark-Simulacrum. Use |
| { | ||
| naked_asm!("adds r0, r0, r1", "bx lr") | ||
| cfg_select! { | ||
| any(target_arch = "x86_64", target_arch = "x86") => { |
Member
There was a problem hiding this comment.
Shouldn't this be any(target_os = "windows", target_os = "linux")?
Seems like the next clause is also the wrong one?
Contributor
Author
There was a problem hiding this comment.
I did change the clause, but I believe that the change is correct. What assembly to use depends on the target architecture, not on the target operating system.
Member
There was a problem hiding this comment.
I see. I guess in practice this worked before because we run this test with specific targets... so macOS really was always aarch64, while linux/win was x86_64/x86.
//@[linux] compile-flags: --target x86_64-unknown-linux-gnu
//@[linux] needs-llvm-components: x86
//@[win_x86] compile-flags: --target x86_64-pc-windows-gnu
//@[win_x86] needs-llvm-components: x86
//@[win_i686] compile-flags: --target i686-pc-windows-gnu
//@[win_i686] needs-llvm-components: x86
//@[macos] compile-flags: --target aarch64-apple-darwin
//@[macos] needs-llvm-components: aarch64
Member
|
@bors r+ |
Collaborator
bors
added a commit
that referenced
this pull request
Nov 16, 2025
Rollup of 7 pull requests Successful merges: - #148703 (Use `overflow_checks` intrinsic so `IterRangeFrom` yields MAX before panicking in debug) - #148881 (use `cfg_select!` to pick assembly in codegen test) - #148911 (Make flags from `*FLAGS*` (such as `RUSTFLAGS`) env. vars. have precedence over flags set by bootstrap) - #148914 (fix incorrect import in `std_detect` on `aarch64-unknown-openbsd`) - #148971 (Document Error::{new,other} as to be avoided in pre_exec) - #148983 (Use rustc target metadata for build-manifest target lists) - #148995 (add must_use to extract_if methods) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
that referenced
this pull request
Nov 16, 2025
Rollup merge of #148881 - folkertdev:cfg-select-codegen-naked, r=Mark-Simulacrum use `cfg_select!` to pick assembly in codegen test This makes it a bit easier to see what assembly is actually used.
Member
|
still in queue @bors r- |
Muscraft
pushed a commit
to Muscraft/rust
that referenced
this pull request
Nov 17, 2025
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#148703 (Use `overflow_checks` intrinsic so `IterRangeFrom` yields MAX before panicking in debug) - rust-lang#148881 (use `cfg_select!` to pick assembly in codegen test) - rust-lang#148911 (Make flags from `*FLAGS*` (such as `RUSTFLAGS`) env. vars. have precedence over flags set by bootstrap) - rust-lang#148914 (fix incorrect import in `std_detect` on `aarch64-unknown-openbsd`) - rust-lang#148971 (Document Error::{new,other} as to be avoided in pre_exec) - rust-lang#148983 (Use rustc target metadata for build-manifest target lists) - rust-lang#148995 (add must_use to extract_if methods) r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This makes it a bit easier to see what assembly is actually used.