Rollup of 9 pull requests #140596

matthiaskrgr · 2025-05-02T17:38:02Z

Successful merges:

Optimize the codegen for Span::from_expansion #140485 (Optimize the codegen for Span::from_expansion)
transmutability: merge contiguous runs with a common destination #140509 (transmutability: merge contiguous runs with a common destination)
Use select in projection lookup in report_projection_error #140519 (Use select in projection lookup in report_projection_error)
interpret: better error message for out-of-bounds pointer arithmetic and accesses #140521 (interpret: better error message for out-of-bounds pointer arithmetic and accesses)
Rename *Guard::try_map to filter_map. #140536 (Rename *Guard::try_map to filter_map.)
Stabilize select_unpredictable #140550 (Stabilize select_unpredictable)
extend the list of registered dylibs on test::prepare_cargo_test #140563 (extend the list of registered dylibs on test::prepare_cargo_test)
Add useful comments on ExprKind::If variants. #140572 (Add useful comments on ExprKind::If variants.)
Add regression test for 133065 #140574 (Add regression test for 133065)

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…and accesses

1. analogous to std::cell::Ref(Mut)::filter_map. 2. doesn't imply `Try` genericizability.

FCP completed in tracking issue rust-lang#133962.

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Things that aren't obvious and took me a while to work out.

…chenkov Optimize the codegen for `Span::from_expansion` See https://godbolt.org/z/bq65Y6bc4 for the difference. the new version is less than half the number of instructions. Also tried fully writing the function by hand: ```rust sp.ctxt_or_parent_or_marker != 0 && ( sp.len_with_tag_or_marker == BASE_LEN_INTERNED_MARKER || sp.len_with_tag_or_marker & PARENT_TAG == 0 ) ``` But that was no better than this PR's current use of `match_span_kind`.

…=jswrenn transmutability: merge contiguous runs with a common destination Based on rust-lang#140380. r? `@jswrenn` `@joshlf`

…son, r=oli-obk Use select in projection lookup in `report_projection_error` Using `for_each_relevant_impl` doesn't actually select the correct impl; we can use `select` here to actually get the correct impl with certainty. Follow-up to rust-lang#140278. r? oli-obk

interpret: better error message for out-of-bounds pointer arithmetic and accesses Fixes rust-lang#93881 r? `@saethlin`

…=Amanieu Rename `*Guard::try_map` to `filter_map`. Rename `std::sync::*Guard::try_map` to `filter_map`. 1. Analogous to `std::cell::Ref(Mut)::filter_map`. 2. Doesn't imply `Try` genericizability. r? `@Amanieu` (or other T-libs-api) Tracking issue for `mapped_lock_guards`: rust-lang#117108

…able, r=workingjubilee Stabilize `select_unpredictable` FCP completed in tracking issue rust-lang#133962.

…ieyouxu extend the list of registered dylibs on `test::prepare_cargo_test` self-explanatory Fixes rust-lang#140299

…=compiler-errors Add useful comments on `ExprKind::If` variants. Things that aren't obvious and took me a while to work out. r? `@BoxyUwU`

…-errors Add regression test for 133065 closes: rust-lang#133065

matthiaskrgr · 2025-05-02T17:38:14Z

@bors r+ rollup=never p=5

bors · 2025-05-02T17:38:17Z

📌 Commit 6f7f3ce has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-05-02T20:59:27Z

⌛ Testing commit 6f7f3ce with merge 2d5ffc513f1c56b7bc95bacb2519705096e8cc2b...

bors · 2025-05-03T00:23:06Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 2d5ffc5 to master...

github-actions · 2025-05-03T00:25:20Z

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 4824c2b (parent) -> 2d5ffc5 (this PR)

Test differences

Show 16 test diffs

Stage 1

[ui] tests/ui/associated-types/mismatch-two-relevant-impls.rs: [missing] -> pass (J0)
[ui] tests/ui/traits/trait-impl-self-mismatch.rs: [missing] -> pass (J0)

Stage 2

[ui] tests/ui/associated-types/mismatch-two-relevant-impls.rs: [missing] -> pass (J1)
[ui] tests/ui/traits/trait-impl-self-mismatch.rs: [missing] -> pass (J1)

Additionally, 12 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 2d5ffc513f1c56b7bc95bacb2519705096e8cc2b --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: 4363.8s -> 5816.6s (33.3%)
x86_64-apple-1: 9777.2s -> 6823.9s (-30.2%)
dist-aarch64-apple: 5606.2s -> 4632.9s (-17.4%)
dist-armv7-linux: 6110.5s -> 5528.0s (-9.5%)
dist-apple-various: 6699.9s -> 6080.3s (-9.2%)
dist-riscv64-linux: 5553.7s -> 5145.0s (-7.4%)
dist-arm-linux: 5060.2s -> 4748.1s (-6.2%)
x86_64-gnu-aux: 6161.6s -> 5826.2s (-5.4%)
aarch64-apple: 4157.5s -> 4360.9s (4.9%)
x86_64-gnu-llvm-19-1: 5564.4s -> 5309.8s (-4.6%)

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-05-03T00:25:38Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#140485	Optimize the codegen for `Span::from_expansion`	`f470d44af24fa7fbc49e47dbe34893f4f3bc684a` (link)
#140509	transmutability: merge contiguous runs with a common destin…	`ee5ff7f91f701bd6cb5966945173c51e3901013b` (link)
#140519	Use select in projection lookup in `report_projection_error`	`b401c7f579e7f858f9666d7c9e963c014108656a` (link)
#140521	interpret: better error message for out-of-bounds pointer a…	`ab2b32a8acb04d9de498087be93deee653bb91f0` (link)
#140536	Rename `*Guard::try_map` to `filter_map`.	`2c311f3dce0f7c28b1a2eb4f77dcd44d07a337ba` (link)
#140550	Stabilize `select_unpredictable`	`d7de6da27ec1a5e02436a75b2bc1f70481b00828` (link)
#140563	extend the list of registered dylibs on `test::prepare_carg…	`95e1c0726bc2d00741413a0a8c212bdba08a7096` (link)
#140572	Add useful comments on `ExprKind::If` variants.	`994e354d3cefd199c887969a15c3f202a95c6852` (link)
#140574	Add regression test for 133065	`50bd965dbb546c361a33257567be8033810a8d20` (link)

previous master: 4824c2bb74

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 · 2025-05-03T02:02:52Z

Finished benchmarking commit (2d5ffc5): comparison URL.

Overall result: ❌✅ regressions and improvements - please read the text below

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

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.4%	[0.2%, 0.5%]	2
Improvements ✅ (primary)	-1.2%	[-1.2%, -1.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.2%	[-1.2%, -1.2%]	1

Max RSS (memory usage)

Results (primary -0.1%, secondary -2.2%)

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)	2.4%	[0.5%, 7.8%]	5
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.8%	[-3.5%, -0.4%]	19
Improvements ✅ (secondary)	-2.2%	[-2.2%, -2.1%]	2
All ❌✅ (primary)	-0.1%	[-3.5%, 7.8%]	24

Cycles

Results (primary 0.2%, secondary -2.8%)

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)	1.5%	[0.4%, 3.9%]	9
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.5%	[-1.0%, -0.4%]	16
Improvements ✅ (secondary)	-2.8%	[-2.9%, -2.7%]	2
All ❌✅ (primary)	0.2%	[-1.0%, 3.9%]	25

Binary size

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

Bootstrap: 767.886s -> 769.328s (0.19%)
Artifact size: 365.54 MiB -> 365.53 MiB (-0.00%)

tmiasko and others added 18 commits April 30, 2025 14:35

transmutability: merge contiguous runs with a common destination

b9e0ecd

Optimize the codegen for Span::from_expansion

d9c060b

interpret: better error message for out-of-bounds pointer arithmetic …

00f25a8

…and accesses

Use select in projection lookup

f293000

Rename (Mapped)(RwLock|Mutex)Guard::try_map to filter_map.

d2068be

1. analogous to std::cell::Ref(Mut)::filter_map. 2. doesn't imply `Try` genericizability.

Stabilize select_unpredictable

72b110a

FCP completed in tracking issue rust-lang#133962.

extend the list of registered dylibs on test::prepare_cargo_test

7b25d4a

Signed-off-by: onur-ozkan <work@onurozkan.dev>

Add useful comments on ExprKind::If variants.

0ea204a

Things that aren't obvious and took me a while to work out.

Add regression test for 133065

a9cd0a9

Rollup merge of rust-lang#140509 - tmiasko:merge-contiguous-ranges, r…

429341b

…=jswrenn transmutability: merge contiguous runs with a common destination Based on rust-lang#140380. r? `@jswrenn` `@joshlf`

Rollup merge of rust-lang#140521 - RalfJung:oob-error, r=saethlin

c796ef0

interpret: better error message for out-of-bounds pointer arithmetic and accesses Fixes rust-lang#93881 r? `@saethlin`

Rollup merge of rust-lang#140550 - Amanieu:stabilize_select_unpredict…

15f21f4

…able, r=workingjubilee Stabilize `select_unpredictable` FCP completed in tracking issue rust-lang#133962.

Rollup merge of rust-lang#140563 - onur-ozkan:extend-dylib-paths, r=j…

bfb8f73

…ieyouxu extend the list of registered dylibs on `test::prepare_cargo_test` self-explanatory Fixes rust-lang#140299

Rollup merge of rust-lang#140572 - nnethercote:comment-ExprKind-If, r…

bcf2490

…=compiler-errors Add useful comments on `ExprKind::If` variants. Things that aren't obvious and took me a while to work out. r? `@BoxyUwU`

Rollup merge of rust-lang#140574 - reddevilmidzy:add-test, r=compiler…

6f7f3ce

…-errors Add regression test for 133065 closes: rust-lang#133065

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 2, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label May 3, 2025

bors merged commit 2d5ffc5 into rust-lang:master May 3, 2025
7 checks passed

rustbot added this to the 1.88.0 milestone May 3, 2025

This was referenced May 3, 2025

Add some track_caller info to precondition panics #129658

Draft

Align RwLockWriteGuard fields with the other RwLock guards (+ cleanup) #140018

Open

rustbot added the perf-regression Performance regression. label May 3, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #140596

Rollup of 9 pull requests #140596

matthiaskrgr commented May 2, 2025

matthiaskrgr commented May 2, 2025

bors commented May 2, 2025

bors commented May 2, 2025

bors commented May 3, 2025

github-actions bot commented May 3, 2025

Stage 1

Stage 2

rust-timer commented May 3, 2025

rust-timer commented May 3, 2025

Rollup of 9 pull requests #140596

Rollup of 9 pull requests #140596

Conversation

matthiaskrgr commented May 2, 2025

matthiaskrgr commented May 2, 2025

bors commented May 2, 2025

bors commented May 2, 2025

bors commented May 3, 2025

github-actions bot commented May 3, 2025

Test differences

Stage 1

Stage 2

Job duration changes

rust-timer commented May 3, 2025

rust-timer commented May 3, 2025

Overall result: ❌✅ regressions and improvements - please read the text below

Instruction count

Max RSS (memory usage)

Cycles

Binary size