Unify SourceFile::name_hash and StableSourceFileId

[michaelwoerister]

This PR adapts the existing StableSourceFileId type so that it can be used instead of the name_hash field of SourceFile. This simplifies a few things that were kind of duplicated before.

The PR should also fix issues #112700 and #115835, but I was not able to reproduce these issues in a regression test. As far as I can tell, the root cause of these issues is that the id of the originating crate is not hashed in the HashStable impl of Span and thus cache entries that should have been considered invalidated were loaded. After this PR, the stable_id field of SourceFile includes information about the originating crate, so that ICE should not occur anymore.

[rustbot]

r? @davidtwco

(rustbot has picked a reviewer for you, use r? to override)

[michaelwoerister]

@bors try @rust-timer queue

The changes here cause more SourceFiles to be cloned during crate metadata generation. Let's see if this has an impact on performance.

[bors]

⌛ Trying commit fa8ef25 with merge 1b4168c...

[bors]

☀️ Try build successful - checks-actions
Build commit: 1b4168c (1b4168c7abb8e0170307e77560ff396321dce94d)

[rust-timer]

Finished benchmarking commit (1b4168c): comparison URL.

Overall result: ❌✅ regressions and improvements - ACTION NEEDED

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

Next Steps: If you can justify the regressions found in this try perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please fix the regressions and do another perf run. If the next run shows neutral or positive results, the label will be automatically removed.

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

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	1.2%	[1.2%, 1.2%]	1
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	1
Improvements ✅ (primary)	-0.2%	[-0.3%, -0.1%]	4
Improvements ✅ (secondary)	-1.0%	[-1.0%, -1.0%]	1
All ❌✅ (primary)	0.1%	[-0.3%, 1.2%]	5

Max RSS (memory usage)

Results

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.8%	[0.7%, 0.8%]	2
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.7%	[-0.8%, -0.5%]	2
Improvements ✅ (secondary)	-3.7%	[-4.2%, -3.1%]	3
All ❌✅ (primary)	0.0%	[-0.8%, 0.8%]	4

Cycles

Results

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

Binary size

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

Bootstrap: 671.988s -> 671.084s (-0.13%)
Artifact size: 312.43 MiB -> 312.49 MiB (0.02%)

[michaelwoerister]

I don't think the unicode-normalization-0.1.19 | opt | full regression is real. The only thing that could be slower due to this PR is exporting SourceFiles to crate metadata, and that should be the same for all build kinds (check, debug, opt / incr. and non-incr.). All the other instances of unicode-normalization-0.1.19 show an improvement.

I'm going to tag this as:
@rustbot label: +perf-regression-triaged

but cc @rust-lang/wg-compiler-performance, just in case

[lqd]

I don't think the unicode-normalization-0.1.19 | opt | full regression is real.

agreed (and so does cachegrind)

[cjgillot]

@bors r+

[bors]

📌 Commit fa8ef25 has been approved by cjgillot

It is now in the queue for this repository.

[bors]

⌛ Testing commit fa8ef25 with merge bf8716f...

[bors]

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing bf8716f to master...

[rust-timer]

Finished benchmarking commit (bf8716f): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

Results

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)	1.6%	[1.6%, 1.6%]	1
Improvements ✅ (primary)	-0.6%	[-0.6%, -0.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.6%	[-0.6%, -0.6%]	1

Cycles

Results

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.3%	[3.3%, 3.3%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.3%	[3.3%, 3.3%]	1

Binary size

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

Bootstrap: 669.342s -> 669.392s (0.01%)
Artifact size: 312.60 MiB -> 312.50 MiB (-0.03%)