From ba757a380053b70a2b9ba26a1b2c5309b8418a24 Mon Sep 17 00:00:00 2001 From: Liam Miller-Cushon Date: Fri, 22 Jan 2021 11:08:55 -0800 Subject: [PATCH] Update to latest ASM API level PiperOrigin-RevId: 353278492 --- .../turbine/bytecode/sig/SigIntegrationTest.java | 2 +- .../google/turbine/lower/IntegrationTestSupport.java | 2 +- javatests/com/google/turbine/lower/LowerTest.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/javatests/com/google/turbine/bytecode/sig/SigIntegrationTest.java b/javatests/com/google/turbine/bytecode/sig/SigIntegrationTest.java index f3ab8e79..ae19298c 100644 --- a/javatests/com/google/turbine/bytecode/sig/SigIntegrationTest.java +++ b/javatests/com/google/turbine/bytecode/sig/SigIntegrationTest.java @@ -93,7 +93,7 @@ public void roundTrip() throws Exception { try { new ClassReader(Files.newInputStream(path)) .accept( - new ClassVisitor(Opcodes.ASM7) { + new ClassVisitor(Opcodes.ASM9) { @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 a154b1ea..74b0f573 100644 --- a/javatests/com/google/turbine/lower/IntegrationTestSupport.java +++ b/javatests/com/google/turbine/lower/IntegrationTestSupport.java @@ -410,7 +410,7 @@ private static void collectTypesFromSignature(Set classes, String signat final Set classes1 = classes; new SignatureReader(signature) .accept( - new SignatureVisitor(Opcodes.ASM7) { + new SignatureVisitor(Opcodes.ASM9) { private final Set classes = classes1; // class signatures may contain type arguments that contain class signatures Deque> pieces = new ArrayDeque<>(); diff --git a/javatests/com/google/turbine/lower/LowerTest.java b/javatests/com/google/turbine/lower/LowerTest.java index a004b08a..6b9edd09 100644 --- a/javatests/com/google/turbine/lower/LowerTest.java +++ b/javatests/com/google/turbine/lower/LowerTest.java @@ -268,7 +268,7 @@ public void innerClassAttributeOrder() throws IOException { List attributes = new ArrayList<>(); new ClassReader(lowered.get("Test$Inner$InnerMost")) .accept( - new ClassVisitor(Opcodes.ASM7) { + new ClassVisitor(Opcodes.ASM9) { @Override public void visitInnerClass( String name, String outerName, String innerName, int access) { @@ -346,11 +346,11 @@ public void typePath() throws Exception { TypePath[] path = new TypePath[1]; new ClassReader(lowered.get("Test")) .accept( - new ClassVisitor(Opcodes.ASM7) { + new ClassVisitor(Opcodes.ASM9) { @Override public FieldVisitor visitField( int access, String name, String desc, String signature, Object value) { - return new FieldVisitor(Opcodes.ASM7) { + return new FieldVisitor(Opcodes.ASM9) { @Override public AnnotationVisitor visitTypeAnnotation( int typeRef, TypePath typePath, String desc, boolean visible) { @@ -397,7 +397,7 @@ public void invalidConstants() throws Exception { Map values = new LinkedHashMap<>(); new ClassReader(actual.get("Test")) .accept( - new ClassVisitor(Opcodes.ASM7) { + new ClassVisitor(Opcodes.ASM9) { @Override public FieldVisitor visitField( int access, String name, String desc, String signature, Object value) { @@ -424,7 +424,7 @@ public void deprecated() throws Exception { int[] acc = {0}; new ClassReader(lowered.get("Test")) .accept( - new ClassVisitor(Opcodes.ASM7) { + new ClassVisitor(Opcodes.ASM9) { @Override public void visit( int version, @@ -629,7 +629,7 @@ public void multipleVisibilities() throws Exception { int[] testAccess = {0}; new ClassReader(lowered.get("Test")) .accept( - new ClassVisitor(Opcodes.ASM7) { + new ClassVisitor(Opcodes.ASM9) { @Override public void visit( int version,