Merge branch 'eclipse-jdt:master' into master

Author: carstenartur

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/ForStatement.java

@@ -242,7 +242,8 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
 			}
 		}
 		this.mergedInitStateIndex = currentScope.methodScope().recordInitializationStates(mergedInfo);
-		this.scope.checkUnclosedCloseables(mergedInfo, loopingContext, null, null);
+		if ((this.bits & ASTNode.NeededScope) != 0)
+			this.scope.checkUnclosedCloseables(mergedInfo, loopingContext, null, null);
 		if (this.condition != null)
 			this.condition.updateFlowOnBooleanResult(mergedInfo, false);
 		return mergedInfo;

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/CaptureBinding18.java

@@ -44,7 +44,7 @@ public boolean setUpperBounds(TypeBinding[] upperBounds, ReferenceBinding javaLa
 		if (upperBounds.length > 0)
 			this.firstBound = upperBounds[0];
 		int numReferenceInterfaces = 0;
-		if (!isConsistentIntersection(upperBounds))
+		if (!isConsistentIntersection(upperBounds, InferenceContext18.SIMULATE_BUG_JDK_8026527))
 			return false;
 		for (TypeBinding aBound : upperBounds) {
 			if (aBound instanceof ReferenceBinding) {

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ExtendedTagBits.java

@@ -39,4 +39,6 @@ public interface ExtendedTagBits {
 	static boolean areAllAnnotationsResolved(long extendedTagBits) {
 		return (extendedTagBits & AllAnnotationsResolved) == AllAnnotationsResolved;
 	}
+
+	int IsNullAnnotationPackage = ASTNode.Bit1; // package
 }

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/InferenceContext18.java

@@ -1307,7 +1307,7 @@ private TypeBinding intersectionFromGlb(TypeBinding[] glbs) {
 			}
 		}
 		IntersectionTypeBinding18 intersection = (IntersectionTypeBinding18) this.environment.createIntersectionType18(refGlbs);
-		if (ReferenceBinding.isConsistentIntersection(intersection.intersectingTypes))
+		if (ReferenceBinding.isConsistentIntersection(intersection.intersectingTypes, InferenceContext18.SIMULATE_BUG_JDK_8026527))
 			return intersection;
 		return null;
 	}

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/LookupEnvironment.java

@@ -126,10 +126,6 @@ public class LookupEnvironment implements ProblemReasons, TypeConstants {
 	public boolean isProcessingAnnotations = false; // ROOT_ONLY
 	public boolean mayTolerateMissingType = false;
 
-	PackageBinding nullableAnnotationPackage;			// the package supposed to contain the Nullable annotation type
-	PackageBinding nonnullAnnotationPackage;			// the package supposed to contain the NonNull annotation type
-	PackageBinding nonnullByDefaultAnnotationPackage;	// the package supposed to contain the NonNullByDefault annotation type
-
 	AnnotationBinding nonNullAnnotation;
 	AnnotationBinding nullableAnnotation;
 
@@ -1627,6 +1623,11 @@ public char[][] getNonNullByDefaultAnnotationName() {
 	return this.globalOptions.nonNullByDefaultAnnotationName;
 }
 
+public char[][][] allNullAnnotationNames() {
+	// should we include names of secondary annotations?
+	return new char[][][] { getNullableAnnotationName(), getNonNullAnnotationName(), getNonNullByDefaultAnnotationName() };
+}
+
 public char[][] getOwningAnnotationName() {
 	return this.globalOptions.owningAnnotationName;
 }
@@ -1708,10 +1709,6 @@ private boolean matchesSimpleName(char[] simpleName, char[][] qualifiedName) {
 	return CharOperation.equals(simpleName, qualifiedName[qualifiedName.length-1]);
 }
 
-public boolean isNullnessAnnotationPackage(PackageBinding pkg) {
-	return this.nonnullAnnotationPackage == pkg || this.nullableAnnotationPackage == pkg || this.nonnullByDefaultAnnotationPackage == pkg;
-}
-
 public boolean usesNullTypeAnnotations() {
 	if (!this.globalOptions.isAnnotationBasedNullAnalysisEnabled)
 		return false;

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/PackageBinding.java

@@ -102,8 +102,11 @@ void addType(ReferenceBinding element) {
 		((UnresolvedReferenceBinding) priorType).setResolvedType(element, this.environment);
 	}
 	if (this.environment.globalOptions.isAnnotationBasedNullAnalysisEnabled || this.environment.globalOptions.isAnnotationBasedResourceAnalysisEnabled)
-		if (element.isAnnotationType() || element instanceof UnresolvedReferenceBinding) // unresolved types don't yet have the modifiers set
-			checkIfAnalysisAnnotationType(element);
+		if (element.isAnnotationType() || element instanceof UnresolvedReferenceBinding) {
+			// check if type is one of the configured null annotation types
+			// if so mark as a well known type using the corresponding typeBit:
+			element.typeBits |= this.environment.getAnalysisAnnotationBit(element.compoundName);
+		}
 
 	if (!element.isUnresolvedType() && this.wrappingSplitPackageBindings != null) {
 		for (SplitPackageBinding splitPackageBinding : this.wrappingSplitPackageBindings) {
@@ -374,12 +377,12 @@ public int problemId() {
 void checkIfNullAnnotationPackage() {
 	LookupEnvironment env = this.environment;
 	if (env.globalOptions.isAnnotationBasedNullAnalysisEnabled) {
-		if (isPackageOfQualifiedTypeName(this.compoundName, env.getNullableAnnotationName()))
-			env.nullableAnnotationPackage = this;
-		if (isPackageOfQualifiedTypeName(this.compoundName, env.getNonNullAnnotationName()))
-			env.nonnullAnnotationPackage = this;
-		if (isPackageOfQualifiedTypeName(this.compoundName, env.getNonNullByDefaultAnnotationName()))
-			env.nonnullByDefaultAnnotationPackage = this;
+		for (char[][] typeName : env.allNullAnnotationNames()) {
+			if (isPackageOfQualifiedTypeName(this.compoundName, typeName)) {
+				this.extendedTagBits |= ExtendedTagBits.IsNullAnnotationPackage;
+				break;
+			}
+		}
 	}
 }
 private boolean isPackageOfQualifiedTypeName(char[][] packageName, char[][] typeName) {
@@ -392,29 +395,6 @@ private boolean isPackageOfQualifiedTypeName(char[][] packageName, char[][] type
 	return true;
 }
 
-void checkIfAnalysisAnnotationType(ReferenceBinding type) {
-	// check if type is one of the configured null annotation types
-	// if so mark as a well known type using the corresponding typeBit:
-	if (this.environment.nullableAnnotationPackage == this
-			&& CharOperation.equals(type.compoundName, this.environment.getNullableAnnotationName())) {
-		type.typeBits |= TypeIds.BitNullableAnnotation;
-		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.typeBits |= TypeIds.BitNonNullAnnotation;
-		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.typeBits |= TypeIds.BitNonNullByDefaultAnnotation;
-		if (!(type instanceof UnresolvedReferenceBinding)) // unresolved will need to check back for the resolved type
-			this.environment.nonnullByDefaultAnnotationPackage = null; // don't check again
-	} else {
-		type.typeBits |= this.environment.getAnalysisAnnotationBit(type.compoundName);
-	}
-}
-
 @Override
 public char[] readableName() /*java.lang*/ {
 	return CharOperation.concatWith(this.compoundName, '.');

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/ReferenceBinding.java

@@ -2227,14 +2227,16 @@ protected int applyCloseableClassWhitelists(CompilerOptions options) {
 					}
 				}
 			}
-			for (int i=0; i<3; i++) {
-				if (!CharOperation.equals(this.compoundName[i], TypeConstants.ONE_UTIL_STREAMEX[i])) {
-					return 0;
+			streamex: {
+				for (int i=0; i<3; i++) {
+					if (!CharOperation.equals(this.compoundName[i], TypeConstants.ONE_UTIL_STREAMEX[i])) {
+						break streamex;
+					}
 				}
-			}
-			for (char[] streamName : TypeConstants.RESOURCE_FREE_CLOSEABLE_STREAMEX) {
-				if (CharOperation.equals(this.compoundName[3], streamName)) {
-					return TypeIds.BitResourceFreeCloseable;
+				for (char[] streamName : TypeConstants.RESOURCE_FREE_CLOSEABLE_STREAMEX) {
+					if (CharOperation.equals(this.compoundName[3], streamName)) {
+						return TypeIds.BitResourceFreeCloseable;
+					}
 				}
 			}
 			break;
@@ -2529,7 +2531,7 @@ public MethodBinding getSingleAbstractMethod(Scope scope, boolean replaceWildcar
 }
 
 // See JLS 4.9 bullet 1
-public static boolean isConsistentIntersection(TypeBinding[] intersectingTypes) {
+public static boolean isConsistentIntersection(TypeBinding[] intersectingTypes, boolean simulatingBugJDK8026527) {
 	TypeBinding[] ci = new TypeBinding[intersectingTypes.length];
 	for (int i = 0; i < ci.length; i++) {
 		TypeBinding current = intersectingTypes[i];
@@ -2542,9 +2544,9 @@ public static boolean isConsistentIntersection(TypeBinding[] intersectingTypes)
 		// when invoked during type inference we only want to check inconsistency among real types:
 		if (current.isTypeVariable() || current.isWildcard() || !current.isProperType(true))
 			continue;
-		if (mostSpecific.isSubtypeOf(current, false))
+		if (mostSpecific.isSubtypeOf(current, simulatingBugJDK8026527))
 			continue;
-		else if (current.isSubtypeOf(mostSpecific, false))
+		else if (current.isSubtypeOf(mostSpecific, simulatingBugJDK8026527))
 			mostSpecific = current;
 		else
 			return false;

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/SourceTypeBinding.java

@@ -2317,7 +2317,7 @@ public void evaluateNullAnnotations() {
 	PackageBinding pkg = getPackage();
 	boolean isInDefaultPkg = (pkg.compoundName == CharOperation.NO_CHAR_CHAR);
 	if (!isPackageInfo) {
-		boolean isInNullnessAnnotationPackage = this.scope.environment().isNullnessAnnotationPackage(pkg);
+		boolean isInNullnessAnnotationPackage = (pkg.extendedTagBits & ExtendedTagBits.IsNullAnnotationPackage) != 0;
 		if (pkg.getDefaultNullness() == NO_NULL_DEFAULT && !isInDefaultPkg && !isInNullnessAnnotationPackage && !(this instanceof NestedTypeBinding)) {
 			ReferenceBinding packageInfo = pkg.getType(TypeConstants.PACKAGE_INFO_NAME, this.module);
 			if (packageInfo == null) {

org.eclipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/MultiProjectTests.java

@@ -2146,84 +2146,6 @@ public void test461074() throws JavaModelException {
 	env.removeProject(p2);
 	env.removeProject(p3);
 }
-// https://bugs.eclipse.org/bugs/show_bug.cgi?id=461074, "indirectly referenced from required .class files" error for unreachable reference of type in overriding method declaration in a library on classpath
-public void _2551_test461074_error() throws JavaModelException {
-	//----------------------------
-	//         Project1
-	//----------------------------
-	IPath p1 = env.addProject("SampleMissing"); //$NON-NLS-1$
-	env.addExternalJars(p1, Util.getJavaClassLibs());
-	// remove old package fragment root so that names don't collide
-	env.removePackageFragmentRoot(p1, ""); //$NON-NLS-1$
-	IPath root1 = env.addPackageFragmentRoot(p1, "src"); //$NON-NLS-1$
-	env.setOutputFolder(p1, "bin"); //$NON-NLS-1$
-
-	env.addClass(root1, "pack.missing", "MissingType", //$NON-NLS-1$ //$NON-NLS-2$
-			"package pack.missing;\n" +
-			"public class MissingType {\n" +
-			"}\n"
-		);
-
-	//----------------------------
-	//         Project2
-	//----------------------------
-	IPath p2 = env.addProject("SampleLib", CompilerOptions.getFirstSupportedJavaVersion()); //$NON-NLS-1$
-	env.addExternalJars(p2, Util.getJavaClassLibs());
-	// remove old package fragment root so that names don't collide
-	env.removePackageFragmentRoot(p2, ""); //$NON-NLS-1$
-	IPath root2 = env.addPackageFragmentRoot(p2, "src"); //$NON-NLS-1$
-	env.setOutputFolder(p2, "bin"); //$NON-NLS-1$
-
-	env.addClass(root2, "pack.lib", "TopClass", //$NON-NLS-1$ //$NON-NLS-2$
-			"package pack.lib;\n" +
-			"public abstract class TopClass {\n" +
-			"  abstract Object get();\n" +
-			"}\n"
-		);
-	env.addClass(root2, "pack.lib", "SuperClass", //$NON-NLS-1$ //$NON-NLS-2$
-			"package pack.lib;\n" +
-			"import pack.missing.MissingType;\n" +
-			"public class SuperClass extends TopClass {\n" +
-			"  @Override\n" +
-			"  MissingType get() { return null; }\n" +
-			"}\n"
-		);
-
-	//----------------------------
-	//         Project3
-	//----------------------------
-	IPath p3 = env.addProject("SampleTest", CompilerOptions.getFirstSupportedJavaVersion()); //$NON-NLS-1$
-	env.addExternalJars(p3, Util.getJavaClassLibs());
-	// remove old package fragment root so that names don't collide
-	env.removePackageFragmentRoot(p3, ""); //$NON-NLS-1$
-	IPath root3 = env.addPackageFragmentRoot(p3, "src"); //$NON-NLS-1$
-	env.setOutputFolder(p3, "bin"); //$NON-NLS-1$
-
-	IPath test = env.addClass(root3, "pack.test", "Test", //$NON-NLS-1$ //$NON-NLS-2$
-			"package pack.test;\n" +
-			"import pack.lib.SuperClass;\n" +
-			"public class Test extends SuperClass {/*empty*/}\n"
-		);
-
-	// for Project1
-	env.addRequiredProject(p2, p1);
-	env.addRequiredProject(p3, p2);
-	env.waitForManualRefresh();
-	fullBuild();
-	env.waitForAutoBuild();
-	expectingOnlySpecificProblemsFor(p3, new Problem[]{
-			new Problem("p3",
-				"The project was not built since its build path is incomplete. Cannot find the class file for pack.missing.MissingType. Fix the build path then try building this project",
-				p3, -1, -1, CategorizedProblem.CAT_BUILDPATH, IMarker.SEVERITY_ERROR),
-			new Problem("p3",
-				"The type pack.missing.MissingType cannot be resolved. It is indirectly referenced from required type pack.lib.SuperClass",
-				test, 0, 1, CategorizedProblem.CAT_BUILDPATH, IMarker.SEVERITY_ERROR),
-	});
-	env.setBuildOrder(null);
-	env.removeProject(p1);
-	env.removeProject(p2);
-	env.removeProject(p3);
-}
 //https://bugs.eclipse.org/bugs/show_bug.cgi?id=461074, "indirectly referenced from required .class files" error for unreachable reference of type in overriding method declaration in a library on classpath
 public void test461074_error_1_8() throws JavaModelException {
 	// as of https://github.com/eclipse-jdt/eclipse.jdt.core/pull/2543 and at 1.8+ we tolerate the missing type

org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericsRegressionTest_9.java

@@ -1583,6 +1583,21 @@ private record W2<T>(W1<T> t) {}
 			"""
 	});
 }
+public void testGH4498() {
+	runConformTest(new String[] {
+			"AFactory.java",
+			"""
+			public abstract class AFactory<T> {
+
+			  public <U extends AFactory> U getProcess(Object object) {
+			    return getProcess(object.getClass()); // Type mismatch: cannot convert from AFactory<capture#2-of ?> to U
+			  }
+
+			  public abstract <U extends AFactory<?>> U getProcess(Class<?> classeObject);
+
+			}
+			"""});
+}
 public static Class<GenericsRegressionTest_9> testClass() {
 	return GenericsRegressionTest_9.class;
 }