Skip to content

resolve before canonicalization in new solver, ICE if unresolved - #114355

Merged
bors merged 4 commits into
rust-lang:masterfrom
compiler-errors:resolve_vars_early
Aug 4, 2023
Merged

resolve before canonicalization in new solver, ICE if unresolved#114355
bors merged 4 commits into
rust-lang:masterfrom
compiler-errors:resolve_vars_early

Conversation

@compiler-errors

@compiler-errorscompiler-errors commented Aug 2, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Fold the values with a resolver before canonicalization instead of making it happen within canonicalization.

This allows us to filter trivial region constraints from the external constraints.

r? @lcnr

@rustbotrustbot 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 Aug 2, 2023
@rustbot

rustbot commented Aug 2, 2023

Copy link
Copy Markdown
Collaborator

Some changes occurred to the core trait solver

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

@compiler-errorscompiler-errors mentioned this pull request Aug 2, 2023
Merged
compiler-errors
compiler-errors commented Aug 2, 2023
View reviewed changes
Comment threadcompiler/rustc_trait_selection/src/solve/eval_ctxt/canonical.rs Outdated
@compiler-errors
compiler-errorsforce-pushed the resolve_vars_early branch 2 times, most recently from 10bf640 to c52b16bCompareAugust 2, 2023 16:28
lcnr
lcnr reviewed Aug 3, 2023
View reviewed changes
Comment threadcompiler/rustc_infer/src/infer/canonical/canonicalizer.rs Outdated
lcnr
lcnr reviewed Aug 3, 2023
View reviewed changes

@lcnrlcnr left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nits, then r=me

Comment threadcompiler/rustc_trait_selection/src/solve/canonicalize.rs Outdated
Comment threadcompiler/rustc_trait_selection/src/solve/canonicalize.rs Outdated
Comment threadcompiler/rustc_trait_selection/src/solve/eval_ctxt/canonical.rs Outdated
@compiler-errors

compiler-errors commented Aug 3, 2023

Copy link
Copy Markdown
ContributorAuthor

@bors r=lcnr

@bors

bors commented Aug 3, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit d87f4a6 has been approved by lcnr

It is now in the queue for this repository.

@borsbors 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 Aug 3, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 3, 2023
@matthiaskrgr
Rollup merge ofrust-lang#114355- compiler-errors:resolve_vars_early…
8f4621a
…, r=lcnr
resolve before canonicalization in new solver, ICE if unresolved
Fold the values with a resolver before canonicalization instead of making it happen within canonicalization.
This allows us to filter trivial region constraints from the external constraints.
r? `@lcnr`
This was referenced Aug 3, 2023
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 4, 2023
@bors
Auto merge ofrust-lang#114451- matthiaskrgr:rollup-37qmv19, r=matth…
34ccd04
…iaskrgr
Rollup of 5 pull requests
Successful merges:
- rust-lang#114022 (Perform OpaqueCast field projection on HIR, too.)
- rust-lang#114253 (Compute variances for lazy type aliases)
- rust-lang#114355 (resolve before canonicalization in new solver, ICE if unresolved)
- rust-lang#114427 (Handle non-utf8 rpaths (fix FIXME))
- rust-lang#114440 (bootstrap: config: fix version comparison bug)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit d6f714e into rust-lang:masterAug 4, 2023
@rustbotrustbot added this to the 1.73.0 milestone Aug 4, 2023
@compiler-errors
compiler-errors deleted the resolve_vars_early branch August 11, 2023 20:14
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lcnrlcnrlcnr left review comments

Assignees

@lcnrlcnr

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.WG-trait-system-refactorThe Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Milestone

1.73.0

Development

Successfully merging this pull request may close these issues.

4 participants

@compiler-errors@rustbot@bors@lcnr