IDEA-84489

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

@@ -289,8 +289,6 @@ public class StandardInstructionVisitor extends InstructionVisitor {
       }
       else if (JavaTokenType.PLUS == opSign) {
         memState.push(instruction.getNonNullStringValue(factory));
-        instruction.setTrueReachable();  // Not a branching instruction actually.
-        instruction.setFalseReachable();
       }
       else {
         if (instruction instanceof InstanceofInstruction) {
@@ -319,6 +317,9 @@ public class StandardInstructionVisitor extends InstructionVisitor {
       memState.push(DfaUnknownValue.getInstance());
     }
 
+    instruction.setTrueReachable();  // Not a branching instruction actually.
+    instruction.setFalseReachable();
+
     return nextInstruction(instruction, runner, memState);
   }
 

java/java-tests/testData/inspection/dataFlow/fixture/IDEA84489.java

@@ -0,0 +1,11 @@
+class Main {
+  static class User {
+    public int RegistrationState;
+  }
+
+  public static void fun(User user) {
+    if ((user.RegistrationState == 5 || user.RegistrationState == 10) == true) {
+
+    }
+  }
+}

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

@@ -57,4 +57,6 @@ public class DataFlowInspectionFixtureTest extends JavaCodeInsightFixtureTestCas
   public void testTryCatchInForNotComplex() throws Throwable { doTest(); }
   public void testFieldChangedBetweenSynchronizedBlocks() throws Throwable { doTest(); }
 
+  public void testIDEA84489() throws Throwable { doTest(); }
+
 }