trait_selection: Keep type-op region constraints in borrowck - #161423
Conversation
Keep rust-lang#158588 focused on reporting solver region constraints. The type-op behavior and its borrowck coverage now live in rust-lang#161423.
|
r? @davidtwco rustbot has assigned @davidtwco. Use Why was this reviewer chosen?The reviewer was selected based on:
|
|
r? BoxyUwU |
|
I think this is a partial revert of #160982 which we don't want. I think that teaching @rustbot author |
|
Reminder, once the PR becomes ready for a review, use |
…tions_binders_diagnostics, r=BoxyUwU trait_selection: fix assumptions-on-binders diagnostics fixes rust-lang#157732 `-Zassumptions-on-binders` was losing the origin of solver region constraints. By the time regionck or borrowck reported them, every constraint received the containing item span, so diagnostics pointed at an entire function or const. Some paths were also still emitting placeholder text (`:3` and `meoow :c`). This keeps canonical solver responses and `ExternalConstraintsData` span-free, so source locations do not participate in candidate equality or caching. When a response is applied, `EvalCtxt::origin_span` is attached to each atomic solver `RegionConstraint` stored in `InferCtxt`. Late region conversion then uses the span attached to each constraint, including for ambiguity diagnostics. The affected paths now report `higher-ranked lifetime bound could not be satisfied` at the type use that introduced the failing constraint. UI coverage checks the rust-lang#157732 call-site diagnostic and the existing regionck alias-outlives case. Unit coverage checks that the spanned evaluator stays in semantic parity with the type-ir evaluator and preserves the first ambiguity origin span. The type-op behavior I ran into while working on this is split into rust-lang#161423. Future work: carry the failed outlives predicate or originating binder far enough through this path to name the exact bound that failed, rather than only pointing at its origin.
…tions_binders_diagnostics, r=BoxyUwU trait_selection: fix assumptions-on-binders diagnostics fixes rust-lang#157732 `-Zassumptions-on-binders` was losing the origin of solver region constraints. By the time regionck or borrowck reported them, every constraint received the containing item span, so diagnostics pointed at an entire function or const. Some paths were also still emitting placeholder text (`:3` and `meoow :c`). This keeps canonical solver responses and `ExternalConstraintsData` span-free, so source locations do not participate in candidate equality or caching. When a response is applied, `EvalCtxt::origin_span` is attached to each atomic solver `RegionConstraint` stored in `InferCtxt`. Late region conversion then uses the span attached to each constraint, including for ambiguity diagnostics. The affected paths now report `higher-ranked lifetime bound could not be satisfied` at the type use that introduced the failing constraint. UI coverage checks the rust-lang#157732 call-site diagnostic and the existing regionck alias-outlives case. Unit coverage checks that the spanned evaluator stays in semantic parity with the type-ir evaluator and preserves the first ambiguity origin span. The type-op behavior I ran into while working on this is split into rust-lang#161423. Future work: carry the failed outlives predicate or originating binder far enough through this path to name the exact bound that failed, rather than only pointing at its origin.
…tions_binders_diagnostics, r=BoxyUwU trait_selection: fix assumptions-on-binders diagnostics fixes rust-lang#157732 `-Zassumptions-on-binders` was losing the origin of solver region constraints. By the time regionck or borrowck reported them, every constraint received the containing item span, so diagnostics pointed at an entire function or const. Some paths were also still emitting placeholder text (`:3` and `meoow :c`). This keeps canonical solver responses and `ExternalConstraintsData` span-free, so source locations do not participate in candidate equality or caching. When a response is applied, `EvalCtxt::origin_span` is attached to each atomic solver `RegionConstraint` stored in `InferCtxt`. Late region conversion then uses the span attached to each constraint, including for ambiguity diagnostics. The affected paths now report `higher-ranked lifetime bound could not be satisfied` at the type use that introduced the failing constraint. UI coverage checks the rust-lang#157732 call-site diagnostic and the existing regionck alias-outlives case. Unit coverage checks that the spanned evaluator stays in semantic parity with the type-ir evaluator and preserves the first ambiguity origin span. The type-op behavior I ran into while working on this is split into rust-lang#161423. Future work: carry the failed outlives predicate or originating binder far enough through this path to name the exact bound that failed, rather than only pointing at its origin.
…tions_binders_diagnostics, r=BoxyUwU trait_selection: fix assumptions-on-binders diagnostics fixes rust-lang#157732 `-Zassumptions-on-binders` was losing the origin of solver region constraints. By the time regionck or borrowck reported them, every constraint received the containing item span, so diagnostics pointed at an entire function or const. Some paths were also still emitting placeholder text (`:3` and `meoow :c`). This keeps canonical solver responses and `ExternalConstraintsData` span-free, so source locations do not participate in candidate equality or caching. When a response is applied, `EvalCtxt::origin_span` is attached to each atomic solver `RegionConstraint` stored in `InferCtxt`. Late region conversion then uses the span attached to each constraint, including for ambiguity diagnostics. The affected paths now report `higher-ranked lifetime bound could not be satisfied` at the type use that introduced the failing constraint. UI coverage checks the rust-lang#157732 call-site diagnostic and the existing regionck alias-outlives case. Unit coverage checks that the spanned evaluator stays in semantic parity with the type-ir evaluator and preserves the first ambiguity origin span. The type-op behavior I ran into while working on this is split into rust-lang#161423. Future work: carry the failed outlives predicate or originating binder far enough through this path to name the exact bound that failed, rather than only pointing at its origin.
…tions_binders_diagnostics, r=BoxyUwU trait_selection: fix assumptions-on-binders diagnostics fixes rust-lang#157732 `-Zassumptions-on-binders` was losing the origin of solver region constraints. By the time regionck or borrowck reported them, every constraint received the containing item span, so diagnostics pointed at an entire function or const. Some paths were also still emitting placeholder text (`:3` and `meoow :c`). This keeps canonical solver responses and `ExternalConstraintsData` span-free, so source locations do not participate in candidate equality or caching. When a response is applied, `EvalCtxt::origin_span` is attached to each atomic solver `RegionConstraint` stored in `InferCtxt`. Late region conversion then uses the span attached to each constraint, including for ambiguity diagnostics. The affected paths now report `higher-ranked lifetime bound could not be satisfied` at the type use that introduced the failing constraint. UI coverage checks the rust-lang#157732 call-site diagnostic and the existing regionck alias-outlives case. Unit coverage checks that the spanned evaluator stays in semantic parity with the type-ir evaluator and preserves the first ambiguity origin span. The type-op behavior I ran into while working on this is split into rust-lang#161423. Future work: carry the failed outlives predicate or originating binder far enough through this path to name the exact bound that failed, rather than only pointing at its origin.
…tions_binders_diagnostics, r=BoxyUwU trait_selection: fix assumptions-on-binders diagnostics fixes rust-lang#157732 `-Zassumptions-on-binders` was losing the origin of solver region constraints. By the time regionck or borrowck reported them, every constraint received the containing item span, so diagnostics pointed at an entire function or const. Some paths were also still emitting placeholder text (`:3` and `meoow :c`). This keeps canonical solver responses and `ExternalConstraintsData` span-free, so source locations do not participate in candidate equality or caching. When a response is applied, `EvalCtxt::origin_span` is attached to each atomic solver `RegionConstraint` stored in `InferCtxt`. Late region conversion then uses the span attached to each constraint, including for ambiguity diagnostics. The affected paths now report `higher-ranked lifetime bound could not be satisfied` at the type use that introduced the failing constraint. UI coverage checks the rust-lang#157732 call-site diagnostic and the existing regionck alias-outlives case. Unit coverage checks that the spanned evaluator stays in semantic parity with the type-ir evaluator and preserves the first ambiguity origin span. The type-op behavior I ran into while working on this is split into rust-lang#161423. Future work: carry the failed outlives predicate or originating binder far enough through this path to name the exact bound that failed, rather than only pointing at its origin.
…tions_binders_diagnostics, r=BoxyUwU trait_selection: fix assumptions-on-binders diagnostics fixes rust-lang#157732 `-Zassumptions-on-binders` was losing the origin of solver region constraints. By the time regionck or borrowck reported them, every constraint received the containing item span, so diagnostics pointed at an entire function or const. Some paths were also still emitting placeholder text (`:3` and `meoow :c`). This keeps canonical solver responses and `ExternalConstraintsData` span-free, so source locations do not participate in candidate equality or caching. When a response is applied, `EvalCtxt::origin_span` is attached to each atomic solver `RegionConstraint` stored in `InferCtxt`. Late region conversion then uses the span attached to each constraint, including for ambiguity diagnostics. The affected paths now report `higher-ranked lifetime bound could not be satisfied` at the type use that introduced the failing constraint. UI coverage checks the rust-lang#157732 call-site diagnostic and the existing regionck alias-outlives case. Unit coverage checks that the spanned evaluator stays in semantic parity with the type-ir evaluator and preserves the first ambiguity origin span. The type-op behavior I ran into while working on this is split into rust-lang#161423. Future work: carry the failed outlives predicate or originating binder far enough through this path to name the exact bound that failed, rather than only pointing at its origin.
…tions_binders_diagnostics, r=BoxyUwU trait_selection: fix assumptions-on-binders diagnostics fixes rust-lang#157732 `-Zassumptions-on-binders` was losing the origin of solver region constraints. By the time regionck or borrowck reported them, every constraint received the containing item span, so diagnostics pointed at an entire function or const. Some paths were also still emitting placeholder text (`:3` and `meoow :c`). This keeps canonical solver responses and `ExternalConstraintsData` span-free, so source locations do not participate in candidate equality or caching. When a response is applied, `EvalCtxt::origin_span` is attached to each atomic solver `RegionConstraint` stored in `InferCtxt`. Late region conversion then uses the span attached to each constraint, including for ambiguity diagnostics. The affected paths now report `higher-ranked lifetime bound could not be satisfied` at the type use that introduced the failing constraint. UI coverage checks the rust-lang#157732 call-site diagnostic and the existing regionck alias-outlives case. Unit coverage checks that the spanned evaluator stays in semantic parity with the type-ir evaluator and preserves the first ambiguity origin span. The type-op behavior I ran into while working on this is split into rust-lang#161423. Future work: carry the failed outlives predicate or originating binder far enough through this path to name the exact bound that failed, rather than only pointing at its origin.
Rollup merge of #158588 - Dnreikronos:trait_selection/assumptions_binders_diagnostics, r=BoxyUwU trait_selection: fix assumptions-on-binders diagnostics fixes #157732 `-Zassumptions-on-binders` was losing the origin of solver region constraints. By the time regionck or borrowck reported them, every constraint received the containing item span, so diagnostics pointed at an entire function or const. Some paths were also still emitting placeholder text (`:3` and `meoow :c`). This keeps canonical solver responses and `ExternalConstraintsData` span-free, so source locations do not participate in candidate equality or caching. When a response is applied, `EvalCtxt::origin_span` is attached to each atomic solver `RegionConstraint` stored in `InferCtxt`. Late region conversion then uses the span attached to each constraint, including for ambiguity diagnostics. The affected paths now report `higher-ranked lifetime bound could not be satisfied` at the type use that introduced the failing constraint. UI coverage checks the #157732 call-site diagnostic and the existing regionck alias-outlives case. Unit coverage checks that the spanned evaluator stays in semantic parity with the type-ir evaluator and preserves the first ambiguity origin span. The type-op behavior I ran into while working on this is split into #161423. Future work: carry the failed outlives predicate or originating binder far enough through this path to name the exact bound that failed, rather than only pointing at its origin.
65f9dd2 to
2959d13
Compare
This comment has been minimized.
This comment has been minimized.
|
Sup,@BoxyUwU :) Yeah, The next solver was storing the tree in the temporary query I also found another place dropping the same tree during implied-bound normalization, before lexical regionck. I fixed that too and added regressions for that path and the borrowck case. I like this version a lot more. It fixes the point where the data was lost and keeps the cache behavior from #160982. The local version worked, but mostly by going around the problem, and that felt wrong once I understood the full path. @rustbot ready |
|
Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor |
|
@rustbot ready |
This comment has been minimized.
This comment has been minimized.
96e94dd to
0f14fc7
Compare
|
This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
| type_tests, | ||
| // These have already been destructured into `outlives_constraints` at the | ||
| // end of MIR type checking. | ||
| solver_constraints: _, |
There was a problem hiding this comment.
want to add an assert that this is empty? that way the comment cant go out of date
There was a problem hiding this comment.
yep....the comment is an assert now. It binds the field and checks it's still trivially true right after the destructure, so if something starts pushing constraints in there after typeck we get a panic instead of quietly dropping them on the floor.
I almost left it as a comment because I'd already convinced myself nothing could get in there. But that's exactly the sort of thing I'd forget in two months, so.
| region_obligations, | ||
| region_constraints, | ||
| region_assumptions, | ||
| Default::default(), |
There was a problem hiding this comment.
Can you add a comment about why we ignore new style constraints here
There was a problem hiding this comment.
Added. Short version is this only runs with the flag off, and with the flag off the solver never makes new style constraints in the first place. Turn it on and we go down the NextGen path instead, which reads the tree straight off the InferCtxt, so this function doesn't even get called.
Took me a minute to talk myself into that when I first passed the empty default in, so the comment probably saves the next person the same trip.
| /// Executes `op` and then scrapes out all resulting region constraints, | ||
| /// creating query-region-constraints. |
There was a problem hiding this comment.
| /// Executes `op` and then scrapes out all resulting region constraints, | |
| /// creating query-region-constraints. | |
| /// Executes `op` and then scrapes out all resulting region constraints | |
| /// in the `infcx`, creating query-region-constraints. |
There was a problem hiding this comment.
Applied. "in the infcx" is the part that actually carries the meaning, my version was vaguer for no reason.
| region_obligations, | ||
| ®ion_constraints, | ||
| region_assumptions, | ||
| Default::default(), |
There was a problem hiding this comment.
comment about why we dont care about new style constraints here
There was a problem hiding this comment.
Added. This one returns early unless we're on the old solver globally, and the flag switches the new solver on globally, so the two can't ever be true at the same time. There's just never anything to pass along here.
| let region_obligations = self.take_registered_region_obligations(); | ||
| let region_assumptions = self.take_registered_region_assumptions(); | ||
| debug!(?region_obligations); | ||
| let solver_constraints = self.clone_solver_region_constraints(); |
There was a problem hiding this comment.
why not take_solver_region_constraints like we do for the other stuff?
There was a problem hiding this comment.
No good reason...that's leftover from the version with the swap, where the tree had to stay in the InferCtxt because borrowck read it much later, so cloning was the only option. Once the swap went away the clone was pure habit and I didn't notice.
Switched to take. We already take the region obligations and assumptions a couple of lines above, so we can't be in a snapshot there and the assert inside take is fine. clone_solver_region_constraints had no other callers, so it's deleted.
There was a problem hiding this comment.
want to destructure query_response.value.region_constraints into all of its fields by pattern matching so that its clear we're not forgetting anything
There was a problem hiding this comment.
Done. I did the same in the NLL variant since it reads the same three fields and would go stale the same way.
It also just reads better. Three separate walks down query_response.value.region_constraints and I was counting fields by hand to be sure I hadn't skipped one, which is the thing the pattern match is there to stop.
|
@rustbot author |
Under `-Zassumptions-on-binders` the next solver stores its region constraints in the `InferCtxt` instead of registering region obligations. The canonical type-op path never copied them into `QueryResponse`, so they were dropped once the query's inference context went away. Borrowck then saw a type op with no constraints and lost the outlives error entirely. `QueryRegionConstraints` now carries the constraint next to the old style constraints and assumptions. It stays unspanned while passing through a canonical query and the caller attaches its own origin span when consuming the response. Borrowck accumulates these in `MirTypeckRegionConstraints` through `ConstraintConversion`, the same way it handles everything else, and destructures them into NLL outlives constraints at the end of MIR type checking. Implied bound normalization was dropping the same constraint before lexical regionck, so that path registers it now as well.
9c65b1e to
a80f20d
Compare
Did, Boxy :) |
|
@bors r+ |
…ve_type_op_constraints, r=BoxyUwU trait_selection: Keep type-op region constraints in borrowck I ran into this while working on rust-lang#158588. `borrowck_env_fail` still had a FIXME because the function body wasn't reporting the outlives error. The next solver creates the region constraint, but the canonical type-op path doesn't put it in `QueryResponse`. Borrowck never sees it, so the type op looks fine and the error is lost. With `-Zassumptions-on-binders`, these type ops now run locally on borrowck's `InferCtxt`. The fast path still runs first. That leaves the constraint in the same inference context borrowck reads later. I prefer this over adding more data to the old canonical response. The next solver already caches its work, and teaching the old query path about these constraints felt like extra machinery for something we can avoid. Running locally is pretty boring, but I think that's a good thing here. The old FIXME is now the regression test.
…uwer Rollup of 6 pull requests Successful merges: - #162309 (offload: automate manual clang-linker-wrapper step) - #160505 (delegation: supporting inherent impls) - #160712 (windows-gnullvm: always link libunwind statically) - #161423 (trait_selection: Keep type-op region constraints in borrowck) - #162461 (limit the api of `fold_predicate` and `visit_predicate`) - #162475 (Fix unsoundness bug on next trait solver for dyn const generics placeholder)
Rollup merge of #161423 - Dnreikronos:trait_selection/preserve_type_op_constraints, r=BoxyUwU trait_selection: Keep type-op region constraints in borrowck I ran into this while working on #158588. `borrowck_env_fail` still had a FIXME because the function body wasn't reporting the outlives error. The next solver creates the region constraint, but the canonical type-op path doesn't put it in `QueryResponse`. Borrowck never sees it, so the type op looks fine and the error is lost. With `-Zassumptions-on-binders`, these type ops now run locally on borrowck's `InferCtxt`. The fast path still runs first. That leaves the constraint in the same inference context borrowck reads later. I prefer this over adding more data to the old canonical response. The next solver already caches its work, and teaching the old query path about these constraints felt like extra machinery for something we can avoid. Running locally is pretty boring, but I think that's a good thing here. The old FIXME is now the regression test.
View all comments
I ran into this while working on #158588.
borrowck_env_failstill had a FIXME because the function body wasn't reporting the outlives error. The next solver creates the region constraint, but the canonical type-op path doesn't put it inQueryResponse. Borrowck never sees it, so the type op looks fine and the error is lost.With
-Zassumptions-on-binders, these type ops now run locally on borrowck'sInferCtxt. The fast path still runs first. That leaves the constraint in the same inference context borrowck reads later.I prefer this over adding more data to the old canonical response. The next solver already caches its work, and teaching the old query path about these constraints felt like extra machinery for something we can avoid. Running locally is pretty boring, but I think that's a good thing here. The old FIXME is now the regression test.