Skip to content

Rollup of 6 pull requests - #165821

Merged
rust-bors[bot] merged 12 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-TeJSwaI
Nov 11, 2026
Merged

rust-bors[bot] merged 12 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-TeJSwaI

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

nnethercote and others added 12 commits November 11, 2026 16:27
The macro was written to get around some suboptimal code generation.
After the recent span compression overhaul it is no longer needed, and
we can use a simpler type to achieve the same goal.
This is a part of the stack-protector stabilization

The `-Z stack-protector=basic` mode (`-fstack-protector`) uses heuristics that are specifically designed
to catch old-C-style string manipulation. This is not a good fit to Rust, which does not perform much
unsafe C-style string manipulation. As far as I can tell, nobody has been asking for it,
and few people are using it even in today's C - modern distros (e.g. Debian) tend to use
`-fstack-protector-strong`.

Therefore, `-Z stack-protector=basic` has been **removed**. If anyone is interested in it, they
are welcome to add it back as an unstable option.
* std: don't overflow when rounding up huge thread stack sizes on unix
* Update library/std/src/thread/tests.rs

Co-authored-by: Joseph Zhao <65984904+programskillforverification@users.noreply.github.com>
Co-authored-by: Ralf Jung <post@ralfj.de>
This was a cdb test that was failing locally when I updated Windows SDK
to 10.0.28000.2957 (and thus cdb and WinDbg).

Seems that for whatever reason eventual visualizations for `c` and
`_box` changed between these cdb (WinDbg) versions.
Replace `match_span_kind` macro with `SpanKind`

The macro was written to get around some suboptimal code generation. After the recent span compression overhaul it is no longer needed, and we can use a simpler type to achieve the same goal.

r? @petrochenkov
…hread-stack-size, r=maxdexh

std: don't overflow when rounding up huge thread stack sizes on unix

This is a resubmission of rust-lang#165703 by lazerg.

Fixes rust-lang#165683

r? maxdexh
Fix 'simga' typo in char.to_lowercase documentation

It should be 'sigma'.
…ic, r=jieyouxu

Remove `-Z stack-protector=basic`

This is a part of the stack-protector stabilization (pulled out from rust-lang#165704)

The `-Z stack-protector=basic` mode (`-fstack-protector`) uses heuristics that are specifically designed to catch old-C-style string manipulation. This is not a good fit to Rust, which does not perform much unsafe C-style string manipulation. As far as I can tell, nobody has been asking for it, and few people are using it even in today's C - modern distros (e.g. Debian) tend to use `-fstack-protector-strong`.

Therefore, `-Z stack-protector=basic` has been **removed**. If anyone is interested in it, they are welcome to add it back as an unstable option.

r? @jieyouxu
…esleywiser

Adjust `unsized.rs` debuginfo test expected output for cdb `10.0.28000.2957`

This was a cdb test that was failing locally when I updated Windows SDK to `10.0.28000.2957` (and thus cdb and WinDbg).

Currently our Windows CI seems to use Windows SDKs around `10.0.26100.*`. See example run:

- rust-lang#165808
- => https://github.com/rust-lang/rust/actions/runs/43010199577
- => https://github.com/rust-lang/rust/actions/runs/43010199577/job/130488011527
- => Runner image `windows-2025-vs2026 20261103.298.1`
- => https://github.com/actions/runner-images/blob/win25-vs2026/20261103.298/images/windows/Windows2025-VS2026-Readme.md
- => `10.0.26100.33674`

Seems that for whatever reason eventual visualizations for `c` and `_box` changed between these cdb (WinDbg) versions. For

```rs
let c: &Foo<dyn std::fmt::Debug> = &Foo { value: 7i32 };
```

the `10.0.26100.*` series seem to output e.g.

```
//@ cdb-check:c                [Type: ref$<unsized::Foo<dyn$<core::fmt::Debug> > >]
//@ cdb-check:    [+0x000] pointer          : 0x[...] [Type: unsized::Foo<dyn$<core::fmt::Debug> > *]
//@ cdb-check:    [...] vtable           : 0x[...] [Type: unsigned [...]int[...] (*)[4]]
```

but `10.0.28000.2957` output changed to a single line e.g.

```
              c                : 7 [Type: i32 (derived from ref$<unsized::Foo<dyn$<core::fmt::Debug> > >)]
```

So likely one of:

- Default visualizers got updated
- WinDbg internals changed
- cdb <-> WinDbg engine interactions changed

I cannot find cdb/WinDbg changelogs anywhere for these specific Windows SDK versions, so the best I can do is use `10.0.28000.2957` output as new expected output and gate this test on a minimum cdb version of `10.0.28000.2957`.

This of course means that, before our GHA windows runner images update to a Windows SDK that's at least `10.0.28000.2957` (and thus cdb since they're distributed and versioned together), this test will not run in CI.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Nov 11, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. A-thread Area: `std::thread` PG-exploit-mitigations Project group: Exploit mitigations 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 Nov 11, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Member Author

@bors r+ p=5 force

Trying commonly failed jobs
@bors try jobs=dist-various-1,test-various,test-x86_64-gnu-aux,test-x86_64-msvc-1,test-aarch64-apple-1,test-aarch64-apple-2,test-x86_64-mingw-1,test-i686-msvc,test-armhf-gnu,test-x86_64-gnu-llvm-22-3,test-aarch64-msvc-2

@rust-bors

rust-bors Bot commented Nov 11, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 3f6aad8 has been approved by JonathanBrouwer

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 Nov 11, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Nov 11, 2026
Rollup of 6 pull requests


try-job: dist-various-1
try-job: test-various
try-job: test-x86_64-gnu-aux
try-job: test-x86_64-msvc-1
try-job: test-aarch64-apple-1
try-job: test-aarch64-apple-2
try-job: test-x86_64-mingw-1
try-job: test-i686-msvc
try-job: test-armhf-gnu
try-job: test-x86_64-gnu-llvm-22-3
try-job: test-aarch64-msvc-2
@rust-bors

This comment has been minimized.

@rust-bors

rust-bors Bot commented Nov 11, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: 47e8ee0 (47e8ee0faf9c8ab05c984e0440966eab82ef4d13)
Base parent: e88737b (e88737b98536eae309f98e207b8af6a2cafa0350)

@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 Nov 11, 2026
@rust-bors

rust-bors Bot commented Nov 11, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 9m 19s
Pushing 3ef0c22 to main...

@rust-bors
rust-bors Bot merged commit 3ef0c22 into rust-lang:main Nov 11, 2026
16 checks passed
@rustbot rustbot added this to the 1.102.0 milestone Nov 11, 2026
@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 9f5e966 (parent) -> 3ef0c22 (this PR)

Test differences

Show 28 test diffs

Stage 1

  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect-windows-32bit.rs#basic: ignore (ignored when the pointer width is 64bit (64-bit table based SEH has slightly different behaviors than classic SEH)) -> [missing] (J0)
  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect-windows-64bit.rs#basic: ignore (only executed when the target environment is msvc) -> [missing] (J0)
  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect.rs#basic: pass -> [missing] (J0)
  • [ui] tests/ui/stack-protector/no-stack-protector-basic.rs: [missing] -> pass (J6)
  • [ui] tests/ui/stack-protector/warn-stack-protector-unsupported.rs#basic: pass -> [missing] (J6)
  • [codegen] tests/codegen-llvm/stack-protector.rs#basic: pass -> [missing] (J13)
  • [ui (polonius)] tests/ui/stack-protector/no-stack-protector-basic.rs: [missing] -> pass (J15)
  • [ui (polonius)] tests/ui/stack-protector/warn-stack-protector-unsupported.rs#basic: pass -> [missing] (J15)
  • thread::tests::test_huge_thread_stack: [missing] -> pass (J17)

Stage 2

  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect.rs#basic: ignore (ignored when the target environment is msvc (stack check code uses different function names)) -> [missing] (J1)
  • [debuginfo-cdb] tests/debuginfo/unsized.rs: pass -> ignore (ignored when the CDB version is lower than 10.0.28000.2957) (J1)
  • [assembly] tests/assembly-gcc/stack-protector/stack-protector-heuristics-effect.rs#basic: pass -> [missing] (J2)
  • [ui] tests/ui/stack-protector/warn-stack-protector-unsupported.rs#basic: ignore (backend gcc cannot build for target nvptx64-nvidia-cuda) -> [missing] (J2)
  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect-windows-64bit.rs#basic: ignore (ignored when the pointer width is 32bit (64-bit table based SEH has slightly different behaviors than classic SEH)) -> [missing] (J3)
  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect-windows-64bit.rs#basic: pass -> [missing] (J4)
  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect.rs#basic: pass -> [missing] (J5)
  • [ui] tests/ui/stack-protector/warn-stack-protector-unsupported.rs#basic: pass -> [missing] (J7)
  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect-windows-64bit.rs#basic: ignore (only executed when the target environment is msvc) -> [missing] (J8)
  • [codegen] tests/codegen-llvm/stack-protector.rs#basic: pass -> [missing] (J9)
  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect-windows-32bit.rs#basic: pass -> [missing] (J10)
  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect-windows-32bit.rs#basic: ignore (only executed when the target environment is msvc) -> [missing] (J11)
  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect-windows-32bit.rs#basic: ignore (ignored when the pointer width is 64bit (64-bit table based SEH has slightly different behaviors than classic SEH)) -> [missing] (J12)
  • thread::tests::test_huge_thread_stack: [missing] -> pass (J14)
  • [ui] tests/ui/stack-protector/no-stack-protector-basic.rs: [missing] -> pass (J16)
  • thread::tests::test_huge_thread_stack: [missing] -> ignore (J18)
  • [assembly] tests/assembly-llvm/stack-protector/stack-protector-heuristics-effect.rs#basic: ignore (ignored when the target vendor is Apple (slightly different policy on stack protection of arrays)) -> [missing] (J19)

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 3ef0c22cdb86ac42dc6b8f0f1ec36857daa6f2a1 --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. test-x86_64-gnu-gcc-core-tests: 10m 53s -> 19m 54s (+82.8%)
  2. test-i686-gnu-2: 1h 3m -> 1h 49m (+74.3%)
  3. test-x86_64-gnu-stdlib-semver-check: 9m 40s -> 15m 1s (+55.3%)
  4. test-x86_64-gnu-miri: 1h -> 1h 32m (+52.5%)
  5. test-pr-check-1: 24m 55s -> 37m 46s (+51.6%)
  6. test-x86_64-msvc-ext1: 1h 44m -> 2h 25m (+38.6%)
  7. test-x86_64-gnu-nopt: 1h 56m -> 2h 41m (+38.0%)
  8. test-arm-android: 1h 26m -> 1h 55m (+33.3%)
  9. dist-i686-linux: 1h 28m -> 1h 58m (+33.0%)
  10. test-various: 1h 47m -> 2h 21m (+30.9%)
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 (3ef0c22): comparison URL.

Overall result: ❌✅ regressions and improvements - please read:

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

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.3% [0.3%, 0.3%] 1
Improvements ✅
(primary)
-0.3% [-0.3%, -0.2%] 3
Improvements ✅
(secondary)
-0.4% [-0.6%, -0.2%] 35
All ❌✅ (primary) -0.3% [-0.3%, -0.2%] 3

Max RSS (memory usage)

Results (secondary 3.8%)

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)
3.8% [2.3%, 4.8%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

Results (primary -3.0%, secondary 2.7%)

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

mean range count
Regressions ❌
(primary)
2.6% [2.6%, 2.6%] 1
Regressions ❌
(secondary)
2.7% [2.7%, 2.7%] 1
Improvements ✅
(primary)
-3.9% [-5.0%, -3.2%] 6
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -3.0% [-5.0%, 2.6%] 7

Binary size

Results (primary 0.0%, secondary 0.0%)

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

mean range count
Regressions ❌
(primary)
0.0% [0.0%, 0.0%] 4
Regressions ❌
(secondary)
0.0% [0.0%, 0.0%] 34
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.0% [0.0%, 0.0%] 4

Bootstrap: 484.648s -> 485.002s (0.07%)
Artifact size: 406.34 MiB -> 406.78 MiB (0.11%)

@rustbot rustbot added the perf-regression Performance regression. label Nov 11, 2026
@rust-bors

rust-bors Bot commented Nov 11, 2026

Copy link
Copy Markdown
Contributor

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#165805 Replace match_span_kind macro with SpanKind acd4224e578033cb6a801874f8ef1b6b693e2f7d
(link)
#165746 std: don't overflow when rounding up huge thread stack size… 16c306986a9f7f892c6cbe60534136c403c717ec
(link)
#165807 Fix 'simga' typo in char.to_lowercase documentation 6d4ddd6212fa191e1c37819d5a024e4f9d0e1107
(link)
#165809 Update to ar_archive_writer 0.5.5 ccf66d4dd0b22d6c0ec5207de20ddba57e00ded8
(link)
#165812 Remove -Z stack-protector=basic 76a11adefa4142f0095486e185dcc38947e0954e
(link)
#165815 Adjust unsized.rs debuginfo test expected output for cdb … 8f20217b4eb719ffeee90604c4311788e0335946
(link)

parent commit: 9f5e966d58

In the case of a perf regression, run the following command with the SHAs of each PR you suspect might be the cause: @rust-timer triage $SHA $SHA $SHA..., or run @rust-timer triage all to benchmark all rollup members.

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. A-thread Area: `std::thread` merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. PG-exploit-mitigations Project group: Exploit mitigations rollup A PR which is a rollup 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.

8 participants