From b665a1998bf1373410c47b1f41f0a021296fd44d Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 30 Jun 2014 17:41:53 +0400 Subject: [PATCH] Supertypes should not be flexible --- .../jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt index a09a904ac95..61c841b9533 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt @@ -47,7 +47,7 @@ class LazyJavaTypeResolver( assert(jetType != null, "Primitive type is not found: " + canonicalText) return jetType!! } - is JavaClassifierType -> if (PLATFORM_TYPES) + is JavaClassifierType -> if (PLATFORM_TYPES && attr.howThisTypeIsUsed != SUPERTYPE) LazyFlexibleJavaClassifierType(javaType, attr) else LazyJavaClassifierType(javaType, attr) is JavaArrayType -> transformArrayType(javaType, attr)