Rollup of 8 pull requests by jhpratt · Pull Request #144658 · rust-lang/rust

jhpratt · 2025-07-29T22:55:23Z

Successful merges:

tests: Test line number in debuginfo for diverging function calls #144034 (tests: Test line number in debuginfo for diverging function calls)
Fix Ord, Eq and Hash implementation of panic::Location #144510 (Fix Ord, Eq and Hash implementation of panic::Location)
Enable T-compiler backport nomination #144583 (Enable T-compiler backport nomination)
Update wasi-sdk to 27.0 in CI #144586 (Update wasi-sdk to 27.0 in CI)
Resolve: cachify ExternPreludeEntry.binding through a Cell #144605 (Resolve: cachify ExternPreludeEntry.binding through a Cell)
Update some tests for LLVM 21 #144632 (Update some tests for LLVM 21)
Update rustc-perf submodule #144639 (Update rustc-perf submodule)
Add support for the m68k architecture in 'object_architecture' #144640 (Add support for the m68k architecture in 'object_architecture')

r? @ghost
@rustbot modify labels: rollup

This is now printed on the same line. Use NEXT/SAME depending on the LLVM version.

The two xors get folded into the select.

On LLVM 21 additional %esp adjustments are generated. Don't use NEXT to allow these.

This updates the wasi-sdk used in CI to build release binaries and run CI with. No major motivation beyond keeping things up-to-date and following the development of wasi-sdk.

Faster equality compare Add tests Add missing files for tests

…buginfo, r=wesleywiser tests: Test line number in debuginfo for diverging function calls Closes rust-lang#59558 which just [E-needs-test](rust-lang#59558 (comment)). The bug seems to have been fixed in **nightly-2021-05-10**: ```sh for toolchain in nightly-2021-05-09 \ nightly-2021-05-10 \ 1.88; do echo -e "\nWith $toolchain:" rustc +$toolchain tests/codegen/diverging-function-call-debuginfo.rs --emit llvm-ir -o /tmp/out.ll -g -Clto -Copt-level=0 build/x86_64-unknown-linux-gnu/ci-llvm/bin/FileCheck --input-file /tmp/out.ll tests/codegen/diverging-function-call-debuginfo.rs --check-prefix=CHECK --dump-input-context 10 2>/dev/null && echo OK || echo FAIL done ``` ``` With nightly-2021-05-09: FAIL With nightly-2021-05-10: OK With 1.88: OK ``` which gives the following list of candidate commits. Not clear which one it is exactly but it doesn't matter much since we can confirm that the test works. I have confirmed locally that with **nightly-2021-05-09** we get `line: 0` for the last call. <details> <summary>click to expand</summary> ``` $ git log ^881c1ac408d93bb7adaa3a51dabab9266e82eee8 ca82264 --no-merges --oneline ``` f25aa57 Remove unused `opt_span_warn` function ebbc949 Note why `Handler::fatal` is different from `Sesssion::fatal` 96509b4 Make `Diagnostic::span_fatal` unconditionally raise an error e49f447 Remove some unnecessary uses of `struct_span_fatal` 955fdae Rename `Parser::span_fatal_err` -> `Parser::span_err` 4b7c8b0 Add `#[track_caller]` to `FakeDefId::expect_real()` ba13225 Remove `FakeDefId::expect_local()` 020d83d Enable `-W semicolon_in_expressions_from_macros` in bootstrap 1b928ff Update LLVM submodule c2b15a6 Support -C passes in NewPM 5519cbf Don't force -O1 with ThinLTO 7c4989a Drop -opt-bisect-limit=0 flag from test db140de Explicitly register GCOV profiling pass as well 5ecbe7f Explicitly register instrprof pass 0318883 Make -Z new-llvm-pass-manager an Option<bool> 0367e24 Avoid predecessors having Drop impls </details>

Fix Ord, Eq and Hash implementation of panic::Location Fixes rust-lang#144486. Now properly compares/hashes the filename rather than the pointer to the string.

…t-nomination, r=jieyouxu,Urgau Enable T-compiler backport nomination This patches the triagebot.toml so that it will trigger a backport label on pull requests fixing regressions. Applying a backport label will trigger creating a Zulip thread. For now the configuration only for `T-compiler` labeled regressions. Comments in the code explain how it works. Documentation [on the forge](https://forge.rust-lang.org/triagebot/backport.html). ``` [backport.foo] # The pull request MUST have one of these labels required_pr_labels = ["T-compiler"] # The regression MUST have this label required_issue_label = "regression-from-stable-to-beta" # if the above conditions matches, the PR will receive these labels add_labels = ["beta-nominated"] ``` Anything to think about before merging this? thanks for a review

…ark-Simulacrum Update wasi-sdk to 27.0 in CI This updates the wasi-sdk used in CI to build release binaries and run CI with. No major motivation beyond keeping things up-to-date and following the development of wasi-sdk.

…ude, r=petrochenkov Resolve: cachify `ExternPreludeEntry.binding` through a `Cell` Provides interior mutability to the `binding` field of `ExternPreludeEntry` as this field behaves like a cache. Per [zulip thread](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion/near/531390914). A little preparatory work for batched import resolution, which is part of [#gsoc > Project: Parallel Macro Expansion](https://rust-lang.zulipchat.com/#narrow/channel/421156-gsoc/topic/Project.3A.20Parallel.20Macro.20Expansion). r? `@petrochenkov`

Update some tests for LLVM 21 Fixes rust-lang#144604. Fixes rust-lang#144606. r? `@durin42`

Update rustc-perf submodule Mostly to include rust-lang/rustc-perf#2204.

Add support for the m68k architecture in 'object_architecture' This is a tiny PR that adds the m68k architecture to `object_architecture`. This allows us to build rmeta files for that ISA(we use the object crate to pack metadata into object files).

jhpratt · 2025-07-29T22:55:30Z

@bors r+ rollup=never p=5

bors · 2025-07-29T22:55:33Z

📌 Commit 72f4ff2 has been approved by jhpratt

It is now in the queue for this repository.

bors · 2025-07-29T23:53:08Z

⌛ Testing commit 72f4ff2 with merge c8bb4e8...

bors · 2025-07-30T02:55:57Z

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing c8bb4e8 to master...

rust-timer · 2025-07-30T02:58:14Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#144034	tests: Test line number in debuginfo for diverging function…	`649cd3b4ae5a2b383c2313c526752d00301d7e4d` (link)
#144510	Fix Ord, Eq and Hash implementation of panic::Location	`2022660e128d8b6840efb94e784145da48be295e` (link)
#144583	Enable T-compiler backport nomination	`0ae86bbad2e0785a8d2c5b672bf1ec674650df38` (link)
#144586	Update wasi-sdk to 27.0 in CI	`6c3d470c199ecfd022ce89d50ca1111a6980c201` (link)
#144605	Resolve: cachify `ExternPreludeEntry.binding` through a `Ce…	`0b0a8696371d13010c5874ff173070603854ddd2` (link)
#144632	Update some tests for LLVM 21	`c8f190f19cf9a675cf3e363076f2e51f4abba42f` (link)
#144639	Update rustc-perf submodule	`647ca15e0c9bc4c9d96a44753c25aaa740a1f6fc` (link)
#144640	Add support for the m68k architecture in 'object_architectu…	`894fafe7925b8cc2d238f665ff6ed518f8f8b606` (link)

previous master: ba7e63b638

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 · 2025-07-30T02:59:22Z

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 ba7e63b (parent) -> c8bb4e8 (this PR)

Test differences

Show 41 test diffs

Stage 1

[assembly] tests/assembly-llvm/nvptx-safe-naming.rs#LLVM21: [missing] -> ignore (ignored when the LLVM version 19.1.1 is older than 21.0.0) (J0)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs: ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) -> [missing] (J0)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM20: [missing] -> ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) (J0)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM21: [missing] -> ignore (ignored when the LLVM version 19.1.1 is older than 21.0.0) (J0)
[assembly] tests/assembly-llvm/nvptx-safe-naming.rs#LLVM21: [missing] -> ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) (J4)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs: pass -> [missing] (J4)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM20: [missing] -> pass (J4)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM21: [missing] -> ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) (J4)
[assembly] tests/assembly-llvm/nvptx-safe-naming.rs: ignore (only executed when the architecture is nvptx64) -> [missing] (J6)
[assembly] tests/assembly-llvm/nvptx-safe-naming.rs#LLVM20: [missing] -> ignore (only executed when the architecture is nvptx64) (J6)
[codegen] tests/codegen-llvm/diverging-function-call-debuginfo.rs: [missing] -> pass (J6)
panic::location::location_eq: [missing] -> pass (J8)
panic::location::location_ord: [missing] -> pass (J8)

Stage 2

[assembly] tests/assembly-llvm/nvptx-safe-naming.rs: ignore (only executed when the architecture is nvptx64) -> [missing] (J1)
[assembly] tests/assembly-llvm/nvptx-safe-naming.rs#LLVM20: [missing] -> ignore (only executed when the architecture is nvptx64) (J1)
[codegen] tests/codegen-llvm/diverging-function-call-debuginfo.rs: [missing] -> pass (J1)
[assembly] tests/assembly-llvm/nvptx-safe-naming.rs#LLVM21: [missing] -> ignore (ignored when the LLVM version 19.1.1 is older than 21.0.0) (J2)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs: ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) -> [missing] (J2)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM20: [missing] -> ignore (ignored when the LLVM version 19.1.1 is older than 20.0.0) (J2)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM21: [missing] -> ignore (ignored when the LLVM version 19.1.1 is older than 21.0.0) (J2)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs: pass -> [missing] (J3)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM20: [missing] -> pass (J3)
[assembly] tests/assembly-llvm/nvptx-safe-naming.rs#LLVM21: [missing] -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J5)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM21: [missing] -> ignore (ignored when the LLVM version 20.1.8 is older than 21.0.0) (J5)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs: ignore (only executed when the pointer width is 64bit) -> [missing] (J7)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM20: [missing] -> ignore (only executed when the pointer width is 64bit) (J7)
[assembly] tests/assembly-llvm/nvptx-safe-naming.rs#LLVM21: [missing] -> ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) (J9)
[codegen] tests/codegen-llvm/enum/enum-discriminant-eq.rs#LLVM21: [missing] -> ignore (ignored when the LLVM version 20.1.2 is older than 21.0.0) (J9)

Additionally, 13 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 c8bb4e8a126cf38cff70cea488a3a423a5321954 --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

x86_64-apple-2: 3471.8s -> 5552.5s (59.9%)
dist-aarch64-apple: 5085.3s -> 7449.8s (46.5%)
dist-aarch64-msvc: 5893.9s -> 8158.0s (38.4%)
aarch64-msvc-1: 9107.5s -> 6304.8s (-30.8%)
aarch64-apple: 5221.5s -> 6746.8s (29.2%)
pr-check-2: 2126.3s -> 2708.0s (27.4%)
x86_64-apple-1: 10441.2s -> 7963.5s (-23.7%)
x86_64-rust-for-linux: 2609.6s -> 3187.5s (22.1%)
x86_64-gnu-llvm-19: 2486.2s -> 2934.6s (18.0%)
pr-check-1: 1510.1s -> 1738.4s (15.1%)

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 · 2025-07-30T04:06:50Z

Finished benchmarking commit (c8bb4e8): 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.9%	[-1.0%, -0.8%]	6
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -0.4%)

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

	mean	range	count
Regressions ❌ (primary)	1.6%	[1.6%, 1.6%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.5%	[-2.5%, -2.5%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.4%	[-2.5%, 1.6%]	2

Cycles

Results (primary 2.2%)

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

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

Binary size

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

Bootstrap: 469.063s -> 470.143s (0.23%)
Artifact size: 376.81 MiB -> 376.75 MiB (-0.01%)

Rollup of 8 pull requests Successful merges: - rust-lang#144034 (tests: Test line number in debuginfo for diverging function calls) - rust-lang#144510 (Fix Ord, Eq and Hash implementation of panic::Location) - rust-lang#144583 (Enable T-compiler backport nomination) - rust-lang#144586 (Update wasi-sdk to 27.0 in CI) - rust-lang#144605 (Resolve: cachify `ExternPreludeEntry.binding` through a `Cell`) - rust-lang#144632 (Update some tests for LLVM 21) - rust-lang#144639 (Update rustc-perf submodule) - rust-lang#144640 (Add support for the m68k architecture in 'object_architecture') r? `@ghost` `@rustbot` modify labels: rollup

apiraino and others added 21 commits July 28, 2025 18:52

Enable t-compiler backport nomination

c5b4606

Fix nvptx-safe-naming.rs test on LLVM 21

56d9ed7

This is now printed on the same line. Use NEXT/SAME depending on the LLVM version.

Adjust enum-discriminant-eq.rs for LLVM 21

d50b4f1

The two xors get folded into the select.

Add support for the m68k architecture in 'object_architecture'

652b9eb

Relax check lines in x86-return-float.rs

ccf660f

On LLVM 21 additional %esp adjustments are generated. Don't use NEXT to allow these.

"Cachify" ExternPreludeEntry.binding through a Cell.

c39b447

Update rustc-perf submodule

0b807fc

Improve tidy error on dependency license exceptions

d1a877a

Update license exceptions for rustc-perf

ab4024e

Remove no longer needed handling of nonstandard licenses

b60026a

Update wasi-sdk to 27.0 in CI

77fc593

This updates the wasi-sdk used in CI to build release binaries and run CI with. No major motivation beyond keeping things up-to-date and following the development of wasi-sdk.

tests: Test line number in debuginfo for diverging function calls

307fd41

Fix Ord, Eq and Hash implementation of panic::Location

05da623

Faster equality compare Add tests Add missing files for tests

Rollup merge of rust-lang#144510 - orlp:fix-location-ord, r=ibraheemdev

48dfddd

Fix Ord, Eq and Hash implementation of panic::Location Fixes rust-lang#144486. Now properly compares/hashes the filename rather than the pointer to the string.

Rollup merge of rust-lang#144632 - nikic:llvm-21-tests, r=durin42

bd40dd6

Update some tests for LLVM 21 Fixes rust-lang#144604. Fixes rust-lang#144606. r? `@durin42`

Rollup merge of rust-lang#144639 - Kobzol:x-perf-tui, r=lqd

322686d

Update rustc-perf submodule Mostly to include rust-lang/rustc-perf#2204.

rustbot added the rollup A PR which is a rollup label Jul 29, 2025

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 Jul 29, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 30, 2025

bors merged commit c8bb4e8 into rust-lang:master Jul 30, 2025
11 checks passed

rustbot added this to the 1.90.0 milestone Jul 30, 2025

bors mentioned this pull request Jul 30, 2025

Introduce ModernIdent type to unify macro 2.0 hygiene handling #144439

Merged

jhpratt deleted the rollup-jdzhz27 branch August 12, 2025 18:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests#144658

Rollup of 8 pull requests#144658
bors merged 21 commits intorust-lang:masterfrom
jhpratt:rollup-jdzhz27

jhpratt commented Jul 29, 2025 •

edited by rustbot

Loading

Uh oh!

jhpratt commented Jul 29, 2025

Uh oh!

bors commented Jul 29, 2025

Uh oh!

bors commented Jul 29, 2025

Uh oh!

bors commented Jul 30, 2025

Uh oh!

Uh oh!

rust-timer commented Jul 30, 2025

Uh oh!

github-actions bot commented Jul 30, 2025

Stage 1

Stage 2

Uh oh!

rust-timer commented Jul 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

Uh oh!

Conversation

jhpratt commented Jul 29, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jhpratt commented Jul 29, 2025

Uh oh!

bors commented Jul 29, 2025

Uh oh!

bors commented Jul 29, 2025

Uh oh!

bors commented Jul 30, 2025

Uh oh!

Uh oh!

rust-timer commented Jul 30, 2025

Uh oh!

github-actions bot commented Jul 30, 2025

Test differences

Stage 1

Stage 2

Job duration changes

Uh oh!

rust-timer commented Jul 30, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

jhpratt commented Jul 29, 2025 •

edited by rustbot

Loading