mirror of
https://github.com/openjdk/jdk.git
synced 2026-08-04 07:05:31 +00:00
8389220: Implement JEP 539: Strict Field Initialization in the JVM (Preview) Co-authored-by: David Simms <dsimms@openjdk.org> Co-authored-by: Dan Smith <dlsmith@openjdk.org> Co-authored-by: Frederic Parain <fparain@openjdk.org> Co-authored-by: Tobias Hartmann <thartmann@openjdk.org> Co-authored-by: Roger Riggs <rriggs@openjdk.org> Co-authored-by: Vicente Romero <vromero@openjdk.org> Co-authored-by: Axel Boldt-Christmas <aboldtch@openjdk.org> Co-authored-by: Karen Kinnear <acorn@openjdk.org> Co-authored-by: Alex Menkov <amenkov@openjdk.org> Co-authored-by: Bill Huang <bhuang@openjdk.org> Co-authored-by: Benoît Maillard <bmaillard@openjdk.org> Co-authored-by: Christian Hagedorn <chagedorn@openjdk.org> Co-authored-by: Chris Plummer <cjplummer@openjdk.org> Co-authored-by: Casper Norrbin <cnorrbin@openjdk.org> Co-authored-by: Coleen Phillimore <coleenp@openjdk.org> Co-authored-by: David Beaumont <dbeaumont@openjdk.org> Co-authored-by: Daniel D. Daugherty <dcubed@openjdk.org> Co-authored-by: Damon Fenacci <dfenacci@openjdk.org> Co-authored-by: David Holmes <dholmes@openjdk.org> Co-authored-by: Dmitry Samersoff <dsamersoff@openjdk.org> Co-authored-by: Eric Caspole <ecaspole@openjdk.org> Co-authored-by: Evgeny Nikitin <enikitin@openjdk.org> Co-authored-by: Ekaterina Pavlova <epavlova@openjdk.org> Co-authored-by: Fei Yang <fyang@openjdk.org> Co-authored-by: Dan Heidinga <heidinga@openjdk.org> Co-authored-by: Harold Seigel <hseigel@openjdk.org> Co-authored-by: Ioi Lam <iklam@openjdk.org> Co-authored-by: Ivan Walulya <iwalulya@openjdk.org> Co-authored-by: Jatin Bhateja <jbhateja@openjdk.org> Co-authored-by: Jan Lahoda <jlahoda@openjdk.org> Co-authored-by: Jim Laskey <jlaskey@openjdk.org> Co-authored-by: John R Rose <jrose@openjdk.org> Co-authored-by: Joel Sikström <jsikstro@openjdk.org> Co-authored-by: Lois Foltan <lfoltan@openjdk.org> Co-authored-by: Chen Liang <liach@openjdk.org> Co-authored-by: Leonid Mesnik <lmesnik@openjdk.org> Co-authored-by: Matias Saavedra Silva <matsaave@openjdk.org> Co-authored-by: Marc Chevalier <mchevalier@openjdk.org> Co-authored-by: Mandy Chung <mchung@openjdk.org> Co-authored-by: Maurizio Cimadamore <mcimadamore@openjdk.org> Co-authored-by: Markus Grönlund <mgronlun@openjdk.org> Co-authored-by: Manuel Hässig <mhaessig@openjdk.org> Co-authored-by: Nick Gasson <ngasson@openjdk.org> Co-authored-by: Patricio Chilano Mateo <pchilanomate@openjdk.org> Co-authored-by: Paul Hübner <phubner@openjdk.org> Co-authored-by: Paul Sandoz <psandoz@openjdk.org> Co-authored-by: Quan Anh Mai <qamai@openjdk.org> Co-authored-by: Roberto Castañeda Lozano <rcastanedalo@openjdk.org> Co-authored-by: Roland Westrelin <roland@openjdk.org> Co-authored-by: Srikanth Adayapalam <sadayapalam@openjdk.org> Co-authored-by: Aleksey Shipilev <shade@openjdk.org> Co-authored-by: Stefan Johansson <sjohanss@openjdk.org> Co-authored-by: Sergey Kuksenko <skuksenko@openjdk.org> Co-authored-by: Serguei Spitsyn <sspitsyn@openjdk.org> Co-authored-by: Stefan Karlsson <stefank@openjdk.org> Co-authored-by: Thomas Stuefe <stuefe@openjdk.org> Co-authored-by: Thomas Schatzl <tschatzl@openjdk.org> Co-authored-by: Zoltan Majo <zmajo@openjdk.org> Co-authored-by: Alan Bateman <alanb@openjdk.org> Co-authored-by: Jaikiran Pai <jpai@openjdk.org> Co-authored-by: Martin Doerr <mdoerr@openjdk.org> Co-authored-by: Richard Reingruber <rrich@openjdk.org> Co-authored-by: Feilong Jiang <fjiang@openjdk.org> Co-authored-by: Daisuke Yamazaki <dyama@openjdk.org> Reviewed-by: mcimadamore, liach, darcy, dcubed, aboldtch, coleenp, iklam, jlahoda, dlong, jpai, vklang, heidinga, sspitsyn, cjplummer
161 lines
6.5 KiB
Java
161 lines
6.5 KiB
Java
/*
|
|
* Copyright (c) 2024, 2026, 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 8335770 8375740
|
|
* @summary improve javap code coverage for value classes
|
|
* @enablePreview
|
|
* @library /tools/lib
|
|
* @modules jdk.jdeps/com.sun.tools.javap
|
|
* @build toolbox.ToolBox toolbox.JavapTask
|
|
* @run main ValueClassesJavapTest
|
|
*/
|
|
|
|
import java.nio.file.*;
|
|
import java.util.*;
|
|
|
|
import toolbox.JavapTask;
|
|
import toolbox.TestRunner;
|
|
import toolbox.ToolBox;
|
|
import toolbox.Task;
|
|
|
|
public class ValueClassesJavapTest extends TestRunner {
|
|
ToolBox tb = new ToolBox();
|
|
|
|
abstract value class AbstractValueClass {}
|
|
value class ValueClass {}
|
|
class IdentityClass {
|
|
ValueClass val;
|
|
}
|
|
class IdentityClass2 {
|
|
void m(ValueClass param) {}
|
|
}
|
|
|
|
private static final List<String> expectedValueClassOutput = List.of(
|
|
"Compiled from \"ValueClassesJavapTest.java\"",
|
|
"final value class ValueClassesJavapTest$ValueClass {",
|
|
" ValueClassesJavapTest$ValueClass(ValueClassesJavapTest);",
|
|
"}");
|
|
private static final List<String> expectedAbstractValueClassOutput = List.of(
|
|
"Compiled from \"ValueClassesJavapTest.java\"",
|
|
"abstract value class ValueClassesJavapTest$AbstractValueClass {",
|
|
" ValueClassesJavapTest$AbstractValueClass(ValueClassesJavapTest);",
|
|
"}");
|
|
private static final List<String> expectedLoadableDescriptorOutput = List.of(
|
|
"LoadableDescriptors:",
|
|
" LValueClassesJavapTest$ValueClass;"
|
|
);
|
|
private static final List<String> expectedIdentityClassOutput = """
|
|
Compiled from "ValueClassesJavapTest.java"
|
|
class ValueClassesJavapTest$IdentityClass {
|
|
ValueClassesJavapTest$ValueClass val;
|
|
ValueClassesJavapTest$IdentityClass(ValueClassesJavapTest);
|
|
}
|
|
""".lines().toList();
|
|
private static final List<String> expectedIdentityClass2Output = """
|
|
Compiled from "ValueClassesJavapTest.java"
|
|
class ValueClassesJavapTest$IdentityClass2 {
|
|
ValueClassesJavapTest$IdentityClass2(ValueClassesJavapTest);
|
|
void m(ValueClassesJavapTest$ValueClass);
|
|
}
|
|
""".lines().toList();
|
|
|
|
ValueClassesJavapTest() throws Exception {
|
|
super(System.err);
|
|
}
|
|
|
|
public static void main(String... args) throws Exception {
|
|
ValueClassesJavapTest tester = new ValueClassesJavapTest();
|
|
tester.runTests();
|
|
}
|
|
|
|
protected void runTests() throws Exception {
|
|
runTests(m -> new Object[] { Paths.get(m.getName()) });
|
|
}
|
|
|
|
@Test
|
|
public void testMain(Path base) throws Exception {
|
|
Path testClassesPath = Paths.get(System.getProperty("test.classes"));
|
|
List<String> output = new JavapTask(tb)
|
|
.options("-p", testClassesPath.resolve(this.getClass().getSimpleName() + "$ValueClass.class").toString())
|
|
.run()
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
System.out.println(output);
|
|
if (!output.equals(expectedValueClassOutput)) {
|
|
throw new AssertionError(String.format("unexpected output:\n %s", output));
|
|
}
|
|
|
|
output = new JavapTask(tb)
|
|
.options("-p", testClassesPath.resolve(this.getClass().getSimpleName() + "$AbstractValueClass.class").toString())
|
|
.run()
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
System.out.println(output);
|
|
if (!output.equals(expectedAbstractValueClassOutput)) {
|
|
throw new AssertionError(String.format("unexpected output:\n %s", output));
|
|
}
|
|
|
|
output = new JavapTask(tb)
|
|
.options("-p", testClassesPath.resolve(this.getClass().getSimpleName() + "$IdentityClass.class").toString())
|
|
.run()
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
System.out.println(output);
|
|
if (!output.equals(expectedIdentityClassOutput)) {
|
|
throw new AssertionError(String.format("unexpected output:\n %s", output));
|
|
}
|
|
|
|
output = new JavapTask(tb)
|
|
.options("-p", "-v", testClassesPath.resolve(this.getClass().getSimpleName() + "$IdentityClass.class").toString())
|
|
.run()
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
System.out.println(output);
|
|
if (!output.containsAll(expectedLoadableDescriptorOutput)) {
|
|
throw new AssertionError(String.format("unexpected output:\n %s", output));
|
|
}
|
|
|
|
output = new JavapTask(tb)
|
|
.options("-p", testClassesPath.resolve(this.getClass().getSimpleName() + "$IdentityClass2.class").toString())
|
|
.run()
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
System.out.println(output);
|
|
if (!output.equals(expectedIdentityClass2Output)) {
|
|
throw new AssertionError(String.format("unexpected output:\n %s", output));
|
|
}
|
|
|
|
output = new JavapTask(tb)
|
|
.options("-p", "-v", testClassesPath.resolve(this.getClass().getSimpleName() + "$IdentityClass2.class").toString())
|
|
.run()
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
System.out.println(output);
|
|
if (!output.containsAll(expectedLoadableDescriptorOutput)) {
|
|
throw new AssertionError(String.format("unexpected output:\n %s", output));
|
|
}
|
|
}
|
|
}
|