azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ConeTypeContext: handle star projection more correctly

Browse Source 
See substitutionSupertypePolicy & testInnerTP in FIR smoke diagnostics
This commit is contained in:
Mikhail Glukhikh
2019-06-24 10:52:10 +03:00
parent 6a21285aed
commit 152abbfb4c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt
+2 -1
View File
@@ -404,7 +404,8 @@ class ConeTypeCheckerContext(override val isErrorTypeEqualsToAnything: Boolean,
val substitutor = if (declaration != null) { val substitutor = if (declaration != null) {
val substitution = val substitution =
declaration.typeParameters.zip(type.typeArguments).associate { (parameter, argument) -> declaration.typeParameters.zip(type.typeArguments).associate { (parameter, argument) ->
parameter.symbol as ConeTypeParameterSymbol to ((argument as? ConeTypedProjection)?.type ?: TODO("ANY?")) parameter.symbol as ConeTypeParameterSymbol to ((argument as? ConeTypedProjection)?.type
?: StandardClassIds.Any(session.firSymbolProvider).constructType(emptyArray(), isNullable = true))
} }
ConeSubstitutorByMap(substitution) ConeSubstitutorByMap(substitution)
} else { } else {