trait solver: Capture binder region constraints while relating - #157984
trait solver: Capture binder region constraints while relating#157984Dnreikronos wants to merge 17 commits into
Conversation
|
r? @mejrs rustbot has assigned @mejrs. Use Why was this reviewer chosen?The reviewer was selected based on:
|
This comment has been minimized.
This comment has been minimized.
f411fec to
d78cef7
Compare
|
r? @lcnr |
|
r? BoxyUwU |
|
|
This comment has been minimized.
This comment has been minimized.
|
@BoxyUwU fwiw, i think the ci failure is still compatible with your suggestion. the direct registration path lgtm to me, but the current version is probably registering from too many relation contexts. the bad bit seems to be solverrelating::regions(): under -zassumptions-on-binders it always pushes regionoutlives into the solver constraint storage. some of those relation calls happen under enter_forall_with_empty_assumptions, so later placeholder handling has no assumptions to discharge the constraint and we hit the max_universe(...) < u assert. imo the fix is not to go back to manually bubbling a list everywhere. i'd rather keep direct registration, but only in contexts where the solver owns the binder assumptions, or keep the constraints local while relating a binder and pull them out before registering. idk which shape is cleaner yet, but unconditional registration in regions() seems too wide. |
|
follow-up after pushing 0d93b4c: i tried to keep the direct-registration shape, but idk, it still looked too broad in practice. buffering constraints around binder relation did not clear the reported failures for me. imo the safer fix is to keep the region constraints local while relating, then register the collected next-gen constraint only from the solver-owned relation entrypoints. ltm this still follows the direction boxy was pointing at, without letting solverrelating::regions() register constraints from the empty-assumption binder probes. i checked the same failure cases locally:
|
in theory that shouldn't cause us to hit an assert. if we have empty assumptions then we'll rewrite the constraints to i would like to fully understand what's going on with the ICEs when always registering the next gen region constraints :3 can you look more into what's going on there, if you could push the code that causes those ICEs to happen so I can see the CI failure too that would be useful :3 |
|
i looked into the unconditional direct-registration version locally. imo it confirms the failure mode from my earlier guess: the new repro tests pass, but the broader assumptions-on-binders set fails. specifically:
so idk, direct registration from i can push the failing experiment to a separate branch if seeing ci on that exact shape would help, but i'd rather not force-push it over this pr branch since the current version is passing. checked with:
|
|
like I said, I don't understand why it's hitting that assertion 😅 can you explain why that assertion is getting hit. i can't properly evaluate this alternate approach without understanding why the other one doesn't work |
This comment has been minimized.
This comment has been minimized.
|
yeah, my bad! i think i explained the empty-assumptions bit too confidently there. i pushed the direct registration version again so ci can show the actual failure: 31be28b idk yet why it ends up at the |
This comment has been minimized.
This comment has been minimized.
31be28b to
0837d0c
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
0837d0c to
83c5653
Compare
This comment has been minimized.
This comment has been minimized.
|
@rustbot author gonna do that while you figure out what's going on there, if you're having trouble we can chat about it over zulip and try figure it out together |
|
@rustbot ready |
|
Spent some time doing thinky think about this. I think the best way to move forward would be to fix the evaluation of I prefer fixing the OR thing over the other options as making In an ideal world we'd land the OR fix as a separate PR first with its own self contained tests that rely on that fix. I think that's only worth it if you can come up with a test for that, otherwise i'd be happy to land it in this PR assuming it lets you remove |
|
Sup @BoxyUwU :) There were two sides to the Or bug. Collapsing the whole thing as soon as we saw Ambiguity threw away candidates that a later universe could still prove. But just dropping the ambiguous branch was wrong too. If we have Mixed Ors now keep both the ambiguity and any candidates that are still open. A true candidate still wins, and if every concrete candidate later becomes false, the ambiguity is still there. I pulled that logic into a small After that I removed normalize_equated_region_vars again. alias_outlives was fine, but implied_higher_ranked_alias_outlives_assumption still went ambiguous with E0283. What seems to happen there is that the current universe region var and the placeholder are equated inside the same And branch, but alias/env matching runs before the later region closure processes that equality. Without I also tried teaching PlaceholderReplacer to rewrite those region vars. That went too far and bound both lifetimes, which is exactly the bad rewrite described in the test comment. The test started hard erroring instead of One other detail is the final regionck path. A mixed Or keeps its ambiguity while the solver is still processing it. When we finally register outlives constraints, we use the concrete candidate if one remains and only emit So I think these are two separate fixes. The Or change preserves possible branches, while the normalization makes an existing equality visible early enough for alias matching. I don't love having an extra normalization Now that there is a self contained test for the Or behavior, would you prefer that part split into its own PR first, or keep both fixes here since this path needs both? |
This comment has been minimized.
This comment has been minimized.
Unknown or remaining must not drop the unknown sibling. A later-false candidate would otherwise become NoSolution.
3f2f383 to
61c7710
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. |
View all comments
Fixes #157859
The issue repro is a pretty good example of how this slipped through: the principal upcast path looked fixed, but other relation paths could still drop binder-region constraints. Fwiw, I think centralizing this in the relation code is the cleaner move here, instead of chasing every object-upcast call site one by one.
This records NextGen region constraints from normal relation, structural alias equality, and the small goal-returning relation helper used by object candidate code. ReVars keep their concrete outlives edges too, so we don't flatten useful info into plain ambiguity. Added the original issue repro and a projection-bound variant, e.g. the kind of path I'd expect to regress later if this only lived in the principal upcast code.