`obligations_for_self_ty`: use `ProofTreeVisitor` for nested goals #122385

lcnr · 2024-03-12T13:28:45Z

As always, dealing with proof trees continues to be a hacked together mess. After this PR and #124380 the only remaining blocker for core is rust-lang/trait-system-refactor-initiative#90. There is also a ProofTreeVisitor issue causing an ICE when compiling alloc which I will handle in a separate PR. This issue likely affects coherence diagnostics more generally.

The core idea is to extend the proof tree visitor to support visiting nested candidates without using a probe. We then simply recurse into nested candidates if they are the only potentially applicable candidate for a given goal and check whether the self type matches the expected one.

For that to work, we need to improve CanonicalState to also handle unconstrained inference variables created inside of the trait solver. This is done by extending the var_values of CanoncalState with each fresh inference variables. Furthermore, we also store the state of all inference variables at the end of each probe. When recursing into InspectCandidates we then unify the values of all these states.

r? @compiler-errors

rustbot · 2024-03-12T13:28:54Z

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

compiler-errors · 2024-03-12T18:57:07Z

@rustbot author since i think ur still working on this

`super::super` of `rustc_hir_typeck::fn_ctxt::_impl` is just `rustc_hir_typeck`.

uses a `ProofTreeVisitor` to look into nested goals when looking at the pending obligations during hir typeck. Used by closure signature inference, coercion, and for async functions.

compiler-errors · 2024-04-25T19:54:58Z

@bors try @rust-timer queue

…r=<try> `obligations_for_self_ty`: use `ProofTreeVisitor` for nested goals As always, dealing with proof trees continues to be a hacked together mess. After this PR and rust-lang#124380 the only remaining blocker for core is rust-lang/trait-system-refactor-initiative#90. There is also a `ProofTreeVisitor` issue causing an ICE when compiling `alloc` which I will handle in a separate PR. This issue likely affects coherence diagnostics more generally. The core idea is to extend the proof tree visitor to support visiting nested candidates without using a `probe`. We then simply recurse into nested candidates if they are the only potentially applicable candidate for a given goal and check whether the self type matches the expected one. For that to work, we need to improve `CanonicalState` to also handle unconstrained inference variables created inside of the trait solver. This is done by extending the `var_values` of `CanoncalState` with each fresh inference variables. Furthermore, we also store the state of all inference variables at the end of each probe. When recursing into `InspectCandidates` we then unify the values of all these states. r? `@compiler-errors`

bors · 2024-04-25T19:56:09Z

⌛ Trying commit 03878c6 with merge 5cd2d13...

compiler-errors

thanks! this is great. r=me after perf is ready.

compiler-errors · 2024-04-25T20:20:56Z

the try build in question: https://github.com/rust-lang-ci/rust/actions/runs/8838574745

rustbot · 2024-04-25T20:21:46Z

triagebot.toml has been modified, there may have been changes to the review queue.

cc @davidtwco, @wesleywiser

lcnr · 2024-04-26T01:13:52Z

@bors try @rust-timer queue

bors · 2024-04-26T01:15:03Z

⌛ Trying commit 146f637 with merge 9dcd6e5...

…r=<try> `obligations_for_self_ty`: use `ProofTreeVisitor` for nested goals As always, dealing with proof trees continues to be a hacked together mess. After this PR and rust-lang#124380 the only remaining blocker for core is rust-lang/trait-system-refactor-initiative#90. There is also a `ProofTreeVisitor` issue causing an ICE when compiling `alloc` which I will handle in a separate PR. This issue likely affects coherence diagnostics more generally. The core idea is to extend the proof tree visitor to support visiting nested candidates without using a `probe`. We then simply recurse into nested candidates if they are the only potentially applicable candidate for a given goal and check whether the self type matches the expected one. For that to work, we need to improve `CanonicalState` to also handle unconstrained inference variables created inside of the trait solver. This is done by extending the `var_values` of `CanoncalState` with each fresh inference variables. Furthermore, we also store the state of all inference variables at the end of each probe. When recursing into `InspectCandidates` we then unify the values of all these states. r? `@compiler-errors`

bors · 2024-04-26T02:52:30Z

☀️ Try build successful - checks-actions
Build commit: 9dcd6e5 (9dcd6e521c16a2266f48f4b06d2d04f466f18ff6)

rust-timer · 2024-04-26T04:42:26Z

Finished benchmarking commit (9dcd6e5): comparison URL.

Overall result: ✅ 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
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.0%	[-1.8%, -0.3%]	2
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)	1.8%	[1.8%, 1.8%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-1.4%	[-1.4%, -1.4%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.2%	[-1.4%, 1.8%]	2

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: 671.645s -> 672.204s (0.08%)
Artifact size: 315.99 MiB -> 315.88 MiB (-0.03%)

compiler-errors · 2024-04-26T14:20:49Z

@bors r+

bors · 2024-04-26T14:20:52Z

📌 Commit 146f637 has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2024-04-26T15:37:08Z

⌛ Testing commit 146f637 with merge 1b3a329...

bors · 2024-04-26T17:40:15Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 1b3a329 to master...

rust-timer · 2024-04-26T18:55:59Z

Finished benchmarking commit (1b3a329): 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
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

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

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)	-1.0%	[-1.2%, -0.8%]	2
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-1.0%	[-1.2%, -0.8%]	2

Binary size

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

Bootstrap: 671.528s -> 671.828s (0.04%)
Artifact size: 316.01 MiB -> 315.91 MiB (-0.03%)

rustbot assigned compiler-errors Mar 12, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative labels Mar 12, 2024

lcnr marked this pull request as draft March 12, 2024 16:57

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 12, 2024

rust-cloud-vms bot force-pushed the analyze-obligations-for-infer branch 2 times, most recently from 7754ca8 to a5f7f1e Compare April 24, 2024 15:24

This comment has been minimized.

Sign in to view

lcnr added 2 commits April 25, 2024 15:21

obligations_for_self_ty to sub module

2293f1e

pub(in super::super) to pub(crate)

662eadb

`super::super` of `rustc_hir_typeck::fn_ctxt::_impl` is just `rustc_hir_typeck`.

rust-cloud-vms bot force-pushed the analyze-obligations-for-infer branch from 97c9abd to 6a17037 Compare April 25, 2024 15:22

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Apr 25, 2024

rust-cloud-vms bot force-pushed the analyze-obligations-for-infer branch from c09ae21 to 7cf4574 Compare April 25, 2024 19:43

hir typeck: look into nested goals

03878c6

uses a `ProofTreeVisitor` to look into nested goals when looking at the pending obligations during hir typeck. Used by closure signature inference, coercion, and for async functions.

rust-cloud-vms bot force-pushed the analyze-obligations-for-infer branch from 7cf4574 to 03878c6 Compare April 25, 2024 19:44

lcnr marked this pull request as ready for review April 25, 2024 19:52

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 25, 2024

compiler-errors approved these changes Apr 25, 2024

View reviewed changes

use EagerResolver

b64f687

add triage bot mentions

146f637

rustbot added the A-meta Area: Issues & PRs about the rust-lang/rust repository itself label Apr 25, 2024

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Apr 26, 2024

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 26, 2024

compiler-errors mentioned this pull request Apr 26, 2024

Weaker closure signature inference rust-lang/trait-system-refactor-initiative#71

Open

bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 26, 2024

bors merged commit 1b3a329 into rust-lang:master Apr 26, 2024
11 checks passed

rustbot added this to the 1.79.0 milestone Apr 26, 2024

lcnr deleted the analyze-obligations-for-infer branch April 26, 2024 17:41

bors mentioned this pull request Apr 26, 2024

Follow-up fixes to report_return_mismatched_types #123812

Merged

matthiaskrgr mentioned this pull request Apr 26, 2024

ICE: solver coherence: 'called Result::unwrap() on an Err value: Sorts(ExpectedFound { expected: u32, found: u16 })' #124422

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`obligations_for_self_ty`: use `ProofTreeVisitor` for nested goals #122385

`obligations_for_self_ty`: use `ProofTreeVisitor` for nested goals #122385

lcnr commented Mar 12, 2024 •

edited

Loading

rustbot commented Mar 12, 2024

compiler-errors commented Mar 12, 2024

This comment has been minimized.

compiler-errors commented Apr 25, 2024

This comment has been minimized.

bors commented Apr 25, 2024

compiler-errors left a comment •

edited

Loading

compiler-errors commented Apr 25, 2024

rustbot commented Apr 25, 2024

lcnr commented Apr 26, 2024

This comment has been minimized.

bors commented Apr 26, 2024

bors commented Apr 26, 2024

This comment has been minimized.

rust-timer commented Apr 26, 2024

compiler-errors commented Apr 26, 2024

bors commented Apr 26, 2024

bors commented Apr 26, 2024

bors commented Apr 26, 2024

rust-timer commented Apr 26, 2024

obligations_for_self_ty: use ProofTreeVisitor for nested goals #122385

obligations_for_self_ty: use ProofTreeVisitor for nested goals #122385

Conversation

lcnr commented Mar 12, 2024 • edited Loading

rustbot commented Mar 12, 2024

compiler-errors commented Mar 12, 2024

This comment has been minimized.

compiler-errors commented Apr 25, 2024

This comment has been minimized.

bors commented Apr 25, 2024

compiler-errors left a comment • edited Loading

Choose a reason for hiding this comment

compiler-errors commented Apr 25, 2024

rustbot commented Apr 25, 2024

lcnr commented Apr 26, 2024

This comment has been minimized.

bors commented Apr 26, 2024

bors commented Apr 26, 2024

This comment has been minimized.

rust-timer commented Apr 26, 2024

Overall result: ✅ improvements - no action needed

compiler-errors commented Apr 26, 2024

bors commented Apr 26, 2024

bors commented Apr 26, 2024

bors commented Apr 26, 2024

rust-timer commented Apr 26, 2024

Overall result: ✅ improvements - no action needed

`obligations_for_self_ty`: use `ProofTreeVisitor` for nested goals #122385

`obligations_for_self_ty`: use `ProofTreeVisitor` for nested goals #122385

lcnr commented Mar 12, 2024 •

edited

Loading

compiler-errors left a comment •

edited

Loading