From 0c32fab690276f3453bec6aad071825e72a2f40b Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 3 Feb 2016 13:58:55 +0300 Subject: [PATCH] Type comparison: first check for star projections, then obtain constructor parameters #KT-10893 Fixed Also #EA-78405 Fixed --- .../jetbrains/kotlin/types/checker/TypeCheckingProcedure.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java b/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java index 58df2192059..af29881bdd8 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java @@ -99,13 +99,13 @@ public class TypeCheckingProcedure { } for (int i = 0; i < type1Arguments.size(); i++) { - TypeParameterDescriptor typeParameter1 = constructor1.getParameters().get(i); TypeProjection typeProjection1 = type1Arguments.get(i); - TypeParameterDescriptor typeParameter2 = constructor2.getParameters().get(i); TypeProjection typeProjection2 = type2Arguments.get(i); if (typeProjection1.isStarProjection() && typeProjection2.isStarProjection()) { continue; } + TypeParameterDescriptor typeParameter1 = constructor1.getParameters().get(i); + TypeParameterDescriptor typeParameter2 = constructor2.getParameters().get(i); if (capture(typeProjection1, typeProjection2, typeParameter1)) { continue;