* Guarded patterns are incorrectly held to be unconditional

* Fixes #2053
eclipse-jdt · Mar 5, 2024 · 76cbf02 · 76cbf02
1 parent 7c77997
commit 76cbf02
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 11 deletions.
diff --git a/...pse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/GuardedPattern.java b/...pse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/GuardedPattern.java
@@ -57,13 +57,12 @@ public FlowInfo analyseCode(BlockScope currentScope, FlowContext flowContext, Fl
 	@Override
 	public void generateCode(BlockScope currentScope, CodeStream codeStream, BranchLabel trueLabel, BranchLabel falseLabel) {
 		this.primaryPattern.generateCode(currentScope, codeStream, trueLabel, falseLabel);
-		Constant cst =  this.condition.optimizedBooleanConstant();
 		this.condition.generateOptimizedBoolean(
 				currentScope,
 				codeStream,
 				trueLabel,
 				null,
-				cst == Constant.NotAConstant);
+				true);
 	}
 
 	@Override
@@ -73,8 +72,11 @@ public boolean matchFailurePossible() {
 
 	@Override
 	public boolean isAlwaysTrue() {
-		Constant cst = this.condition.optimizedBooleanConstant();
-		return cst != Constant.NotAConstant && cst.booleanValue() == true;
+		if (this.primaryPattern.isAlwaysTrue()) {
+			Constant cst = this.condition.optimizedBooleanConstant();
+			return cst != Constant.NotAConstant && cst.booleanValue() == true;
+		}
+		return false;
 	}
 
 	@Override

diff --git a/....tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/RecordPatternTest.java b/....tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/RecordPatternTest.java
@@ -2544,7 +2544,7 @@ public void testIssue1224_5() {
 			"PASS");
 	}
 	public void testIssue1224_6() {
-		runNegativeTest(new String[] {
+		runConformTest(new String[] {
 			"X.java",
 			"record Record(String s){}\n"
 			+ "public class X {\n"
@@ -2563,12 +2563,7 @@ public void testIssue1224_6() {
 			+ "	}\n"
 			+ "}"
 			},
-				"----------\n" +
-				"1. ERROR in X.java (at line 7)\n" +
-				"	default -> {}        }\n" +
-				"	^^^^^^^\n" +
-				"Switch case cannot have both unconditional pattern and default label\n" +
-				"----------\n");
+				"PASS");
 	}
 	public void testIssue1224_7() {
 		runConformTest(new String[] {

diff --git a/....tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/SwitchPatternTest.java b/....tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/SwitchPatternTest.java
@@ -7504,5 +7504,76 @@ public static void main(String argv[]) {
 			},
 		 "OK!");
 	}
+	// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/2053
+	// ECJ rejects guarded pattern in switch as being dominated by prior cases
+	public void testIssue2053() throws Exception {
+		runConformTest(
+			new String[] {
+				"X.java",
+				"""
+				interface I {}
+
+				record R (I i, I  j) {}
+
+				class A implements I {}
+				class B implements I {}
+
+				public class X {
 
+					static int swtch(Object o) {
+						return switch (o) {
+							case R(A a1, A a2) when true -> 1;
+							case R(B b1, B b2) when o != null -> 2;
+							case Object obj -> 3;
+						};
+					}
+					public static void main(String argv[]) {
+						Object o = new R(new A(), new A());
+						System.out.print(swtch(o));
+						o = new R(new B(), new B());
+						System.out.print(swtch(o));
+						o = new R(new I() {}, new I() {});
+						System.out.println(swtch(o));
+					}
+				}
+				"""
+			},
+		 "123");
+	}
+	// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/2053
+	// ECJ rejects guarded pattern in switch as being dominated by prior cases
+	public void testIssue2053_2() throws Exception {
+		runConformTest(
+			new String[] {
+				"X.java",
+				"""
+				interface I {}
+
+				record R (I i, I  j) {}
+
+				class A implements I {}
+				class B implements I {}
+
+				public class X {
+
+					static int swtch(Object o) {
+						return switch (o) {
+							case R(A a1, A a2) when true -> 1;
+							case R(B b1, B b2) when o == null -> 2;
+							case Object obj -> 3;
+						};
+					}
+					public static void main(String argv[]) {
+						Object o = new R(new A(), new A());
+						System.out.print(swtch(o));
+						o = new R(new B(), new B());
+						System.out.print(swtch(o));
+						o = new R(new I() {}, new I() {});
+						System.out.println(swtch(o));
+					}
+				}
+				"""
+			},
+		 "133");
+	}
 }