ECJ accepts illegal modifiers in classic instanceof expression (#1080)

* Fix ECJ's incorrect behavior in accepting illegal modifiers in classic instanceof expression * Fix DocumentElementParser's violation of stack discipline. * Improve error message coordinates Fixes #1076
eclipse-jdt · Jun 8, 2023 · 3d72ef7 · 3d72ef7
1 parent b1cb266
commit 3d72ef7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Parser.java b/org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/parser/Parser.java
@@ -4605,8 +4605,11 @@ protected void consumeInstanceOfExpression() {
  				new InstanceOfExpression(
  					this.expressionStack[this.expressionPtr],
  					typeRef);
-		this.intPtr--; // skip modifierSourceStart
-		this.intPtr--; // lose the fake modifier if any
+		int anyModifiersourceStart = this.intStack[this.intPtr--];
+		int anyModifiers =  this.intStack[this.intPtr--];
+		if (anyModifiers != 0) {
+			problemReporter().illegalModifiers(anyModifiersourceStart, typeRef.sourceEnd);
+		}
 	}
 
 	if (exp.sourceEnd == 0) {

diff --git a/...iler/src/org/eclipse/jdt/core/tests/compiler/regression/InstanceofPrimaryPatternTest.java b/...iler/src/org/eclipse/jdt/core/tests/compiler/regression/InstanceofPrimaryPatternTest.java
@@ -278,4 +278,25 @@ public void test009() {
 			"s1 cannot be resolved to a variable\n" +
 			"----------\n");
 	}
+	// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1076
+	// ECJ accepts invalid Java code instanceof final Type
+	public void testGH1076() {
+		runNegativeTest(
+			new String[] {
+				"X.java",
+				"class Test {\n" +
+				"    void check() {\n" +
+				"        Number n = Integer.valueOf(1);\n" +
+				"        if (n instanceof final Integer) {}\n" +
+				"        if (n instanceof final Integer x) {}\n" +
+				"    }\n" +
+				"}\n",
+			},
+			"----------\n" +
+			"1. ERROR in X.java (at line 4)\n" +
+			"	if (n instanceof final Integer) {}\n" +
+			"	                 ^^^^^^^^^^^^^\n" +
+			"Syntax error, modifiers are not allowed here\n" +
+			"----------\n");
+	}
 }
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/DocumentElementParser.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/compiler/DocumentElementParser.java
@@ -806,13 +806,13 @@ protected void consumeFormalParameter(boolean isVarArgs) {
 }
 @Override
 protected void consumeInstanceOfExpression() {
-	super.consumeInstanceOfExpression();
 	this.intPtr--; // skip declarationSourceStart of modifiers
+	super.consumeInstanceOfExpression();
 }
 @Override
 protected void consumeInstanceOfExpressionWithName() {
-	super.consumeInstanceOfExpressionWithName();
 	this.intPtr--; // skip declarationSourceStart of modifiers
+	super.consumeInstanceOfExpressionWithName();
 }
 /*
  *