Skip to content

Rollup of 5 pull requests - #133032

Merged
bors merged 11 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-vqakdmw
Nov 14, 2024
Merged

Rollup of 5 pull requests#133032
bors merged 11 commits into
rust-lang:masterfrom
GuillaumeGomez:rollup-vqakdmw

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cuviperand others added 11 commits November 11, 2024 13:10
It will be slower to build and produce larger artifacts, but hopefully
it will help catch debuginfo regressions sooner, especially for problems
that LLVM assertions would uncover.
As described here UseOdrIndicator should be disabled on Windows
since link.exe does not support duplicate weak definitions
(https://reviews.llvm.org/D137227).
Co-Authored-By: Bastian Kersting <bkersting@google.com>
…to contain files that do not have a "known-bug" directive
Fixesrust-lang#133009
This file is copied from the rtems as initial implementation, and
forgot to change the OS name in the comment.
Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
There's already `min-llvm-version`, and contributors were using
`ignore-llvm-version: 20 - 99` to emulate `max-llvm-major-version: 19`.
…range like `N - 99`
For tests that use `ignore-llvm-version: N - M`, replace that with
`max-llvm-major-version: N-1`.
…-Simulacrum
ci: Enable full `debuginfo-level=2` in `DEPLOY_ALT`
It will be slower to build and produce larger artifacts, but hopefully
it will help catch debuginfo regressions sooner, especially for problems
that LLVM assertions would uncover.
try-job: dist-x86_64-linux
try-job: dist-x86_64-linux-alt
…ozkan
compiletest: add `max-llvm-major-version` directive
To complement existing `min-llvm-version` so contributors don't have to use `ignore-llvm-version: 20 - 99` to emulate `max-llvm-major-version: 19`.
Closesrust-lang#132305.
cc `@workingjubilee` who suggested this.
### Implementation steps
- [x] 1. Implement the directive (this PR)
- [x] 2. Open an accompanying dev-guide PR to describe the directive (rust-lang/rustc-dev-guide#2129)
r? bootstrap
PassWrapper: disable UseOdrIndicator for Asan Win32
As described in https://reviews.llvm.org/D137227 UseOdrIndicator should be disabled on Windows since link.exe does not support duplicate weak definitions.
Fixesrust-lang#124390.
Credits also belong to `@1c3t3a` who worked with me on this.
We are currently testing this on a Windows machine.
compiletest: known-bug / crashes: allow for an "auxiliary" directory to contain files that do not have a "known-bug" directive
Fixesrust-lang#133009
r? `@jieyouxu`
Fix a copy-paste issue in the NuttX raw type definition
This file is copied from the rtems as initial implementation, and forgot to change the OS name in the comment.
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r+ p=5 rollup=never

@rustbotrustbot added A-compiletest Area: The compiletest test runner 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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. rollup A PR which is a rollup labels Nov 14, 2024
@bors

bors commented Nov 14, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit e6cd869 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@borsbors 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 14, 2024
@bors

bors commented Nov 14, 2024

Copy link
Copy Markdown
Collaborator

⌛ Testing commit e6cd869 with merge a4cedec...

@bors

bors commented Nov 14, 2024

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing a4cedec to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Nov 14, 2024
@bors
bors merged commit a4cedec into rust-lang:masterNov 14, 2024
@rustbotrustbot added this to the 1.84.0 milestone Nov 14, 2024
@GuillaumeGomez
GuillaumeGomez deleted the rollup-vqakdmw branch November 14, 2024 14:14
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR#MessagePerf Build Sha
#132010ci: Enable full debuginfo-level=2 in DEPLOY_ALT87cf3260d45730df9897f8e4f89bdbe187473ba0 (link)
#132310compiletest: add max-llvm-major-version directive6271b7b68d45c8650dc8c83cc7aa04243d3b6dad (link)
#132773PassWrapper: disable UseOdrIndicator for Asan Win328600cd3b6a647076157539cf319a02a79b8c65e6 (link)
#133013compiletest: known-bug / crashes: allow for an "auxiliary" …672532ed060d645a7f761b77c308abb41563beb0 (link)
#133027Fix a copy-paste issue in the NuttX raw type definitioncb6f7fd79afd43cb7199333322db1d674d4a2fc4 (link)

previous master: dae7ac133b

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

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (a4cedec): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

meanrangecount
Regressions ❌
(primary)
--0
Regressions ❌
(secondary)
0.7%[0.7%, 0.7%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)--0

Max RSS (memory usage)

Results (primary 2.8%, secondary 1.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

meanrangecount
Regressions ❌
(primary)
2.8%[2.8%, 2.8%]1
Regressions ❌
(secondary)
1.9%[1.9%, 1.9%]1
Improvements ✅
(primary)
--0
Improvements ✅
(secondary)
--0
All ❌✅ (primary)2.8%[2.8%, 2.8%]1

Cycles

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

Binary size

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

Bootstrap: 786.305s -> 787.308s (0.13%)
Artifact size: 335.33 MiB -> 335.36 MiB (0.01%)

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

Labels

A-compiletestArea: The compiletest test runnerA-testsuiteArea: The testsuite used to check the correctness of rustcmerged-by-borsThis PR was explicitly merged by bors.rollupA PR which is a rollupS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-bootstrapRelevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.T-libsRelevant 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.

9 participants

@GuillaumeGomez@bors@rust-timer@rustbot@cuviper@Jakob-Koschel@matthiaskrgr@no1wudi@jieyouxu