Record with exception in constructor results in invalid byte code

The following code results in generating instructions after an athrow byte code statement: record X(String s) { X { throw new RuntimeException(); } } This is due to CompactConstructorDeclaration.checkAndGenerateFieldAssignment() appending field assignments after the record constructor body. This change adjusts CompactConstructorDeclaration to not generate field assignments if the execution flow is unreachable or dead after adding the statements from the record constructor. This prevents generating code after an athrow statement in the byte code. Fixes: eclipse-jdt#487 Signed-off-by: Simeon Andreev <[email protected]>
iloveeclipse · Mar 30, 2023 · c9c2eb9 · c9c2eb9
1 parent b681dfb
commit c9c2eb9
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 1 deletion.
diff --git a/...mpiler.batch/src/org/eclipse/jdt/internal/compiler/ast/CompactConstructorDeclaration.java b/...mpiler.batch/src/org/eclipse/jdt/internal/compiler/ast/CompactConstructorDeclaration.java
@@ -76,7 +76,7 @@ protected void checkAndGenerateFieldAssignment(FlowContext flowContext, FlowInfo
 			assert flowInfo.isDefinitelyAssigned(field);
 			fieldAssignments.add(assignment);
 		}
-		if (fieldAssignments.isEmpty())
+		if (fieldAssignments.isEmpty() || (flowInfo.tagBits & FlowInfo.UNREACHABLE_OR_DEAD) != 0)
 			return;
 
 		Statement[] fa = fieldAssignments.toArray(new Statement[0]);

diff --git a/...mpiler/src/org/eclipse/jdt/core/tests/compiler/regression/RecordsRestrictedClassTest.java b/...mpiler/src/org/eclipse/jdt/core/tests/compiler/regression/RecordsRestrictedClassTest.java
@@ -9213,4 +9213,58 @@ public void testIssue365_001() throws Exception {
 	RecordsRestrictedClassTest.verifyClassFile(expectedOutput, "A.class", ClassFileBytesDisassembler.SYSTEM);
 
 }
+
+/**
+ * Test that the following code doesn't result in generating byte code after the throw statement:
+ * <pre>
+ * record X(String s) {
+ *    X {
+ *        throw new RuntimeException();
+ *    }
+ * }
+ * </pre>
+ */
+public void testRecordConstructorWithExceptionGh487() throws Exception {
+	getPossibleComplianceLevels();
+	runConformTest(
+			// test directory preparation
+			true /* should flush output directory */,
+			new String[] { /* test files */
+					"X.java",
+					"""
+					public record X(String s) {
+					    public X {
+					        throw new RuntimeException();
+					    }
+					    public static void main(String[] args) throws Exception {
+					        new X("");
+					    }
+					}
+					""",
+			},
+			// compiler results
+			"" /* expected compiler log */,
+			// runtime results
+			"" /* expected output string */,
+			"""
+			java.lang.RuntimeException
+				at X.<init>(X.java:3)
+				at X.main(X.java:6)
+			""" /* expected error string */,
+			// javac options
+			JavacTestOptions.forRelease("16"));
+	String expectedOutput = // constructor
+			"""
+			  // Method descriptor #8 (Ljava/lang/String;)V
+			  // Stack: 2, Locals: 2
+			  public X(java.lang.String s);
+			     0  aload_0 [this]
+			     1  invokespecial java.lang.Record() [10]
+			     4  new java.lang.RuntimeException [13]
+			     7  dup
+			     8  invokespecial java.lang.RuntimeException() [15]
+			    11  athrow
+			""";
+	RecordsRestrictedClassTest.verifyClassFile(expectedOutput, "X.class", ClassFileBytesDisassembler.SYSTEM);
+}
 }