Skip to content

Rollup of 11 pull requests #142685

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

Merged
merged 38 commits into from
Jun 18, 2025
Merged

Rollup of 11 pull requests #142685

merged 38 commits into from
Jun 18, 2025

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jun 18, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

workingjubilee and others added 30 commits June 4, 2025 14:51
This test only makes sense if you send it back in time and run it with
a now-old Rust commit, e.g. 50e0cc5
However, if you do go back that far in time, you will see it pass.
Update this time-traveler on the changes in compiletest and target specs
that they missed over the pass ~3 years by being caught in a time rift.
The aarch64-apple rev splits into itself and aarch64-apple-on, because
rustc obtained support for non-leaf frame-pointers ever since 9b67cba
implemented them and used them in aarch64-apple-darwin's spec.

Note that the aarch64-apple-off revision fails, despite modernization.
This is because 9b67cba also changed the behavior of rustc to defer to
the spec over the command-line interface.
I went back 20 *stable* versions of Rust and I couldn't find this flag actually being used. Despite some of our CI workflows actually set this flag (!).
This is used to replace the previous downcasting of executed steps, which wasn't very scalable. In addition to tests, we could also use the metadata e.g. for tracing.
Another refactor pulled out from 138759

The previous implementation I'd written here based on `index_by_increasing_offset` is complicated to follow and difficult to extend to non-structs.

This changes the implementation, without actually changing any codegen (thus no test changes either), to be more like the existing `extract_field` (<https://github.com/rust-lang/rust/blob/2b0274c71dba0e24370ebf65593da450e2e91868/compiler/rustc_codegen_ssa/src/mir/operand.rs#L345-L425>) in that it allows setting a particular field directly.

Notably I've found this one much easier to get right, in particular because having the `OperandRef<Result<V, Scalar>>` gives a really useful thing to include in ICE messages if something did happen to go wrong.
…pointers-favor-the-target-or-cli, r=jieyouxu

Affirm `-Cforce-frame-pointers=off` does not override

This PR exists to document that we (that is, the compiler reviewer) implicitly made a decision in rust-lang#86652 that defies the expectations of some programmers. Some programmers believe `-Cforce-frame-pointers=false` should obey the programmer in all cases, forcing the compiler to avoid generating frame pointers, even if the target specification would indicate they must be generated. However, many targets rely on frame pointers for fast or sound unwinding.

T-compiler had a weekly triage meeting on 2025-05-22. This topic was put to discussion because some programmers may expect the target-overriding behavior. In that meeting we decided removing frame pointers, at least with regards to the contract of the `-Cforce-frame-pointers` option, is not required, even if `=off` is passed, and that we will not do so if the target would expect them. This follows from the documentation here: https://doc.rust-lang.org/rustc/codegen-options/index.html#force-frame-pointers

We may separately pursue trying to clarify the situation more emphatically in our documentation, or warn when people pass the option when it doesn't do anything.
…r, r=lcnr,traviscross

Stabilize `feature(generic_arg_infer)`

Fixes rust-lang#85077

r? lcnr

cc ````@rust-lang/project-const-generics````
…kingjubilee

CodeGen: rework Aggregate implemention for rvalue_creates_operand cases

A non-trivial refactor pulled out from rust-lang#138759
r? workingjubilee

The previous implementation I'd written here based on `index_by_increasing_offset` is complicated to follow and difficult to extend to non-structs.

This changes the implementation, without actually changing any codegen (thus no test changes either), to be more like the existing `extract_field` (<https://github.com/rust-lang/rust/blob/2b0274c71dba0e24370ebf65593da450e2e91868/compiler/rustc_codegen_ssa/src/mir/operand.rs#L345-L425>) in that it allows setting a particular field directly.

Notably I've found this one much easier to get right, in particular because having the `OperandRef<Result<V, Scalar>>` gives a really useful thing to include in ICE messages if something did happen to go wrong.
Kobzol added 6 commits June 18, 2025 18:06
Actually take `--build` into account in bootstrap

I went back 20 *stable* versions of Rust and I couldn't find this flag actually being used. Despite some of our CI workflows actually set this flag (!).

I added destructuring of the flags to make sure that this doesn't happen again. It found one more duplicated CLI flag.

r? ```@jieyouxu```
Add `StepMetadata` to describe steps

This is used to replace the previous downcasting of executed steps, which wasn't very scalable. In addition to tests, we could also use the metadata e.g. for tracing.

r? ```@jieyouxu```
remove joboet from review rotation

I've been very busy recently and this has led to reviews feeling less like fun and more like an additional chore – in short: I need a break. I'm still around though and am happy to review PRs explicitly assigned to me.
…obzol

Skip tidy triagebot linkcheck if `triagebot.toml` doesn't exist

Since distribution tarballs won't include `triagebot.toml`.

I think it's sufficiently obvious if `triagebot.toml` gets deleted entirely in PRs.

r? Kobzol
…n, r=jieyouxu

Clarify bootstrap tools description

The existence of `stage0-bootstrap-tools` suggests the possiblity of `stage1/N-bootstrap-tools`, but that's not really a thing. Also it doesn't fit the new bootstrap model, where `stageN` essentially means that it was built with a `stageN-1` compiler (except for std).

r? ``@jieyouxu``
…r=bjorn3

remove duplicate crash test

I noticed near duplication between "library/alloctests/tests/testing/crash_test.rs" and "library/alloctests/testing/crash_test.rs" and wanted to try and remove that. The only difference is the path used to import `Debug`, but it seems not to matter. Perhaps my change is still wrong?

r? ``@bjorn3``
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jun 18, 2025
@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 18, 2025

@bors r+ rollup=never p=5

@rustbot rustbot added the rollup A PR which is a rollup label Jun 18, 2025
@bors
Copy link
Collaborator

bors commented Jun 18, 2025

📌 Commit a0a6db2 has been approved by Kobzol

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 Jun 18, 2025
@bors
Copy link
Collaborator

bors commented Jun 18, 2025

⌛ Testing commit a0a6db2 with merge c683403...

@bors
Copy link
Collaborator

bors commented Jun 18, 2025

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing c683403 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 18, 2025
@bors bors merged commit c683403 into rust-lang:master Jun 18, 2025
1 check passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 18, 2025
Copy link
Contributor

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 f9c15f4 (parent) -> c683403 (this PR)

Test differences

Show 30 test diffs

Stage 1

  • [codegen] tests/codegen/frame-pointer-cli-control.rs#aarch64-apple: [missing] -> pass (J0)
  • [codegen] tests/codegen/frame-pointer-cli-control.rs#aarch64-apple-off: [missing] -> pass (J0)
  • [codegen] tests/codegen/frame-pointer-cli-control.rs#aarch64-apple-on: [missing] -> pass (J0)
  • [codegen] tests/codegen/frame-pointer-cli-control.rs#force-on: [missing] -> pass (J0)
  • [ui] tests/ui/const-generics/generic_arg_infer/parend_infer.rs: [missing] -> pass (J0)
  • [ui] tests/ui/const-generics/generic_arg_infer/parend_infer.rs#gate: pass -> [missing] (J0)
  • [ui] tests/ui/const-generics/generic_arg_infer/parend_infer.rs#nogate: pass -> [missing] (J0)
  • [ui] tests/ui/feature-gates/feature-gate-generic_arg_infer.rs#feature: pass -> [missing] (J0)
  • [ui] tests/ui/feature-gates/feature-gate-generic_arg_infer.rs#normal: pass -> [missing] (J0)
  • [ui] tests/ui/parser/issues/issue-14303-fncall.rs: [missing] -> pass (J0)
  • [ui] tests/ui/parser/issues/issue-14303-fncall.rs#full: pass -> [missing] (J0)
  • [ui] tests/ui/parser/issues/issue-14303-fncall.rs#generic_arg: pass -> [missing] (J0)
  • [ui] tests/ui/span/issue-42234-unknown-receiver-type.rs: [missing] -> pass (J0)
  • [ui] tests/ui/span/issue-42234-unknown-receiver-type.rs#full: pass -> [missing] (J0)
  • [ui] tests/ui/span/issue-42234-unknown-receiver-type.rs#generic_arg: pass -> [missing] (J0)

Stage 2

  • [ui] tests/ui/const-generics/generic_arg_infer/parend_infer.rs: [missing] -> pass (J1)
  • [ui] tests/ui/const-generics/generic_arg_infer/parend_infer.rs#gate: pass -> [missing] (J1)
  • [ui] tests/ui/const-generics/generic_arg_infer/parend_infer.rs#nogate: pass -> [missing] (J1)
  • [ui] tests/ui/feature-gates/feature-gate-generic_arg_infer.rs#feature: pass -> [missing] (J1)
  • [ui] tests/ui/feature-gates/feature-gate-generic_arg_infer.rs#normal: pass -> [missing] (J1)
  • [ui] tests/ui/parser/issues/issue-14303-fncall.rs: [missing] -> pass (J1)
  • [ui] tests/ui/parser/issues/issue-14303-fncall.rs#full: pass -> [missing] (J1)
  • [ui] tests/ui/parser/issues/issue-14303-fncall.rs#generic_arg: pass -> [missing] (J1)
  • [ui] tests/ui/span/issue-42234-unknown-receiver-type.rs: [missing] -> pass (J1)
  • [ui] tests/ui/span/issue-42234-unknown-receiver-type.rs#full: pass -> [missing] (J1)
  • [ui] tests/ui/span/issue-42234-unknown-receiver-type.rs#generic_arg: pass -> [missing] (J1)
  • [codegen] tests/codegen/frame-pointer-cli-control.rs#aarch64-apple: [missing] -> pass (J2)
  • [codegen] tests/codegen/frame-pointer-cli-control.rs#aarch64-apple-off: [missing] -> pass (J2)
  • [codegen] tests/codegen/frame-pointer-cli-control.rs#aarch64-apple-on: [missing] -> pass (J2)
  • [codegen] tests/codegen/frame-pointer-cli-control.rs#force-on: [missing] -> pass (J2)

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard c68340350c78eea402c4a85f8d9c1b7d3d607635 --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. mingw-check-tidy: 65.4s -> 98.5s (50.6%)
  2. dist-aarch64-apple: 4853.1s -> 6867.6s (41.5%)
  3. dist-x86_64-apple: 8541.1s -> 11248.9s (31.7%)
  4. aarch64-apple: 5031.0s -> 6126.0s (21.8%)
  5. i686-gnu-2: 5396.2s -> 6246.7s (15.8%)
  6. x86_64-rust-for-linux: 2543.3s -> 2879.9s (13.2%)
  7. x86_64-gnu-llvm-19-1: 3292.8s -> 3714.5s (12.8%)
  8. aarch64-gnu: 6186.5s -> 6965.6s (12.6%)
  9. i686-gnu-nopt-1: 7184.2s -> 7954.8s (10.7%)
  10. x86_64-gnu-stable: 7022.5s -> 7751.1s (10.4%)
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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#140774 Affirm -Cforce-frame-pointers=off does not override b0306001fe99969dbde025bb33224b42499b0469 (link)
#141610 Stabilize feature(generic_arg_infer) 744244e4e5083bdd53afd7dda7e438d32dee5670 (link)
#142383 CodeGen: rework Aggregate implemention for rvalue_creates_o… b1c1358247ea8613d1272eeb1f0b8e919a3de6e7 (link)
#142591 Add spawn APIs for BootstrapCommand to support deferred com… 20be753dcbfd334f7c54f1041ceab26b5b044b00 (link)
#142619 apply clippy::or_fun_call a660db3b66bec053ecf311c4597990ee1da7324f (link)
#142624 Actually take --build into account in bootstrap b6ea36db4295b541dcefdf781b59e012d1f3a0c9 (link)
#142627 Add StepMetadata to describe steps 836e9e2f6b08dff8fc3a26209f2906ddd2136236 (link)
#142660 remove joboet from review rotation e99cd45d9d57901814d3a0387f0c8a631c216da8 (link)
#142666 Skip tidy triagebot linkcheck if triagebot.toml doesn't e… 087fcbe636ad6a5cb0105ce8adc64b3ff05ce871 (link)
#142672 Clarify bootstrap tools description e099e4bfa599562f3b1464378b241233e1fee7f8 (link)
#142674 remove duplicate crash test 96aa17f8ef18436c643ae8ebe286f33f6053ef58 (link)

previous master: f9c15f40fb

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

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-meta Area: Issues & PRs about the rust-lang/rust repository itself A-rustc-dev-guide Area: rustc-dev-guide A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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.