a consistent dfa treatment for plain fields assuming single-threaded context (IDEA-92380)

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

@@ -1592,7 +1592,7 @@ class ControlFlowAnalyzer extends JavaElementVisitor {
       return myFactory.getVarFactory().createVariableValue(var, refExpr.getType(), false, null, isCall);
     }
 
-    if (DfaUtil.isFinalField(var)) {
+    if (DfaUtil.isFinalField(var) || DfaUtil.isPlainMutableField(var)) {
       DfaVariableValue qualifierValue = createChainedVariableValue(qualifier);
       if (qualifierValue != null) {
         return myFactory.getVarFactory().createVariableValue(var, refExpr.getType(), false, qualifierValue, isCall || qualifierValue.isViaMethods());

java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaValueFactory.java

@@ -135,7 +135,7 @@ public class DfaValueFactory {
       }
     }
 
-    if (isEffectivelyUnqualified(referenceExpression)) {
+    if (!variable.hasModifierProperty(PsiModifier.VOLATILE) && isEffectivelyUnqualified(referenceExpression)) {
       return getVarFactory().createVariableValue(variable, referenceExpression.getType(), false, null, false);
     }
 

java/java-impl/src/com/intellij/codeInspection/dataFlow/value/DfaVariableValue.java

@@ -118,7 +118,7 @@ public class DfaVariableValue extends DfaValue {
 
   @Nullable
   public PsiType getVariableType() {
-    return myVariable == null ? null : myVariable.getType();
+    return myVarType;
   }
 
   public boolean isNegated() {

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

@@ -32,11 +32,11 @@ class Foo {
     System.out.println(data.hashCode());
   }
   
-  void dontWarnWhenDoubleChecked(Foo f) {
+  void warnWhenDoubleChecked(Foo f) {
     if (f.data == null) {
       return;
     }
-    if (f.data == null) {
+    if (<warning descr="Condition 'f.data == null' is always 'false'">f.data == null</warning>) {
       return;
     }
     System.out.println(f.data.hashCode());
@@ -53,7 +53,7 @@ class Foo {
     }
     System.out.println(data.hashCode());
   }
-  
+
   void dontWarnWhenDoubleChecked_This_WithMethodCall() {
     if (data == null) {
       return;

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

@@ -34,11 +34,11 @@ class Foo {
     System.out.println(data.hashCode());
   }
   
-  void dontWarnWhenDoubleChecked(Foo f) {
+  void warnWhenDoubleChecked(Foo f) {
     if (f.data == null) {
       return;
     }
-    if (f.data == null) {
+    if (<warning descr="Condition 'f.data == null' is always 'false'">f.data == null</warning>) {
       return;
     }
     System.out.println(f.data.hashCode());

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

@@ -135,8 +135,8 @@ public class DataFlowInspectionTest extends LightCodeInsightFixtureTestCase {
 
   public void testConstantDoubleComparisons() { doTest(); }
   
-  public void _testMutableNullableFieldsTreatment() { doTest(); }
-  public void _testMutableVolatileNullableFieldsTreatment() { doTest(); }
+  public void testMutableNullableFieldsTreatment() { doTest(); }
+  public void testMutableVolatileNullableFieldsTreatment() { doTest(); }
   public void testMutableNotAnnotatedFieldsTreatment() { doTest(); }
 
   public void testMethodCallFlushesField() { doTest(); }