Merge branch 'eclipse-jdt:master' into master

Author: carstenartur

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

@@ -264,7 +264,7 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
 		}
 		manageEnclosingInstanceAccessIfNecessary(currentScope, flowInfo);
 		updateMaxFieldCount(); // propagate down the max field count
-		internalAnalyseCode(flowContext, flowInfo.unconditionalFieldLessCopy()); // discards info about fields of enclosing classes
+		internalAnalyseCode(flowContext, flowInfo);
 	} catch (AbortType e) {
 		this.ignoreFurtherInvestigation = true;
 	}
@@ -300,7 +300,7 @@ public void analyseCode(ClassScope currentScope, FlowContext flowContext, FlowIn
 		}
 		manageEnclosingInstanceAccessIfNecessary(currentScope, flowInfo);
 		updateMaxFieldCount(); // propagate down the max field count
-		internalAnalyseCode(flowContext, flowInfo.unconditionalFieldLessCopy()); // discards info about fields of enclosing classes
+		internalAnalyseCode(flowContext, flowInfo);
 	} catch (AbortType e) {
 		this.ignoreFurtherInvestigation = true;
 	}
@@ -744,8 +744,8 @@ private void internalAnalyseCode(FlowContext flowContext, FlowInfo flowInfo) {
 	InitializationFlowContext initializerContext = new InitializationFlowContext(parentContext, this, flowInfo, flowContext, this.initializerScope);
 	// no static initializer in local classes, thus no need to set parent:
 	InitializationFlowContext staticInitializerContext = new InitializationFlowContext(null, this, flowInfo, flowContext, this.staticInitializerScope);
-	FlowInfo nonStaticFieldInfo = flowInfo.copy();
-	FlowInfo staticFieldInfo = flowInfo.copy();
+	FlowInfo nonStaticFieldInfo = flowInfo.unconditionalFieldLessCopy();	// discards info about fields of inclosing classes
+	FlowInfo staticFieldInfo = flowInfo.unconditionalFieldLessCopy();
 
 	if (JavaFeature.FLEXIBLE_CONSTRUCTOR_BODIES.isSupported(this.scope.compilerOptions())) {
 		if (this.methods != null) {
@@ -755,7 +755,7 @@ private void internalAnalyseCode(FlowContext flowContext, FlowInfo flowInfo) {
 			for (int i=0; i<this.methods.length; i++) {
 				AbstractMethodDeclaration method = this.methods[i];
 				if (method.isConstructor()) {
-					FlowInfo ctorInfo = flowInfo.copy();
+					FlowInfo ctorInfo = flowInfo.unconditionalFieldLessCopy();
 					ConstructorDeclaration constructor = (ConstructorDeclaration) method;
 					constructor.analyseCode(this.scope, initializerContext, ctorInfo, ctorInfo.reachMode(), AnalysisMode.PROLOGUE);
 					ctorInfo = constructor.getPrologueInfo();
@@ -856,7 +856,7 @@ private void internalAnalyseCode(FlowContext flowContext, FlowInfo flowInfo) {
 		}
 	}
 	if (this.methods != null) {
-		FlowInfo outerInfo = flowInfo.copy();
+		UnconditionalFlowInfo outerInfo = flowInfo.unconditionalFieldLessCopy();
 		if (nonStaticFieldInfo instanceof UnconditionalDualFlowInfo udfi) {
 			nonStaticFieldInfo = udfi.getMainInits(); // drop info from prologues
 		} else if (nonStaticFieldInfo instanceof DualFlowInfo dfi) {

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

@@ -307,7 +307,9 @@ public void initializeBounds(Scope scope, ParameterizedTypeBinding capturedParam
 		if(scope.environment().usesNullTypeAnnotations()) {
 			evaluateNullAnnotations(scope, null);
 		}
-		this.compatibleCache = null; // any checks during initialization may have produced bogus results, get rid of them now
+		if (this.compatibleCache != null) {
+			this.compatibleCache.clear(); // any checks during initialization may have produced bogus results, get rid of them now
+		}
 	}
 
 	@Override

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

@@ -2034,6 +2034,46 @@ interface MyCallable<U, F extends Exception> extends Callable<U> {
 	});
 }
 
+// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/4864
+// Cannot infer type arguments with ecj 3.44.0 but not with 3.43.0
+public void testIssue4864() {
+	runConformTest(new String[] {
+			"X.java",
+			"""
+			import java.util.Locale;
+
+			public class X {
+
+				interface TypeConverter<T> {
+					T convert(String s) throws Exception;
+				}
+
+				class EnumConverter<E extends Enum<E>> implements TypeConverter<E> {
+					private Class<E> clazz;
+
+					EnumConverter(Class<E> clazz) {
+						this.clazz = clazz;
+					}
+
+					@Override
+					public E convert(String s) {
+						return valueOf(clazz, s);
+					}
+
+					<T extends Enum<T>> T valueOf(Class<T> enumType, String name) {
+						return Enum.valueOf(enumType, name.toUpperCase(Locale.ENGLISH));
+					}
+				}
+
+				TypeConverter<?> findCompatibleConverter(Class<?> clazz) {
+					EnumConverter<? extends Enum> converter = new EnumConverter<>(clazz.asSubclass(Enum.class));
+					return converter;
+				}
+			}
+			"""
+	});
+}
+
 public static Class<GenericsRegressionTest_9> testClass() {
 	return GenericsRegressionTest_9.class;
 }

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

@@ -669,6 +669,34 @@ public class Test {
 			"""
 	});
 }
+public void testGH4865() {
+	runConformTest(new String[] {
+			"Foo.java",
+			"""
+			import java.util.Comparator;
+			public class Foo {
+				private final String greeting;
+
+				public Foo() {
+					this.greeting = "Hello";
+
+					Comparator<String> comp = new Comparator<String>() {
+
+						{
+							System.out.println(greeting);
+						}
+
+						@Override
+						public int compare(String o1, String o2) {
+							System.out.println(greeting);
+							return o1.compareTo(o2);
+						}
+					};
+				}
+			}
+			"""
+	});
+}
 public static Class testClass() {
 	return InitializationTests.class;
 }