Attachment 272159 Details for Bug 529497 – update ASM 6 code

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] update ASM 6 code

update_ASM6_code.patch (text/plain), 6.40 KB, created by Vikas Chandra

on 2018-01-08 01:16:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Vikas Chandra

Created: 2018-01-08 01:16:31 EST

Size: 6.40 KB

patch

obsolete

>diff --git a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java b/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java
>index 24ddae3..e90e646 100644
>--- a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java
>+++ b/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java
>@@ -57,17 +57,16 @@
> import org.eclipse.jdt.core.util.IInnerClassesAttributeEntry;
> import org.eclipse.jdt.core.util.IMethodInfo;
> import org.eclipse.jdt.core.util.ISignatureAttribute;
>+import org.eclipse.jdt.internal.compiler.codegen.Opcodes;
> import org.eclipse.pde.api.tools.generator.util.Util;
> import org.eclipse.pde.api.tools.internal.IApiXmlConstants;
> import org.eclipse.pde.api.tools.internal.provisional.ProfileModifiers;
> import org.objectweb.asm.AnnotationVisitor;
>-import org.objectweb.asm.Attribute;
> import org.objectweb.asm.ClassReader;
> import org.objectweb.asm.ClassVisitor;
> import org.objectweb.asm.ClassWriter;
> import org.objectweb.asm.FieldVisitor;
> import org.objectweb.asm.MethodVisitor;
>-import org.objectweb.asm.Opcodes;
> import org.w3c.dom.DOMException;
> import org.w3c.dom.Document;
> import org.w3c.dom.Element;
>@@ -1174,7 +1173,7 @@
> 		 * @param stubtype
> 		 */
> 		public StubClassAdapter(Type stubtype) {
>-			super(Opcodes.ASM5, new ClassWriter(0));
>+			super(Opcodes.ASM6, new ClassWriter(0));
> 			this.type = stubtype;
> 		}
> 
>@@ -1270,7 +1269,7 @@
> 				return null;
> 			}
> 			final StubMethod method = this.stub.addMethod(methodName, desc);
>-			return new MethodVisitor(Opcodes.ASM5, super.visitMethod(access, methodName, desc, signature, exceptions)) {
>+			return new MethodVisitor(Opcodes.ASM6, super.visitMethod(access, methodName, desc, signature, exceptions)) {
> 				@Override
> 				public AnnotationVisitor visitAnnotation(String sig, boolean visible) {
> 					if (visible && "Ljava/lang/invoke/MethodHandle$PolymorphicSignature;".equals(sig)) { //$NON-NLS-1$
>diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
>index 48c3e0c..0e83170 100644
>--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
>+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
>@@ -79,7 +79,7 @@
> 		protected List<Reference> references;
> 
> 		public ClassFileSignatureVisitor() {
>-			super(Opcodes.ASM5);
>+			super(Opcodes.ASM6);
> 			this.references = new ArrayList<>();
> 		}
> 
>@@ -244,7 +244,7 @@
> 		 * @param mv
> 		 */
> 		public ClassFileMethodVisitor(MethodVisitor mv, String name, int argumentcount) {
>-			super(Opcodes.ASM5, mv);
>+			super(Opcodes.ASM6, mv);
> 			this.argumentcount = argumentcount;
> 			this.linePositionTracker = new LinePositionTracker();
> 			this.lastLineNumber = -1;
>@@ -628,7 +628,7 @@
> 	class ClassFileFieldVisitor extends FieldVisitor {
> 
> 		ClassFileFieldVisitor() {
>-			super(Opcodes.ASM5);
>+			super(Opcodes.ASM6);
> 		}
> 
> 		@Override
>@@ -983,7 +983,7 @@
> 	 *            {@link ReferenceModifiers}
> 	 */
> 	public ReferenceExtractor(IApiType type, Set<Reference> collector, int referenceKinds) {
>-		super(Opcodes.ASM5, new ClassNode());
>+		super(Opcodes.ASM6, new ClassNode());
> 		fType = type;
> 		this.collector = collector;
> 		fReferenceKinds = referenceKinds;
>@@ -1000,7 +1000,7 @@
> 	 * @param tracker
> 	 */
> 	protected ReferenceExtractor(IApiType type, Set<Reference> collector, int referenceKinds, FieldTracker tracker) {
>-		super(Opcodes.ASM5, new ClassNode());
>+		super(Opcodes.ASM6, new ClassNode());
> 		fType = type;
> 		this.collector = collector;
> 		fReferenceKinds = referenceKinds;
>diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java
>index d33c6d7..d40d3a2 100644
>--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java
>+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java
>@@ -29,7 +29,7 @@
> 	SignatureDescriptor signatureDescriptor;
> 
> 	public SignatureDecoder(SignatureDescriptor signatureDescriptor) {
>-		super(Opcodes.ASM5);
>+		super(Opcodes.ASM6);
> 		this.signatureDescriptor = signatureDescriptor;
> 	}
> 
>diff --git a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java
>index 454cd72..8f9b933 100644
>--- a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java
>+++ b/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java
>@@ -54,7 +54,7 @@
> 	 *            unknown
> 	 */
> 	TypeStructureBuilder(ClassVisitor cv, IApiComponent component, IApiTypeRoot file) {
>-		super(Opcodes.ASM5, cv);
>+		super(Opcodes.ASM6, cv);
> 		fComponent = component;
> 		fFile = file;
> 	}
>@@ -151,7 +151,7 @@
> 			}
> 		}
> 		final ApiMethod method = fType.addMethod(name, desc, signature, laccess, names);
>-		return new MethodVisitor(Opcodes.ASM5, super.visitMethod(laccess, name, desc, signature, exceptions)) {
>+		return new MethodVisitor(Opcodes.ASM6, super.visitMethod(laccess, name, desc, signature, exceptions)) {
> 			@Override
> 			public AnnotationVisitor visitAnnotation(String sig, boolean visible) {
> 				if (visible && "Ljava/lang/invoke/MethodHandle$PolymorphicSignature;".equals(sig)) { //$NON-NLS-1$
>@@ -186,7 +186,7 @@
> 		int traceCount = 0;
> 
> 		public AnnotationDefaultVisitor(ApiMethod method) {
>-			super(Opcodes.ASM5);
>+			super(Opcodes.ASM6);
> 			this.method = method;
> 		}
> 
>@@ -304,7 +304,7 @@
> 		String typeName;
> 
> 		public EnclosingMethodSetter(ClassVisitor cv, String typeName) {
>-			super(Opcodes.ASM5, cv);
>+			super(Opcodes.ASM6, cv);
> 			this.typeName = typeName.replace('.', '/');
> 		}
> 
>@@ -337,7 +337,7 @@
> 		protected EnclosingMethodSetter setter;
> 
> 		public TypeNameFinder(MethodVisitor mv, EnclosingMethodSetter enclosingMethodSetter) {
>-			super(Opcodes.ASM5, mv);
>+			super(Opcodes.ASM6, mv);
> 			this.setter = enclosingMethodSetter;
> 		}
>

Actions: View | Diff

Attachments on bug 529497: 272158 | 272159