+ fix position computation in dereferencingNullableExpression()

stephan-herrmann · Jan 16, 2025 · a6171cb · a6171cb
1 parent 7ddead3
commit a6171cb
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/...dt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java b/...dt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
@@ -11248,7 +11248,7 @@ public void dereferencingNullableExpression(long positions, LookupEnvironment en
 	char[][] nullableName = env.getNullableAnnotationName();
 	char[] nullableShort = nullableName[nullableName.length-1];
 	String[] arguments = { String.valueOf(nullableShort) };
-	this.handle(IProblem.DereferencingNullableExpression, arguments, arguments, (int)(positions>>>32), (int)(positions&0xFFFF));
+	this.handle(IProblem.DereferencingNullableExpression, arguments, arguments, (int)(positions>>>32), (int)(positions));
 }
 public void onlyReferenceTypesInIntersectionCast(TypeReference typeReference) {
 	this.handle(

diff --git a/...s.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java b/...s.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java
@@ -19455,4 +19455,31 @@ public enum MyEnum {
 		};
 	runner.runConformTest();
 }
+public void testTemp() {
+	StringBuilder padding = new StringBuilder();
+	// push the relevant source to a position beyond 0xFFFF to trigger bug in position computation
+	for (int i=0; i<1000; i++)
+		padding.append("// ============================== padding ================================\n");
+	runNegativeTestWithLibs(new String[]{
+			"X.java",
+			padding.toString() +
+			"""
+			import org.eclipse.jdt.annotation.*;
+			class X {
+				@Nullable String s;
+				String test() {
+					return this.s.toLowerCase();
+				}
+			}
+			"""
+		},
+		"""
+		----------
+		1. ERROR in X.java (at line 1005)
+			return this.s.toLowerCase();
+			            ^
+		Potential null pointer access: this expression has a '@Nullable' type
+		----------
+		""");
+}
 }