From 2bd99e00d242d7c1a2943a55f47b56de12d1a7dc Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Mon, 7 Jul 2025 12:08:03 +0100 Subject: [PATCH 1/2] Initial push --- .../com/sun/tools/javac/comp/Attr.java | 4 +- .../ObjectEarlyContext/java/lang/Object.java | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+), 2 deletions(-) create mode 100644 test/langtools/tools/javac/ObjectEarlyContext/java/lang/Object.java diff --git a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java index 8819acbe67ee3..2b829b7cfaec7 100644 --- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java @@ -1236,8 +1236,8 @@ public void visitMethodDef(JCMethodDecl tree) { annotate.queueScanTreeAndTypeAnnotate(tree.body, localEnv, m, null); annotate.flush(); - // Start of constructor prologue - localEnv.info.ctorPrologue = isConstructor; + // Start of constructor prologue (if not in java.lang.Object constructor) + localEnv.info.ctorPrologue = isConstructor && owner.type != syms.objectType; // Attribute method body. attribStat(tree.body, localEnv); diff --git a/test/langtools/tools/javac/ObjectEarlyContext/java/lang/Object.java b/test/langtools/tools/javac/ObjectEarlyContext/java/lang/Object.java new file mode 100644 index 0000000000000..c4be32405a36b --- /dev/null +++ b/test/langtools/tools/javac/ObjectEarlyContext/java/lang/Object.java @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8361481 + * @summary Flexible Constructor Bodies generates a compilation error when compiling a user supplied java.lang.Object class + * @compile -source 8 Object.java + */ + +package java.lang; + +public class Object { + int x; + + public Object() { + x = 2; + } +} From 4189ba17a9e4d4edb469dcdba60345ad7b58a2cb Mon Sep 17 00:00:00 2001 From: Maurizio Cimadamore Date: Mon, 7 Jul 2025 16:12:20 +0100 Subject: [PATCH 2/2] Tweak test to work with latest source version --- .../javac/ObjectEarlyContext/T8361481.java | 57 +++++++++++++++++++ .../{ => x}/java/lang/Object.java | 13 +---- 2 files changed, 60 insertions(+), 10 deletions(-) create mode 100644 test/langtools/tools/javac/ObjectEarlyContext/T8361481.java rename test/langtools/tools/javac/ObjectEarlyContext/{ => x}/java/lang/Object.java (83%) diff --git a/test/langtools/tools/javac/ObjectEarlyContext/T8361481.java b/test/langtools/tools/javac/ObjectEarlyContext/T8361481.java new file mode 100644 index 0000000000000..16eb11ee44983 --- /dev/null +++ b/test/langtools/tools/javac/ObjectEarlyContext/T8361481.java @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + + + +/* + * @test + * @bug 8361481 + * @modules jdk.compiler + * @summary Flexible Constructor Bodies generates a compilation error when compiling a user supplied java.lang.Object class + */ + +import java.io.*; +import java.util.*; + +public class T8361481 { + static String testSrc = System.getProperty("test.src", "."); + + public static void main(String... args) throws Exception { + new T8361481().run(); + } + + public void run() throws Exception { + // compile modified Object.java, using patch-module to avoid errors + File x = new File(testSrc, "x"); + String[] jcArgs = { "-d", ".", "--patch-module", "java.base=" + x.getAbsolutePath(), + new File(new File(new File(x, "java"), "lang"), "Object.java").getPath()}; + compile(jcArgs); + } + + void compile(String... args) { + int rc = com.sun.tools.javac.Main.compile(args); + if (rc != 0) + throw new Error("javac failed: " + Arrays.asList(args) + ": " + rc); + } +} + diff --git a/test/langtools/tools/javac/ObjectEarlyContext/java/lang/Object.java b/test/langtools/tools/javac/ObjectEarlyContext/x/java/lang/Object.java similarity index 83% rename from test/langtools/tools/javac/ObjectEarlyContext/java/lang/Object.java rename to test/langtools/tools/javac/ObjectEarlyContext/x/java/lang/Object.java index c4be32405a36b..0a68e1cccb6cc 100644 --- a/test/langtools/tools/javac/ObjectEarlyContext/java/lang/Object.java +++ b/test/langtools/tools/javac/ObjectEarlyContext/x/java/lang/Object.java @@ -21,19 +21,12 @@ * questions. */ -/* - * @test - * @bug 8361481 - * @summary Flexible Constructor Bodies generates a compilation error when compiling a user supplied java.lang.Object class - * @compile -source 8 Object.java - */ - package java.lang; public class Object { - int x; - public Object() { - x = 2; + foo(); // valid, not in early constructor context } + + void foo() { } }