Normalize region obligation in lexical region resolution with next-gen solver

[compiler-errors]

This normalizes region obligations when we resolve_regions, since they may be unnormalized with deferred projection equality.

It's pretty hard to add tests that exercise this without also triggering MIR borrowck errors (because we don't normalize there yet). I've added one test with two revisions that should test that we both 1. normalize region obligations in the param env, and 2. normalize registered region obligations during lexical region resolution.

[bors]

☔ The latest upstream changes (presumably #119047) made this pull request unmergeable. Please resolve the merge conflicts.

[compiler-errors]

@bors try @rust-timer queue

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout outlives (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self outlives --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_trait_selection/src/traits/select/mod.rs
Auto-merging compiler/rustc_hir_analysis/src/check/mod.rs
CONFLICT (content): Merge conflict in compiler/rustc_hir_analysis/src/check/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

[compiler-errors]

@bors try

[bors]

⌛ Trying commit f5a13e3 with merge bd85a7d...

[bors]

☀️ Try build successful - checks-actions
Build commit: bd85a7d (bd85a7d7cab71742c35348c06a31aa31a3c78e9d)

[rust-timer]

Finished benchmarking commit (bd85a7d): comparison URL.

Overall result: ❌✅ regressions and improvements - no 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.

@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)	-	-	0
Regressions ❌ (secondary)	0.2%	[0.2%, 0.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.8%	[-0.9%, -0.7%]	5
All ❌✅ (primary)	-	-	0

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)	2.9%	[2.9%, 2.9%]	1
Regressions ❌ (secondary)	0.9%	[0.9%, 0.9%]	1
Improvements ✅ (primary)	-1.0%	[-1.3%, -0.5%]	3
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.0%	[-1.3%, 2.9%]	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
Improvements ✅ (secondary)	-2.5%	[-2.9%, -1.9%]	4
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 671.842s -> 673.164s (0.20%)
Artifact size: 312.46 MiB -> 312.50 MiB (0.01%)

[bors]

☔ The latest upstream changes (presumably #117213) made this pull request unmergeable. Please resolve the merge conflicts.

[bors]

☔ The latest upstream changes (presumably #119751) made this pull request unmergeable. Please resolve the merge conflicts.

[rustbot]

Some changes occurred in engine.rs, potentially modifying the public API of ObligationCtxt.

cc @lcnr, @compiler-errors

[compiler-errors]

r? lcnr

[lcnr]

can you also add the tests from

• Unsound associated type outlives bound due to lazy norm trait-system-refactor-initiative#59
• Outlives obligations aren't normalized before processing trait-system-refactor-initiative#61
• we eagerly normalize Type-outlives bounds trait-system-refactor-initiative#63
  r=me after that

[lcnr]

@bors try @rust-timer queue

[bors]

⌛ Trying commit 9ae7edf with merge 0110aa8...

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout outlives (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self outlives --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_borrowck/src/type_check/mod.rs
CONFLICT (content): Merge conflict in compiler/rustc_borrowck/src/type_check/mod.rs
Automatic merge failed; fix conflicts and then commit the result.

[bors]

☔ The latest upstream changes (presumably #120466) made this pull request unmergeable. Please resolve the merge conflicts.

[lcnr]

@bors r+

[bors]

📌 Commit 720d7a7 has been approved by lcnr

It is now in the queue for this repository.

[bors]

⌛ Testing commit 720d7a7 with merge 6436e8f...

[bors]

💔 Test failed - checks-actions

[rust-log-analyzer]

A job failed! Check out the build log: (web) (plain)

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

[compiler-errors]

@bors retry

[bors]

⌛ Testing commit 720d7a7 with merge cb4d9a1...

[bors]

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing cb4d9a1 to master...

[rust-timer]

Finished benchmarking commit (cb4d9a1): 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.3%, -0.2%]	4
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.2%	[-0.3%, -0.2%]	4

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)	-	-	0
Improvements ✅ (primary)	-2.3%	[-4.2%, -0.7%]	37
Improvements ✅ (secondary)	-3.0%	[-6.7%, -0.8%]	90
All ❌✅ (primary)	-2.3%	[-4.2%, -0.7%]	37

Cycles

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

Binary size

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

Bootstrap: 661.322s -> 660.046s (-0.19%)
Artifact size: 308.09 MiB -> 308.08 MiB (-0.01%)