return switch conversion

FUTURE_COPYBARA_INTEGRATE_REVIEW=#3690 from msridhar:make-memoizeconstantvisitorstatelookups-suppressible 0adb67b PiperOrigin-RevId: 496418664
google · Jan 5, 2023 · 7aaf061 · 7aaf061
1 parent bb2563e
commit 7aaf061
Show file tree

Hide file tree

Showing 4 changed files with 1,434 additions and 18 deletions.
diff --git a/core/src/main/java/com/google/errorprone/bugpatterns/MemoizeConstantVisitorStateLookups.java b/core/src/main/java/com/google/errorprone/bugpatterns/MemoizeConstantVisitorStateLookups.java
@@ -42,7 +42,6 @@
 import com.sun.source.tree.CompilationUnitTree;
 import com.sun.source.tree.ExpressionTree;
 import com.sun.source.tree.MethodInvocationTree;
-import com.sun.source.util.TreeScanner;
 import com.sun.tools.javac.code.Symbol.MethodSymbol;
 import com.sun.tools.javac.code.Symbol.TypeSymbol;
 import com.sun.tools.javac.tree.JCTree.JCFieldAccess;
@@ -157,9 +156,9 @@ private static final class CallSite {
     }
   }
 
-  private static ImmutableList<CallSite> findConstantLookups(ClassTree tree, VisitorState state) {
+  private ImmutableList<CallSite> findConstantLookups(ClassTree tree, VisitorState state) {
     ImmutableList.Builder<CallSite> result = ImmutableList.builder();
-    new TreeScanner<Void, Void>() {
+    new SuppressibleTreePathScanner<Void, Void>(state) {
       @Override
       public Void visitMethodInvocation(MethodInvocationTree tree, Void unused) {
         if (CONSTANT_LOOKUP.matches(tree, state)) {
@@ -186,7 +185,7 @@ private void handleConstantLookup(MethodInvocationTree tree) {
           }
         }
       }
-    }.scan(tree, null);
+    }.scan(state.getPath(), null);
     return result.build();
   }