From c02e54678eb71e6eee729134247ee789da3da48e Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Fri, 27 Jul 2012 20:16:38 +0400
Subject: [PATCH] Descriptors with error types can override each other

---
 .../org/jetbrains/jet/lang/resolve/OverridingUtil.java |  3 ++-
 .../namespaceComparator/OverrideWithErrors.kt          |  9 +++++++++
 .../namespaceComparator/OverrideWithErrors.txt         | 10 ++++++++++
 .../LazyResolveNamespaceComparingTestGenerated.java    |  5 +++++
 4 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.kt
 create mode 100644 compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
index 53a9c4fa8d7..12db2659e06 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
@@ -185,7 +185,8 @@ public class OverridingUtil {
                 JetType superValueParameter = superValueParameters.get(i);
                 JetType subValueParameter = subValueParameters.get(i);
 
-                if (!JetTypeChecker.INSTANCE.equalTypes(superValueParameter, subValueParameter, axioms)) {
+                boolean bothErrors = ErrorUtils.isErrorType(superValueParameter) && ErrorUtils.isErrorType(subValueParameter);
+                if (!bothErrors && !JetTypeChecker.INSTANCE.equalTypes(superValueParameter, subValueParameter, axioms)) {
                     return OverrideCompatibilityInfo.valueParameterTypeMismatch(superValueParameter, subValueParameter, OverrideCompatibilityInfo.Result.INCOMPATIBLE);
                 }
             }
diff --git a/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.kt b/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.kt
new file mode 100644
index 00000000000..e492c6cfbeb
--- /dev/null
+++ b/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.kt
@@ -0,0 +1,9 @@
+package test
+
+open class A {
+  open fun foo(a: E) {}
+}
+
+class B : A() {
+  override fun foo(a: E) {}
+}
\ No newline at end of file
diff --git a/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt b/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt
new file mode 100644
index 00000000000..064a4778861
--- /dev/null
+++ b/compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.txt
@@ -0,0 +1,10 @@
+namespace test
+
+internal open class test.A : jet.Any {
+    public final /*constructor*/ fun <init>(): test.A
+    internal open fun foo(/*0*/ a: [ERROR : E]): jet.Tuple0
+}
+internal final class test.B : test.A {
+    public final /*constructor*/ fun <init>(): test.B
+    internal open override /*1*/ fun foo(/*0*/ a: [ERROR : E]): jet.Tuple0
+}
diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
index ad411ea5f69..6f5625789c4 100644
--- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
@@ -1287,6 +1287,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
             doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/innerObject.kt");
         }
         
+        @TestMetadata("OverrideWithErrors.kt")
+        public void testOverrideWithErrors() throws Exception {
+            doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/OverrideWithErrors.kt");
+        }
+        
         @TestMetadata("packageLevelObject.kt")
         public void testPackageLevelObject() throws Exception {
             doTestSinglePackage("compiler/testData/lazyResolve/namespaceComparator/packageLevelObject.kt");