DFA control flow: do not leak this for nested class constructor

GitOrigin-RevId: a5c8e571dac99819b9f058db753f3a41e1025aac

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

@@ -1852,7 +1852,7 @@ public class ControlFlowAnalyzer extends JavaElementVisitor {
         qualifier.accept(this);
       } else {
         PsiClass aClass = PsiUtil.resolveClassInClassTypeOnly(expression.getType());
-        if (aClass != null) {
+        if (aClass != null && !aClass.hasModifierProperty(PsiModifier.STATIC)) {
           PsiClass outerClass = aClass.getContainingClass();
           if (outerClass != null && InheritanceUtil.hasEnclosingInstanceInScope(outerClass, expression, true, false)) {
             qualifierValue = myFactory.getVarFactory().createThisValue(outerClass);

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

@@ -27,6 +27,16 @@ class Tester
       System.err.println("Is false");
   }
 
+  private Tester(int i)
+  {
+    // nested class: should not drop locality ('this' is not leaked)
+    new Nested();
+    if (<warning descr="Condition 'flag' is always 'false'">flag</warning>)
+      System.err.println("Is true.");
+    else
+      System.err.println("Is false");
+  }
+
   class Inner
   {
     Inner()
@@ -34,4 +44,12 @@ class Tester
       flag = true;
     }
   }
+
+  static class Nested
+  {
+    Nested()
+    {
+      <error descr="Non-static field 'flag' cannot be referenced from a static context">flag</error> = true; // cannot access flag
+    }
+  }
 }