Do not modify resolver outputs during lowering

[cjgillot]

View all comments

Split from #142830

I believe this achieves the same thing as #153656 but in a much simpler way.

This PR forces AST->HIR lowering to stop mutating resolver outputs. Instead, it manages a few override maps that only live during lowering and are dropped afterwards.

r? @petrochenkov
cc @aerooneqq

[rustbot]

Some changes occurred in compiler/rustc_ast_lowering/src/format.rs

cc @m-ou-se

[cjgillot]

@bors try @rust-timer queue

[rust-bors]

☀️ Try build successful (CI)
Build commit: fd1275a (fd1275a2d0718b26a05018665073cb854870b511, parent: f29256dd1420dc681bf4956e3012ffe9eccdc7e7)

[rust-timer]

Finished benchmarking commit (fd1275a): comparison URL.

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

Benchmarking means the PR may be perf-sensitive. It's automatically marked not fit for rolling up. Overriding is possible but disadvised: it risks changing compiler perf.

Next, please: If you can, justify the regressions found in this try perf run in writing along with @rustbot label: +perf-regression-triaged. If not, fix the regressions and do another perf run. Neutral or positive results will clear the label automatically.

@bors rollup=never
@rustbot label: -S-waiting-on-perf +perf-regression

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

Max RSS (memory usage)

Results (primary 2.8%, secondary 3.2%)

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

	mean	range	count
Regressions ❌ (primary)	2.8%	[0.9%, 7.3%]	123
Regressions ❌ (secondary)	3.2%	[0.9%, 8.0%]	48
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.8%	[0.9%, 7.3%]	123

Cycles

Results (secondary -3.7%)

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)	2.0%	[2.0%, 2.0%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-5.1%	[-8.0%, -2.3%]	4
All ❌✅ (primary)	-	-	0

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 490.91s -> 488.306s (-0.53%)
Artifact size: 394.18 MiB -> 395.94 MiB (0.45%)

[cjgillot]

@bors try @rust-timer queue

[rust-bors]

☀️ Try build successful (CI)
Build commit: 1c6d6e2 (1c6d6e2c1b3985c72ee1ae7801921428e8a66b2e, parent: 9ec5d5f32e19d250c7fbeaa90978c79105b39dee)

[rust-timer]

Finished benchmarking commit (1c6d6e2): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking means the PR may be perf-sensitive. It's automatically marked not fit for rolling up. Overriding is possible but disadvised: it risks changing compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

This perf run didn't have relevant results for this metric.

Cycles

Results (secondary -14.1%)

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)	4.7%	[4.7%, 4.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-17.8%	[-24.1%, -3.5%]	5
All ❌✅ (primary)	-	-	0

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 489.594s -> 487.712s (-0.38%)
Artifact size: 394.45 MiB -> 394.22 MiB (-0.06%)

[oli-obk]

Please squash the first two commits to avoid the back and forth in the diff

[rustbot]

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

[oli-obk]

@bors r+

[rust-bors]

📌 Commit 4433512 has been approved by oli-obk

It is now in the queue for this repository.

[petrochenkov]

(I was waiting for the S-waiting-on-review label to approve the PR.)