LTDA: Make supertypes in lazy type parameters be recorded in order of declaration

2014-09-11 16:18:01 +04:00
parent 261d4293ae
commit 365319a8e6
7 changed files with 10 additions and 10 deletions
@@ -65,13 +65,13 @@ public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescri

        JetTypeParameter jetTypeParameter = this.jetTypeParameter;

-        resolveUpperBoundsFromWhereClause(upperBounds);
-
        JetTypeReference extendsBound = jetTypeParameter.getExtendsBound();
        if (extendsBound != null) {
            upperBounds.add(resolveBoundType(extendsBound));
        }

+        resolveUpperBoundsFromWhereClause(upperBounds);
+
        if (upperBounds.isEmpty()) {
            upperBounds.add(KotlinBuiltIns.getInstance().getDefaultBound());
        }