src/jdk.compiler/share/classes/com/sun/tools/javac/comp/ThisEscapeAnalyzer.java

*** 504,11 ***
  
      @Override
      public void visitApply(JCMethodInvocation invoke) {
  
          // Get method symbol
!         MethodSymbol sym = (MethodSymbol)TreeInfo.symbolFor(invoke.meth);
  
          // Recurse on method expression
          scan(invoke.meth);
          boolean direct = refs.remove(ExprRef.direct(depth));
          boolean indirect = refs.remove(ExprRef.indirect(depth));
--- 504,11 ---
  
      @Override
      public void visitApply(JCMethodInvocation invoke) {
  
          // Get method symbol
!         Symbol sym = TreeInfo.symbolFor(invoke.meth);
  
          // Recurse on method expression
          scan(invoke.meth);
          boolean direct = refs.remove(ExprRef.direct(depth));
          boolean indirect = refs.remove(ExprRef.indirect(depth));

*** 528,11 ***
  
          // "Invoke" the method
          invoke(invoke, sym, invoke.args, receiverRefs);
      }
  
!     private void invoke(JCTree site, MethodSymbol sym, List<JCExpression> args, RefSet<?> receiverRefs) {
  
          // Skip if ignoring warnings for a constructor invoked via 'this()'
          if (suppressed.contains(sym))
              return;
  
--- 528,11 ---
  
          // "Invoke" the method
          invoke(invoke, sym, invoke.args, receiverRefs);
      }
  
!     private void invoke(JCTree site, Symbol sym, List<JCExpression> args, RefSet<?> receiverRefs) {
  
          // Skip if ignoring warnings for a constructor invoked via 'this()'
          if (suppressed.contains(sym))
              return;
  

*** 772,11 ***
          boolean selectedDirectRef = refs.remove(ExprRef.direct(depth));
          boolean selectedIndirectRef = refs.remove(ExprRef.indirect(depth));
  
          // Explicit 'this' reference?
          Type.ClassType currentClassType = (Type.ClassType)methodClass.sym.type;
!         if (isExplicitThisReference(types, currentClassType, tree)) {
              refs.mapInto(refs, ThisRef.class, direct -> new ExprRef(depth, direct));
              return;
          }
  
          // Explicit outer 'this' reference?
--- 772,11 ---
          boolean selectedDirectRef = refs.remove(ExprRef.direct(depth));
          boolean selectedIndirectRef = refs.remove(ExprRef.indirect(depth));
  
          // Explicit 'this' reference?
          Type.ClassType currentClassType = (Type.ClassType)methodClass.sym.type;
!         if (TreeInfo.isExplicitThisReference(types, currentClassType, tree)) {
              refs.mapInto(refs, ThisRef.class, direct -> new ExprRef(depth, direct));
              return;
          }
  
          // Explicit outer 'this' reference?

*** 1156,47 ***
          return sym != null &&
              sym.kind == VAR &&
              (sym.owner.kind == MTH || sym.owner.kind == VAR);
      }
  
-     /** Check if the given tree is an explicit reference to the 'this' instance of the
-      *  class currently being compiled. This is true if tree is:
-      *  - An unqualified 'this' identifier
-      *  - A 'super' identifier qualified by a class name whose type is 'currentClass' or a supertype
-      *  - A 'this' identifier qualified by a class name whose type is 'currentClass' or a supertype
-      *    but also NOT an enclosing outer class of 'currentClass'.
-      */
-     private boolean isExplicitThisReference(Types types, Type.ClassType currentClass, JCTree tree) {
-         switch (tree.getTag()) {
-             case PARENS:
-                 return isExplicitThisReference(types, currentClass, TreeInfo.skipParens(tree));
-             case IDENT:
-             {
-                 JCIdent ident = (JCIdent)tree;
-                 Names names = ident.name.table.names;
-                 return ident.name == names._this;
-             }
-             case SELECT:
-             {
-                 JCFieldAccess select = (JCFieldAccess)tree;
-                 Type selectedType = types.erasure(select.selected.type);
-                 if (!selectedType.hasTag(CLASS))
-                     return false;
-                 ClassSymbol currentClassSym = (ClassSymbol)((Type.ClassType)types.erasure(currentClass)).tsym;
-                 ClassSymbol selectedClassSym = (ClassSymbol)((Type.ClassType)selectedType).tsym;
-                 Names names = select.name.table.names;
-                 return currentClassSym.isSubClass(selectedClassSym, types) &&
-                         (select.name == names._super ||
-                         (select.name == names._this &&
-                             (currentClassSym == selectedClassSym ||
-                             !currentClassSym.isEnclosedBy(selectedClassSym))));
-             }
-             default:
-                 return false;
-         }
-     }
- 
      // When scanning nodes we can be in one of two modes:
      //  (a) Looking for constructors - we do not recurse into any code blocks
      //  (b) Analyzing a constructor - we are tracing its possible execution paths
      private boolean isAnalyzing() {
          return targetClass != null;
--- 1156,10 ---