Automatic code cleanup.
PiperOrigin-RevId: 219881070
diff --git a/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/ClassCache.java b/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/ClassCache.java
index 2355d3c..d6f7f3e 100644
--- a/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/ClassCache.java
+++ b/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/ClassCache.java
@@ -356,7 +356,7 @@
private boolean directDep;
public ClassInfoBuilder() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
diff --git a/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/DepsCheckerClassVisitor.java b/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/DepsCheckerClassVisitor.java
index 8fadf10..00fcaae 100644
--- a/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/DepsCheckerClassVisitor.java
+++ b/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/DepsCheckerClassVisitor.java
@@ -43,7 +43,7 @@
private final DepsCheckerMethodVisitor defaultMethodChecker = new DepsCheckerMethodVisitor();
public DepsCheckerClassVisitor(ClassCache classCache, ResultCollector resultCollector) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
this.classCache = classCache;
this.resultCollector = resultCollector;
}
@@ -221,7 +221,7 @@
private class DepsCheckerAnnotationVisitor extends AnnotationVisitor {
DepsCheckerAnnotationVisitor() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
@@ -262,7 +262,7 @@
private class DepsCheckerFieldVisitor extends FieldVisitor {
DepsCheckerFieldVisitor() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
@@ -283,7 +283,7 @@
private class DepsCheckerMethodVisitor extends MethodVisitor {
DepsCheckerMethodVisitor() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
diff --git a/src/test/java/com/google/devtools/build/android/desugar/CorePackageRenamerTest.java b/src/test/java/com/google/devtools/build/android/desugar/CorePackageRenamerTest.java
index 5220ed6..fc40459 100644
--- a/src/test/java/com/google/devtools/build/android/desugar/CorePackageRenamerTest.java
+++ b/src/test/java/com/google/devtools/build/android/desugar/CorePackageRenamerTest.java
@@ -70,7 +70,7 @@
final MockMethodVisitor mv = new MockMethodVisitor();
public MockClassVisitor() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
@@ -86,7 +86,7 @@
String desc;
public MockMethodVisitor() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java b/src/tools/android/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java
index ce36071..d8183e9 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java
@@ -46,7 +46,7 @@
private final String methodSignature;
public BytecodeTypeInference(int access, String owner, String name, String methodDescriptor) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
localVariableSlots = createInitialLocalVariableTypes(access, owner, name, methodDescriptor);
previousFrame = FrameInfo.create(ImmutableList.copyOf(localVariableSlots), ImmutableList.of());
this.methodSignature = owner + "." + name + methodDescriptor;
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/CloseResourceMethodScanner.java b/src/tools/android/java/com/google/devtools/build/android/desugar/CloseResourceMethodScanner.java
index 7567515..649a8f7 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/CloseResourceMethodScanner.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/CloseResourceMethodScanner.java
@@ -30,7 +30,7 @@
private int classFileVersion;
public CloseResourceMethodScanner() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
@@ -73,7 +73,7 @@
private boolean hasStackMapFrame;
public StackMapFrameCollector(String name, String desc) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
methodSignature = internalName + '.' + name + desc;
}
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java b/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java
index 381a344..6672d08 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibraryInvocationRewriter.java
@@ -33,7 +33,7 @@
private final CoreLibrarySupport support;
public CoreLibraryInvocationRewriter(ClassVisitor cv, CoreLibrarySupport support) {
- super(Opcodes.ASM6, cv);
+ super(Opcodes.ASM7, cv);
this.support = support;
}
@@ -46,7 +46,7 @@
private class CoreLibraryMethodInvocationRewriter extends MethodVisitor {
public CoreLibraryMethodInvocationRewriter(MethodVisitor mv) {
- super(Opcodes.ASM6, mv);
+ super(Opcodes.ASM7, mv);
}
@Override
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixer.java b/src/tools/android/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixer.java
index 51a6a44..4b195b2 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixer.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixer.java
@@ -65,7 +65,7 @@
@Nullable CoreLibrarySupport coreLibrarySupport,
ClassReaderFactory bootclasspath,
ClassLoader targetLoader) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
this.classpath = classpath;
this.coreLibrarySupport = coreLibrarySupport;
this.bootclasspath = bootclasspath;
@@ -454,7 +454,7 @@
public DefaultMethodStubber(
boolean isBootclasspathInterface, boolean mayNeedStubsForSuperclass) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
this.isBootclasspathInterface = isBootclasspathInterface;
this.mayNeedStubsForSuperclass = mayNeedStubsForSuperclass;
}
@@ -617,7 +617,7 @@
private boolean found;
public DefaultMethodFinder() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
@@ -663,7 +663,7 @@
private String className;
public InstanceMethodRecorder(boolean ignoreEmulatedMethods) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
this.ignoreEmulatedMethods = ignoreEmulatedMethods;
}
@@ -711,7 +711,7 @@
private boolean hasDefaultMethods;
public InterfaceInitializationNecessityDetector(String internalName) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
this.internalName = internalName;
}
@@ -745,7 +745,7 @@
hasDefaultMethods = isNonBridgeDefaultMethod(access);
}
if ("<clinit>".equals(name)) {
- return new MethodVisitor(Opcodes.ASM6) {
+ return new MethodVisitor(Opcodes.ASM7) {
@Override
public void visitFieldInsn(int opcode, String owner, String name, String desc) {
if (opcode == Opcodes.PUTSTATIC && internalName.equals(owner)) {
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/EmulatedInterfaceRewriter.java b/src/tools/android/java/com/google/devtools/build/android/desugar/EmulatedInterfaceRewriter.java
index 355dd97..49a8d06 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/EmulatedInterfaceRewriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/EmulatedInterfaceRewriter.java
@@ -32,7 +32,7 @@
private final CoreLibrarySupport support;
public EmulatedInterfaceRewriter(ClassVisitor dest, CoreLibrarySupport support) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
this.support = support;
}
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/InterfaceDesugaring.java b/src/tools/android/java/com/google/devtools/build/android/desugar/InterfaceDesugaring.java
index e9e3199..06ce60b 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/InterfaceDesugaring.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/InterfaceDesugaring.java
@@ -71,7 +71,7 @@
ClassLoader targetLoader,
GeneratedClassStore store,
boolean legacyJaCoCo) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
this.interfaceCache = interfaceCache;
this.depsCollector = depsCollector;
this.coreLibrarySupport = coreLibrarySupport;
@@ -338,7 +338,7 @@
private class InterfaceFieldWriteCollector extends MethodVisitor {
public InterfaceFieldWriteCollector(MethodVisitor mv) {
- super(Opcodes.ASM6, mv);
+ super(Opcodes.ASM7, mv);
}
@Override
@@ -384,7 +384,7 @@
ClassLoader targetLoader,
DependencyCollector depsCollector,
String declaringClass) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
this.interfaceName = knownInterfaceName;
this.bootclasspath = bootclasspath;
this.targetLoader = targetLoader;
@@ -478,7 +478,7 @@
private static class MoveJacocoFieldAccess extends MethodVisitor {
public MoveJacocoFieldAccess(MethodVisitor mv) {
- super(Opcodes.ASM6, mv);
+ super(Opcodes.ASM7, mv);
}
@Override
@@ -501,7 +501,7 @@
private final MethodVisitor annotationOnlyDest;
public MultiplexAnnotations(@Nullable MethodVisitor dest, MethodVisitor annotationOnlyDest) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
this.annotationOnlyDest = annotationOnlyDest;
}
@@ -546,7 +546,7 @@
public MultiplexAnnotationVisitor(
@Nullable AnnotationVisitor dest, AnnotationVisitor... moreDestinations) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
this.moreDestinations = moreDestinations;
}
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/InvokeDynamicLambdaMethodCollector.java b/src/tools/android/java/com/google/devtools/build/android/desugar/InvokeDynamicLambdaMethodCollector.java
index 002c08b..58bd0e6 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/InvokeDynamicLambdaMethodCollector.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/InvokeDynamicLambdaMethodCollector.java
@@ -32,7 +32,7 @@
private boolean needOuterClassRewrite = false;
public InvokeDynamicLambdaMethodCollector() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
/**
@@ -64,7 +64,7 @@
private class LambdaMethodCollector extends MethodVisitor {
public LambdaMethodCollector(MethodVisitor dest) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
}
@Override
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/Java7Compatibility.java b/src/tools/android/java/com/google/devtools/build/android/desugar/Java7Compatibility.java
index 4ac29a4..a786f1f 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/Java7Compatibility.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/Java7Compatibility.java
@@ -48,7 +48,7 @@
public Java7Compatibility(
ClassVisitor cv, ClassReaderFactory factory, ClassReaderFactory bootclasspathReader) {
- super(Opcodes.ASM6, cv);
+ super(Opcodes.ASM7, cv);
this.factory = factory;
this.bootclasspathReader = bootclasspathReader;
}
@@ -128,7 +128,7 @@
boolean updated = false;
public UpdateBytecodeVersionIfNecessary(MethodVisitor methodVisitor) {
- super(Opcodes.ASM6, methodVisitor);
+ super(Opcodes.ASM7, methodVisitor);
}
@Override
@@ -160,7 +160,7 @@
private class InlineJacocoInit extends MethodVisitor {
public InlineJacocoInit(MethodVisitor dest) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
}
@Override
@@ -186,7 +186,7 @@
private int copied = 0;
public InlineOneMethod(String methodName, MethodVisitor dest) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
this.methodName = methodName;
this.dest = dest;
}
@@ -220,7 +220,7 @@
public InlineMethodBody(MethodVisitor dest) {
// We'll set the destination visitor in visitCode() to reduce the risk of copying anything
// we didn't mean to copy
- super(Opcodes.ASM6, (MethodVisitor) null);
+ super(Opcodes.ASM7, (MethodVisitor) null);
this.dest = dest;
}
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java b/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java
index 180dc09..f5d78ce 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaClassFixer.java
@@ -72,7 +72,7 @@
ImmutableSet<String> interfaceLambdaMethods,
boolean allowDefaultMethods,
boolean copyBridgeMethods) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
checkArgument(!allowDefaultMethods || interfaceLambdaMethods.isEmpty());
checkArgument(allowDefaultMethods || copyBridgeMethods);
this.lambdaInfo = lambdaInfo;
@@ -241,7 +241,7 @@
/** Rewriter for methods in generated lambda classes. */
private class LambdaClassMethodRewriter extends MethodVisitor {
public LambdaClassMethodRewriter(MethodVisitor dest) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
}
@Override
@@ -301,7 +301,7 @@
private static class LambdaClassInvokeSpecialRewriter extends MethodVisitor {
public LambdaClassInvokeSpecialRewriter(MethodVisitor dest) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
}
@Override
@@ -326,7 +326,7 @@
public CopyBridgeMethods() {
// No delegate visitor; instead we'll add methods to the outer class's delegate where needed
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
@@ -371,7 +371,7 @@
public CopyOneMethod(String methodName) {
// No delegate visitor; instead we'll add methods to the outer class's delegate where needed
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
checkState(!allowDefaultMethods, "Couldn't copy interface lambda bodies");
this.methodName = methodName;
}
@@ -416,7 +416,7 @@
*/
private static class AvoidJacocoInit extends MethodVisitor {
public AvoidJacocoInit(MethodVisitor dest) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
}
@Override
@@ -445,7 +445,7 @@
String desc,
String signature,
String[] exceptions) {
- super(Opcodes.ASM6, access, name, desc, signature, exceptions);
+ super(Opcodes.ASM7, access, name, desc, signature, exceptions);
this.dest = dest;
this.lambdaInfo = lambdaInfo;
this.classLoader = classLoader;
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaDesugaring.java b/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaDesugaring.java
index f9b5316..a30175c 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaDesugaring.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/LambdaDesugaring.java
@@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static java.lang.invoke.MethodHandles.publicLookup;
-import static org.objectweb.asm.Opcodes.ASM6;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableSet;
@@ -74,7 +73,7 @@
ImmutableSet.Builder<String> aggregateInterfaceLambdaMethods,
ImmutableSet<MethodInfo> lambdaMethodsUsedInInvokeDyanmic,
boolean allowDefaultMethods) {
- super(Opcodes.ASM6, dest);
+ super(Opcodes.ASM7, dest);
this.targetLoader = targetLoader;
this.lambdas = lambdas;
this.aggregateInterfaceLambdaMethods = aggregateInterfaceLambdaMethods;
@@ -382,7 +381,7 @@
String desc,
String signature,
String[] exceptions) {
- super(ASM6, access, name, desc, signature, exceptions);
+ super(Opcodes.ASM7, access, name, desc, signature, exceptions);
this.dest = checkNotNull(dest, "Null destination for %s.%s : %s", internalName, name, desc);
}
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/LongCompareMethodRewriter.java b/src/tools/android/java/com/google/devtools/build/android/desugar/LongCompareMethodRewriter.java
index 7f2f355..8f8d6a9 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/LongCompareMethodRewriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/LongCompareMethodRewriter.java
@@ -13,13 +13,13 @@
// limitations under the License.
package com.google.devtools.build.android.desugar;
-import static org.objectweb.asm.Opcodes.ASM6;
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
import static org.objectweb.asm.Opcodes.LCMP;
import com.google.devtools.build.android.desugar.io.CoreLibraryRewriter;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
/**
* This class rewrites any call to Long.compare with the JVM instruction lcmp that is semantically
@@ -30,7 +30,7 @@
private final CoreLibraryRewriter rewriter;
public LongCompareMethodRewriter(ClassVisitor cv, CoreLibraryRewriter rewriter) {
- super(ASM6, cv);
+ super(Opcodes.ASM7, cv);
this.rewriter = rewriter;
}
@@ -44,7 +44,7 @@
private class LongCompareMethodVisitor extends MethodVisitor {
public LongCompareMethodVisitor(MethodVisitor visitor) {
- super(ASM6, visitor);
+ super(Opcodes.ASM7, visitor);
}
@Override
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/ObjectsRequireNonNullMethodRewriter.java b/src/tools/android/java/com/google/devtools/build/android/desugar/ObjectsRequireNonNullMethodRewriter.java
index 931459a..cdb66a7 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/ObjectsRequireNonNullMethodRewriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/ObjectsRequireNonNullMethodRewriter.java
@@ -13,7 +13,6 @@
// limitations under the License.
package com.google.devtools.build.android.desugar;
-import static org.objectweb.asm.Opcodes.ASM6;
import static org.objectweb.asm.Opcodes.DUP;
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
@@ -22,6 +21,7 @@
import com.google.devtools.build.android.desugar.io.CoreLibraryRewriter;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
/**
* This class desugars any call to Objects.requireNonNull(Object o), Objects.requireNonNull(Object
@@ -33,7 +33,7 @@
private final CoreLibraryRewriter rewriter;
public ObjectsRequireNonNullMethodRewriter(ClassVisitor cv, CoreLibraryRewriter rewriter) {
- super(ASM6, cv);
+ super(Opcodes.ASM7, cv);
this.rewriter = rewriter;
}
@@ -47,7 +47,7 @@
private class ObjectsMethodInlinerMethodVisitor extends MethodVisitor {
public ObjectsMethodInlinerMethodVisitor(MethodVisitor mv) {
- super(ASM6, mv);
+ super(Opcodes.ASM7, mv);
}
@Override
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriter.java b/src/tools/android/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriter.java
index 98eef45..45ac7c4 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/TryWithResourcesRewriter.java
@@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkState;
import static org.objectweb.asm.Opcodes.ACC_STATIC;
import static org.objectweb.asm.Opcodes.ACC_SYNTHETIC;
-import static org.objectweb.asm.Opcodes.ASM6;
import static org.objectweb.asm.Opcodes.INVOKEINTERFACE;
import static org.objectweb.asm.Opcodes.INVOKESTATIC;
import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
@@ -39,6 +38,7 @@
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
import org.objectweb.asm.commons.ClassRemapper;
import org.objectweb.asm.commons.Remapper;
import org.objectweb.asm.tree.MethodNode;
@@ -131,7 +131,7 @@
Set<String> visitedExceptionTypes,
AtomicInteger numOfTryWithResourcesInvoked,
boolean hasCloseResourceMethod) {
- super(ASM6, classVisitor);
+ super(Opcodes.ASM7, classVisitor);
this.classLoader = classLoader;
this.visitedExceptionTypes = visitedExceptionTypes;
this.numOfTryWithResourcesInvoked = numOfTryWithResourcesInvoked;
@@ -185,7 +185,7 @@
}
if (isSyntheticCloseResourceMethod(access, name, desc)) {
checkState(closeResourceMethod == null, "The TWR rewriter has been used.");
- closeResourceMethod = new MethodNode(ASM6, access, name, desc, signature, exceptions);
+ closeResourceMethod = new MethodNode(Opcodes.ASM7, access, name, desc, signature, exceptions);
// Run the TWR desugar pass over the $closeResource(Throwable, AutoCloseable) first, for
// example, to rewrite calls to AutoCloseable.close()..
TryWithResourceVisitor twrVisitor =
@@ -263,7 +263,7 @@
MethodVisitor methodVisitor,
ClassLoader classLoader,
@Nullable BytecodeTypeInference typeInference) {
- super(ASM6, methodVisitor);
+ super(Opcodes.ASM7, methodVisitor);
this.classLoader = classLoader;
this.internalName = internalName;
this.methodSignature = methodSignature;
@@ -432,7 +432,7 @@
public MethodVisitor visitMethod(
int access, String name, String desc, String signature, String[] exceptions) {
MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
- return new MethodVisitor(ASM6, mv) {
+ return new MethodVisitor(Opcodes.ASM7, mv) {
@Override
public void visitMethodInsn(
int opcode, String owner, String name, String desc, boolean itf) {
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/io/CoreLibraryRewriter.java b/src/tools/android/java/com/google/devtools/build/android/desugar/io/CoreLibraryRewriter.java
index f3c546c..a63bc05 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/io/CoreLibraryRewriter.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/io/CoreLibraryRewriter.java
@@ -160,7 +160,7 @@
private String finalClassName;
UnprefixingClassWriter(int flags) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
this.writer = new ClassWriter(flags);
this.cv = this.writer;
if (!prefix.isEmpty()) {
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/io/HeaderClassLoader.java b/src/tools/android/java/com/google/devtools/build/android/desugar/io/HeaderClassLoader.java
index f70dc0e..ee718f7 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/io/HeaderClassLoader.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/io/HeaderClassLoader.java
@@ -87,7 +87,7 @@
private String internalName;
public NonPrimitiveFieldCollector() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
@@ -132,7 +132,7 @@
private final ImmutableList<FieldInfo> interfaceFields;
public CodeStubber(ClassVisitor cv, ImmutableList<FieldInfo> interfaceFields) {
- super(Opcodes.ASM6, cv);
+ super(Opcodes.ASM7, cv);
this.interfaceFields = interfaceFields;
}
@@ -178,7 +178,7 @@
public InterfaceInitializerEraser(
MethodVisitor mv, String internalName, ImmutableList<FieldInfo> interfaceFields) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
dest = mv;
this.interfaceFields = interfaceFields;
}
@@ -209,7 +209,7 @@
private boolean hasCode = false;
public BodyStubber(MethodVisitor mv) {
- super(Opcodes.ASM6, mv);
+ super(Opcodes.ASM7, mv);
}
@Override
diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/scan/PrefixReferenceScanner.java b/src/tools/android/java/com/google/devtools/build/android/desugar/scan/PrefixReferenceScanner.java
index b899ccc..c2e9eaa 100644
--- a/src/tools/android/java/com/google/devtools/build/android/desugar/scan/PrefixReferenceScanner.java
+++ b/src/tools/android/java/com/google/devtools/build/android/desugar/scan/PrefixReferenceScanner.java
@@ -52,7 +52,7 @@
private final String prefix;
public PrefixReferenceScanner(String prefix) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
this.prefix = prefix;
}
@@ -228,7 +228,7 @@
private class PrefixReferenceMethodVisitor extends MethodVisitor {
public PrefixReferenceMethodVisitor() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
@@ -356,7 +356,7 @@
private class PrefixReferenceFieldVisitor extends FieldVisitor {
public PrefixReferenceFieldVisitor() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
@@ -376,7 +376,7 @@
private class PrefixReferenceAnnotationVisitor extends AnnotationVisitor {
public PrefixReferenceAnnotationVisitor() {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
}
@Override
