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
194 lines
6.9 KiB
Java
194 lines
6.9 KiB
Java
/*
|
|
* Copyright (c) 2023, 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 8308590
|
|
* @summary Test basic modeling for value classes
|
|
* @library /tools/lib /tools/javac/lib
|
|
* @modules
|
|
* jdk.compiler/com.sun.tools.javac.api
|
|
* jdk.compiler/com.sun.tools.javac.main
|
|
* @build toolbox.ToolBox toolbox.JavacTask JavacTestingAbstractProcessor
|
|
* @run main TestValueClasses
|
|
*/
|
|
|
|
import java.io.*;
|
|
import java.nio.file.Files;
|
|
import java.nio.file.Path;
|
|
import java.nio.file.Paths;
|
|
import java.util.*;
|
|
|
|
import javax.annotation.processing.*;
|
|
import javax.lang.model.*;
|
|
import javax.lang.model.element.*;
|
|
import javax.lang.model.type.*;
|
|
import javax.lang.model.util.*;
|
|
import java.time.*;
|
|
|
|
import toolbox.JavacTask;
|
|
import toolbox.Task;
|
|
import toolbox.Task.Mode;
|
|
import toolbox.Task.OutputKind;
|
|
import toolbox.TestRunner;
|
|
import toolbox.ToolBox;
|
|
|
|
public class TestValueClasses extends TestRunner {
|
|
|
|
protected ToolBox tb;
|
|
|
|
TestValueClasses() {
|
|
super(System.err);
|
|
tb = new ToolBox();
|
|
}
|
|
|
|
public static void main(String... args) throws Exception {
|
|
new TestValueClasses().runTests();
|
|
}
|
|
|
|
/**
|
|
* Run all methods annotated with @Test, and throw an exception if any
|
|
* errors are reported..
|
|
*
|
|
* @throws Exception if any errors occurred
|
|
*/
|
|
protected void runTests() throws Exception {
|
|
runTests(m -> new Object[] { Paths.get(m.getName()) });
|
|
}
|
|
|
|
Path[] findJavaFiles(Path... paths) throws IOException {
|
|
return tb.findJavaFiles(paths);
|
|
}
|
|
|
|
void checkOutputContains(String log, String... expect) throws Exception {
|
|
for (String e : expect) {
|
|
if (!log.contains(e)) {
|
|
throw new Exception("expected output not found: " + e);
|
|
}
|
|
}
|
|
}
|
|
|
|
@Test
|
|
public void testValueClassesProcessor(Path base) throws Exception {
|
|
Path src = base.resolve("src");
|
|
Path r = src.resolve("Test");
|
|
|
|
Path classes = base.resolve("classes");
|
|
|
|
Files.createDirectories(classes);
|
|
|
|
tb.writeJavaFiles(r,
|
|
"""
|
|
interface Interface {}
|
|
|
|
value class ValueClass {}
|
|
|
|
class IdentityClass {}
|
|
|
|
value record ValueRecord() {}
|
|
"""
|
|
);
|
|
|
|
List<String> expected = List.of(
|
|
"- compiler.note.proc.messager: visiting: Interface Modifiers: [abstract]",
|
|
"- compiler.note.proc.messager: visiting: ValueClass Modifiers: [final, value]",
|
|
"- compiler.note.proc.messager: constructor modifiers: []",
|
|
"- compiler.note.proc.messager: visiting: IdentityClass Modifiers: []",
|
|
"- compiler.note.proc.messager: constructor modifiers: []",
|
|
"- compiler.note.proc.messager: visiting: ValueRecord Modifiers: [final, value]",
|
|
"- compiler.note.proc.messager: constructor modifiers: []",
|
|
"- compiler.note.preview.filename: Interface.java, DEFAULT",
|
|
"- compiler.note.preview.recompile"
|
|
);
|
|
|
|
for (Mode mode : new Mode[] {Mode.API}) {
|
|
List<String> log = new JavacTask(tb, mode)
|
|
.options("--enable-preview", "-source", String.valueOf(Runtime.version().feature()), "-processor", ValueClassesProcessor.class.getName(),
|
|
"-XDrawDiagnostics")
|
|
.files(findJavaFiles(src))
|
|
.outdir(classes)
|
|
.run()
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
System.out.println("log:" +log);
|
|
|
|
if (!expected.equals(log)) {
|
|
if (expected.size() == log.size()) {
|
|
for (int i = 0; i < expected.size(); i++) {
|
|
if (!expected.get(i).equals(log.get(i))) {
|
|
System.err.println("failing at line " + (i + 1));
|
|
System.err.println(" expecting " + expected.get(i));
|
|
System.err.println(" found " + log.get(i));
|
|
}
|
|
}
|
|
} else {
|
|
System.err.println("expected and log lists differ in length");
|
|
}
|
|
throw new AssertionError("Unexpected output: " + log);
|
|
}
|
|
}
|
|
}
|
|
|
|
public static final class ValueClassesProcessor extends JavacTestingAbstractProcessor {
|
|
|
|
@Override
|
|
public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
|
|
if (!roundEnv.processingOver()) {
|
|
Messager messager = processingEnv.getMessager();
|
|
ElementScanner scanner = new ValueClassesScanner(messager);
|
|
for(Element rootElement : roundEnv.getRootElements()) {
|
|
scanner.visit(rootElement);
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
class ValueClassesScanner extends ElementScanner<Void, Void> {
|
|
|
|
Messager messager;
|
|
|
|
public ValueClassesScanner(Messager messager) {
|
|
this.messager = messager;
|
|
}
|
|
|
|
@Override
|
|
public Void visitType(TypeElement element, Void p) {
|
|
messager.printNote("visiting: " + element.getSimpleName() + " Modifiers: " + element.getModifiers());
|
|
List<? extends Element> enclosedElements = element.getEnclosedElements();
|
|
for (Element elem : enclosedElements) {
|
|
System.out.println("visiting " + elem.getSimpleName());
|
|
switch (elem.getSimpleName().toString()) {
|
|
case "<init>":
|
|
messager.printNote(" constructor modifiers: " + elem.getModifiers());
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
return super.visitType(element, p);
|
|
}
|
|
}
|
|
}
|
|
}
|