Update to ASM 7.0

MOE_MIGRATED_REVID=219649528

5 files changed, 12 insertions, 12 deletions

diff --git a/javatests/com/google/turbine/bytecode/sig/SigIntegrationTest.java b/javatests/com/google/turbine/bytecode/sig/SigIntegrationTest.java
index 1c0d5c4..f3ab8e7 100644
--- a/javatests/com/google/turbine/bytecode/sig/SigIntegrationTest.java
+++ b/javatests/com/google/turbine/bytecode/sig/SigIntegrationTest.java
@@ -93,7 +93,7 @@ public class SigIntegrationTest {
           try {
             new ClassReader(Files.newInputStream(path))
                 .accept(
-                    new ClassVisitor(Opcodes.ASM6) {
+                    new ClassVisitor(Opcodes.ASM7) {
                       @Override
                       public void visit(
                           int version,
diff --git a/javatests/com/google/turbine/lower/IntegrationTestSupport.java b/javatests/com/google/turbine/lower/IntegrationTestSupport.java
index 3de3005..c039241 100644
--- a/javatests/com/google/turbine/lower/IntegrationTestSupport.java
+++ b/javatests/com/google/turbine/lower/IntegrationTestSupport.java
@@ -404,7 +404,7 @@ public class IntegrationTestSupport {
     final Set<String> classes1 = classes;
     new SignatureReader(signature)
         .accept(
-            new SignatureVisitor(Opcodes.ASM6) {
+            new SignatureVisitor(Opcodes.ASM7) {
               private final Set<String> classes = classes1;
               // class signatures may contain type arguments that contain class signatures
               Deque<List<String>> pieces = new ArrayDeque<>();
diff --git a/javatests/com/google/turbine/lower/LowerTest.java b/javatests/com/google/turbine/lower/LowerTest.java
index 4e6a38a..7ea3d33 100644
--- a/javatests/com/google/turbine/lower/LowerTest.java
+++ b/javatests/com/google/turbine/lower/LowerTest.java
@@ -259,7 +259,7 @@ public class LowerTest {
     List<String> attributes = new ArrayList<>();
     new ClassReader(lowered.get("Test$Inner$InnerMost"))
         .accept(
-            new ClassVisitor(Opcodes.ASM6) {
+            new ClassVisitor(Opcodes.ASM7) {
               @Override
               public void visitInnerClass(
                   String name, String outerName, String innerName, int access) {
@@ -337,11 +337,11 @@ public class LowerTest {
     TypePath[] path = new TypePath[1];
     new ClassReader(lowered.get("Test"))
         .accept(
-            new ClassVisitor(Opcodes.ASM6) {
+            new ClassVisitor(Opcodes.ASM7) {
               @Override
               public FieldVisitor visitField(
                   int access, String name, String desc, String signature, Object value) {
-                return new FieldVisitor(Opcodes.ASM6) {
+                return new FieldVisitor(Opcodes.ASM7) {
                   @Override
                   public AnnotationVisitor visitTypeAnnotation(
                       int typeRef, TypePath typePath, String desc, boolean visible) {
@@ -388,7 +388,7 @@ public class LowerTest {
     Map<String, Object> values = new LinkedHashMap<>();
     new ClassReader(actual.get("Test"))
         .accept(
-            new ClassVisitor(Opcodes.ASM6) {
+            new ClassVisitor(Opcodes.ASM7) {
               @Override
               public FieldVisitor visitField(
                   int access, String name, String desc, String signature, Object value) {
@@ -415,7 +415,7 @@ public class LowerTest {
     int[] acc = {0};
     new ClassReader(lowered.get("Test"))
         .accept(
-            new ClassVisitor(Opcodes.ASM6) {
+            new ClassVisitor(Opcodes.ASM7) {
               @Override
               public void visit(
                   int version,
@@ -619,7 +619,7 @@ public class LowerTest {
     int[] testAccess = {0};
     new ClassReader(lowered.get("Test"))
         .accept(
-            new ClassVisitor(Opcodes.ASM6) {
+            new ClassVisitor(Opcodes.ASM7) {
               @Override
               public void visit(
                   int version,
diff --git a/javatests/com/google/turbine/lower/testdata/golden/outer.txt b/javatests/com/google/turbine/lower/testdata/golden/outer.txt
index b831a81..b6d541c 100644
--- a/javatests/com/google/turbine/lower/testdata/golden/outer.txt
+++ b/javatests/com/google/turbine/lower/testdata/golden/outer.txt
@@ -1,8 +1,8 @@
 // class version 52.0 (52)
 // access flags 0x21
 // signature <V:Ltest/Test$Inner;>Ljava/lang/Object;Ljava/util/List<TV;>;
-// declaration: <V extends test.Test$Inner> implements java.util.List<V>
-public class test/Test implements java/util/List  {
+// declaration: test/Test<V extends test.Test$Inner> implements java.util.List<V>
+public class test/Test implements java/util/List {
 
   // access flags 0xC
   protected static INNERCLASS test/Test$Inner test/Test Inner
@@ -15,7 +15,7 @@ public class test/Test implements java/util/List  {
 
   // access flags 0x1
   // signature <V::Ljava/lang/Runnable;E:Ljava/lang/Error;>(I)V^TE;
-  // declaration: void <V extends java.lang.Runnable, E extends java.lang.Error>(int) throws E
+  // declaration: void g<V extends java.lang.Runnable, E extends java.lang.Error>(int) throws E
   public g(I)V throws java/lang/Error 
     // parameter  foo
 }
diff --git a/pom.xml b/pom.xml
index 1150e06..80de042 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
   </description>
 
   <properties>
-    <asm.version>6.2.1</asm.version>
+    <asm.version>7.0</asm.version>
     <javac.version>9+181-r4173-1</javac.version>
     <guava.version>25.1-jre</guava.version>
   </properties>