New J2K: fix SOE in inference processing for star-projection as type argument

#KT-33942 fixed #KT-33941 fixed
2019-10-11 12:03:07 +03:00
parent b350515237
commit 1ec620b753
2 changed files with 7 additions and 6 deletions
@@ -204,16 +204,17 @@ open class BoundTypeCalculatorImpl(
                BoundTypeImpl(
                    typeVariable?.let { TypeVariableLabel(it) } ?: GenericLabel(target.classReference),
                    arguments.mapIndexed { i, argument ->
-                        TypeParameter(
-                            argument.type.boundTypeUnenhanced(
+                        val argumentBoundType = when {
+                            argument.isStarProjection -> BoundType.STAR_PROJECTION
+                            else -> argument.type.boundTypeUnenhanced(
                                typeVariable?.typeParameters?.getOrNull(i)?.boundType?.label?.safeAs<TypeVariableLabel>()?.typeVariable,
                                contextBoundType,
                                call,
                                isImplicitReceiver,
                                inferenceContext
-                            ) ?: return null,
-                            constructor.parameters[i].variance
-                        )
+                            ) ?: return null
+                        }
+                        TypeParameter(argumentBoundType, constructor.parameters[i].variance)
                    }
                )