Add support for inherent projections in new solver #113336

compiler-errors · 2023-07-04T20:05:20Z

Not hard to support these, and it cuts out a really big chunk of failing UI tests with --compare-mode=next-solver

r? @lcnr (feel free to reassign, anyone can review this)

rustbot · 2023-07-04T20:05:27Z

Some changes occurred to the core trait solver

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

compiler-errors · 2023-07-04T20:52:36Z

compiler/rustc_trait_selection/src/solve/inherent_projection.rs

+            tcx.type_of(impl_def_id).subst(tcx, impl_substs),
+        )?;
+        self.add_goals(
+            tcx.predicates_of(impl_def_id)


Here, just like the normal projection code,

rust/compiler/rustc_trait_selection/src/solve/trait_goals.rs

Lines 70 to 76 in 4dbc7e3

let where_clause_bounds = tcx

.predicates_of(impl_def_id)

.instantiate(tcx, impl_substs)

.predicates

.into_iter()

.map(|pred| goal.with(tcx, pred));

ecx.add_goals(where_clause_bounds);

we only register the impl's where clauses. the GAT's own where clauses are guaranteed by well-formedness.

Not exactly sure if we should be registering both. Maybe it affects inference?? 🤷

please also check GAT where clauses for this, ordinary trait impl candidates and object candidates, and weak alias types rust-lang/trait-system-refactor-initiative#44

compiler-errors · 2023-07-07T19:29:47Z

compiler/rustc_trait_selection/src/solve/project_goals.rs

@@ -122,6 +123,14 @@ impl<'tcx> assembly::GoalKind<'tcx> for ProjectionPredicate<'tcx> {
                    )?;
                    ecx.eq(goal.param_env, goal.predicate.term, assumption_projection_pred.term)
                        .expect("expected goal term to be fully unconstrained");
+
+                    // Add GAT where clauses from the trait's definition


I found it easier to check the GAT WC here in probe_and_match_goal_against_assumption rather than just doing it for object candidates. This also makes sure we check them correctly for alias bounds, and for most other built-in bounds which end up flowing through this method.

Let me know what you think about this.

hm... I don't feel too happy about this but don't really know. It feels potentially unnecessary and might cause issues. But I guess we cna always move it out and check it in less places.

I mean, especially moving towards coinduction, I'm not certain if I understand how this isn't going to be necessary. Builtin candidates should be checking their GAT WCs for them to be sound, right?

bors · 2023-07-13T20:14:09Z

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

lcnr · 2023-07-14T08:38:45Z

r=me after rebase

compiler-errors · 2023-07-14T16:08:20Z

@bors r=lcnr

bors · 2023-07-14T16:08:22Z

📌 Commit 7c3d5fffbb844c9ec34e4e55d9af02fc53c0cfb3 has been approved by lcnr

It is now in the queue for this repository.

bors · 2023-07-14T17:36:03Z

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

bors · 2023-07-15T01:14:29Z

🔒 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:

git checkout new-solver-iat (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self new-solver-iat --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/project.rs
CONFLICT (content): Merge conflict in compiler/rustc_trait_selection/src/traits/project.rs
Auto-merging compiler/rustc_trait_selection/src/solve/weak_types.rs
Auto-merging compiler/rustc_trait_selection/src/solve/project_goals.rs
Auto-merging compiler/rustc_trait_selection/src/solve/mod.rs
Auto-merging compiler/rustc_middle/src/ty/sty.rs
CONFLICT (content): Merge conflict in compiler/rustc_middle/src/ty/sty.rs
Automatic merge failed; fix conflicts and then commit the result.

compiler-errors · 2023-07-16T21:15:17Z

rebased to rename substs to args

@bors r=lcnr

bors · 2023-07-16T21:15:18Z

📌 Commit c9ce51b has been approved by lcnr

It is now in the queue for this repository.

bors · 2023-07-17T01:06:39Z

⌛ Testing commit c9ce51b with merge 4c7af42...

bors · 2023-07-17T02:56:03Z

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

rust-timer · 2023-07-17T07:03:44Z

Finished benchmarking commit (4c7af42): comparison URL.

Overall result: ❌ regressions - 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.8%	[0.6%, 1.0%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
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)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.0%	[-2.0%, -2.0%]	1
All ❌✅ (primary)	-	-	0

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: 657.855s -> 656.194s (-0.25%)

rustbot assigned lcnr Jul 4, 2023

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 (-Znext-solver) labels Jul 4, 2023

compiler-errors commented Jul 4, 2023

View reviewed changes

compiler-errors mentioned this pull request Jul 7, 2023

GAT where bounds of impl candidates rust-lang/trait-system-refactor-initiative#44

Open

rust-cloud-vms bot force-pushed the new-solver-iat branch from 5c4170f to 57de776 Compare July 7, 2023 19:26

compiler-errors commented Jul 7, 2023

View reviewed changes

rust-cloud-vms bot force-pushed the new-solver-iat branch from 57de776 to 7c3d5ff Compare July 14, 2023 15:04

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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 14, 2023

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 14, 2023

compiler-errors added 2 commits July 16, 2023 21:14

Add support for inherent projections

085ae9e

Check GAT, IAT, and weak type where clauses during projection

c9ce51b

rust-cloud-vms bot force-pushed the new-solver-iat branch from 7c3d5ff to c9ce51b Compare July 16, 2023 21:14

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 Jul 16, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 17, 2023

bors merged commit 4c7af42 into rust-lang:master Jul 17, 2023

rustbot added this to the 1.73.0 milestone Jul 17, 2023

compiler-errors deleted the new-solver-iat branch August 11, 2023 20:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for inherent projections in new solver #113336

Add support for inherent projections in new solver #113336

compiler-errors commented Jul 4, 2023

rustbot commented Jul 4, 2023

compiler-errors Jul 4, 2023

lcnr Jul 7, 2023 •

edited

Loading

compiler-errors Jul 7, 2023

lcnr Jul 14, 2023

compiler-errors Jul 14, 2023

bors commented Jul 13, 2023

lcnr commented Jul 14, 2023

compiler-errors commented Jul 14, 2023

bors commented Jul 14, 2023

bors commented Jul 14, 2023

bors commented Jul 15, 2023

compiler-errors commented Jul 16, 2023

bors commented Jul 16, 2023

bors commented Jul 17, 2023

bors commented Jul 17, 2023

rust-timer commented Jul 17, 2023

	let where_clause_bounds = tcx
	.predicates_of(impl_def_id)
	.instantiate(tcx, impl_substs)
	.predicates
	.into_iter()
	.map(\|pred\| goal.with(tcx, pred));
	ecx.add_goals(where_clause_bounds);

Add support for inherent projections in new solver #113336

Add support for inherent projections in new solver #113336

Conversation

compiler-errors commented Jul 4, 2023

rustbot commented Jul 4, 2023

Choose a reason for hiding this comment

lcnr Jul 7, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented Jul 13, 2023

lcnr commented Jul 14, 2023

compiler-errors commented Jul 14, 2023

bors commented Jul 14, 2023

bors commented Jul 14, 2023

bors commented Jul 15, 2023

compiler-errors commented Jul 16, 2023

bors commented Jul 16, 2023

bors commented Jul 17, 2023

bors commented Jul 17, 2023

rust-timer commented Jul 17, 2023

Overall result: ❌ regressions - no action needed

lcnr Jul 7, 2023 •

edited

Loading