deoptimize so overriding methods from object marked as abstract won't get lost (IDEA-143141)

java/java-psi-impl/src/com/intellij/psi/scope/conflictResolvers/JavaMethodsConflictResolver.java

@@ -208,11 +208,7 @@ public class JavaMethodsConflictResolver implements PsiConflictResolver{
     for (CandidateInfo conflict : conflicts) {
       final PsiMethod method = ((MethodCandidateInfo)conflict).getElement();
       for (HierarchicalMethodSignature methodSignature : method.getHierarchicalMethodSignature().getSuperSignatures()) {
-        final PsiMethod superMethod = methodSignature.getMethod();
-        final PsiClass aClass = superMethod.getContainingClass();
-        if (aClass != null && !CommonClassNames.JAVA_LANG_OBJECT.equals(aClass.getQualifiedName())) {
-          superMethods.add(superMethod);
-        }
+        superMethods.add(methodSignature.getMethod());
       }
     }
     nextConflict:

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/OverrideObjectMethods.java

@@ -0,0 +1,24 @@
+abstract class A {
+  public abstract int hashCode();
+  public abstract boolean equals(Object obj);
+  public abstract void foo();
+  
+  {
+    new A() {
+      @Override
+      public int hashCode() {
+        return <error descr="Abstract method 'hashCode()' cannot be accessed directly">super.hashCode()</error>;
+      }
+
+      @Override
+      public boolean equals(Object obj) {
+        return <error descr="Abstract method 'equals(Object)' cannot be accessed directly">super.equals(obj)</error>;
+      }
+
+      @Override
+      public void foo() {
+        <error descr="Abstract method 'foo()' cannot be accessed directly">super.foo()</error>;
+      }
+    };
+  }
+}

java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java

@@ -134,6 +134,10 @@ public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
+  public void testOverrideObjectMethods() throws Exception {
+    doTest();
+  }
+
   private void doTest() {
     doTest(true);
   }