Skip to content

Rollup of 6 pull requests #141255

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 13 commits into from
May 19, 2025
Merged

Rollup of 6 pull requests #141255

merged 13 commits into from
May 19, 2025

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ismailarilik and others added 13 commits May 14, 2025 08:59
…y-instability-lint-for-rustc-query_system, r=fee1-dead

Handle `rustc_query_system` cases of `rustc::potential_query_instability` lint

This PR removes `#![allow(rustc::potential_query_instability)]` line from [`compiler/rustc_query_system/src/lib.rs`](https://github.com/rust-lang/rust/blob/master/compiler/rustc_query_system/src/lib.rs#L2) and converts `FxHash{Map,Set}` types into `FxIndex{Map,Set}` to suppress lint errors.

A somewhat tracking issue: rust-lang#84447

r? `@compiler-errors`
… r=ChrisDenton

windows: document that we rely on an undocumented property of GetUserProfileDirectoryW

r? `@ChrisDenton`
Also see rust-lang/miri#4332
skip compiler tools sanity checks on certain commands

Closes rust-lang#141246
…boet

fix data race in ReentrantLock fallback for targets without 64bit atomics

See [Zulip](https://rust-lang.zulipchat.com/#narrow/channel/269128-miri/topic/reentrant.20lock.20failure.20on.20musl) for details: the address used to identify a thread might get lazily allocated inside `tls_addr()`, so if we call that *after* doing the `tls_addr.load()` it is too late to establish synchronization with prior threads that used the same address -- the `load()` thus races with the `store()` by that prior thread, and might hence see outdated values, and then the entire logic breaks down.

r? `@joboet`
…s, r=oli-obk

introduce common macro for `MutVisitor` and `Visitor` to dedup code

helps with rust-lang#127615.

I can do everything in one go but I figured it might be worth it to open a PR first for vibeck.

r? oli-obk
…-inconsistency-warning, r=oli-obk

Warning added when dependency crate has async drop types, and the feature is disabled

In continue of rust-lang#141031.

When dependency crate has non-empty `adt_async_destructor` table in metadata, and `async_drop` feature is disabled for local crate, warning will be emitted.

Test `dependency-dropped` has two revisions - with and without feature enabled. With feature enabled, async drop for dropee is executed ("Async drop" printed). Without the feature enabled, sync drop is executed ("Sync drop" printed) and warning is emitted.

Warning example:
```
warning: found async drop types in dependecy `async_drop_dep`, but async_drop feature is disabled for `dependency_dropped`
  --> $DIR/dependency-dropped.rs:7:1
   |
LL | #![cfg_attr(with_feature, feature(async_drop))]
   | ^
   |
   = help: if async drop type will be dropped in a crate without `feature(async_drop)`, sync Drop will be used
```
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) O-windows Operating system: Windows 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. rollup A PR which is a rollup labels May 19, 2025
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 19, 2025

📌 Commit e95315d has been approved by matthiaskrgr

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 May 19, 2025
@bors
Copy link
Collaborator

bors commented May 19, 2025

⌛ Testing commit e95315d with merge 59372f2...

@bors
Copy link
Collaborator

bors commented May 19, 2025

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 59372f2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 19, 2025
@bors bors merged commit 59372f2 into rust-lang:master May 19, 2025
1 check passed
@rustbot rustbot added this to the 1.89.0 milestone May 19, 2025
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#131200 Handle rustc_query_system cases of `rustc::potential_quer… 1cfc76b69c1a0706fcea3b943280cbc2243f4dcf (link)
#141244 windows: document that we rely on an undocumented property … 789a5d96f1eac406738be328d01e978498fcd494 (link)
#141247 skip compiler tools sanity checks on certain commands a65e4165b3f402eb41a755aa83497b3cb728f7f0 (link)
#141248 fix data race in ReentrantLock fallback for targets without… 24fef3f58e4296f16ea5dfe470e6feb7cec3c3da (link)
#141249 introduce common macro for MutVisitor and Visitor to de… 9a1ce4a06cbf02cae50ff3988241c8c022eed9ca (link)
#141253 Warning added when dependency crate has async drop types, a… 4b0ca6bd529b7b63cba80369bd06a0f6e1ebe836 (link)

previous master: e5a2a6a15d

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

Copy link

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 e5a2a6a (parent) -> 59372f2 (this PR)

Test differences

Show 23 test diffs

Stage 1

  • [ui] tests/ui/async-await/async-drop/dependency-dropped.rs: pass -> [missing] (J1)
  • [ui] tests/ui/async-await/async-drop/dependency-dropped.rs#with_feature: [missing] -> pass (J1)
  • [ui] tests/ui/async-await/async-drop/dependency-dropped.rs#without_feature: [missing] -> pass (J1)
  • errors::verify_metadata_async_drop_types_in_dependency_81: [missing] -> pass (J2)

Stage 2

  • [ui] tests/ui/async-await/async-drop/dependency-dropped.rs: pass -> [missing] (J0)
  • [ui] tests/ui/async-await/async-drop/dependency-dropped.rs#with_feature: [missing] -> pass (J0)
  • [ui] tests/ui/async-await/async-drop/dependency-dropped.rs#without_feature: [missing] -> pass (J0)

Additionally, 16 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 59372f2c81ba74554d9a71b12a4ed7f29adb33a2 --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-aarch64-linux: 5431.2s -> 7792.2s (43.5%)
  2. x86_64-apple-1: 10782.7s -> 7720.3s (-28.4%)
  3. x86_64-apple-2: 5080.5s -> 5849.2s (15.1%)
  4. dist-x86_64-apple: 11081.9s -> 9511.7s (-14.2%)
  5. dist-apple-various: 8779.0s -> 7550.3s (-14.0%)
  6. dist-aarch64-apple: 6609.0s -> 5803.4s (-12.2%)
  7. aarch64-apple: 4970.1s -> 4489.8s (-9.7%)
  8. x86_64-gnu-llvm-19-1: 5312.4s -> 5714.7s (7.6%)
  9. dist-arm-linux: 5000.4s -> 5329.2s (6.6%)
  10. x86_64-rust-for-linux: 2709.4s -> 2532.4s (-6.5%)
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

Finished benchmarking commit (59372f2): comparison URL.

Overall result: ✅ improvements - 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.

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

Max RSS (memory usage)

Results (secondary -1.0%)

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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.7% [0.5%, 1.8%] 8
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.4% [-6.9%, -0.8%] 4
All ❌✅ (primary) - - 0

Cycles

Results (secondary 1.6%)

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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.4% [0.8%, 5.7%] 11
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.6% [-1.0%, -0.4%] 4
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 774.641s -> 775.652s (0.13%)
Artifact size: 365.52 MiB -> 365.59 MiB (0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. O-windows Operating system: Windows 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.

9 participants