Skip to content

Conversation

@matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost

Create a similar rollup

tisonkun and others added 22 commits December 14, 2025 14:35
This commit reorders some cases in `export_symbols` in the linker
implementation for wasm to ensure that the `is_like_wasm` case is
handled before the catch-all `CrateType::Executable` case.
NVPTX does not support cycles in static initializers. LLVM produces an error when attempting to codegen such constructs (like self referential structs).

To not produce LLVM UB we instead emit a post-monomorphization error on
Rust side before reaching codegen.

This is achieved by analysing a subgraph of the "mono item graph" that
only contains statics:
1. Calculate the strongly connected components (SCCs) of the graph
2. Check for cycles (more than one node in a SCC or exactly one node
   which references itself)
Having two dedicated target maintainers is a prerequisite for promoting
this target to tier 2. I've been in contact with Ulrich and he's agreed
to having me as a co-maintainer in preparation for a MCP to promote it to
tier 2.
This is a safe function, which doesn't take a `ptr` parameter.
Add waker_fn and local_waker_fn to std::task

This refers to rust-lang#149580.
…crum

Update provider API docs

Adds guidance on a specific provider API implementation anti pattern that implementers of the error trait should avoid.

resolves rust-lang#99301 (comment)
`c_variadic`: provide our own `va_arg` implementation for more targets

tracking issue: rust-lang#44930

Provide our own implementations in order to guarantee the behavior of `va_arg`. We will only be able to stabilize `c_variadic` on targets where we know and guarantee the properties of `va_arg`.

r? workingjubilee
…, r=jdonszelmann

rustc: Fix `-Zexport-executable-symbols` on wasm

This commit reorders some cases in `export_symbols` in the linker implementation for wasm to ensure that the `is_like_wasm` case is handled before the catch-all `CrateType::Executable` case.
…r=workingjubilee

Ensure that static initializers are acyclic for NVPTX

NVPTX does not support cycles in static initializers (see rust-lang#146787). LLVM produces an error when attempting to generate code for such constructs, like self-referential structs.

To avoid LLVM UB, we emit a post-monomorphization error on the Rust side before reaching codegen.

This is achieved by analyzing a subgraph of the "mono item graph" that only contains statics.
1. Calculate the strongly connected components (SCCs) of the graph.
2. Check for cycles (more than one node in an SCC or one node that references itself).
./x check miri: enable check_only feature

With this, we should no longer need to turn off the default features, so we can undo rust-lang#149550.

@bjorn3 you seem to have a test setup to check if this works properly in terms of skipping all the work that should not be required -- could you test if this PR works as intended?

FWIW we could now remove `default_features` from `run_tool_check_step`. Not sure if that's worth it.
Thread `--jobs` from `bootstrap` -> `compiletest` -> `run-make-support`

Context is rust-lang#150524 (comment), where we would like to thread the `--jobs` config from bootstrap explicitly through to run-make tests without relying on an "external env var" that bypasses the build/test infra.

Note that this PR currently intentionally couples the jobs configured for *builds*, versus for `TestMode::RunMake` tests. We can further specialize some kind of `run-make-jobs` bootstrap config *if actually needed*; I will keep this configuration naive for now.

r? @Kobzol
Add AtomicPtr::null

Implementation for rust-lang#150733.

I marked this function as `#[must_use]` even though the other `AtomicPtr` constructors aren't. It's unclear to me why they aren't already marked as such, I opened a zulip thread asking about it: [#t-libs > Is there a reason AtomicPtr constructors aren't #&rust-lang#91;must_use&rust-lang#93;?](https://rust-lang.zulipchat.com/#narrow/channel/219381-t-libs/topic/Is.20there.20a.20reason.20AtomicPtr.20constructors.20aren't.20.23.5Bmust_use.5D.3F/with/566624261).
Add myself as co-maintainer for s390x-unknown-linux-musl

Having two dedicated target maintainers is a prerequisite for promoting this target to tier 2. I've been in contact with Ulrich and he's agreed to having me as a co-maintainer in preparation for a MCP to promote it to tier 2.

cc @uweigand
Fix copy-n-paste error in `vtable_for` docs

This is a safe function, which doesn't take a `ptr` parameter.
@rust-bors rust-bors bot added the rollup A PR which is a rollup label Jan 8, 2026
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs A-test-infra-minicore Area: `minicore` test auxiliary and `//@ add-core-stubs` A-testsuite Area: The testsuite used to check the correctness of rustc 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) labels Jan 8, 2026
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 8, 2026
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@rust-bors rust-bors bot 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 Jan 8, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 8, 2026

📌 Commit 5a5740f has been approved by matthiaskrgr

It is now in the queue for this repository.

@rust-bors

This comment has been minimized.

@rust-bors rust-bors bot added the merged-by-bors This PR was explicitly merged by bors. label Jan 8, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 8, 2026

☀️ Test successful - CI
Approved by: matthiaskrgr
Pushing 4586feb to main...

@rust-bors rust-bors bot merged commit 4586feb into rust-lang:main Jan 8, 2026
12 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Jan 8, 2026
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#149976 Add waker_fn and local_waker_fn to std::task 0f7bd5e131654b8554e69d294d32fbd811c61ce4 (link)
#150074 Update provider API docs ca35bbf7a97fb33f35427c0efa2a89571b81a0bb (link)
#150094 c_variadic: provide our own va_arg implementation for m… ae11c0b6f58c000e1df7b31fa9b9769ad8e087c5 (link)
#150164 rustc: Fix -Zexport-executable-symbols on wasm 5c64e12479a62c0becf060416da64de8fa692f87 (link)
#150569 Ensure that static initializers are acyclic for NVPTX 62f3c51b88a7d43fec77c3155bb5fe18810051ed (link)
#150694 ./x check miri: enable check_only feature de215f0038742ba14a3a70428d010efd4082d95b (link)
#150717 Thread --jobs from bootstrap -> compiletest -> `run-m… 6f87a1381801a8c3057dd7bcc09a56ec44c2e3e9 (link)
#150736 Add AtomicPtr::null 1ac6f9fa75493842ddc2d1c354382c9c8750b206 (link)
#150787 Add myself as co-maintainer for s390x-unknown-linux-musl 38962d856467ea371e9fe3ece3824f2e957d76e4 (link)
#150789 Fix copy-n-paste error in vtable_for docs 4eacf298c0259407d18e2268d742fb5dc3f97444 (link)

previous master: 32fe406b5e

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions
Copy link
Contributor

github-actions bot commented Jan 8, 2026

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 32fe406 (parent) -> 4586feb (this PR)

Test differences

Show 1373 test diffs

Stage 0

  • errors::verify_monomorphize_static_initializer_cyclic_12: [missing] -> pass (J2)

Stage 1

  • errors::verify_monomorphize_static_initializer_cyclic_12: [missing] -> pass (J1)
  • [run-make] tests/run-make/compiletest-self-test/jobs: [missing] -> pass (J2)
  • [ui] tests/ui/static/static-initializer-acyclic-issue-146787.rs: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/static/static-initializer-acyclic-issue-146787.rs: [missing] -> ignore (gcc backend is marked as ignore) (J0)
  • [ui] tests/ui/static/static-initializer-acyclic-issue-146787.rs: [missing] -> pass (J3)
  • [run-make] tests/run-make/compiletest-self-test/jobs: [missing] -> pass (J4)

Additionally, 1366 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 4586feb998521343b91c554adbb11ba30547d67a --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-aarch64-apple: 6024.5s -> 7968.5s (+32.3%)
  2. dist-apple-various: 3822.6s -> 4792.1s (+25.4%)
  3. pr-check-1: 1651.3s -> 2015.1s (+22.0%)
  4. aarch64-gnu-llvm-20-1: 3362.3s -> 3954.0s (+17.6%)
  5. aarch64-gnu-llvm-20-2: 2697.1s -> 3146.2s (+16.7%)
  6. x86_64-gnu-stable: 7678.5s -> 8930.1s (+16.3%)
  7. x86_64-rust-for-linux: 2760.9s -> 3180.6s (+15.2%)
  8. x86_64-gnu-llvm-20-1: 3925.4s -> 4443.2s (+13.2%)
  9. aarch64-gnu-debug: 3944.3s -> 4451.4s (+12.9%)
  10. x86_64-gnu-tools: 3271.9s -> 3684.7s (+12.6%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (4586feb): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.5% [-0.5%, -0.5%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (primary 2.0%, secondary 1.6%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
2.0% [1.4%, 2.4%] 3
Regressions ❌
(secondary)
1.6% [1.6%, 1.6%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.0% [1.4%, 2.4%] 3

Cycles

Results (primary 2.1%, secondary 2.3%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
2.1% [2.1%, 2.1%] 2
Regressions ❌
(secondary)
2.3% [1.5%, 3.0%] 5
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.1% [2.1%, 2.1%] 2

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 474.424s -> 478.143s (0.78%)
Artifact size: 390.80 MiB -> 390.88 MiB (0.02%)

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

Labels

A-compiletest Area: The compiletest test runner A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-run-make Area: port run-make Makefiles to rmake.rs A-test-infra-minicore Area: `minicore` test auxiliary and `//@ add-core-stubs` A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.