Attachment #207883 for bug #365519

View | Details | Raw Unified | Return to bug 365519
Collapse All | Expand All

Lines 147-157 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java (-2 / +2 lines)
147	*/	147	*/
148	public BinaryTypeBinding(PackageBinding packageBinding, IBinaryType binaryType, LookupEnvironment environment) {	148	public BinaryTypeBinding(PackageBinding packageBinding, IBinaryType binaryType, LookupEnvironment environment) {
149	this.compoundName = CharOperation.splitOn('/', binaryType.getName());	149	this.compoundName = CharOperation.splitOn('/', binaryType.getName());
		150	this.fPackage = packageBinding;
		151	this.modifiers = binaryType.getModifiers();
150	computeId();	152	computeId();
151		153
152	this.tagBits \|= TagBits.IsBinaryBinding;	154	this.tagBits \|= TagBits.IsBinaryBinding;
153	this.environment = environment;	155	this.environment = environment;
154	this.fPackage = packageBinding;
155	this.fileName = binaryType.getFileName();	156	this.fileName = binaryType.getFileName();
156		157
157	/* https://bugs.eclipse.org/bugs/show_bug.cgi?id=324850, even in a 1.4 project, we	158	/* https://bugs.eclipse.org/bugs/show_bug.cgi?id=324850, even in a 1.4 project, we
Lines 165-171 Link Here
165	: Binding.NO_TYPE_VARIABLES;	166	: Binding.NO_TYPE_VARIABLES;
166		167
167	this.sourceName = binaryType.getSourceName();	168	this.sourceName = binaryType.getSourceName();
168	this.modifiers = binaryType.getModifiers();
169		169
170	if ((binaryType.getTagBits() & TagBits.HierarchyHasProblems) != 0)	170	if ((binaryType.getTagBits() & TagBits.HierarchyHasProblems) != 0)
171	this.tagBits \|= TagBits.HierarchyHasProblems;	171	this.tagBits \|= TagBits.HierarchyHasProblems;




	if (this.knownTypes == null)
		this.knownTypes = new HashtableOfType(25);
	this.knownTypes.put(element.compoundName[element.compoundName.length - 1], element);
	if (this.environment.globalOptions.isAnnotationBasedNullAnalysisEnabled)
		if (element.isAnnotationType() || element instanceof UnresolvedReferenceBinding) // unresolved types don't yet have the modifiers set
			checkIfNullAnnotationType(element);
}

void clearMissingTagBit() {

		if (!CharOperation.equals(packageName[i], typeName[i]))
			return false;
	return true;
}

void checkIfNullAnnotationType(ReferenceBinding type) {
	// check if type is one of the configured null annotation types
	// if so mark as a well known type using the corresponding typeID:
	if (this.environment.nullableAnnotationPackage == this
			&& CharOperation.equals(type.compoundName, this.environment.getNullableAnnotationName())) {
		type.id = TypeIds.T_ConfiguredAnnotationNullable;
		if (!(type instanceof UnresolvedReferenceBinding)) // unresolved will need to check back for the resolved type
			this.environment.nullableAnnotationPackage = null; // don't check again
	} else if (this.environment.nonnullAnnotationPackage == this
			&& CharOperation.equals(type.compoundName, this.environment.getNonNullAnnotationName())) {
		type.id = TypeIds.T_ConfiguredAnnotationNonNull;
		if (!(type instanceof UnresolvedReferenceBinding)) // unresolved will need to check back for the resolved type
			this.environment.nonnullAnnotationPackage = null; // don't check again
	} else if (this.environment.nonnullByDefaultAnnotationPackage == this
			&& CharOperation.equals(type.compoundName, this.environment.getNonNullByDefaultAnnotationName())) {
		type.id = TypeIds.T_ConfiguredAnnotationNonNullByDefault;
		if (!(type instanceof UnresolvedReferenceBinding)) // unresolved will need to check back for the resolved type
			this.environment.nonnullByDefaultAnnotationPackage = null; // don't check again
	}
}

public TypeBinding getNullnessDefaultAnnotation(Scope scope) {





public void computeId() {
	// try to avoid multiple checks against a package/type name
	outerSwitch:
	switch (this.compoundName.length) {

		case 3 :
			if (!CharOperation.equals(TypeConstants.JAVA, this.compoundName[0])
					&& !CharOperation.equals(TypeConstants.JAVAX, this.compoundName[0]))
				break outerSwitch;
			
			char[] packageName = this.compoundName[1];
			if (packageName.length == 0) return; // just to be safe

								this.id = TypeIds.T_JavaxAnnotationPostConstruct;
							if (CharOperation.equals(typeName, TypeConstants.JAVAX_ANNOTATION_PREDESTROY[2]))
								this.id = TypeIds.T_JavaxAnnotationPreDestroy;
							break outerSwitch;
					}
				}
				break outerSwitch;
			}
			if (!CharOperation.equals(TypeConstants.LANG, this.compoundName[1])) {
				switch (packageName[0]) {

								case 'C' :
									if (CharOperation.equals(typeName, TypeConstants.JAVA_IO_CLOSEABLE[2]))
										this.typeBits |= TypeIds.BitCloseable; // don't assign id, only typeBit (for analysis of resource leaks) 
									break outerSwitch;
								case 'E' :
									if (CharOperation.equals(typeName, TypeConstants.JAVA_IO_EXTERNALIZABLE[2]))
										this.id = TypeIds.T_JavaIoExternalizable;
									break outerSwitch;
								case 'I' :
									if (CharOperation.equals(typeName, TypeConstants.JAVA_IO_IOEXCEPTION[2]))
										this.id = TypeIds.T_JavaIoException;
									break outerSwitch;
								case 'O' :
									if (CharOperation.equals(typeName, TypeConstants.JAVA_IO_OBJECTSTREAMEXCEPTION[2]))
										this.id = TypeIds.T_JavaIoObjectStreamException;
									break outerSwitch;
								case 'P' :
									if (CharOperation.equals(typeName, TypeConstants.JAVA_IO_PRINTSTREAM[2]))
										this.id = TypeIds.T_JavaIoPrintStream;
									break outerSwitch;
								case 'S' :
									if (CharOperation.equals(typeName, TypeConstants.JAVA_IO_SERIALIZABLE[2]))
										this.id = TypeIds.T_JavaIoSerializable;
									break outerSwitch;
							}
						}
						break outerSwitch;
					case 'u' :
						if (CharOperation.equals(packageName, TypeConstants.UTIL)) {
							switch (typeName[0]) {
								case 'C' :
									if (CharOperation.equals(typeName, TypeConstants.JAVA_UTIL_COLLECTION[2]))
										this.id = TypeIds.T_JavaUtilCollection;
									break outerSwitch;
								case 'I' :
									if (CharOperation.equals(typeName, TypeConstants.JAVA_UTIL_ITERATOR[2]))
										this.id = TypeIds.T_JavaUtilIterator;
									break outerSwitch;
							}
						}
						break outerSwitch;
				}
				break outerSwitch;
			}

			// remaining types MUST be in java.lang.*

								this.id = TypeIds.T_JavaLangAutoCloseable;
								this.typeBits |= TypeIds.BitAutoCloseable; 
							}
							break outerSwitch;
						case 14:
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ASSERTIONERROR[2]))
								this.id = TypeIds.T_JavaLangAssertionError;
							break outerSwitch;
					}
					break outerSwitch;
				case 'B' :
					switch (typeName.length) {
						case 4 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_BYTE[2]))
								this.id = TypeIds.T_JavaLangByte;
							break outerSwitch;
						case 7 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_BOOLEAN[2]))
								this.id = TypeIds.T_JavaLangBoolean;
							break outerSwitch;
					}
					break outerSwitch;
				case 'C' :
					switch (typeName.length) {
						case 5 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_CLASS[2]))
								this.id = TypeIds.T_JavaLangClass;
							break outerSwitch;
						case 9 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_CHARACTER[2]))
								this.id = TypeIds.T_JavaLangCharacter;
							else if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_CLONEABLE[2]))
							    this.id = TypeIds.T_JavaLangCloneable;
							break outerSwitch;
						case 22 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_CLASSNOTFOUNDEXCEPTION[2]))
								this.id = TypeIds.T_JavaLangClassNotFoundException;
							break outerSwitch;
					}
					break outerSwitch;
				case 'D' :
					switch (typeName.length) {
						case 6 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_DOUBLE[2]))
								this.id = TypeIds.T_JavaLangDouble;
							break outerSwitch;
						case 10 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_DEPRECATED[2]))
								this.id = TypeIds.T_JavaLangDeprecated;
							break outerSwitch;
					}
					break outerSwitch;
				case 'E' :
					switch (typeName.length) {
						case 4 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ENUM[2]))
								this.id = TypeIds.T_JavaLangEnum;
							break outerSwitch;
						case 5 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ERROR[2]))
								this.id = TypeIds.T_JavaLangError;
							break outerSwitch;
						case 9 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_EXCEPTION[2]))
								this.id = TypeIds.T_JavaLangException;
							break outerSwitch;
					}
					break outerSwitch;
				case 'F' :
					if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_FLOAT[2]))
						this.id = TypeIds.T_JavaLangFloat;
					break outerSwitch;
				case 'I' :
					switch (typeName.length) {
						case 7 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_INTEGER[2]))
								this.id = TypeIds.T_JavaLangInteger;
							break outerSwitch;
						case 8 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ITERABLE[2]))
								this.id = TypeIds.T_JavaLangIterable;
							break outerSwitch;
						case 24 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ILLEGALARGUMENTEXCEPTION[2]))
								this.id = TypeIds.T_JavaLangIllegalArgumentException;
							break outerSwitch;
					}
					break outerSwitch;
				case 'L' :
					if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_LONG[2]))
						this.id = TypeIds.T_JavaLangLong;
					break outerSwitch;
				case 'N' :
					if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_NOCLASSDEFERROR[2]))
						this.id = TypeIds.T_JavaLangNoClassDefError;
					break outerSwitch;
				case 'O' :
					switch (typeName.length) {
						case 6 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_OBJECT[2]))
								this.id = TypeIds.T_JavaLangObject;
							break outerSwitch;
						case 8 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_OVERRIDE[2]))
								this.id = TypeIds.T_JavaLangOverride;
							break outerSwitch;
					}
					break outerSwitch;
				case 'R' :
					if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_RUNTIMEEXCEPTION[2]))
						this.id = 	TypeIds.T_JavaLangRuntimeException;

						case 5 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_SHORT[2]))
								this.id = TypeIds.T_JavaLangShort;
							break outerSwitch;
						case 6 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_STRING[2]))
								this.id = TypeIds.T_JavaLangString;
							else if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_SYSTEM[2]))
								this.id = TypeIds.T_JavaLangSystem;
							break outerSwitch;
						case 11 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_SAFEVARARGS[2]))
								this.id = TypeIds.T_JavaLangSafeVarargs;
							break outerSwitch;
						case 12 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_STRINGBUFFER[2]))
								this.id = TypeIds.T_JavaLangStringBuffer;
							break outerSwitch;
						case 13 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_STRINGBUILDER[2]))
								this.id = TypeIds.T_JavaLangStringBuilder;
							break outerSwitch;
						case 16 :
							if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_SUPPRESSWARNINGS[2]))
								this.id = TypeIds.T_JavaLangSuppressWarnings;
							break outerSwitch;
					}
					break outerSwitch;
				case 'T' :
					if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_THROWABLE[2]))
						this.id = TypeIds.T_JavaLangThrowable;
					break outerSwitch;
				case 'V' :
					if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_VOID[2]))
						this.id = TypeIds.T_JavaLangVoid;
					break outerSwitch;
			}
		break;

		case 4:
			if (!CharOperation.equals(TypeConstants.JAVA, this.compoundName[0]))
				break outerSwitch;
			packageName = this.compoundName[1];
			if (packageName.length == 0) return; // just to be safe


							case 'A' :
								if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ANNOTATION_ANNOTATION[3]))
									this.id = TypeIds.T_JavaLangAnnotationAnnotation;
								break outerSwitch;
							case 'D' :
								if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ANNOTATION_DOCUMENTED[3]))
									this.id = TypeIds.T_JavaLangAnnotationDocumented;
								break outerSwitch;
							case 'E' :
								if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ANNOTATION_ELEMENTTYPE[3]))
									this.id = TypeIds.T_JavaLangAnnotationElementType;
								break outerSwitch;
							case 'I' :
								if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ANNOTATION_INHERITED[3]))
									this.id = TypeIds.T_JavaLangAnnotationInherited;
								break outerSwitch;
							case 'R' :
								switch (typeName.length) {
									case 9 :
										if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ANNOTATION_RETENTION[3]))
											this.id = TypeIds.T_JavaLangAnnotationRetention;
										break outerSwitch;
									case 15 :
										if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ANNOTATION_RETENTIONPOLICY[3]))
											this.id = TypeIds.T_JavaLangAnnotationRetentionPolicy;
										break outerSwitch;
								}
								break outerSwitch;
							case 'T' :
								if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_ANNOTATION_TARGET[3]))
									this.id = TypeIds.T_JavaLangAnnotationTarget;
								break outerSwitch;
						}
					}
					break outerSwitch;
				case 'i':
					if (CharOperation.equals(packageName, TypeConstants.INVOKE)) {
						if (typeName.length == 0) return; // just to be safe

							case 'M' :
								if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_$_POLYMORPHICSIGNATURE[3]))
									this.id = TypeIds.T_JavaLangInvokeMethodHandlePolymorphicSignature;
								break outerSwitch;
						}
					}
					break outerSwitch;
				case 'r' :
					if (CharOperation.equals(packageName, TypeConstants.REFLECT)) {
						switch (typeName[0]) {
							case 'C' :
								if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_REFLECT_CONSTRUCTOR[2]))
									this.id = TypeIds.T_JavaLangReflectConstructor;
								break outerSwitch;
							case 'F' :
								if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_REFLECT_FIELD[2]))
									this.id = TypeIds.T_JavaLangReflectField;
								break outerSwitch;
							case 'M' :
								if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_REFLECT_METHOD[2]))
									this.id = TypeIds.T_JavaLangReflectMethod;
								break outerSwitch;
						}
					}
					break outerSwitch;
			}
			break;
		case 5 :
			if (!CharOperation.equals(TypeConstants.JAVA, this.compoundName[0]))
				break outerSwitch;
			packageName = this.compoundName[1];
			if (packageName.length == 0) return; // just to be safe


									if (CharOperation.equals(typeName, TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_POLYMORPHICSIGNATURE[3])
											&& CharOperation.equals(memberTypeName, TypeConstants.JAVA_LANG_INVOKE_METHODHANDLE_POLYMORPHICSIGNATURE[4]))
										this.id = TypeIds.T_JavaLangInvokeMethodHandlePolymorphicSignature;
									break outerSwitch;
							}
						}
						break outerSwitch;
				}
				break outerSwitch;
			}
	}
	if (this.fPackage != null) {
		LookupEnvironment env = this.fPackage.environment;
		if (env.globalOptions.isAnnotationBasedNullAnalysisEnabled) {
			if (isAnnotationType() || this instanceof UnresolvedReferenceBinding) {// unresolved types don't yet have the modifiers set
				// check if type is one of the configured null annotation types
				// if so mark as a well known type using the corresponding typeID:
				if (env.nullableAnnotationPackage == this.fPackage
						&& CharOperation.equals(this.compoundName, env.getNullableAnnotationName())) {
					this.id = TypeIds.T_ConfiguredAnnotationNullable;
					if (!(this instanceof UnresolvedReferenceBinding)) // unresolved will need to check back for the resolved type
						env.nullableAnnotationPackage = null; // don't check again
				} else if (env.nonnullAnnotationPackage == this.fPackage
						&& CharOperation.equals(this.compoundName, env.getNonNullAnnotationName())) {
					this.id = TypeIds.T_ConfiguredAnnotationNonNull;
					if (!(this instanceof UnresolvedReferenceBinding)) // unresolved will need to check back for the resolved type
						env.nonnullAnnotationPackage = null; // don't check again
				} else if (env.nonnullByDefaultAnnotationPackage == this.fPackage
						&& CharOperation.equals(this.compoundName, env.getNonNullByDefaultAnnotationName())) {
					this.id = TypeIds.T_ConfiguredAnnotationNonNullByDefault;
					if (!(this instanceof UnresolvedReferenceBinding)) // unresolved will need to check back for the resolved type
						env.nonnullByDefaultAnnotationPackage = null; // don't check again
				}
			}
		}
	}
}

/**

Return to bug 365519

Lines 65-73 Link Here

(-)a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java (-24 lines)
65	if (this.knownTypes == null)	65	if (this.knownTypes == null)
66	this.knownTypes = new HashtableOfType(25);	66	this.knownTypes = new HashtableOfType(25);
67	this.knownTypes.put(element.compoundName[element.compoundName.length - 1], element);	67	this.knownTypes.put(element.compoundName[element.compoundName.length - 1], element);
68	if (this.environment.globalOptions.isAnnotationBasedNullAnalysisEnabled)
69	if (element.isAnnotationType() \|\| element instanceof UnresolvedReferenceBinding) // unresolved types don't yet have the modifiers set
70	checkIfNullAnnotationType(element);
71	}	68	}
72		69
73	void clearMissingTagBit() {	70	void clearMissingTagBit() {
Lines 260-286 Link Here
260	if (!CharOperation.equals(packageName[i], typeName[i]))	257	if (!CharOperation.equals(packageName[i], typeName[i]))
261	return false;	258	return false;
262	return true;	259	return true;
263	}
264
265	void checkIfNullAnnotationType(ReferenceBinding type) {
266	// check if type is one of the configured null annotation types
267	// if so mark as a well known type using the corresponding typeID:
268	if (this.environment.nullableAnnotationPackage == this
269	&& CharOperation.equals(type.compoundName, this.environment.getNullableAnnotationName())) {
270	type.id = TypeIds.T_ConfiguredAnnotationNullable;
271	if (!(type instanceof UnresolvedReferenceBinding)) // unresolved will need to check back for the resolved type
272	this.environment.nullableAnnotationPackage = null; // don't check again
273	} else if (this.environment.nonnullAnnotationPackage == this
274	&& CharOperation.equals(type.compoundName, this.environment.getNonNullAnnotationName())) {
275	type.id = TypeIds.T_ConfiguredAnnotationNonNull;
276	if (!(type instanceof UnresolvedReferenceBinding)) // unresolved will need to check back for the resolved type
277	this.environment.nonnullAnnotationPackage = null; // don't check again
278	} else if (this.environment.nonnullByDefaultAnnotationPackage == this
279	&& CharOperation.equals(type.compoundName, this.environment.getNonNullByDefaultAnnotationName())) {
280	type.id = TypeIds.T_ConfiguredAnnotationNonNullByDefault;
281	if (!(type instanceof UnresolvedReferenceBinding)) // unresolved will need to check back for the resolved type
282	this.environment.nonnullByDefaultAnnotationPackage = null; // don't check again
283	}
284	}	260	}
285		261
286	public TypeBinding getNullnessDefaultAnnotation(Scope scope) {	262	public TypeBinding getNullnessDefaultAnnotation(Scope scope) {