Fix RecordPattern generation for standalone instanceof (#2016)

* Fix RecordPattern generation for standalone instanceof * Fixes #1804 * Fixes #1985 Signed-off-by: David Thompson <[email protected]> Co-authored-by: Srikanth Sankaran <[email protected]>
eclipse-jdt · Feb 14, 2024 · d0c6a4d · d0c6a4d
1 parent 663ddf1
commit d0c6a4d
Show file tree

Hide file tree

Showing 2 changed files with 276 additions and 10 deletions.
diff --git a/...t.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/InstanceOfExpression.java b/...t.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/ast/InstanceOfExpression.java
@@ -116,22 +116,30 @@ public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean
 		codeStream.addVariable(this.secretExpressionValue);
 	}
 	codeStream.instance_of(this.type, this.type.resolvedType);
-	if (this.elementVariable != null) {
-		BranchLabel actionLabel = new BranchLabel(codeStream);
-		codeStream.dup();
-		codeStream.ifeq(actionLabel);
+	if (this.pattern != null) {
+		BranchLabel falseLabel = new BranchLabel(codeStream);
+		BranchLabel trueLabel = new BranchLabel(codeStream);
+		BranchLabel continueLabel = new BranchLabel(codeStream);
+		codeStream.ifeq(falseLabel);
+
 		if (this.secretExpressionValue != null) {
 			codeStream.load(this.secretExpressionValue);
 			codeStream.removeVariable(this.secretExpressionValue);
 		} else {
 			this.expression.generateCode(currentScope, codeStream, true);
 		}
-		codeStream.checkcast(this.type, this.type.resolvedType, codeStream.position);
-		this.elementVariable.binding.recordInitializationStartPC(codeStream.position);
-		codeStream.store(this.elementVariable.binding, false);
-		codeStream.removeVariable(this.elementVariable.binding);
-		codeStream.recordPositionsFrom(codeStream.position, this.sourceEnd);
-		actionLabel.place();
+		this.pattern.generateOptimizedBoolean(currentScope, codeStream, trueLabel, falseLabel);
+
+		trueLabel.place();
+		codeStream.iconst_1();
+		codeStream.goto_(continueLabel);
+		falseLabel.place();
+		for (LocalVariableBinding binding : this.pattern.bindingsWhenTrue()) {
+			binding.recordInitializationEndPC(codeStream.position);
+		}
+		codeStream.iconst_0();
+		continueLabel.place();
+
 	}
 	if (valueRequired) {
 		codeStream.generateImplicitConversion(this.implicitConversion);

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
@@ -4096,6 +4096,7 @@ public static void main(String[] args) {
 				+ "110\n"
 				+ "220");
 	}
+
 	// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1804
 	// Revisit code generation for record patterns
 	public void testIssue1804() {
@@ -4129,4 +4130,261 @@ case Box(Paper a) -> {
 				},
 				"true");
 	}
+	public void testIssue1804_0() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a) {}
+					public static void main(String[] args) {
+						Box<?> b = new Box<>(null);
+						boolean res = b instanceof Box(Paper a);
+						if (res) {
+							System.out.println("res is true");
+						} else {
+							System.out.println("res is false");
+						}
+					}
+				}
+				""" }, "res is false");
+	}
+	public void testIssue1804_1() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a) {}
+					public static void main(String[] args) {
+						Box<?> b = new Box<>(new Paper(0));
+						boolean res = b instanceof Box(Paper a);
+						if (res) {
+							System.out.println("res is true");
+						} else {
+							System.out.println("res is false");
+						}
+					}
+				}
+				""" }, "res is true");
+	}
+	public void testIssue1804_2() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a) {}
+					public static void main(String[] args) {
+						Box<?> b = new Box<>(new Paper(0));
+						boolean res = b instanceof Box(Paper a) && a == null;
+						if (res) {
+							System.out.println("res is true");
+						} else {
+							System.out.println("res is false");
+						}
+					}
+				}
+				""" }, "res is false");
+	}
+	public void testIssue1804_3() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a) {}
+					public static void main(String[] args) {
+						Box b = new Box<>(null);
+						System.out.println(b instanceof Box(Paper a));
+						System.out.println(b instanceof Box(Object a));
+					}
+				}
+				""" }, "false\ntrue");
+	}
+	public void testIssue1804_4() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a) {}
+					public static void main(String argv[]) {
+						foo(null, null);
+					}
+					public static void foo(String abc, String def) {
+						Box<?> p = new Box<>(new Paper(0));
+						boolean b = false;
+						switch (p) {
+							case Box(Paper a) -> {
+								b = true;
+								break;
+							}
+							default -> {
+								b = false;
+								break;
+							}
+						}
+						System.out.println(b);
+					}
+				}
+				""" }, "true");
+	}
+	public void testIssue1804_5() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a) {}
+					public static void main(String argv[]) {
+						foo(null, null);
+					}
+					public static void foo(String abc, String def) {
+						Box<?> p = new Box<>(null);
+						boolean b = false;
+						switch (p) {
+							case Box(Paper a) -> {
+								b = true;
+								break;
+							}
+							default -> {
+								b = false;
+								break;
+							}
+						}
+						System.out.println(b);
+					}
+				}
+				""" }, "false");
+	}
+	public void testIssue1804_6() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a, T b) {}
+					public static void main(String argv[]) {
+						foo(null, null);
+					}
+					public static void foo(String abc, String def) {
+						Box<?> p = new Box<>(new Paper(0), new Paper(1));
+						boolean c = false;
+						switch (p) {
+							case Box(Paper a, Paper b) -> {
+								System.out.println(a.color);
+								System.out.println(b.color);
+								c = true;
+								break;
+							}
+							default -> {
+								c = false;
+								break;
+							}
+						}
+						System.out.println(c);
+					}
+				}
+				""" }, "0\n1\ntrue");
+	}
+	public void testIssue1804_7() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a) {}
+					public static void main(String[] args) {
+						Box<?> b = new Box<>(new Paper(0));
+						boolean res = b instanceof Box box;
+						if (res) {
+							System.out.println("res is true");
+						} else {
+							System.out.println("res is false");
+						}
+					}
+				}
+				""" }, "res is true");
+	}
+	public void testIssue1804_8() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a) {}
+					public static void main(String[] args) {
+						Box<?> b = new Box<>(new Paper(0));
+						boolean res = b instanceof Box(Paper paper) && paper.color != 0;
+						if (res) {
+							System.out.println("res is true");
+						} else {
+							System.out.println("res is false");
+						}
+					}
+				}
+				""" }, "res is false");
+	}
+	public void testIssue1804_9() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a) {}
+					public static void main(String[] args) {
+						boolean res = new Box<>(new Paper(0)) instanceof Box(Paper(int c));
+						if (res) {
+							System.out.println("res is true");
+						} else {
+							System.out.println("res is false");
+						}
+					}
+				}
+				""" }, "res is true");
+	}
+	public void testIssue1804_10() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+					record Paper(int color) {}
+					record Box<T>(T a) {}
+					public static void main(String[] args) {
+						boolean res = new Box<>(new Paper(0)) instanceof Box(Paper(int c)) && c == 0;
+						if (res) {
+							System.out.println("res is true");
+						} else {
+							System.out.println("res is false");
+						}
+					}
+				}
+				""" }, "res is true");
+	}
+	// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1985
+	// [Patterns][records] ECJ fails to generate code to deconstruct record in pattern
+	public void testIssue1985() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+
+					record R(int x) {
+						public int x() {
+							return 100 / this.x;
+						}
+					}
+
+					public static void main(String[] args) {
+						try {
+							boolean b = new R(0) instanceof R(int i);
+						} catch (Throwable t) {
+							System.out.println(t.getClass().getName());
+						}
+					}
+				}
+				""" },
+				"java.lang.MatchException");
+	}
+	// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1985
+	// [Patterns][records] ECJ fails to generate code to deconstruct record in pattern
+	public void testIssue1985_2() {
+		runConformTest(new String[] { "X.java", """
+				public class X {
+
+					boolean b = new R(0) instanceof R(int i);
+					record R(int x) {
+						public int x() {
+							return 100 / this.x;
+						}
+					}
+
+					public static void main(String[] args) {
+				            try {
+				        	new X();
+				            } catch (Throwable t) {
+				        	System.out.println(t.getClass().getName());
+				            }
+					}
+				}
+				""" },
+				"java.lang.MatchException");
+	}
 }