Internal Compiler Error when a static field with custom annotation references a generic type parameter T (#4773)

* Fixes #4768

Author: srikanth-sankaran

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

@@ -942,7 +942,7 @@ private VariableBinding resolveTypeFor(VariableBinding variable) {
 		return this.prototype.resolveTypeFor(variable);
 
 	if ((variable.modifiers & ExtraCompilerModifiers.AccUnresolved) == 0)
-		return variable;
+		return variable.type == null ? null : variable; // don't allow a prior resolution error to be masked.
 
 	MethodScope initializationScope = variable.isStatic()
 		? this.scope.referenceContext.staticInitializerScope

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

@@ -13440,4 +13440,47 @@ public void run() {
 		"1 problem (1 error)\n",
 		true);
 }
+// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/4768
+// Internal Compiler Error when a static field with custom annotation references a generic type parameter T
+public void testIssue4768(){
+	this.runNegativeTest(
+		new String[] {
+			"X.java",
+			"""
+			import java.lang.annotation.*;
+			@interface CompileTimeConstant {}
+
+			class FunctionPointerContainer<T> {
+			    @CompileTimeConstant
+			    public static final T VALUE = null;
+			}
+
+			public class X {
+			    public static void main(String[] args) {
+			        FunctionPointerContainer<Integer> nestedContainer = new FunctionPointerContainer<>();
+			        Integer value = nestedContainer.VALUE;
+			    }
+			}
+			""",
+		},
+
+		"\"" + OUTPUT_DIR +  File.separator + "X.java\""
+		+ " -sourcepath \"" + OUTPUT_DIR + "\""
+		+ " -nowarn -d \"" + OUTPUT_DIR + "\"",
+		"",
+		"----------\n" +
+		"1. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 6)\n" +
+		"	public static final T VALUE = null;\n" +
+		"	                    ^\n" +
+		"Cannot make a static reference to the non-static type T\n" +
+		"----------\n" +
+		"2. ERROR in ---OUTPUT_DIR_PLACEHOLDER---/X.java (at line 12)\n" +
+		"	Integer value = nestedContainer.VALUE;\n" +
+		"	                                ^^^^^\n" +
+		"VALUE cannot be resolved or is not a field\n" +
+		"----------\n" +
+		"2 problems (2 errors)\n",
+
+		true);
+}
 }