Bug 529497 - Update ASM to version 6 in PDE in 4.7.3 and update the codeM20180125-0335M20180124-0610M20180124-0400

accordingly

Change-Id: I7cf8339cec9d51b4015771e7fd290d727efde387
Signed-off-by: Vikas Chandra <Vikas.Chandra@in.ibm.com>

4 files changed, 14 insertions, 15 deletions

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 24ddae3233..e90e646731 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.IInnerClassesAttribute;
 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 @@ public class EEGenerator {
 		 * @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 @@ public class EEGenerator {
 				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 48c3e0c9ef..0e83170ac5 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 @@ public class ReferenceExtractor extends ClassVisitor {
 		protected List<Reference> references;
 
 		public ClassFileSignatureVisitor() {
-			super(Opcodes.ASM5);
+			super(Opcodes.ASM6);
 			this.references = new ArrayList<>();
 		}
 
@@ -244,7 +244,7 @@ public class ReferenceExtractor extends ClassVisitor {
 		 * @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 @@ public class ReferenceExtractor extends ClassVisitor {
 	class ClassFileFieldVisitor extends FieldVisitor {
 
 		ClassFileFieldVisitor() {
-			super(Opcodes.ASM5);
+			super(Opcodes.ASM6);
 		}
 
 		@Override
@@ -983,7 +983,7 @@ public class ReferenceExtractor extends ClassVisitor {
 	 *            {@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 @@ public class ReferenceExtractor extends ClassVisitor {
 	 * @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 d33c6d7088..d40d3a206f 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 @@ final class SignatureDecoder extends SignatureVisitor {
 	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 454cd72302..8f9b933d4b 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 @@ public class TypeStructureBuilder extends ClassVisitor {
 	 *            unknown
 	 */
 	TypeStructureBuilder(ClassVisitor cv, IApiComponent component, IApiTypeRoot file) {
-		super(Opcodes.ASM5, cv);
+		super(Opcodes.ASM6, cv);
 		fComponent = component;
 		fFile = file;
 	}
@@ -151,7 +151,7 @@ public class TypeStructureBuilder extends ClassVisitor {
 			}
 		}
 		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 @@ public class TypeStructureBuilder extends ClassVisitor {
 		int traceCount = 0;
 
 		public AnnotationDefaultVisitor(ApiMethod method) {
-			super(Opcodes.ASM5);
+			super(Opcodes.ASM6);
 			this.method = method;
 		}
 
@@ -304,7 +304,7 @@ public class TypeStructureBuilder extends ClassVisitor {
 		String typeName;
 
 		public EnclosingMethodSetter(ClassVisitor cv, String typeName) {
-			super(Opcodes.ASM5, cv);
+			super(Opcodes.ASM6, cv);
 			this.typeName = typeName.replace('.', '/');
 		}
 
@@ -337,7 +337,7 @@ public class TypeStructureBuilder extends ClassVisitor {
 		protected EnclosingMethodSetter setter;
 
 		public TypeNameFinder(MethodVisitor mv, EnclosingMethodSetter enclosingMethodSetter) {
-			super(Opcodes.ASM5, mv);
+			super(Opcodes.ASM6, mv);
 			this.setter = enclosingMethodSetter;
 		}