Skip to content

Rollup of 7 pull requests#155710

Merged
rust-bors[bot] merged 18 commits intorust-lang:mainfrom
tgross35:rollup-skXlTFI
Apr 24, 2026
Merged

Rollup of 7 pull requests#155710
rust-bors[bot] merged 18 commits intorust-lang:mainfrom
tgross35:rollup-skXlTFI

Conversation

@tgross35
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

lewisfm and others added 18 commits April 9, 2026 23:03
Commit 623c7d7 accidentally changed the return value from
REGULAR_UNION to RegularEnum when converting string literals
to enum values. Commit b17670d then renamed RegularUnion
to Union, but the buggy return statement remained unchanged.
This caused unions to be misclassified as enums, preventing
LLDB from displaying union field contents.
…gross35

c-variadic: fix for sparc64

tracking issue: rust-lang#44930

Turns out it's a big-endian target that right-adjusts values in the stack slots.

Apparently these tests do get run occasionally, though i don't think test failures are usually turned into issues on this repo. I guess we could add an assembly test here too, though really you just have to run these tests. I've tried this locally with qemu, and it passes all c-variadic tests.

cc @thejpster @glaubitz
r? tgross35
…cros, r=ehuss

tests/ui/macros: add annotations for reference rules
Add docs about SDKs and C compilation on armv7a-vex-v5

This PR expands the documentation for armv7a-vex-v5 to fix broken links, add more information about SDKs, and create a new section about C compilation.

I'm not super familiar with how Rust chooses what linker configuration to use / how the `cc` crate chooses what compiler to use - is this configuration to make C compilation work usually something that would be included in the compiler itself? Either way, it requires a lot of extra work which is kind of unfortunate (downloading a separate compiler, adding it to path, setting up a bunch of environment variables, and making a cargo config for linking).
Fix `get_child_at_index` return type hints

returning `None` is valid when the index is invalid, so the type hints should reflect that
Fix array template arg lookup behavior

Minor logic error. `get_template_args` expects a matching `<`/`>` pair. We were passing in an array type with the beginning `<` removed, so the template arg behavior would fail.
…l, r=ShoyuVanilla

Const initialize `LOCK_LATCH` thread local

A simple refactor to avoid runtime thread-local initialization.
Fix classify_union to return Union for regular unions

Commit 623c7d7 accidentally changed the return value from REGULAR_UNION to RegularEnum when converting string literals to enum values. Commit b17670d then renamed RegularUnion to Union, but the buggy return statement remained unchanged. This caused unions to be misclassified as enums, preventing LLDB from displaying union field contents.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Apr 24, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Apr 24, 2026
@tgross35
Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 24, 2026

📌 Commit 2493328 has been approved by tgross35

It is now in the queue for this repository.

@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 Apr 24, 2026
@Zalathar
Copy link
Copy Markdown
Member

The previous rollup (#155700) encountered a mysterious possibly-flaky failure in aarch64-apple, so watch out for that if this rollup also fails in that job.

@tgross35
Copy link
Copy Markdown
Contributor Author

Oh, feel free to just reapprove that one and close this one.

The failure is bizarre; #155518 was a similar failure.

@Zalathar
Copy link
Copy Markdown
Member

Oh, feel free to just reapprove that one and close this one.

I think the old rollup is stale for other reasons, so this PR should be fine.

@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 24, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 24, 2026

☀️ Test successful - CI
Approved by: tgross35
Duration: 3h 16m 16s
Pushing d493b7c to main...

@rust-bors rust-bors Bot merged commit d493b7c into rust-lang:main Apr 24, 2026
12 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 24, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#153482 tests/ui/macros: add annotations for reference rules 5381b618aea778831566755c0341a291fbfa1fc5 (link)
#155075 Add docs about SDKs and C compilation on armv7a-vex-v5 39fc3c4f0f75b281656ef0341ab30a9ce48907be (link)
#155660 c-variadic: fix for sparc64 9198e5abd381263ef8745c9234fe4409b36e68c9 (link)
#155685 Fix get_child_at_index return type hints e1817988a42c19b34a16b5f58c4f32ded0e75265 (link)
#155686 Fix array template arg lookup behavior ee1a618ae34d558b9f5d4e46786fcbdb452ff3d0 (link)
#155689 Const initialize LOCK_LATCH thread local 553e78a01604c336c3372b2b5ef820051bcb10c1 (link)
#155690 Fix classify_union to return Union for regular unions 7bfb21b6268782114353af1adc9e11979a98e633 (link)

previous master: 9836b06b55

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
Copy Markdown
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 9836b06 (parent) -> d493b7c (this PR)

Test differences

Show 26 test diffs

Stage 1

  • [assembly] tests/assembly-llvm/c-variadic-arm.rs: ignore (only executed when the architecture is arm) -> [missing] (J1)
  • [assembly] tests/assembly-llvm/c-variadic-mips.rs#MIPS: pass -> [missing] (J1)
  • [assembly] tests/assembly-llvm/c-variadic-mips.rs#MIPS64: pass -> [missing] (J1)
  • [assembly] tests/assembly-llvm/c-variadic-mips.rs#MIPS64EL: pass -> [missing] (J1)
  • [assembly] tests/assembly-llvm/c-variadic/arm.rs: [missing] -> ignore (only executed when the architecture is arm) (J1)
  • [assembly] tests/assembly-llvm/c-variadic/mips.rs#MIPS: [missing] -> pass (J1)
  • [assembly] tests/assembly-llvm/c-variadic/mips.rs#MIPS64: [missing] -> pass (J1)
  • [assembly] tests/assembly-llvm/c-variadic/mips.rs#MIPS64EL: [missing] -> pass (J1)
  • [assembly] tests/assembly-llvm/c-variadic/sparc.rs#SPARC: [missing] -> pass (J1)
  • [assembly] tests/assembly-llvm/c-variadic/sparc.rs#SPARC64: [missing] -> pass (J1)

Stage 2

  • [assembly] tests/assembly-llvm/c-variadic-mips.rs#MIPS: pass -> [missing] (J0)
  • [assembly] tests/assembly-llvm/c-variadic-mips.rs#MIPS64: pass -> [missing] (J0)
  • [assembly] tests/assembly-llvm/c-variadic-mips.rs#MIPS64EL: pass -> [missing] (J0)
  • [assembly] tests/assembly-llvm/c-variadic/mips.rs#MIPS: [missing] -> pass (J0)
  • [assembly] tests/assembly-llvm/c-variadic/mips.rs#MIPS64: [missing] -> pass (J0)
  • [assembly] tests/assembly-llvm/c-variadic/mips.rs#MIPS64EL: [missing] -> pass (J0)
  • [assembly] tests/assembly-llvm/c-variadic/sparc.rs#SPARC: [missing] -> pass (J0)
  • [assembly] tests/assembly-llvm/c-variadic/sparc.rs#SPARC64: [missing] -> pass (J0)
  • [assembly] tests/assembly-llvm/c-variadic-arm.rs: ignore (only executed when the architecture is arm) -> [missing] (J2)
  • [assembly] tests/assembly-llvm/c-variadic/arm.rs: [missing] -> ignore (only executed when the architecture is arm) (J2)
  • [assembly] tests/assembly-llvm/c-variadic-arm.rs: ignore (ignored when the operating system is android) -> [missing] (J3)
  • [assembly] tests/assembly-llvm/c-variadic/arm.rs: [missing] -> ignore (ignored when the operating system is android) (J3)
  • [assembly] tests/assembly-llvm/c-variadic-arm.rs: pass -> [missing] (J4)
  • [assembly] tests/assembly-llvm/c-variadic/arm.rs: [missing] -> pass (J4)

Additionally, 2 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 d493b7c5ac637ed7edf626128b9f14796a2dad20 --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-various-2: 40m 24s -> 1h 20m (+98.9%)
  2. i686-gnu-nopt-2: 1h 43m -> 2h 17m (+32.9%)
  3. dist-various-1: 57m 3s -> 1h 11m (+25.7%)
  4. dist-powerpc64-linux-gnu: 1h 15m -> 1h 32m (+23.1%)
  5. x86_64-msvc-1: 2h 43m -> 2h 7m (-22.1%)
  6. dist-x86_64-solaris: 1h 17m -> 1h 34m (+21.7%)
  7. pr-check-1: 26m 52s -> 32m 19s (+20.3%)
  8. x86_64-gnu-tools: 54m 29s -> 1h 4m (+19.2%)
  9. aarch64-gnu-debug: 1h 5m -> 1h 17m (+18.9%)
  10. x86_64-rust-for-linux: 45m 27s -> 54m (+18.8%)
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
Copy Markdown
Collaborator

Finished benchmarking commit (d493b7c): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (primary -1.9%, 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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.9% [-1.9%, -1.9%] 1
Improvements ✅
(secondary)
-2.3% [-2.3%, -2.3%] 1
All ❌✅ (primary) -1.9% [-1.9%, -1.9%] 1

Cycles

Results (primary 2.0%, secondary -0.9%)

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

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

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 493.683s -> 491.485s (-0.45%)
Artifact size: 394.30 MiB -> 394.32 MiB (0.01%)

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

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants