Rollup of 7 pull requests #139689

jhpratt · 2025-04-11T19:21:03Z

Successful merges:

Use BinOp::Cmp for iNN::signum #137835 (Use BinOp::Cmp for iNN::signum)
Avoid a reverse map that is only used in diagnostics paths #139584 (Avoid a reverse map that is only used in diagnostics paths)
Cleanup the InstSimplify MIR transformation #139638 (Cleanup the InstSimplify MIR transformation)
Handle a negated literal in eat_token_lit. #139653 (Handle a negated literal in eat_token_lit.)
Tweak DefPathData #139662 (Tweak DefPathData)
Reuse address-space computation from global alloc #139664 (Reuse address-space computation from global alloc)
Add spastorino to users_on_vacation #139687 (Add spastorino to users_on_vacation)

r? @ghost
@rustbot modify labels: rollup

This way it can use the nice new LLVM intrinsic in LLVM20.

No need to convert the `DefKind` to `DefPathData`, they're very similar types.

PR rust-lang#137977 changed `DefPathData::TypeNs` to contain `Option<Symbol>` to account for RPITIT assoc types being anonymous. This commit changes it back to `Symbol` and gives anonymous assoc types their own variant. It makes things a bit nicer overall.

Give them their own symbol `anon_assoc`, as is done for all the other anonymous `DefPathData` variants.

Use `BinOp::Cmp` for `iNN::signum` This way it can use the nice new LLVM intrinsic in LLVM20.

…etrochenkov Avoid a reverse map that is only used in diagnostics paths r? `@petrochenkov` iterating a map until a value matches and returning the key is bad obviously, but it happens very rarely and only on diagnostics paths. It would also be a lot cheaper with rust-lang#138995. Which is actually why I'm trying this out, that PR adds a new entry in `create_def`, which makes `create_def` show up in cachegrind. So I'm trying out if removing adding an entry in `create_def` is a perf improvement

…plify/cleanup, r=oli-obk Cleanup the `InstSimplify` MIR transformation Some minor cleanups and rightward-drift-protection found while working on rust-lang#139411 and a future follow-up

…nkov Handle a negated literal in `eat_token_lit`. Fixes rust-lang#139495. r? `@petrochenkov`

…ompiler-errors Tweak `DefPathData` Some improvements in and around `DefPathData`, following on from rust-lang#137977. r? `@spastorino`

Reuse address-space computation from global alloc r? `@RalfJung` just avoiding some minor duplication

…ion, r=Urgau Add spastorino to users_on_vacation

jhpratt · 2025-04-11T19:21:20Z

@bors r+ rollup=never p=5

bors · 2025-04-11T19:21:23Z

📌 Commit c8992c9 has been approved by jhpratt

It is now in the queue for this repository.

bors · 2025-04-11T20:06:10Z

⌛ Testing commit c8992c9 with merge d2b3dd7...

bors · 2025-04-11T23:20:22Z

☀️ Test successful - checks-actions
Approved by: jhpratt
Pushing d2b3dd7 to master...

github-actions · 2025-04-11T23:22:07Z

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 ed3a4aa (parent) -> d2b3dd7 (this PR)

Test differences

Show 318 test diffs

Stage 1

[ui] tests/ui/macros/reparse-expr-issue-139495.rs: [missing] -> pass (J1)

Stage 2

[ui] tests/ui/macros/reparse-expr-issue-139495.rs: [missing] -> pass (J0)

Additionally, 316 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Job duration changes

dist-aarch64-linux: 5504.5s -> 7621.0s (38.5%)
x86_64-apple-1: 7607.2s -> 9842.4s (29.4%)
x86_64-apple-2: 5038.7s -> 3955.0s (-21.5%)
aarch64-apple: 4315.9s -> 3791.6s (-12.1%)
x86_64-msvc-1: 8687.9s -> 9525.9s (9.6%)
dist-x86_64-msvc: 5942.3s -> 6440.1s (8.4%)
dist-x86_64-mingw: 8116.6s -> 7564.2s (-6.8%)
dist-x86_64-linux: 5140.2s -> 5468.5s (6.4%)
dist-aarch64-apple: 4916.3s -> 4609.3s (-6.2%)
dist-loongarch64-linux: 6645.2s -> 6338.9s (-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-04-11T23:22:22Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#137835	Use `BinOp::Cmp` for `iNN::signum`	`a9c4f37571986ad90ab452ac4ee99f5139d2fd3c` (link)
#139584	Avoid a reverse map that is only used in diagnostics paths	`40b73e94cdad24851f95a8eb4304535401e1b8d6` (link)
#139638	Cleanup the `InstSimplify` MIR transformation	`acbda69db321073c754fbb19118de23bfae695eb` (link)
#139653	Handle a negated literal in `eat_token_lit`.	`42ab03a77be92475fb036b339a157e5af9f9159c` (link)
#139662	Tweak `DefPathData`	`f6d1242ac2152329d49ed1e53bfb68a3c8724b80` (link)
#139664	Reuse address-space computation from global alloc	`accee9cafd810c46d7658e6cc054b08996d1da67` (link)
#139687	Add spastorino to users_on_vacation	`60ae45be1e0f4ebcf3773641059b4250ec6334c9` (link)

previous master: ed3a4aac81

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-04-12T01:43:46Z

Finished benchmarking commit (d2b3dd7): 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.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.6%	[0.6%, 0.6%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary -2.8%, secondary -0.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)	3.1%	[3.1%, 3.1%]	1
Regressions ❌ (secondary)	3.0%	[1.9%, 3.5%]	5
Improvements ✅ (primary)	-4.3%	[-6.4%, -3.1%]	4
Improvements ✅ (secondary)	-2.9%	[-4.1%, -1.5%]	6
All ❌✅ (primary)	-2.8%	[-6.4%, 3.1%]	5

Cycles

Results (primary 2.0%, secondary 3.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)	2.0%	[1.1%, 3.0%]	2
Regressions ❌ (secondary)	3.6%	[3.6%, 3.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.0%	[1.1%, 3.0%]	2

Binary size

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

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
Improvements ✅ (primary)	-0.1%	[-0.2%, -0.0%]	69
Improvements ✅ (secondary)	-0.1%	[-0.2%, -0.0%]	30
All ❌✅ (primary)	-0.1%	[-0.2%, -0.0%]	69

Bootstrap: 779.659s -> 782.643s (0.38%)
Artifact size: 365.50 MiB -> 365.51 MiB (0.00%)

scottmcm and others added 20 commits March 1, 2025 13:06

Use BinOp::Cmp for iNN::signum

8004615

This way it can use the nice new LLVM intrinsic in LLVM20.

Cleanup the InstSimplify MIR transformation

9491242

Handle a negated literal in eat_token_lit.

d25c8a8

Fixes rust-lang#139495.

Adjust an assertion.

fad2535

No need to convert the `DefKind` to `DefPathData`, they're very similar types.

Reuse address-space computation from global alloc

cfa52e4

Avoid a reverse map that is only used in diagnostics paths

24efefa

Avoid another node_id_to_def_id call

f5c60f6

Avoid storing the LocalDefId twice

33a6820

Avoid a node_id_to_def_id call by just storing DefIds instead of NodeIds

d35e830

Only compute the DefId when a diagnostic is definitely emitted

98d51fb

Change how anonymous associated types are printed.

cdf5b8d

Give them their own symbol `anon_assoc`, as is done for all the other anonymous `DefPathData` variants.

Add spastorino to users_on_vacation

452c280

Rollup merge of rust-lang#137835 - scottmcm:signum, r=compiler-errors

a660829

Use `BinOp::Cmp` for `iNN::signum` This way it can use the nice new LLVM intrinsic in LLVM20.

Rollup merge of rust-lang#139638 - yotamofek:pr/mir_transform/instsim…

00b9060

…plify/cleanup, r=oli-obk Cleanup the `InstSimplify` MIR transformation Some minor cleanups and rightward-drift-protection found while working on rust-lang#139411 and a future follow-up

Rollup merge of rust-lang#139653 - nnethercote:fix-139495, r=petroche…

2f873f9

…nkov Handle a negated literal in `eat_token_lit`. Fixes rust-lang#139495. r? `@petrochenkov`

Rollup merge of rust-lang#139662 - nnethercote:tweak-DefPathData, r=c…

2b54f9b

…ompiler-errors Tweak `DefPathData` Some improvements in and around `DefPathData`, following on from rust-lang#137977. r? `@spastorino`

Rollup merge of rust-lang#139664 - oli-obk:push-tkmurytmnsyw, r=RalfJung

eea366c

Reuse address-space computation from global alloc r? `@RalfJung` just avoiding some minor duplication

Rollup merge of rust-lang#139687 - spastorino:add-spastorino-to-vacat…

c8992c9

…ion, r=Urgau Add spastorino to users_on_vacation

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 Apr 11, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 11, 2025

bors merged commit d2b3dd7 into rust-lang:master Apr 11, 2025
1 check passed

rustbot added this to the 1.88.0 milestone Apr 11, 2025

This was referenced Apr 11, 2025

Try enabling precondition checks on ptr::{read,write} #129498

Draft

Add post-mono MIR passes to make mono-reachable analysis more accurate #131650

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #139689

Rollup of 7 pull requests #139689

jhpratt commented Apr 11, 2025

jhpratt commented Apr 11, 2025

bors commented Apr 11, 2025

bors commented Apr 11, 2025

bors commented Apr 11, 2025

github-actions bot commented Apr 11, 2025

Stage 1

Stage 2

rust-timer commented Apr 11, 2025

rust-timer commented Apr 12, 2025

Rollup of 7 pull requests #139689

Rollup of 7 pull requests #139689

Conversation

jhpratt commented Apr 11, 2025

jhpratt commented Apr 11, 2025

bors commented Apr 11, 2025

bors commented Apr 11, 2025

bors commented Apr 11, 2025

github-actions bot commented Apr 11, 2025

Test differences

Stage 1

Stage 2

Job duration changes

rust-timer commented Apr 11, 2025

rust-timer commented Apr 12, 2025

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size