From c06d521e780bf5915068c33720a005b99c9f2e0a Mon Sep 17 00:00:00 2001
From: Simon Ogorodnik <Simon.Ogorodnik@jetbrains.com>
Date: Tue, 30 Apr 2019 17:01:18 +0300
Subject: [PATCH] FIR: support star projection in
 CreateFreshTypeVariableSubstitutorStage

This commit fixes a small pack of tests failing at this point
---
 ...CreateFreshTypeVariableSubstitutorStage.kt | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CreateFreshTypeVariableSubstitutorStage.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CreateFreshTypeVariableSubstitutorStage.kt
index 449e1013afd..8c963fdf883 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CreateFreshTypeVariableSubstitutorStage.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CreateFreshTypeVariableSubstitutorStage.kt
@@ -7,9 +7,14 @@ package org.jetbrains.kotlin.fir.resolve.calls
 
 import org.jetbrains.kotlin.fir.declarations.FirCallableMemberDeclaration
 import org.jetbrains.kotlin.fir.declarations.FirDeclaration
+import org.jetbrains.kotlin.fir.renderWithType
+import org.jetbrains.kotlin.fir.resolve.constructType
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
 import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutorByMap
 import org.jetbrains.kotlin.fir.resolve.transformers.firUnsafe
+import org.jetbrains.kotlin.fir.service
+import org.jetbrains.kotlin.fir.symbols.StandardClassIds
+import org.jetbrains.kotlin.fir.symbols.invoke
 import org.jetbrains.kotlin.fir.types.*
 import org.jetbrains.kotlin.fir.types.impl.FirTypePlaceholderProjection
 import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemOperation
@@ -58,17 +63,21 @@ internal object CreateFreshTypeVariableSubstitutorStage : ResolutionStage() {
             val typeArgument =
                 callInfo.typeArguments.getOrElse(index) { FirTypePlaceholderProjection }//resolvedCall.typeArgumentMappingByOriginal.getTypeArgument(typeParameter)
 //
-            if (typeArgument is FirTypeProjectionWithVariance) {
-                csBuilder.addEqualityConstraint(
+            when (typeArgument) {
+                is FirTypeProjectionWithVariance -> csBuilder.addEqualityConstraint(
                     freshVariable.defaultType,
                     typeArgument.typeRef.coneTypeUnsafe(),
                     SimpleConstraintSystemConstraintPosition // TODO
                 )
-            } else {
-                assert(typeArgument == FirTypePlaceholderProjection) // TODO
-//                assert(typeArgument == TypeArgumentPlaceholder) {
-//                    "Unexpected typeArgument: $typeArgument, ${typeArgument.javaClass.canonicalName}"
-//                }
+                is FirStarProjection -> csBuilder.addEqualityConstraint(
+                    freshVariable.defaultType,
+                    typeParameter.bounds.firstOrNull()?.coneTypeUnsafe()
+                        ?: StandardClassIds.Any(sink.components.session.service()).constructType(emptyArray(), true),
+                    SimpleConstraintSystemConstraintPosition
+                )
+                else -> assert(typeArgument == FirTypePlaceholderProjection) {
+                    "Unexpected typeArgument: ${typeArgument.renderWithType()}"
+                }
             }
         }
     }