Patch in google#1439

TimvdLippe · Apr 17, 2020 · b7cc877 · b7cc877
1 parent 58337bc
commit b7cc877
Showing 1 changed file with 37 additions and 5 deletions.
diff --git a/check_api/src/main/java/com/google/errorprone/util/FindIdentifiers.java b/check_api/src/main/java/com/google/errorprone/util/FindIdentifiers.java
@@ -61,6 +61,7 @@
 import com.sun.tools.javac.comp.Resolve;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.tree.JCTree.JCMethodDecl;
+import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition;
 import com.sun.tools.javac.util.Name;
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -98,17 +99,48 @@ public static Symbol findIdent(String name, VisitorState state, KindSelector kin
       }
     }
     try {
-      Method method =
-          Resolve.class.getDeclaredMethod("findIdent", Env.class, Name.class, KindSelector.class);
-      method.setAccessible(true);
-      Symbol result =
-          (Symbol) method.invoke(Resolve.instance(state.context), env, state.getName(name), kind);
+      Symbol result = (Symbol) FindIdent.method.invoke(
+              Resolve.instance(state.context),
+              FindIdent.args.of(env, state.getName(name), kind));
       return result.exists() ? result : null;
     } catch (ReflectiveOperationException e) {
       throw new LinkageError(e.getMessage(), e);
     }
   }
 
+  private static final class FindIdent {
+    static final Method method;
+    static final Args args;
+    static {
+      Method m;
+      Args a;
+      try {
+        // Java 13
+        m = Resolve.class.getDeclaredMethod(
+            "findIdent", DiagnosticPosition.class, Env.class, Name.class, KindSelector.class);
+        a = (env, name, kind) -> new Object[] { null, env, name, kind };
+      } catch (NoSuchMethodException e1) {
+        try {
+          // Java 12 and below
+          m = Resolve.class.getDeclaredMethod(
+              "findIdent", Env.class, Name.class, KindSelector.class);
+          a = (env, name, kind) -> new Object[] { env, name, kind };
+        } catch (NoSuchMethodException e2) {
+          LinkageError linkageError = new LinkageError(e1.getMessage(), e1);
+          linkageError.addSuppressed(e2);
+          throw linkageError;
+        }
+      }
+      m.setAccessible(true);
+      method = m;
+      args = a;
+    }
+
+    interface Args {
+      Object[] of(Env<AttrContext> env, Name name, KindSelector kind);
+    }
+  }
+
   @Nullable
   private static ClassTree getEnclosingClass(TreePath treePath) {
     while (treePath != null) {