Attachment #51753 for bug #155115





public class UnresolvedAnnotationBinding extends AnnotationBinding {
	private LookupEnvironment env;
	private boolean typeUnresolved = true;

UnresolvedAnnotationBinding(ReferenceBinding type, ElementValuePair[] pairs, LookupEnvironment env) {
	super(type, pairs);

}

public ReferenceBinding getAnnotationType() {
	if (this.typeUnresolved) { // the type is resolved when requested
	if (this.env != null) {
		// annotation type are never parameterized
		this.type = BinaryTypeBinding.resolveType(this.type, this.env, false);
			// annotation type are never parameterized
		this.typeUnresolved = false;
	}
	return this.type;
}

public ElementValuePair[] getElementValuePairs() {
	if (this.env != null) {
		if (this.typeUnresolved) {
			getAnnotationType(); // resolve the annotation type
		}
		// resolve method binding and value type (if unresolved) for each pair
		for (int i = this.pairs.length; --i >= 0;) {
			ElementValuePair pair = this.pairs[i];
			MethodBinding[] methods = this.type.getMethods(pair.getName());
			// there should be exactly one since the type is an annotation type.
			if (methods != null && methods.length == 1) {
				pair.setMethodBinding(methods[0]);
			} // else silently leave a null there
			Object value = pair.getValue();
			if (value instanceof UnresolvedReferenceBinding) {
				pair.setValue(((UnresolvedReferenceBinding) value).
						resolve(this.env, false));
							// no parameterized types in annotation values
			} // do nothing for UnresolvedAnnotationBinding-s, since their 
			  // content is only accessed through get* methods
		}
		this.env = null;
	}
	return this.pairs;
}
}

Lines 95-98 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/ElementValuePair.java (+5 lines)
95	// lazily set after annotation type was resolved	95	// lazily set after annotation type was resolved
96	this.binding = binding;	96	this.binding = binding;
97	}	97	}
		98
		99	void setValue(Object value) {
		100	// can be modified after the initialization if holding an unresolved ref
		101	this.value = value;
		102	}
98	}	103	}

Lines 4-7 Link Here

(-)workspace/Converter15/.classpath (+1 lines)
4	<classpathentry kind="var" path="CONVERTER_JCL15_LIB" sourcepath="CONVERTER_JCL15_SRC" rootpath="CONVERTER_JCL_SRCROOT"/>	4	<classpathentry kind="var" path="CONVERTER_JCL15_LIB" sourcepath="CONVERTER_JCL15_SRC" rootpath="CONVERTER_JCL_SRCROOT"/>
5	<classpathentry kind="output" path="bin"/>	5	<classpathentry kind="output" path="bin"/>
6	<classpathentry kind="lib" sourcepath="src" path="bins"/>	6	<classpathentry kind="lib" sourcepath="src" path="bins"/>
		7	<classpathentry kind="lib" path="bins/binaries.jar"/>
7	</classpath>	8	</classpath>




package org.eclipse.jdt.core.tests.dom;

import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

		CompilationUnit unit = (CompilationUnit) node;
		assertProblemsSize(unit, 0);
	}

// https://bugs.eclipse.org/bugs/show_bug.cgi?id=155115
public void test0227() throws JavaModelException {
	this.workingCopy = getWorkingCopy("/Converter15/src/X.java", true/*resolve*/);
	String contents =
		"import anno.Anno;\n" + 
		"import binary.B;\n" + 
		"import intf.IFoo;\n" + 
		"\n" + 
		"public class X extends B {\n" + 
		"	@Anno(clz=IFoo.IBar.class)\n" + 
			// the annotation we chase up is not this one, but the one
			// carried by B#f
		"	public void f() {}\n" +
		"   IFoo.IBar m;\n" + 
		"}";
	class TestASTRequestor extends ASTRequestor {
		public ArrayList asts = new ArrayList();
		public void acceptAST(ICompilationUnit source, CompilationUnit compilationUnit) {
			this.asts.add(compilationUnit);
		}
		public void acceptBinding(String bindingKey, IBinding binding) {
		}
	}
	this.workingCopy.getBuffer().setContents(contents);
	this.workingCopy.save(null, true);
	TestASTRequestor requestor = new TestASTRequestor();
	resolveASTs(new ICompilationUnit[] { this.workingCopy } , new String[0], requestor, this.getJavaProject("Converter15"), null);
	ArrayList asts = requestor.asts;
	assertEquals("Wrong size", 1, asts.size());
	CompilationUnit compilationUnit = (CompilationUnit) asts.get(0);
	assertNotNull("No compilation unit", compilationUnit);
	List types = compilationUnit.types();
	assertEquals("Wrong size", 1, types.size());
	AbstractTypeDeclaration abstractTypeDeclaration = (AbstractTypeDeclaration) types.get(0);
	assertEquals("Wrong type", ASTNode.TYPE_DECLARATION, abstractTypeDeclaration.getNodeType());
	TypeDeclaration declaration = (TypeDeclaration) abstractTypeDeclaration;
	Type superclass = declaration.getSuperclassType();
	assertNotNull("No superclass", superclass);
	ITypeBinding typeBinding = superclass.resolveBinding();
	assertNotNull("No binding", typeBinding);
	IMethodBinding[] methods = typeBinding.getDeclaredMethods();
	assertNotNull("No methods", methods);
	assertEquals("Wrong size", 2, methods.length);
	IMethodBinding methodBinding = null;
	for(int i = 0; i < 2; i++) {
		methodBinding = methods[i];
		if (methodBinding.getName().equals("f")) {
			break;
		}
	}
	assertEquals("Wrong name", "f", methodBinding.getName());
	IAnnotationBinding[] annotationBindings = methodBinding.getAnnotations();
	assertNotNull("No annotations", annotationBindings);
	assertEquals("Wrong size", 1, annotationBindings.length);
	IAnnotationBinding annotationBinding = annotationBindings[0];
	IMemberValuePairBinding[] pairs = annotationBinding.getAllMemberValuePairs();
	assertNotNull("no pairs", pairs);
	assertEquals("Wrong size", 1, pairs.length);
	IMemberValuePairBinding memberValuePairBinding = pairs[0];
	assertEquals("Wrong kind", IBinding.MEMBER_VALUE_PAIR, memberValuePairBinding.getKind());
	Object value = memberValuePairBinding.getValue();
	assertNotNull("No value", value);
	assertTrue("Not a type binding", value instanceof ITypeBinding);
	assertEquals("Wrong qualified name", "intf.IFoo.IBar", 
			((ITypeBinding) value).getQualifiedName());		
	IVariableBinding[] fields = 
		declaration.resolveBinding().getDeclaredFields();
	assertTrue("Bad field definition", fields != null && fields.length == 1);
	assertEquals("Type binding mismatch", value, fields[0].getType());
}
}

Added Link Here

(-)workspace/Converter15/bins/binaries.jar (+3 lines)
1	PK½j5META-INF/MANIFEST.MFþÊóMÌËLK-.Ñ
2	K-ÎÌÏ³R0Ô3àåâåPK²îPKÔh5anno/Anno.class??KAÅßD5ñ_4(Ak+ÑÄÈyÚXm!lØìIn/?À%ÎÆâ?}ìþÞf¾>¿\¢§Ð ´µsyt-Ea?Ð?ê¬vh4ræZãê5à^{»éOÖ2ûAè??ôÆê¢¸"tórñ?±,ýë"@¤tÞÌøÕfl¹Ê+'Ú {vAIns¡m)ýÐ§Ül)¼<¦ÃpToIõ\|Â^ÈÓúÿØòL2Óå;ÔÆéýè¶O?ùå4e$;TØÕ@{U;ØûPÔ0Ûì¢ä±ý_PK+?SYøPKºj5binary/A.class]OMKÃ@}¤ILªU~¡gEB¡TrßÄnIw!Ýú¯< üþ(q?fÞÌ·ovß?^ß±À!Ò¢~LÒa8"©¾K.¹,-Á?QZÙS»·¼ss+#¸Xé£0ÈÍ¢?õ?(Ie¦U.jÕöß¤gïÕe?û 4#l_5ÚªÌÕR±0ÕÚXaÑ,3ÁmÒr¬vËê_Èëì,NÙ?ÑµiêRNT»ÇO?Ú?`\|íq¸âr¸K±wðð¹Gýôsî W kÌ;ps7äX/1êÜ;Ç§ð?ý:mtªÍOPKdµEPK¸j5binary/B.class]NMKÃ@¤ILªU~Á³"4B¡<¨ä¾[\Iw!Ýõ_y<øú£ÄøûæÍ¼Ùy»z}p?!,õ2Ix¿lLðÏVöàæïÒÜÉ.ÖúèÁ'2¥åU3/d}+JF)EZµüKôì½Z¢ì{Ï?fÝëF[5¹Z(6µ6VXe4ãL0MZ?ÝnY=¼ÎÎéÄýijD7¦©K9Qí?=y?{àh?ÃÿkÀ,a$ÆÞÑÂçnqõ;ÑGÌµÿi`\g$l°î`À}ÌlÈw³Ä¨K;î\|ÿ'è'i«smPKówU{PKåh5intf/IFoo$IBar.class;õo×>Cnv&F¾Ì¼4}O·ü\|O§Ä"vF?¬Ä²DýÄ¼t}ÿ¤¬ÔäF®àüÒ¢äT·ÌTFN?r=?"FÏ¼¼Ô"çÄââÔbvN ,ÜDF?lÌÀÄÀ
3	&ÙØ?4H??PKfû?PKåh5intf/IFoo.class;õo×>Cnv&FÎÌ¼4}O·ü\|vF?¬Ä²DýÄ¼t}ÿ¤¬ÔäF®àüÒ¢äT·ÌT r?J=?"FÏ¼¼Ô"çÄââÔbvNF>¸a*NE, ???XÁ$;?æÊp1'PK¯¼ÕPK½j5²îMETA-INF/MANIFEST.MFþÊPKÔh5+?SYøaanno/Anno.classPKºj5dµEbinary/A.classPK¸j5ówU{äbinary/B.classPKåh5fû?'intf/IFoo$IBar.classPKåh5¯¼Õêintf/IFoo.classPKz§

Return to bug 155115

Lines 12-17 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/lookup/UnresolvedAnnotationBinding.java (-8 / +26 lines)
12		12
13	public class UnresolvedAnnotationBinding extends AnnotationBinding {	13	public class UnresolvedAnnotationBinding extends AnnotationBinding {
14	private LookupEnvironment env;	14	private LookupEnvironment env;
		15	private boolean typeUnresolved = true;
15		16
16	UnresolvedAnnotationBinding(ReferenceBinding type, ElementValuePair[] pairs, LookupEnvironment env) {	17	UnresolvedAnnotationBinding(ReferenceBinding type, ElementValuePair[] pairs, LookupEnvironment env) {
17	super(type, pairs);	18	super(type, pairs);
Lines 19-38 Link Here
19	}	20	}
20		21
21	public ReferenceBinding getAnnotationType() {	22	public ReferenceBinding getAnnotationType() {
22	// the type is resolved when requested	23	if (this.typeUnresolved) { // the type is resolved when requested
23	if (this.env != null) {
24	// annotation type are never parameterized
25	this.type = BinaryTypeBinding.resolveType(this.type, this.env, false);	24	this.type = BinaryTypeBinding.resolveType(this.type, this.env, false);
26	this.env = null;	25	// annotation type are never parameterized
27	setMethodBindings();	26	this.typeUnresolved = false;
28	}	27	}
29	return this.type;	28	return this.type;
30	}	29	}
31		30
32	public ElementValuePair[] getElementValuePairs() {	31	public ElementValuePair[] getElementValuePairs() {
33	if (this.env != null)	32	if (this.env != null) {
34	getAnnotationType(); // resolve the annotation type & method bindings of each pair	33	if (this.typeUnresolved) {
35		34	getAnnotationType(); // resolve the annotation type
		35	}
		36	// resolve method binding and value type (if unresolved) for each pair
		37	for (int i = this.pairs.length; --i >= 0;) {
		38	ElementValuePair pair = this.pairs[i];
		39	MethodBinding[] methods = this.type.getMethods(pair.getName());
		40	// there should be exactly one since the type is an annotation type.
		41	if (methods != null && methods.length == 1) {
		42	pair.setMethodBinding(methods[0]);
		43	} // else silently leave a null there
		44	Object value = pair.getValue();
		45	if (value instanceof UnresolvedReferenceBinding) {
		46	pair.setValue(((UnresolvedReferenceBinding) value).
		47	resolve(this.env, false));
		48	// no parameterized types in annotation values
		49	} // do nothing for UnresolvedAnnotationBinding-s, since their
		50	// content is only accessed through get* methods
		51	}
		52	this.env = null;
		53	}
36	return this.pairs;	54	return this.pairs;
37	}	55	}
38	}	56	}

Lines 12-17 Link Here

(-)src/org/eclipse/jdt/core/tests/dom/ASTConverter15Test.java (+72 lines)
12	package org.eclipse.jdt.core.tests.dom;	12	package org.eclipse.jdt.core.tests.dom;
13		13
14	import java.io.IOException;	14	import java.io.IOException;
		15	import java.util.ArrayList;
15	import java.util.HashMap;	16	import java.util.HashMap;
16	import java.util.List;	17	import java.util.List;
17	import java.util.Map;	18	import java.util.Map;
Lines 6962-6965 Link Here
6962	CompilationUnit unit = (CompilationUnit) node;	6963	CompilationUnit unit = (CompilationUnit) node;
6963	assertProblemsSize(unit, 0);	6964	assertProblemsSize(unit, 0);
6964	}	6965	}
		6966
		6967	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=155115
		6968	public void test0227() throws JavaModelException {
		6969	this.workingCopy = getWorkingCopy("/Converter15/src/X.java", true/resolve/);
		6970	String contents =
		6971	"import anno.Anno;\n" +
		6972	"import binary.B;\n" +
		6973	"import intf.IFoo;\n" +
		6974	"\n" +
		6975	"public class X extends B {\n" +
		6976	" @Anno(clz=IFoo.IBar.class)\n" +
		6977	// the annotation we chase up is not this one, but the one
		6978	// carried by B#f
		6979	" public void f() {}\n" +
		6980	" IFoo.IBar m;\n" +
		6981	"}";
		6982	class TestASTRequestor extends ASTRequestor {
		6983	public ArrayList asts = new ArrayList();
		6984	public void acceptAST(ICompilationUnit source, CompilationUnit compilationUnit) {
		6985	this.asts.add(compilationUnit);
		6986	}
		6987	public void acceptBinding(String bindingKey, IBinding binding) {
		6988	}
		6989	}
		6990	this.workingCopy.getBuffer().setContents(contents);
		6991	this.workingCopy.save(null, true);
		6992	TestASTRequestor requestor = new TestASTRequestor();
		6993	resolveASTs(new ICompilationUnit[] { this.workingCopy } , new String[0], requestor, this.getJavaProject("Converter15"), null);
		6994	ArrayList asts = requestor.asts;
		6995	assertEquals("Wrong size", 1, asts.size());
		6996	CompilationUnit compilationUnit = (CompilationUnit) asts.get(0);
		6997	assertNotNull("No compilation unit", compilationUnit);
		6998	List types = compilationUnit.types();
		6999	assertEquals("Wrong size", 1, types.size());
		7000	AbstractTypeDeclaration abstractTypeDeclaration = (AbstractTypeDeclaration) types.get(0);
		7001	assertEquals("Wrong type", ASTNode.TYPE_DECLARATION, abstractTypeDeclaration.getNodeType());
		7002	TypeDeclaration declaration = (TypeDeclaration) abstractTypeDeclaration;
		7003	Type superclass = declaration.getSuperclassType();
		7004	assertNotNull("No superclass", superclass);
		7005	ITypeBinding typeBinding = superclass.resolveBinding();
		7006	assertNotNull("No binding", typeBinding);
		7007	IMethodBinding[] methods = typeBinding.getDeclaredMethods();
		7008	assertNotNull("No methods", methods);
		7009	assertEquals("Wrong size", 2, methods.length);
		7010	IMethodBinding methodBinding = null;
		7011	for(int i = 0; i < 2; i++) {
		7012	methodBinding = methods[i];
		7013	if (methodBinding.getName().equals("f")) {
		7014	break;
		7015	}
		7016	}
		7017	assertEquals("Wrong name", "f", methodBinding.getName());
		7018	IAnnotationBinding[] annotationBindings = methodBinding.getAnnotations();
		7019	assertNotNull("No annotations", annotationBindings);
		7020	assertEquals("Wrong size", 1, annotationBindings.length);
		7021	IAnnotationBinding annotationBinding = annotationBindings[0];
		7022	IMemberValuePairBinding[] pairs = annotationBinding.getAllMemberValuePairs();
		7023	assertNotNull("no pairs", pairs);
		7024	assertEquals("Wrong size", 1, pairs.length);
		7025	IMemberValuePairBinding memberValuePairBinding = pairs[0];
		7026	assertEquals("Wrong kind", IBinding.MEMBER_VALUE_PAIR, memberValuePairBinding.getKind());
		7027	Object value = memberValuePairBinding.getValue();
		7028	assertNotNull("No value", value);
		7029	assertTrue("Not a type binding", value instanceof ITypeBinding);
7030	assertEquals("Wrong qualified name", "intf.IFoo.IBar",
7031	((ITypeBinding) value).getQualifiedName());
7032	IVariableBinding[] fields =
7033	declaration.resolveBinding().getDeclaredFields();
7034	assertTrue("Bad field definition", fields != null && fields.length == 1);
7035	assertEquals("Type binding mismatch", value, fields[0].getType());
7036	}
6965	}	7037	}