fix(jvm_indexer): prepare code using ASM for Java 11 (#3214)

Update to the ASM 7 API level
kythe · Nov 2, 2018 · 9481095 · 9481095
1 parent 9d119db
commit 9481095
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/external.bzl b/external.bzl
@@ -222,8 +222,8 @@ def _java_dependencies():
     maybe(
         native.maven_jar,
         name = "org_ow2_asm_asm",
-        artifact = "org.ow2.asm:asm:6.0",
-        sha1 = "bc6fa6b19424bb9592fe43bbc20178f92d403105",
+        artifact = "org.ow2.asm:asm:7.0",
+        sha1 = "d74d4ba0dee443f68fb2dcb7fcdb945a2cd89912",
     )
 
     maybe(

diff --git a/kythe/java/com/google/devtools/kythe/analyzers/jvm/KytheClassVisitor.java b/kythe/java/com/google/devtools/kythe/analyzers/jvm/KytheClassVisitor.java
@@ -31,7 +31,7 @@
 
 /** JVM class visitor emitting Kythe graph facts. */
 public final class KytheClassVisitor extends ClassVisitor {
-  private static final int ASM_API_LEVEL = Opcodes.ASM6;
+  private static final int ASM_API_LEVEL = Opcodes.ASM7;
 
   private final JvmGraph jvmGraph;
   private final KytheEntrySets entrySets;
@@ -100,7 +100,7 @@ public void visit(
       entrySets.emitEdge(
           classVName,
           EdgeKind.EXTENDS,
-          jvmGraph.getReferenceVName(JvmGraph.Type.referenceType(superName)));
+          JvmGraph.getReferenceVName(JvmGraph.Type.referenceType(superName)));
     }
     for (String iface : interfaces) {
       entrySets.emitEdge(
@@ -115,9 +115,9 @@ public void visit(
   public void visitInnerClass(String name, String outerName, String innerName, int access) {
     if (outerName != null) { // avoid anonymous/local classes
       entrySets.emitEdge(
-          jvmGraph.getReferenceVName(JvmGraph.Type.referenceType(name)),
+          JvmGraph.getReferenceVName(JvmGraph.Type.referenceType(name)),
           EdgeKind.CHILDOF,
-          jvmGraph.getReferenceVName(JvmGraph.Type.referenceType(outerName)));
+          JvmGraph.getReferenceVName(JvmGraph.Type.referenceType(outerName)));
     }
     super.visitInnerClass(name, outerName, innerName, access);
   }