small refactor to new projection code #107348

lcnr · 2023-01-27T07:24:05Z

extract eq_term_and_make_canonical_response into a helper function which also is another guarantee that the expected term does not influence candidate selection for projections.

also change evaluate_all(vec![single_goal]) to use evaluate_goal.

the second commit now also adds a debug_assert! to evaluate_goal.

rustbot · 2023-01-27T07:24:11Z

r? @cjgillot

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

rustbot · 2023-01-27T07:24:15Z

Some changes occurred to the core trait solver

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

compiler-errors · 2023-01-27T07:37:04Z

compiler/rustc_trait_selection/src/solve/project_goals.rs

@@ -453,7 +456,8 @@ impl<'tcx> assembly::GoalKind<'tcx> for ProjectionPredicate<'tcx> {
                                tcx,
                                ty::Binder::dummy(goal.predicate.with_self_ty(tcx, self_ty)),
                            );
-                            return ecx.evaluate_all_and_make_canonical_response(vec![new_goal]);
+                            let (_, certainty) = ecx.evaluate_goal(new_goal)?;


Why do we throw away changed here, but evaluate_all runs in a loop until changed is false?

because evaluate_all has multiple goals which can influence each other.

added a second commit which checks that the result of evaluate_goal is stable and we don't get any additional information by rerunning a goal after applying its substitutions.

Will have to change the is_identity check to ignore regions once they are implemented but that doesn't yet matter.

cjgillot · 2023-01-28T10:17:14Z

I don't know enough of the new solver to approve.
r? @compiler-errors

compiler-errors

r=me with nit or not

compiler-errors · 2023-01-28T19:13:12Z

compiler/rustc_trait_selection/src/solve/mod.rs

+
+    /// This field is used by a debug assertion in [`EvalCtxt::evaluate_goal`],
+    /// see the comment in that method for more details.
+    in_projection_eq_hack: bool,


Thiis hack would be also useful for other let (_, certainty) = evaluate_goal() calls in candidate assembly, maybe generalize the name and put it in a helper like evaluate_goal_expect_stable?

why would it be useful there? All other evaluate_goal shouldn't result in cycles when rerunning with substitutions applied (that's at least what I believe and why I've added the debug assert in the first place)

I guess you meant for evaluate_goal added in the future? We only really hit this issue if we branch on the inference state where we actually drop info, I don't think this will happen for anything apart from hacks for better caching

lcnr · 2023-01-31T15:12:25Z

@bors r+ rollup

bors · 2023-01-31T15:12:27Z

📌 Commit 85e6f38 has been approved by lcnr

It is now in the queue for this repository.

compiler-errors · 2023-01-31T15:30:28Z

@bors r+

i don't think we want it to say that you approved it 😅

bors · 2023-01-31T15:30:30Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Modify primary span label for E0308 #106399

bors · 2023-01-31T15:30:31Z

📌 Commit 85e6f38 has been approved by compiler-errors

It is now in the queue for this repository.

…-errors small refactor to new projection code extract `eq_term_and_make_canonical_response` into a helper function which also is another guarantee that the expected term does not influence candidate selection for projections. also change `evaluate_all(vec![single_goal])` to use `evaluate_goal`. the second commit now also adds a `debug_assert!` to `evaluate_goal`.

…llaumeGomez Rollup of 12 pull requests Successful merges: - rust-lang#106898 (Include both md and yaml ICE ticket templates) - rust-lang#107331 (Clean up eslint annotations and remove unused JS function) - rust-lang#107348 (small refactor to new projection code) - rust-lang#107354 (rustdoc: update Source Serif 4 from 4.004 to 4.005) - rust-lang#107412 (avoid needless checks) - rust-lang#107467 (Improve enum checks) - rust-lang#107486 (Track bound types like bound regions) - rust-lang#107491 (rustdoc: remove unused CSS from `.setting-check`) - rust-lang#107508 (`Edition` micro refactor) - rust-lang#107525 (PointeeInfo is advisory only) - rust-lang#107527 (rustdoc: stop making unstable items transparent) - rust-lang#107535 (Replace unwrap with ? in TcpListener doc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned cjgillot Jan 27, 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 Jan 27, 2023

lcnr force-pushed the project-solve-new branch from b898d12 to a3b053c Compare January 27, 2023 07:25

small refactor to new projection code

9c3fe58

lcnr force-pushed the project-solve-new branch from a3b053c to 9c3fe58 Compare January 27, 2023 07:26

compiler-errors reviewed Jan 27, 2023

View reviewed changes

lcnr force-pushed the project-solve-new branch from 92ab944 to faa07d8 Compare January 27, 2023 09:04

assert that solver results are stable

85e6f38

lcnr force-pushed the project-solve-new branch from faa07d8 to 85e6f38 Compare January 27, 2023 09:05

rustbot assigned compiler-errors and unassigned cjgillot Jan 28, 2023

compiler-errors approved these changes Jan 28, 2023

View reviewed changes

compiler-errors mentioned this pull request Jan 29, 2023

Add candidates for DiscriminantKind builtin #107427

Merged

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 Jan 31, 2023

GuillaumeGomez mentioned this pull request Jan 31, 2023

Rollup of 13 pull requests #107530

Closed

GuillaumeGomez mentioned this pull request Jan 31, 2023

Rollup of 12 pull requests #107536

Merged

bors merged commit d65f60d into rust-lang:master Feb 1, 2023

rustbot added this to the 1.69.0 milestone Feb 1, 2023

lcnr deleted the project-solve-new branch February 1, 2023 09:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

small refactor to new projection code #107348

small refactor to new projection code #107348

lcnr commented Jan 27, 2023 •

edited

Loading

rustbot commented Jan 27, 2023

rustbot commented Jan 27, 2023

compiler-errors Jan 27, 2023 •

edited

Loading

lcnr Jan 27, 2023

cjgillot commented Jan 28, 2023

compiler-errors left a comment

compiler-errors Jan 28, 2023

lcnr Jan 30, 2023

lcnr Jan 30, 2023

lcnr commented Jan 31, 2023

bors commented Jan 31, 2023

compiler-errors commented Jan 31, 2023

bors commented Jan 31, 2023

bors commented Jan 31, 2023

small refactor to new projection code #107348

small refactor to new projection code #107348

Conversation

lcnr commented Jan 27, 2023 • edited Loading

rustbot commented Jan 27, 2023

rustbot commented Jan 27, 2023

compiler-errors Jan 27, 2023 • edited Loading

Choose a reason for hiding this comment

lcnr Jan 27, 2023

Choose a reason for hiding this comment

cjgillot commented Jan 28, 2023

compiler-errors left a comment

Choose a reason for hiding this comment

compiler-errors Jan 28, 2023

Choose a reason for hiding this comment

lcnr Jan 30, 2023

Choose a reason for hiding this comment

lcnr Jan 30, 2023

Choose a reason for hiding this comment

lcnr commented Jan 31, 2023

bors commented Jan 31, 2023

compiler-errors commented Jan 31, 2023

bors commented Jan 31, 2023

bors commented Jan 31, 2023

lcnr commented Jan 27, 2023 •

edited

Loading

compiler-errors Jan 27, 2023 •

edited

Loading