From 22be8ad49af445356526f834de236cebcee5a41c Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Wed, 30 May 2012 21:47:19 +0400
Subject: [PATCH] do not include error types in hierarchy

---
 .../jet/lang/resolve/java/JavaDescriptorResolver.java     | 3 +++
 .../org/jetbrains/jet/lang/resolve/OverrideResolver.java  | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index 123a25788d4..ec63d424085 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -898,6 +898,9 @@ public class JavaDescriptorResolver implements DependencyClassByQualifiedNameRes
             }
             
             JetType transform = semanticServices.getTypeTransformer().transformToType(type, JavaTypeTransformer.TypeUsage.SUPERTYPE, typeVariableResolver);
+            if (ErrorUtils.isErrorType(transform)) {
+                continue;
+            }
 
             result.add(TypeUtils.makeNotNullable(transform));
         }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
index a1a21125a5b..a4e580f9a08 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
@@ -367,10 +367,6 @@ public class OverrideResolver {
 
     private void checkOverrideForMember(@NotNull CallableMemberDescriptor declared,
             @NotNull Multimap<CallableDescriptor, CallableDescriptor> invisibleOverriddenDescriptors) {
-        if (ErrorUtils.isError(declared)) {
-            return;
-        }
-
         JetNamedDeclaration member = (JetNamedDeclaration) BindingContextUtils.descriptorToDeclaration(trace.getBindingContext(), declared);
         if (member == null) {
             Boolean delegated = trace.get(DELEGATED, declared);
@@ -441,10 +437,6 @@ public class OverrideResolver {
     }
 
     private void checkOverridesForParameters(CallableMemberDescriptor declared) {
-        if (ErrorUtils.isError(declared)) {
-            return;
-        }
-
         boolean fakeOverride = declared.getKind() == CallableMemberDescriptor.Kind.FAKE_OVERRIDE;
         if (!fakeOverride) {
             // No check if the function is not marked as 'override'