Attachment #272159 for bug #529497

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




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;

		 * @param stubtype
		 */
		public StubClassAdapter(Type stubtype) {
			super(Opcodes.ASM6, new ClassWriter(0));
			this.type = stubtype;
		}


				return null;
			}
			final StubMethod method = this.stub.addMethod(methodName, desc);
			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$




		protected List<Reference> references;

		public ClassFileSignatureVisitor() {
			super(Opcodes.ASM6);
			this.references = new ArrayList<>();
		}


		 * @param mv
		 */
		public ClassFileMethodVisitor(MethodVisitor mv, String name, int argumentcount) {
			super(Opcodes.ASM6, mv);
			this.argumentcount = argumentcount;
			this.linePositionTracker = new LinePositionTracker();
			this.lastLineNumber = -1;

	class ClassFileFieldVisitor extends FieldVisitor {

		ClassFileFieldVisitor() {
			super(Opcodes.ASM6);
		}

		@Override

	 *            {@link ReferenceModifiers}
	 */
	public ReferenceExtractor(IApiType type, Set<Reference> collector, int referenceKinds) {
		super(Opcodes.ASM6, new ClassNode());
		fType = type;
		this.collector = collector;
		fReferenceKinds = referenceKinds;

	 * @param tracker
	 */
	protected ReferenceExtractor(IApiType type, Set<Reference> collector, int referenceKinds, FieldTracker tracker) {
		super(Opcodes.ASM6, new ClassNode());
		fType = type;
		this.collector = collector;
		fReferenceKinds = referenceKinds;

Lines 29-35 Link Here

(-)a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java (-1 / +1 lines)
29	SignatureDescriptor signatureDescriptor;	29	SignatureDescriptor signatureDescriptor;
30		30
31	public SignatureDecoder(SignatureDescriptor signatureDescriptor) {	31	public SignatureDecoder(SignatureDescriptor signatureDescriptor) {
32	super(Opcodes.ASM5);	32	super(Opcodes.ASM6);
33	this.signatureDescriptor = signatureDescriptor;	33	this.signatureDescriptor = signatureDescriptor;
34	}	34	}
35		35




	 *            unknown
	 */
	TypeStructureBuilder(ClassVisitor cv, IApiComponent component, IApiTypeRoot file) {
		super(Opcodes.ASM6, cv);
		fComponent = component;
		fFile = file;
	}

			}
		}
		final ApiMethod method = fType.addMethod(name, desc, signature, laccess, names);
		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$

		int traceCount = 0;

		public AnnotationDefaultVisitor(ApiMethod method) {
			super(Opcodes.ASM6);
			this.method = method;
		}


		String typeName;

		public EnclosingMethodSetter(ClassVisitor cv, String typeName) {
			super(Opcodes.ASM6, cv);
			this.typeName = typeName.replace('.', '/');
		}


		protected EnclosingMethodSetter setter;

		public TypeNameFinder(MethodVisitor mv, EnclosingMethodSetter enclosingMethodSetter) {
			super(Opcodes.ASM6, mv);
			this.setter = enclosingMethodSetter;
		}


Return to bug 529497

Lines 57-73 Link Here

(-)a/apitools/org.eclipse.pde.api.tools.generator/src/org/eclipse/pde/api/tools/generator/EEGenerator.java (-4 / +3 lines)
57	import org.eclipse.jdt.core.util.IInnerClassesAttributeEntry;	57	import org.eclipse.jdt.core.util.IInnerClassesAttributeEntry;
58	import org.eclipse.jdt.core.util.IMethodInfo;	58	import org.eclipse.jdt.core.util.IMethodInfo;
59	import org.eclipse.jdt.core.util.ISignatureAttribute;	59	import org.eclipse.jdt.core.util.ISignatureAttribute;
		60	import org.eclipse.jdt.internal.compiler.codegen.Opcodes;
60	import org.eclipse.pde.api.tools.generator.util.Util;	61	import org.eclipse.pde.api.tools.generator.util.Util;
61	import org.eclipse.pde.api.tools.internal.IApiXmlConstants;	62	import org.eclipse.pde.api.tools.internal.IApiXmlConstants;
62	import org.eclipse.pde.api.tools.internal.provisional.ProfileModifiers;	63	import org.eclipse.pde.api.tools.internal.provisional.ProfileModifiers;
63	import org.objectweb.asm.AnnotationVisitor;	64	import org.objectweb.asm.AnnotationVisitor;
64	import org.objectweb.asm.Attribute;
65	import org.objectweb.asm.ClassReader;	65	import org.objectweb.asm.ClassReader;
66	import org.objectweb.asm.ClassVisitor;	66	import org.objectweb.asm.ClassVisitor;
67	import org.objectweb.asm.ClassWriter;	67	import org.objectweb.asm.ClassWriter;
68	import org.objectweb.asm.FieldVisitor;	68	import org.objectweb.asm.FieldVisitor;
69	import org.objectweb.asm.MethodVisitor;	69	import org.objectweb.asm.MethodVisitor;
70	import org.objectweb.asm.Opcodes;
71	import org.w3c.dom.DOMException;	70	import org.w3c.dom.DOMException;
72	import org.w3c.dom.Document;	71	import org.w3c.dom.Document;
73	import org.w3c.dom.Element;	72	import org.w3c.dom.Element;
Lines 1174-1180 Link Here
1174	* @param stubtype	1173	* @param stubtype
1175	*/	1174	*/
1176	public StubClassAdapter(Type stubtype) {	1175	public StubClassAdapter(Type stubtype) {
1177	super(Opcodes.ASM5, new ClassWriter(0));	1176	super(Opcodes.ASM6, new ClassWriter(0));
1178	this.type = stubtype;	1177	this.type = stubtype;
1179	}	1178	}
1180		1179
Lines 1270-1276 Link Here
1270	return null;	1269	return null;
1271	}	1270	}
1272	final StubMethod method = this.stub.addMethod(methodName, desc);	1271	final StubMethod method = this.stub.addMethod(methodName, desc);
1273	return new MethodVisitor(Opcodes.ASM5, super.visitMethod(access, methodName, desc, signature, exceptions)) {	1272	return new MethodVisitor(Opcodes.ASM6, super.visitMethod(access, methodName, desc, signature, exceptions)) {
1274	@Override	1273	@Override
1275	public AnnotationVisitor visitAnnotation(String sig, boolean visible) {	1274	public AnnotationVisitor visitAnnotation(String sig, boolean visible) {
1276	if (visible && "Ljava/lang/invoke/MethodHandle$PolymorphicSignature;".equals(sig)) { //$NON-NLS-1$	1275	if (visible && "Ljava/lang/invoke/MethodHandle$PolymorphicSignature;".equals(sig)) { //$NON-NLS-1$

Lines 79-85 Link Here

(-)a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java (-5 / +5 lines)
79	protected List<Reference> references;	79	protected List<Reference> references;
80		80
81	public ClassFileSignatureVisitor() {	81	public ClassFileSignatureVisitor() {
82	super(Opcodes.ASM5);	82	super(Opcodes.ASM6);
83	this.references = new ArrayList<>();	83	this.references = new ArrayList<>();
84	}	84	}
85		85
Lines 244-250 Link Here
244	* @param mv	244	* @param mv
245	*/	245	*/
246	public ClassFileMethodVisitor(MethodVisitor mv, String name, int argumentcount) {	246	public ClassFileMethodVisitor(MethodVisitor mv, String name, int argumentcount) {
247	super(Opcodes.ASM5, mv);	247	super(Opcodes.ASM6, mv);
248	this.argumentcount = argumentcount;	248	this.argumentcount = argumentcount;
249	this.linePositionTracker = new LinePositionTracker();	249	this.linePositionTracker = new LinePositionTracker();
250	this.lastLineNumber = -1;	250	this.lastLineNumber = -1;
Lines 628-634 Link Here
628	class ClassFileFieldVisitor extends FieldVisitor {	628	class ClassFileFieldVisitor extends FieldVisitor {
629		629
630	ClassFileFieldVisitor() {	630	ClassFileFieldVisitor() {
631	super(Opcodes.ASM5);	631	super(Opcodes.ASM6);
632	}	632	}
633		633
634	@Override	634	@Override
Lines 983-989 Link Here
983	* {@link ReferenceModifiers}	983	* {@link ReferenceModifiers}
984	*/	984	*/
985	public ReferenceExtractor(IApiType type, Set<Reference> collector, int referenceKinds) {	985	public ReferenceExtractor(IApiType type, Set<Reference> collector, int referenceKinds) {
986	super(Opcodes.ASM5, new ClassNode());	986	super(Opcodes.ASM6, new ClassNode());
987	fType = type;	987	fType = type;
988	this.collector = collector;	988	this.collector = collector;
989	fReferenceKinds = referenceKinds;	989	fReferenceKinds = referenceKinds;
Lines 1000-1006 Link Here
1000	* @param tracker	1000	* @param tracker
1001	*/	1001	*/
1002	protected ReferenceExtractor(IApiType type, Set<Reference> collector, int referenceKinds, FieldTracker tracker) {	1002	protected ReferenceExtractor(IApiType type, Set<Reference> collector, int referenceKinds, FieldTracker tracker) {
1003	super(Opcodes.ASM5, new ClassNode());	1003	super(Opcodes.ASM6, new ClassNode());
1004	fType = type;	1004	fType = type;
1005	this.collector = collector;	1005	this.collector = collector;
1006	fReferenceKinds = referenceKinds;	1006	fReferenceKinds = referenceKinds;

Lines 54-60 Link Here

(-)a/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java (-5 / +5 lines)
54	* unknown	54	* unknown
55	*/	55	*/
56	TypeStructureBuilder(ClassVisitor cv, IApiComponent component, IApiTypeRoot file) {	56	TypeStructureBuilder(ClassVisitor cv, IApiComponent component, IApiTypeRoot file) {
57	super(Opcodes.ASM5, cv);	57	super(Opcodes.ASM6, cv);
58	fComponent = component;	58	fComponent = component;
59	fFile = file;	59	fFile = file;
60	}	60	}
Lines 151-157 Link Here
151	}	151	}
152	}	152	}
153	final ApiMethod method = fType.addMethod(name, desc, signature, laccess, names);	153	final ApiMethod method = fType.addMethod(name, desc, signature, laccess, names);
154	return new MethodVisitor(Opcodes.ASM5, super.visitMethod(laccess, name, desc, signature, exceptions)) {	154	return new MethodVisitor(Opcodes.ASM6, super.visitMethod(laccess, name, desc, signature, exceptions)) {
155	@Override	155	@Override
156	public AnnotationVisitor visitAnnotation(String sig, boolean visible) {	156	public AnnotationVisitor visitAnnotation(String sig, boolean visible) {
157	if (visible && "Ljava/lang/invoke/MethodHandle$PolymorphicSignature;".equals(sig)) { //$NON-NLS-1$	157	if (visible && "Ljava/lang/invoke/MethodHandle$PolymorphicSignature;".equals(sig)) { //$NON-NLS-1$
Lines 186-192 Link Here
186	int traceCount = 0;	186	int traceCount = 0;
187		187
188	public AnnotationDefaultVisitor(ApiMethod method) {	188	public AnnotationDefaultVisitor(ApiMethod method) {
189	super(Opcodes.ASM5);	189	super(Opcodes.ASM6);
190	this.method = method;	190	this.method = method;
191	}	191	}
192		192
Lines 304-310 Link Here
304	String typeName;	304	String typeName;
305		305
306	public EnclosingMethodSetter(ClassVisitor cv, String typeName) {	306	public EnclosingMethodSetter(ClassVisitor cv, String typeName) {
307	super(Opcodes.ASM5, cv);	307	super(Opcodes.ASM6, cv);
308	this.typeName = typeName.replace('.', '/');	308	this.typeName = typeName.replace('.', '/');
309	}	309	}
310		310
Lines 337-343 Link Here
337	protected EnclosingMethodSetter setter;	337	protected EnclosingMethodSetter setter;
338		338
339	public TypeNameFinder(MethodVisitor mv, EnclosingMethodSetter enclosingMethodSetter) {	339	public TypeNameFinder(MethodVisitor mv, EnclosingMethodSetter enclosingMethodSetter) {
340	super(Opcodes.ASM5, mv);	340	super(Opcodes.ASM6, mv);
341	this.setter = enclosingMethodSetter;	341	this.setter = enclosingMethodSetter;
342	}	342	}
343		343