[rollback] NotNullValues mustn't end up in equivalence classes table. (Check SliceTreeTest next time)

java/java-impl/src/com/intellij/codeInspection/dataFlow/DfaMemoryStateImpl.java

@@ -568,6 +568,7 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
       return true;
     }
 
+    /*
     if (dfaRight instanceof DfaNotNullValue) {
       if (dfaLeft instanceof DfaVariableValue) {
         DfaVariableState varState = getVariableState((DfaVariableValue)dfaLeft);
@@ -576,11 +577,12 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
         if (isNegated) {
           return varState.addNotInstanceofValue(type) || applyCondition(compareToNull(dfaVar, false));
         }
-        return applyCondition(compareToNull(dfaVar, false)) && varState.setInstanceofValue(type);
+        return applyCondition(compareToNull(dfaVar, true)) && varState.setInstanceofValue(type);
 
       }
       return true;
     }
+    */
 
     if (dfaRight == myFactory.getConstFactory().getNull() && dfaLeft instanceof DfaVariableValue) {
       final DfaVariableState varState = getVariableState((DfaVariableValue)dfaLeft);

java/java-tests/testSrc/com/intellij/codeInspection/DataFlowInspectionFixtureTest.java

@@ -50,7 +50,7 @@ public class DataFlowInspectionFixtureTest extends JavaCodeInsightFixtureTestCas
   public void testFieldInAnonymous() throws Throwable { doTest(); }
   public void testNullableField() throws Throwable { doTest(); }
   public void testCanBeNullDoesntImplyIsNull() throws Throwable { doTest(); }
-  public void testAnnReport() throws Throwable { doTest(); }
+  /*public void testAnnReport() throws Throwable { doTest(); }*/
 
   public void testBigMethodNotComplex() throws Throwable { doTest(); }
 }