Fix failing tests

eclipse-jdt · Nov 6, 2023 · b22e502 · b22e502
1 parent b938177
commit b22e502
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...ore.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java b/...ore.compiler.batch/src/org/eclipse/jdt/internal/compiler/lookup/CompilationUnitScope.java
@@ -768,6 +768,8 @@ ImportBinding[] getDefaultImports() {
 	ReferenceBinding templateSTR;
 	ImportBinding[] allImports = null;
 	if (this.environment.globalOptions.complianceLevel >= ClassFileConstants.JDK21) {
+		boolean old = this.environment.globalOptions.isAnnotationBasedNullAnalysisEnabled;
+		this.environment.globalOptions.isAnnotationBasedNullAnalysisEnabled = false;
 		templateSTR = (ReferenceBinding) ((PackageBinding) importBinding).getTypeOrPackage(TypeConstants.JAVA_LANG_STRING_TEMPLATE_STR[2], module(), false);
 		if (templateSTR != null) {
 			FieldBinding str = templateSTR.getField("STR".toCharArray(), true); //$NON-NLS-1$
@@ -780,6 +782,7 @@ public boolean isStatic() {
 			allImports = new ImportBinding[] {
 					new ImportBinding(TypeConstants.JAVA_LANG, true, importBinding, null), ibinding};
 		}
+		this.environment.globalOptions.isAnnotationBasedNullAnalysisEnabled = old;
 	}
 	if (allImports == null){
 		allImports = new ImportBinding[] {new ImportBinding(TypeConstants.JAVA_LANG, true, importBinding, null)};

diff --git a/....core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/DietRecoveryTest.java b/....core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/parser/DietRecoveryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2020 IBM Corporation and others.
+ * Copyright (c) 2000, 2023 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -8183,7 +8183,7 @@ public void test405778a() {
 		"  void m(String[] names) {\n" +
 		"    for (String string : names) \n" +
 		"      {\n" +
-		"        System.out.println(string.class);\n" +
+		"        System.out.println(string.\"\");\n" +
 		"      }\n" +
 		"  }\n" +
 		"}\n";