incr.comp.: Fix potential unstable Fingerprint error for BorrowCheckResult

[michaelwoerister]

This potentially fixes issue #96655, but I was not able to actually reproduce it.

r? @Aaron1011

[lqd]

@bors try

so we can the CI artifacts on the other issues

[bors]

⌛ Trying commit 9421219 with merge 3d838c809141fd15465b18559757a34c360c11d4...

[bors]

☀️ Try build successful - checks-actions
Build commit: 3d838c809141fd15465b18559757a34c360c11d4 (3d838c809141fd15465b18559757a34c360c11d4)

[Aaron1011]

r=me once you've performed any additional testing with the CI artifact toolchain.

[michaelwoerister]

@rust-timer queue

[rust-timer]

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

[michaelwoerister]

@rust-timer build 3d838c809141fd15465b18559757a34c360c11d4

[rust-timer]

Queued 3d838c809141fd15465b18559757a34c360c11d4 with parent 4045ce6, future comparison URL.

[rust-timer]

Finished benchmarking commit (3d838c809141fd15465b18559757a34c360c11d4): comparison url.

Instruction count

• Primary benchmarks: no relevant changes found
• Secondary benchmarks: 🎉 relevant improvements found

	mean1	max	count2
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-1.3%	-1.7%	6
All 😿🎉 (primary)	N/A	N/A	0

Max RSS (memory usage)

Results

• Primary benchmarks: 🎉 relevant improvement found
• Secondary benchmarks: 🎉 relevant improvement found

	mean1	max	count2
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	-0.0%	-0.0%	1
Improvements 🎉 (secondary)	-2.9%	-2.9%	1
All 😿🎉 (primary)	-0.0%	-0.0%	1

Cycles

Results

• Primary benchmarks: 😿 relevant regressions found
• Secondary benchmarks: 😿 relevant regression found

	mean1	max	count2
Regressions 😿 (primary)	2.3%	2.5%	2
Regressions 😿 (secondary)	3.4%	3.4%	1
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	2.3%	2.5%	2

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

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.

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

Footnotes

1. the arithmetic mean of the percent change ↩ ↩² ↩³

2. number of relevant changes ↩ ↩² ↩³

[michaelwoerister]

@bors r=Aaron1011

#98959 probably fixes the underlying source of indeterminism, but this PR doesn't seem to hurt performance and provides an additional safety measure if there are additional instabilities.

The real fix will be to make progress on #94188 and use a collection type that doesn't leak iteration order into fingerprints.

[bors]

📌 Commit 9421219 has been approved by Aaron1011

[bors]

⌛ Testing commit 9421219 with merge 049ee8c62795b3ea3b662f89efc209ddbd78d5ec...

[rust-log-analyzer]

The job x86_64-gnu-debug failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

    Checking rustc_borrowck v0.0.0 (/checkout/compiler/rustc_borrowck)
error[E0599]: no method named `create_stable_hashing_context` found for struct `TyCtxt<'tcx>` in the current scope
   --> compiler/rustc_borrowck/src/lib.rs:444:58
    |
444 |     opaque_type_values.sort_deterministically(&infcx.tcx.create_stable_hashing_context());
    |                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: there is an associated function with a similar name: `with_stable_hashing_context`
For more information about this error, try `rustc --explain E0599`.
error: could not compile `rustc_borrowck` due to previous error
warning: build failed, waiting for other jobs to finish...
error: could not compile `rustc_borrowck` due to previous error

[bors]

💔 Test failed - checks-actions

[bors]

⌛ Testing commit 9421219 with merge e55a669443e142e23a46f3d12eae0c0dd7e9082f...

[bors]

💔 Test failed - checks-actions

[rust-log-analyzer]

The job x86_64-gnu-debug failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

    Checking rustc_mir_transform v0.0.0 (/checkout/compiler/rustc_mir_transform)
error[E0599]: no method named `create_stable_hashing_context` found for struct `TyCtxt<'tcx>` in the current scope
   --> compiler/rustc_borrowck/src/lib.rs:444:58
    |
444 |     opaque_type_values.sort_deterministically(&infcx.tcx.create_stable_hashing_context());
    |                                                          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: there is an associated function with a similar name: `with_stable_hashing_context`
For more information about this error, try `rustc --explain E0599`.
error: could not compile `rustc_borrowck` due to previous error
warning: build failed, waiting for other jobs to finish...
error: could not compile `rustc_borrowck` due to previous error

[apiraino]

Based on the latest tests failures. I'll switch to waiting on author, if it's ok. Feel free to request a review with @rustbot ready, thanks!

@rustbot author

[michaelwoerister]

I'm closing this. #98959 has fixed the root cause and the work that will eventually come out of rust-lang/compiler-team#533 will provide nicer "hardening" than what's implemented in this PR.