Author: sbratton Date: Fri Oct 26 03:46:11 2018 New Revision: 1844862 URL: http://svn.apache.org/viewvc?rev=1844862&view=rev Log: use asm7 beta
Modified: aries/branches/java6support/proxy/proxy-impl/pom.xml aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/synthesizer/Synthesizer.java Modified: aries/branches/java6support/proxy/proxy-impl/pom.xml URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/pom.xml?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/pom.xml (original) +++ aries/branches/java6support/proxy/proxy-impl/pom.xml Fri Oct 26 03:46:11 2018 @@ -55,7 +55,7 @@ <aries.osgi.import.pkg> org.apache.aries.proxy.weavinghook;resolution:=optional;provide:=true, org.apache.aries.proxy*;provide:=true, - org.objectweb.asm*;resolution:=optional;version="[5,7)", + org.objectweb.asm*;resolution:=optional;version="[5,8)", sun.reflect*;resolution:=optional, * </aries.osgi.import.pkg> @@ -76,13 +76,13 @@ <groupId>org.ow2.asm</groupId> <artifactId>asm</artifactId> <optional>true</optional> - <version>6.2</version> + <version>7.0-beta</version> </dependency> <dependency> <groupId>org.ow2.asm</groupId> <artifactId>asm-commons</artifactId> <optional>true</optional> - <version>6.2</version> + <version>7.0-beta</version> </dependency> <dependency> <groupId>org.slf4j</groupId> Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyAdapter.java Fri Oct 26 03:46:11 2018 @@ -210,7 +210,7 @@ public abstract class AbstractWovenProxy */ public AbstractWovenProxyAdapter(ClassVisitor writer, String className, ClassLoader loader) { - super(Opcodes.ASM5, writer); + super(Opcodes.ASM7, writer); typeBeingWoven = Type.getType("L" + className.replace('.', '/') + ";"); //By default we expect to see methods from a concrete class currentMethodDeclaringType = typeBeingWoven; @@ -365,7 +365,7 @@ public abstract class AbstractWovenProxy //to write our init code to static_init_UUID instead staticInitMethod = new Method("static_init_" + UU_ID, Type.VOID_TYPE, NO_ARGS); staticInitMethodFlags = staticInitMethodFlags | ACC_FINAL; - methodVisitorToReturn = new AdviceAdapter(Opcodes.ASM5, cv.visitMethod(access, name, desc, signature, + methodVisitorToReturn = new AdviceAdapter(Opcodes.ASM7, cv.visitMethod(access, name, desc, signature, exceptions), access, name, desc){ @Override protected void onMethodEnter() Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/AbstractWovenProxyMethodAdapter.java Fri Oct 26 03:46:11 2018 @@ -30,7 +30,7 @@ import static org.apache.aries.proxy.imp import static org.apache.aries.proxy.impl.common.AbstractWovenProxyAdapter.WOVEN_PROXY_IFACE_TYPE; import static org.objectweb.asm.Opcodes.ACONST_NULL; import static org.objectweb.asm.Opcodes.IFNE; -import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ASM7; import java.util.Arrays; @@ -181,7 +181,7 @@ public abstract class AbstractWovenProxy String methodStaticFieldName, Method currentTransformMethod, Type typeBeingWoven, Type methodDeclaringType, boolean isMethodDeclaringTypeInterface, boolean isDefaultMethod) { - super(ASM5, mv, access, name, desc); + super(ASM7, mv, access, name, desc); this.methodStaticFieldName = methodStaticFieldName; this.currentTransformMethod = currentTransformMethod; returnType = currentTransformMethod.getReturnType(); Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/ConstructorFinder.java Fri Oct 26 03:46:11 2018 @@ -37,7 +37,7 @@ public class ConstructorFinder extends C public ConstructorFinder() { - super(Opcodes.ASM5); + super(Opcodes.ASM7); } @Override Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/MethodCopyingClassAdapter.java Fri Oct 26 03:46:11 2018 @@ -64,7 +64,7 @@ final class MethodCopyingClassAdapter ex public MethodCopyingClassAdapter(AbstractWovenProxyAdapter awpa, ClassLoader definingLoader, Class<?> superToCopy, Type overridingClassType, Set<Method> knownMethods, Map<String, TypeMethod> transformedMethods) { - super(Opcodes.ASM5); + super(Opcodes.ASM7); this.wovenProxyAdapter = awpa; this.superToCopy = superToCopy; this.overridingClassType = overridingClassType; @@ -178,7 +178,7 @@ private void methodHiddenException(Strin public CopyingMethodAdapter(GeneratorAdapter mv, Type superType, Method currentTransformMethod) { - super(Opcodes.ASM5); + super(Opcodes.ASM7); this.mv = mv; this.superType = superType; this.currentTransformMethod = currentTransformMethod; Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/common/OSGiFriendlyClassVisitor.java Fri Oct 26 03:46:11 2018 @@ -35,7 +35,7 @@ public final class OSGiFriendlyClassVisi public OSGiFriendlyClassVisitor(ClassVisitor cv, int arg1) { - super(Opcodes.ASM5, cv); + super(Opcodes.ASM7, cv); inlineJSR = arg1 == ClassWriter.COMPUTE_FRAMES; } Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassAdapter.java Fri Oct 26 03:46:11 2018 @@ -66,7 +66,7 @@ public class ProxySubclassAdapter extend public ProxySubclassAdapter(ClassVisitor writer, String newClassName, ClassLoader loader) { // call the superclass constructor - super(Opcodes.ASM5, writer); + super(Opcodes.ASM7, writer); // the writer is now the cv in the superclass of ClassAdapter LOGGER.debug(Constants.LOG_ENTRY, "ProxySubclassAdapter", new Object[] { this, writer, Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/gen/ProxySubclassHierarchyAdapter.java Fri Oct 26 03:46:11 2018 @@ -47,7 +47,7 @@ public class ProxySubclassHierarchyAdapt ProxySubclassHierarchyAdapter(ProxySubclassAdapter adapter, Collection<String> methodsToImplement) { - super(Opcodes.ASM5); + super(Opcodes.ASM7); LOGGER.debug(Constants.LOG_ENTRY, "ProxySubclassHeirarchyAdapter", new Object[] { this, adapter, methodsToImplement }); Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceCombiningClassAdapter.java Fri Oct 26 03:46:11 2018 @@ -61,7 +61,7 @@ final class InterfaceCombiningClassAdapt */ InterfaceCombiningClassAdapter(String className, ClassLoader loader, Class<?> superclass, Collection<Class<?>> interfaces) { - super(Opcodes.ASM5); + super(Opcodes.ASM7); writer = new OSGiFriendlyClassWriter(ClassWriter.COMPUTE_FRAMES, loader); ClassVisitor cv = new OSGiFriendlyClassVisitor(writer, ClassWriter.COMPUTE_FRAMES); adapter = new InterfaceUsingWovenProxyAdapter(cv, className, loader); Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/interfaces/InterfaceProxyGenerator.java Fri Oct 26 03:46:11 2018 @@ -48,7 +48,7 @@ public final class InterfaceProxyGenerat public InterfaceProxyGenerator() { - super(Opcodes.ASM5); + super(Opcodes.ASM7); } Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/impl/weaving/SyntheticSerialVerUIDAdder.java Fri Oct 26 03:46:11 2018 @@ -20,7 +20,7 @@ package org.apache.aries.proxy.impl.weav import java.lang.reflect.Modifier; -import static org.objectweb.asm.Opcodes.ASM5; +import static org.objectweb.asm.Opcodes.ASM7; import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; @@ -42,7 +42,7 @@ class SyntheticSerialVerUIDAdder extends private boolean hasSVUID; public SyntheticSerialVerUIDAdder(WovenProxyAdapter cv) { - super(ASM5, cv); + super(Opcodes.ASM7, cv); wpa = cv; } Modified: aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/synthesizer/Synthesizer.java URL: http://svn.apache.org/viewvc/aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/synthesizer/Synthesizer.java?rev=1844862&r1=1844861&r2=1844862&view=diff ============================================================================== --- aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/synthesizer/Synthesizer.java (original) +++ aries/branches/java6support/proxy/proxy-impl/src/main/java/org/apache/aries/proxy/synthesizer/Synthesizer.java Fri Oct 26 03:46:11 2018 @@ -82,7 +82,7 @@ public class Synthesizer public CustomClassVisitor( ClassVisitor cv) { - super(Opcodes.ASM5, cv); + super(Opcodes.ASM7, cv); } @Override