Skip to content

Rollup of 8 pull requests #140475

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.

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

Closed
wants to merge 31 commits into from
Closed

Conversation

tgross35
Copy link
Contributor

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

bjorn3 and others added 30 commits April 14, 2025 09:25
While LLVM is rather permissive in this regards, some other codegen
backends demand that once you declare a function for definition you
actually define contents of the function, which doesn't happen for naked
functions as we actually generate assembly for them.
This allows it to be reused by codegen backends that don't use cg_ssa
like cg_clif.
Most notably, the `FIXME` for suboptimal printing of `use` groups in
`tests/ui/macros/stringify.rs` is fixed. And all other test output
changes result in pretty printed output being closer to the original
formatting in the source code.
…esleywiser

Share the naked asm impl between cg_ssa and cg_clif

This was introduced in rust-lang#128004.
…etrochenkov

Improve pretty-printing of braces

r? ``@petrochenkov``
…s-msa, r=jieyouxu

enable msa feature for mips in codegen tests

Fix codegen unit tests for mips by enabling the msa target feature.
…s, r=Kobzol

Add `rust.debug-assertions-tools` option

Before this PR, the two only options to configure the presence of debug assertions were the `rust.debug-assertions` and `rust.debug-assertions-std` options. The former applied to everything, and the latter allowed to override the setting just for the standard library. This combination of settings doesn't allow to enable debug assertions for the std and the compiler but not tools.

Some tools (like Cargo) are not really meant to be executed with debug assertions enabled, and in Ferrocene we hit some debug assertions in it that are exclusively meant for its test suite. We'd thus like to enable debug assertions everywhere but in tools.

This PR adds a `rust.debug-assertions-tools` setting that does exactly this.
…et, r=oli-obk

miri: algebraic intrinsics: bring back float non-determinism

Fixes rust-lang/miri#4289
Cc `@bjoernager`
r? `@oli-obk`
…1-dead

Treat ManuallyDrop as ~const Destruct

cc rust-lang#133214 (comment)

r? `@compiler-errors`

cc `@fee1-dead`
…errors

Rename `rustc_query_append!` to `rustc_with_all_queries!`

Whenever I'm trying to make sense of the query system internals, I always get tripped up on this unhelpfully-named macro. The fact that it's a higher-order proc macro is already mind-melting enough on its own.

This new name, `rustc_with_all_queries!`, forms a much more intuitive combination with the helper macros that it invokes. And only one of the call sites was even making use of the “append” part of its old name.

This PR also reformats the parameters matched by the helper macros, to make the actual argument syntax a bit easier to see.

---

Renaming and reformatting only; no functional changes.
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-tidy Area: The tidy tool S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Apr 29, 2025
@tgross35
Copy link
Contributor Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Apr 29, 2025

📌 Commit 9529cc4 has been approved by tgross35

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
Copy link
Contributor Author

Whoops
@bors p=5

@bors
Copy link
Collaborator

bors commented Apr 29, 2025

⌛ Testing commit 9529cc4 with merge 7405ad3...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 29, 2025
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
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-apple-1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
##[group][AOT] mini_core_hello_world
[AOT] mini_core_hello_world
error: linking with `cc` failed: exit status: 1
  |
  = note:  "cc" "/var/folders/gn/rldh9pd93qg48089gvgb1gb80000gn/T/rustcr9n30g/symbols.o" "<1 object files omitted>" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/cg_clif/build/example/mini_core_hello_world.mini_core_hello_world.45f92588d0075ceb-cgu.0.rcgu.asm.o" "-lpthread" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/cg_clif/build/example/{libmini_core.rlib}.rlib" "-lc" "-arch" "x86_64" "-mmacosx-version-min=10.12.0" "-o" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/cg_clif/build/example/mini_core_hello_world" "-Wl,-dead_strip" "-nodefaultlibs" "-L/Users/runner/work/rust/rust/build/x86_64-apple-darwin/ci-llvm/lib" "-Wl,-rpath,@loader_path/../lib"
  = note: some arguments are omitted. use `--verbose` to show all linker arguments
  = note: ld: warning: no platform load command found in '/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/cg_clif/build/example/mini_core_hello_world.mini_core_hello_world.45f92588d0075ceb-cgu.0.rcgu.o', assuming: macOS
          ld: warning: no platform load command found in '/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/cg_clif/build/example/libmini_core.rlib[3](mini_core.mini_core.8ebffec3f94e0043-cgu.0.rcgu.o)', assuming: macOS
          ld: Undefined symbols:
            __RNvCs60sSKvRjvJL_21mini_core_hello_world10naked_test, referenced from:
                __RNvCs60sSKvRjvJL_21mini_core_hello_world4main in mini_core_hello_world.mini_core_hello_world.45f92588d0075ceb-cgu.0.rcgu.o
          clang: error: linker command failed with exit code 1 (use -v to see invocation)
          

error: aborting due to 1 previous error

"/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/cg_clif/dist/rustc-clif" "-Csymbol-mangling-version=v0" "-Zunstable-options" "--check-cfg=cfg(bootstrap)" "--check-cfg=cfg(llvm_enzyme)" "-Zmacro-backtrace" "-Csplit-debuginfo=unpacked" "-Clink-arg=-L/Users/runner/work/rust/rust/build/x86_64-apple-darwin/ci-llvm/lib" "-Zosx-rpath-install-name" "-Clink-args=-Wl,-rpath,@loader_path/../lib" "-Alinker-messages" "-L" "crate=/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/cg_clif/build/example" "--out-dir" "/Users/runner/work/rust/rust/build/x86_64-apple-darwin/stage1-tools/cg_clif/build/example" "-Cdebuginfo=2" "--target" "x86_64-apple-darwin" "-Cpanic=abort" "--check-cfg=cfg(jit)" "example/mini_core_hello_world.rs" exited with status ExitStatus(unix_wait_status(256))
Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 1:16:59
  local time: Tue Apr 29 21:04:12 UTC 2025
  network time: Tue, 29 Apr 2025 21:04:12 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

@bors
Copy link
Collaborator

bors commented Apr 29, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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
@tgross35 tgross35 closed this Apr 29, 2025
@tgross35 tgross35 deleted the rollup-mdp98bb branch April 29, 2025 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-tidy Area: The tidy tool rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.