NI: In subtyping do not intersect arguments for non-covariant types

It partially reverts 7898922066
because it's not obvious that it's a safe operation
for invariant/contravariant types.

Also, there's a necessary fix in prepareReceiverRegardingCaptureTypes
to make types order stable
Otherwise test bareTypesWithStarProjections becomes flaky.

Also, the changes in bareTypesWithStarProjections.kt are also expected
because the type of the expression `coneSymbol` after the second "if" is
FirVariableSymbol<*> & FirPropertySymbol & AbstractFirBasedSymbol<*>
thus we fix D in the call `coneSymbol.phasedFir()` to FirVariableSymbol<*>
because it's the first type in the list
(see the next line after the last changed in AbstractTypeChecker)
This commit is contained in:
Denis Zharkov
2020-01-14 12:35:17 +03:00
parent 4202c9c1a4
commit d6b01f1007
9 changed files with 38 additions and 12 deletions
@@ -36,5 +36,5 @@ fun foo(coneSymbol: AbstractFirBasedSymbol<*>) {
coneSymbol.phasedFir() checkType { _<FirVariable<*>>() }
if (coneSymbol !is FirPropertySymbol) return
coneSymbol.phasedFir() checkType { _<FirProperty>() }
coneSymbol.phasedFir() checkType { _<FirVariable<*>>() }
}
@@ -36,5 +36,5 @@ fun foo(coneSymbol: AbstractFirBasedSymbol<*>) {
coneSymbol.phasedFir() checkType { _<FirVariable<*>>() }
if (coneSymbol !is FirPropertySymbol) return
coneSymbol.phasedFir() checkType { _<FirProperty>() }
coneSymbol.phasedFir() checkType { _<FirVariable<*>>() }
}