Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't ICE on DiscriminantKind projection in new solver #109748

Merged
merged 2 commits into from
Mar 30, 2023

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Mar 30, 2023

As title says, since we now actually call Ty::discriminant_kind on placeholder types 😃

Also drive-by simplify Pointee::Metadata projection logic, and fix the UI test because the <T as Pointee>::Metadata tests weren't actually exercising the new projection logic, since we still eagerly normalize (which hits project.rs in the old solver) in HIR typeck.

r? @lcnr tho feel free to re-roll, this pr is very low-priority and not super specific to the new trait solver.

Fixes compiler-errors/next-solver-hir-issues#14

@rustbot 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 Mar 30, 2023
@rustbot
Copy link
Collaborator

rustbot commented Mar 30, 2023

Some changes occurred to the core trait solver

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

@lcnr
Copy link
Contributor

lcnr commented Mar 30, 2023

@bors r+ rollup (limited to new solver)

@bors
Copy link
Contributor

bors commented Mar 30, 2023

📌 Commit 321a5db has been approved by lcnr

It is now in the queue for this repository.

@bors 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 Mar 30, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 30, 2023
Rollup of 7 pull requests

Successful merges:

 - rust-lang#106985 (Enhanced doucmentation of binary search methods for `slice` and `VecDeque` for unsorted instances)
 - rust-lang#109509 (compiletest: Don't allow tests with overlapping prefix names)
 - rust-lang#109719 (RELEASES: Add "Only support Android NDK 25 or newer" to 1.68.0)
 - rust-lang#109748 (Don't ICE on `DiscriminantKind` projection in new solver)
 - rust-lang#109749 (Canonicalize float var as float in new solver)
 - rust-lang#109761 (Drop binutils on powerpc-unknown-freebsd)
 - rust-lang#109766 (Fix title for openharmony.md)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c1b28c3 into rust-lang:master Mar 30, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 30, 2023
@compiler-errors compiler-errors deleted the new-solver-discr-kind-ice branch August 11, 2023 20:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

DiscriminantKind assembly is wrong for placeholders
4 participants