From 152abbfb4c5a36017f2ba366054543c09d686c5e Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 24 Jun 2019 10:52:10 +0300 Subject: [PATCH] ConeTypeContext: handle star projection more correctly See substitutionSupertypePolicy & testInnerTP in FIR smoke diagnostics --- .../src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt index 0f096f09e41..1067179f0dc 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/types/ConeTypeContext.kt @@ -404,7 +404,8 @@ class ConeTypeCheckerContext(override val isErrorTypeEqualsToAnything: Boolean, val substitutor = if (declaration != null) { val substitution = 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) } else {