initialized twice should not make use of computed constants (IDEA-63226)

java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightControlFlowUtil.java

@@ -531,7 +531,7 @@ public class HighlightControlFlowUtil {
     Collection<ControlFlowUtil.VariableInfo> codeBlockProblems = finalVarProblems.get(codeBlock);
     if (codeBlockProblems == null) {
       try {
-        final ControlFlow controlFlow = getControlFlow(codeBlock);
+        final ControlFlow controlFlow = getControlFlowNoConstantEvaluate(codeBlock);
         codeBlockProblems = ControlFlowUtil.getInitializedTwice(controlFlow);
       }
       catch (AnalysisCanceledException e) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/LocalVariableInitialization.java

@@ -339,7 +339,7 @@ public class a  {
         final int k;
         if (false) {
             k = 0;
-            k = 1;
+            <error descr="Variable 'k' might already have been assigned to">k</error> = 1;
             System.out.println(k);
         }
     }
@@ -415,4 +415,15 @@ class SwitchTest
                 return "";
         }
     }
+}
+
+class NotDefinitelyUnassigned {
+  final int i;
+
+  NotDefinitelyUnassigned() {
+    if (false) {
+      i = 0;
+    }
+    <error descr="Variable 'i' might already have been assigned to">i</error> = 1;
+  }
 }