From 85d69f2397d7b54fa8b8c69b7bc9ec6d36cb1d49 Mon Sep 17 00:00:00 2001 From: cushon Date: Tue, 28 Nov 2017 20:57:01 -0800 Subject: Automatic code cleanup. PiperOrigin-RevId: 177261837 --- .../build/android/desugar/BytecodeTypeInference.java | 2 +- .../build/android/desugar/CloseResourceMethodScanner.java | 4 ++-- .../build/android/desugar/CoreLibraryRewriter.java | 2 +- .../build/android/desugar/DefaultMethodClassFixer.java | 12 ++++++------ .../devtools/build/android/desugar/HeaderClassLoader.java | 8 ++++---- .../build/android/desugar/InterfaceDesugaring.java | 12 ++++++------ .../desugar/InvokeDynamicLambdaMethodCollector.java | 4 ++-- .../devtools/build/android/desugar/Java7Compatibility.java | 10 +++++----- .../devtools/build/android/desugar/LambdaClassFixer.java | 14 +++++++------- .../devtools/build/android/desugar/LambdaDesugaring.java | 6 +++--- .../build/android/desugar/LongCompareMethodRewriter.java | 6 +++--- .../desugar/ObjectsRequireNonNullMethodRewriter.java | 6 +++--- .../build/android/desugar/TryWithResourcesRewriter.java | 10 +++++----- 13 files changed, 48 insertions(+), 48 deletions(-) (limited to 'src/tools/android/java/com/google/devtools/build/android') 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 1c7d0286aa..36dc18b2e8 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 @@ -53,7 +53,7 @@ public final class BytecodeTypeInference extends MethodVisitor { new HashMap<>(); public BytecodeTypeInference(int access, String owner, String name, String methodDescriptor) { - super(Opcodes.ASM5); + super(Opcodes.ASM6); 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 a390d72705..75675155f1 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 @@ public class CloseResourceMethodScanner extends ClassVisitor { private int classFileVersion; public CloseResourceMethodScanner() { - super(Opcodes.ASM5); + super(Opcodes.ASM6); } @Override @@ -73,7 +73,7 @@ public class CloseResourceMethodScanner extends ClassVisitor { private boolean hasStackMapFrame; public StackMapFrameCollector(String name, String desc) { - super(Opcodes.ASM5); + super(Opcodes.ASM6); methodSignature = internalName + '.' + name + desc; } diff --git a/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibraryRewriter.java b/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibraryRewriter.java index fd61702910..cbb32713d5 100644 --- a/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibraryRewriter.java +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/CoreLibraryRewriter.java @@ -133,7 +133,7 @@ class CoreLibraryRewriter { private final ClassWriter writer; UnprefixingClassWriter(int flags) { - super(Opcodes.ASM5); + super(Opcodes.ASM6); 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/DefaultMethodClassFixer.java b/src/tools/android/java/com/google/devtools/build/android/desugar/DefaultMethodClassFixer.java index cf904a49dd..1aaf0b69de 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 @@ -59,7 +59,7 @@ public class DefaultMethodClassFixer extends ClassVisitor { DependencyCollector depsCollector, ClassReaderFactory bootclasspath, ClassLoader targetLoader) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, dest); this.classpath = classpath; this.bootclasspath = bootclasspath; this.targetLoader = targetLoader; @@ -388,7 +388,7 @@ public class DefaultMethodClassFixer extends ClassVisitor { private String stubbedInterfaceName; public DefaultMethodStubber() { - super(Opcodes.ASM5); + super(Opcodes.ASM6); } @Override @@ -469,7 +469,7 @@ public class DefaultMethodClassFixer extends ClassVisitor { private boolean found; public DefaultMethodFinder() { - super(Opcodes.ASM5); + super(Opcodes.ASM6); } @Override @@ -511,7 +511,7 @@ public class DefaultMethodClassFixer extends ClassVisitor { private class InstanceMethodRecorder extends ClassVisitor { public InstanceMethodRecorder() { - super(Opcodes.ASM5); + super(Opcodes.ASM6); } @Override @@ -547,7 +547,7 @@ public class DefaultMethodClassFixer extends ClassVisitor { private boolean hasDefaultMethods; public InterfaceInitializationNecessityDetector(String internalName) { - super(Opcodes.ASM5); + super(Opcodes.ASM6); this.internalName = internalName; } @@ -581,7 +581,7 @@ public class DefaultMethodClassFixer extends ClassVisitor { hasDefaultMethods = isNonBridgeDefaultMethod(access); } if ("".equals(name)) { - return new MethodVisitor(Opcodes.ASM5) { + return new MethodVisitor(Opcodes.ASM6) { @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/HeaderClassLoader.java b/src/tools/android/java/com/google/devtools/build/android/desugar/HeaderClassLoader.java index 5be41cfcf6..0a757bf8e5 100644 --- a/src/tools/android/java/com/google/devtools/build/android/desugar/HeaderClassLoader.java +++ b/src/tools/android/java/com/google/devtools/build/android/desugar/HeaderClassLoader.java @@ -86,7 +86,7 @@ class HeaderClassLoader extends ClassLoader { private String internalName; public NonPrimitiveFieldCollector() { - super(Opcodes.ASM5); + super(Opcodes.ASM6); } @Override @@ -131,7 +131,7 @@ class HeaderClassLoader extends ClassLoader { private final ImmutableList interfaceFields; public CodeStubber(ClassVisitor cv, ImmutableList interfaceFields) { - super(Opcodes.ASM5, cv); + super(Opcodes.ASM6, cv); this.interfaceFields = interfaceFields; } @@ -177,7 +177,7 @@ class HeaderClassLoader extends ClassLoader { public InterfaceInitializerEraser( MethodVisitor mv, String internalName, ImmutableList interfaceFields) { - super(Opcodes.ASM5); + super(Opcodes.ASM6); dest = mv; this.interfaceFields = interfaceFields; } @@ -208,7 +208,7 @@ class HeaderClassLoader extends ClassLoader { private boolean hasCode = false; public BodyStubber(MethodVisitor mv) { - super(Opcodes.ASM5, mv); + super(Opcodes.ASM6, mv); } @Override 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 9f24646cee..b8b3ead330 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 @@ -64,7 +64,7 @@ class InterfaceDesugaring extends ClassVisitor { ClassReaderFactory bootclasspath, GeneratedClassStore store, boolean legacyJaCoCo) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, dest); this.interfaceCache = interfaceCache; this.depsCollector = depsCollector; this.bootclasspath = bootclasspath; @@ -321,7 +321,7 @@ class InterfaceDesugaring extends ClassVisitor { private class InterfaceFieldWriteCollector extends MethodVisitor { public InterfaceFieldWriteCollector(MethodVisitor mv) { - super(Opcodes.ASM5, mv); + super(Opcodes.ASM6, mv); } @Override @@ -365,7 +365,7 @@ class InterfaceDesugaring extends ClassVisitor { ClassReaderFactory bootclasspath, DependencyCollector depsCollector, String declaringClass) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, dest); this.interfaceName = knownInterfaceName; this.bootclasspath = bootclasspath; this.depsCollector = depsCollector; @@ -432,7 +432,7 @@ class InterfaceDesugaring extends ClassVisitor { private static class MoveJacocoFieldAccess extends MethodVisitor { public MoveJacocoFieldAccess(MethodVisitor mv) { - super(Opcodes.ASM5, mv); + super(Opcodes.ASM6, mv); } @Override @@ -455,7 +455,7 @@ class InterfaceDesugaring extends ClassVisitor { private final MethodVisitor annotationOnlyDest; public MultiplexAnnotations(@Nullable MethodVisitor dest, MethodVisitor annotationOnlyDest) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, dest); this.annotationOnlyDest = annotationOnlyDest; } @@ -500,7 +500,7 @@ class InterfaceDesugaring extends ClassVisitor { public MultiplexAnnotationVisitor( @Nullable AnnotationVisitor dest, AnnotationVisitor... moreDestinations) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, 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 5d26a0a049..002c08b2a7 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 @@ class InvokeDynamicLambdaMethodCollector extends ClassVisitor { private boolean needOuterClassRewrite = false; public InvokeDynamicLambdaMethodCollector() { - super(Opcodes.ASM5); + super(Opcodes.ASM6); } /** @@ -64,7 +64,7 @@ class InvokeDynamicLambdaMethodCollector extends ClassVisitor { private class LambdaMethodCollector extends MethodVisitor { public LambdaMethodCollector(MethodVisitor dest) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, 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 777dfcb18e..37a45dd3c0 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 @@ -47,7 +47,7 @@ public class Java7Compatibility extends ClassVisitor { public Java7Compatibility( ClassVisitor cv, ClassReaderFactory factory, ClassReaderFactory bootclasspathReader) { - super(Opcodes.ASM5, cv); + super(Opcodes.ASM6, cv); this.factory = factory; this.bootclasspathReader = bootclasspathReader; } @@ -119,7 +119,7 @@ public class Java7Compatibility extends ClassVisitor { boolean updated = false; public UpdateBytecodeVersionIfNecessary(MethodVisitor methodVisitor) { - super(Opcodes.ASM5, methodVisitor); + super(Opcodes.ASM6, methodVisitor); } @Override @@ -151,7 +151,7 @@ public class Java7Compatibility extends ClassVisitor { private class InlineJacocoInit extends MethodVisitor { public InlineJacocoInit(MethodVisitor dest) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, dest); } @Override @@ -177,7 +177,7 @@ public class Java7Compatibility extends ClassVisitor { private int copied = 0; public InlineOneMethod(String methodName, MethodVisitor dest) { - super(Opcodes.ASM5); + super(Opcodes.ASM6); this.methodName = methodName; this.dest = dest; } @@ -211,7 +211,7 @@ public class Java7Compatibility extends ClassVisitor { 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.ASM5, (MethodVisitor) null); + super(Opcodes.ASM6, (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 630559e59b..fb05bcbf91 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 @@ -71,7 +71,7 @@ class LambdaClassFixer extends ClassVisitor { ImmutableSet interfaceLambdaMethods, boolean allowDefaultMethods, boolean copyBridgeMethods) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, dest); checkArgument(!allowDefaultMethods || interfaceLambdaMethods.isEmpty()); checkArgument(allowDefaultMethods || copyBridgeMethods); this.lambdaInfo = lambdaInfo; @@ -240,7 +240,7 @@ class LambdaClassFixer extends ClassVisitor { /** Rewriter for methods in generated lambda classes. */ private class LambdaClassMethodRewriter extends MethodVisitor { public LambdaClassMethodRewriter(MethodVisitor dest) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, dest); } @Override @@ -300,7 +300,7 @@ class LambdaClassFixer extends ClassVisitor { private static class LambdaClassInvokeSpecialRewriter extends MethodVisitor { public LambdaClassInvokeSpecialRewriter(MethodVisitor dest) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, dest); } @Override @@ -325,7 +325,7 @@ class LambdaClassFixer extends ClassVisitor { public CopyBridgeMethods() { // No delegate visitor; instead we'll add methods to the outer class's delegate where needed - super(Opcodes.ASM5); + super(Opcodes.ASM6); } @Override @@ -370,7 +370,7 @@ class LambdaClassFixer extends ClassVisitor { public CopyOneMethod(String methodName) { // No delegate visitor; instead we'll add methods to the outer class's delegate where needed - super(Opcodes.ASM5); + super(Opcodes.ASM6); checkState(!allowDefaultMethods, "Couldn't copy interface lambda bodies"); this.methodName = methodName; } @@ -415,7 +415,7 @@ class LambdaClassFixer extends ClassVisitor { */ private static class AvoidJacocoInit extends MethodVisitor { public AvoidJacocoInit(MethodVisitor dest) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, dest); } @Override @@ -444,7 +444,7 @@ class LambdaClassFixer extends ClassVisitor { String desc, String signature, String[] exceptions) { - super(Opcodes.ASM5, access, name, desc, signature, exceptions); + super(Opcodes.ASM6, 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 86cc69245e..5f41347be5 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,7 @@ import static com.google.common.base.Preconditions.checkArgument; 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.ASM5; +import static org.objectweb.asm.Opcodes.ASM6; import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableSet; @@ -73,7 +73,7 @@ class LambdaDesugaring extends ClassVisitor { ImmutableSet.Builder aggregateInterfaceLambdaMethods, ImmutableSet lambdaMethodsUsedInInvokeDyanmic, boolean allowDefaultMethods) { - super(Opcodes.ASM5, dest); + super(Opcodes.ASM6, dest); this.targetLoader = targetLoader; this.lambdas = lambdas; this.aggregateInterfaceLambdaMethods = aggregateInterfaceLambdaMethods; @@ -381,7 +381,7 @@ class LambdaDesugaring extends ClassVisitor { String desc, String signature, String[] exceptions) { - super(ASM5, access, name, desc, signature, exceptions); + super(ASM6, 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 23d7a0d0b1..f66d862365 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,7 +13,7 @@ // limitations under the License. package com.google.devtools.build.android.desugar; -import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ASM6; import static org.objectweb.asm.Opcodes.INVOKESTATIC; import static org.objectweb.asm.Opcodes.LCMP; @@ -27,7 +27,7 @@ import org.objectweb.asm.MethodVisitor; public class LongCompareMethodRewriter extends ClassVisitor { public LongCompareMethodRewriter(ClassVisitor cv) { - super(ASM5, cv); + super(ASM6, cv); } @Override @@ -40,7 +40,7 @@ public class LongCompareMethodRewriter extends ClassVisitor { private static class LongCompareMethodVisitor extends MethodVisitor { public LongCompareMethodVisitor(MethodVisitor visitor) { - super(ASM5, visitor); + super(ASM6, 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 5ce0bee6a1..86465d6bfa 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,7 @@ // limitations under the License. package com.google.devtools.build.android.desugar; -import static org.objectweb.asm.Opcodes.ASM5; +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; @@ -30,7 +30,7 @@ import org.objectweb.asm.MethodVisitor; public class ObjectsRequireNonNullMethodRewriter extends ClassVisitor { public ObjectsRequireNonNullMethodRewriter(ClassVisitor cv) { - super(ASM5, cv); + super(ASM6, cv); } @Override @@ -43,7 +43,7 @@ public class ObjectsRequireNonNullMethodRewriter extends ClassVisitor { private static class ObjectsMethodInlinerMethodVisitor extends MethodVisitor { public ObjectsMethodInlinerMethodVisitor(MethodVisitor mv) { - super(ASM5, mv); + super(ASM6, 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 17580c4130..2ccef0046d 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,7 @@ import static com.google.common.base.Preconditions.checkNotNull; 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.ASM5; +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; @@ -129,7 +129,7 @@ public class TryWithResourcesRewriter extends ClassVisitor { Set visitedExceptionTypes, AtomicInteger numOfTryWithResourcesInvoked, boolean hasCloseResourceMethod) { - super(ASM5, classVisitor); + super(ASM6, classVisitor); this.classLoader = classLoader; this.visitedExceptionTypes = visitedExceptionTypes; this.numOfTryWithResourcesInvoked = numOfTryWithResourcesInvoked; @@ -185,7 +185,7 @@ public class TryWithResourcesRewriter extends ClassVisitor { } if (isSyntheticCloseResourceMethod(access, name, desc)) { checkState(closeResourceMethod == null, "The TWR rewriter has been used."); - closeResourceMethod = new MethodNode(ASM5, access, name, desc, signature, exceptions); + closeResourceMethod = new MethodNode(ASM6, 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 @@ public class TryWithResourcesRewriter extends ClassVisitor { MethodVisitor methodVisitor, ClassLoader classLoader, @Nullable BytecodeTypeInference typeInference) { - super(ASM5, methodVisitor); + super(ASM6, methodVisitor); this.classLoader = classLoader; this.internalName = internalName; this.methodSignature = methodSignature; @@ -395,7 +395,7 @@ public class TryWithResourcesRewriter extends ClassVisitor { 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(ASM5, mv) { + return new MethodVisitor(ASM6, mv) { @Override public void visitMethodInsn( int opcode, String owner, String name, String desc, boolean itf) { -- cgit v1.2.3