dfa: don't forget facts coming from boxed booleans after they're flushed

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

@@ -705,7 +705,10 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
     }
 
     DfaBoxedValue.Factory boxedFactory = myFactory.getBoxedFactory();
-    return applyRelation(boxedFactory.createUnboxed(dfaLeft), boxedFactory.createUnboxed(dfaRight), negated);
+    DfaValue unboxedLeft = boxedFactory.createUnboxed(dfaLeft);
+    DfaValue unboxedRight = boxedFactory.createUnboxed(dfaRight);
+    return applyRelation(unboxedLeft, unboxedRight, negated) &&
+           checkCompareWithBooleanLiteral(unboxedLeft, unboxedRight, negated);
   }
 
   private boolean checkCompareWithBooleanLiteral(DfaValue dfaLeft, DfaValue dfaRight, boolean negated) {
@@ -716,6 +719,9 @@ public class DfaMemoryStateImpl implements DfaMemoryState {
         if (!applyRelation(dfaLeft, negVal, !negated)) {
           return false;
         }
+        if (!applyRelation(dfaLeft.createNegated(), negVal, negated)) {
+          return false;
+        }
       }
     }
     return true;

java/java-tests/testData/inspection/dataFlow/boxingBoolean/expected.xml

@@ -35,5 +35,11 @@
     <line>51</line>
     <description>Condition &lt;code&gt;o&lt;/code&gt; at the left side of assignment expression is always &lt;code&gt;false&lt;/code&gt;. Can be simplified.</description>
   </problem>
+  <problem>
+
+  <file>Test.java</file>
+    <line>62</line>
+    <description>Condition &lt;code&gt;o&lt;/code&gt; is always &lt;code&gt;true&lt;/code&gt;</description>
+  </problem>
 
 </problems>

java/java-tests/testData/inspection/dataFlow/boxingBoolean/src/Test.java

@@ -52,4 +52,14 @@ public class S {
         if (o) {
         }
     }
+
+  public void flushOriginal(boolean b){
+    boolean o;
+    {
+      Boolean c = Boolean.FALSE;
+      o = !c;
+    }
+    if (o) {
+    }
+  }
 }