From e5386682293cb5d905968ce8e70ab3896f7cd63c Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 31 Oct 2013 13:01:56 +0400
Subject: [PATCH] Do not allow error supertypes

---
 .../lazy/descriptors/LazyJavaClassDescriptor.kt     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt
index 5fc623033cb..ba658fb2678 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt
@@ -27,8 +27,6 @@ import org.jetbrains.jet.lang.resolve.java.sam.SingleAbstractMethodUtils
 import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod
 import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor
 import org.jetbrains.jet.lang.types.TypeUtils
-import java.util.ArrayList
-import org.jetbrains.jet.lang.types.checker.JetTypeChecker
 import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor
 
 class LazyJavaClassDescriptor(
@@ -122,10 +120,13 @@ class LazyJavaClassDescriptor(
                     emptyOrSingletonList(jlObject ?: KotlinBuiltIns.getInstance().getAnyType())
                 }
             else
-                supertypes.map {
-                    supertype ->
-                    innerC.typeResolver.transformJavaType(supertype, TypeUsage.SUPERTYPE.toAttributes())
-                }
+                supertypes.iterator()
+                        .map {
+                            supertype ->
+                            innerC.typeResolver.transformJavaType(supertype, TypeUsage.SUPERTYPE.toAttributes())
+                        }
+                        .filter { supertype -> !supertype.isError() }
+                        .toList()
         }
 
         override fun getSupertypes(): Collection<JetType> = _supertypes()