From 8611ce577304b6bf2650001599221e565d128fa7 Mon Sep 17 00:00:00 2001
From: Stepan Koltsov <stepan.koltsov@jetbrains.com>
Date: Wed, 30 May 2012 20:26:08 +0400
Subject: [PATCH] KT-2047 Assertion from override resolver

#KT-2047 Fixed
---
 .../src/org/jetbrains/jet/lang/resolve/OverrideResolver.java | 5 +++++
 1 file changed, 5 insertions(+)

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 4fafee9b93d..76cbabde688 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
@@ -31,6 +31,7 @@ import org.jetbrains.jet.lang.diagnostics.Errors;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
+import org.jetbrains.jet.lang.types.ErrorUtils;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lexer.JetTokens;
@@ -366,6 +367,10 @@ 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);