Emit alias-eq when equating numeric var and projection #108828
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
S-waiting-on-review
lcnr
reviewed
Mar 7, 2023
lcnr
reviewed
Mar 7, 2023
compiler-errors
force-pushed
the
new-solver-alias-eq-on-num-var
branch
from
3aa876c to
8b43968
Compare
lcnr
reviewed
Mar 8, 2023
This comment has been minimized.
This comment has been minimized.
compiler-errors
force-pushed
the
new-solver-alias-eq-on-num-var
branch
from
8b43968 to
06ae044
Compare
compiler-errors
force-pushed
the
new-solver-alias-eq-on-num-var
branch
from
06ae044 to
d4b59a0
Compare
rustbot
added
the
WG-trait-system-refactor
|
Some changes occurred to the core trait solver cc @rust-lang/initiative-trait-system-refactor |
compiler-errors
commented
Mar 9, 2023
| @@ -148,10 +148,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |||
| rhs_ty, | |||
| op, | |||
| ); | |||
| self.demand_suptype(expr.span, builtin_return_ty, return_ty); | |||
| self.demand_eqtype(expr.span, builtin_return_ty, return_ty); | |||
There was a problem hiding this comment.
This demand_suptype doesn't matter because the only types we're gonna encounter here are scalars.
| @@ -148,10 +148,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { | |||
| rhs_ty, | |||
| op, | |||
| ); | |||
| self.demand_suptype(expr.span, builtin_return_ty, return_ty); | |||
| self.demand_eqtype(expr.span, builtin_return_ty, return_ty); | |||
| builtin_return_ty | |||
There was a problem hiding this comment.
But returning builtin_return_ty here means that when we equate _#0i and _#1i, the type we return will be _#0i instead of <#_0i as Add<_#i1>>::Output, which helps guide inference in the solver.
| CanonicalVarInfo { kind: CanonicalVarKind::Ty(CanonicalTyVarKind::Float) }, | ||
| t, | ||
| ), | ||
| ty::Infer(ty::IntVar(vid)) => { |
There was a problem hiding this comment.
We also needed to fix the canonicalizer bug for int and float vars as well...
| @@ -15,41 +15,65 @@ LL | second == 1 | |||
| = note: expected fn item `fn() {second}` | |||
| found type `{integer}` | |||
|
|
|||
| error[E0308]: mismatched types | |||
There was a problem hiding this comment.
Due to the changes to typeck, we end up emitting this additional error. I can work around it pretty easily by checking if the output type of the binop references errors before returning builtin_return_ty a few files up, but I also think that it's fine? Like, this is a meaningful error 😅
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 11, 2023
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#106921 (Add documentation about the memory layout of `Cell`) - rust-lang#108828 (Emit alias-eq when equating numeric var and projection) - rust-lang#108834 (Do not ICE when we have fn pointer `Fn` obligations with bound vars in the self type) - rust-lang#108900 (fix(lexer): print whitespace warning for \x0c) - rust-lang#108930 (feat: implement better error for manual impl of `Fn*` traits) - rust-lang#108937 (improve readability of winnowing) - rust-lang#108947 (Don't even try to combine consts with incompatible types) - rust-lang#108976 (Update triagebot rust-analyzer team mention) - rust-lang#108983 (Forbid `#[target_feature]` on safe default implementations) Failed merges: - rust-lang#108950 (Directly construct Inherited in typeck.) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This doesn't fix everything having to do with projections and infer vars, but it does fix a common case I saw in HIR typeck.
r? @lcnr