mirror of
https://github.com/openjdk/jdk.git
synced 2026-08-03 22:55:40 +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
129 lines
5.2 KiB
Java
129 lines
5.2 KiB
Java
/*
|
|
* Copyright (c) 2024, 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 8333748 8349536
|
|
* @summary javap should not fail if reserved access flag bits are set to 1
|
|
* @library /tools/lib
|
|
* @modules jdk.jdeps/com.sun.tools.javap
|
|
* @run junit UndefinedAccessFlagTest
|
|
*/
|
|
|
|
import org.junit.jupiter.params.ParameterizedTest;
|
|
import org.junit.jupiter.params.provider.EnumSource;
|
|
import toolbox.JavapTask;
|
|
import toolbox.Task;
|
|
import toolbox.ToolBox;
|
|
|
|
import java.lang.classfile.AccessFlags;
|
|
import java.lang.classfile.ClassModel;
|
|
import java.lang.classfile.FieldModel;
|
|
import java.lang.classfile.MethodModel;
|
|
import java.lang.classfile.attribute.InnerClassInfo;
|
|
import java.lang.classfile.attribute.InnerClassesAttribute;
|
|
import java.nio.file.Files;
|
|
import java.nio.file.Path;
|
|
|
|
import static java.lang.classfile.ClassFile.*;
|
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
|
|
|
public class UndefinedAccessFlagTest {
|
|
|
|
final ToolBox toolBox = new ToolBox();
|
|
|
|
enum TestLocation {
|
|
NONE(false), CLASS, FIELD, METHOD, INNER_CLASS(false);
|
|
|
|
final boolean fails;
|
|
TestLocation() { this(true); }
|
|
TestLocation(boolean fails) { this.fails = fails; }
|
|
}
|
|
|
|
@ParameterizedTest
|
|
@EnumSource(TestLocation.class)
|
|
void test(TestLocation location) throws Throwable {
|
|
var cf = of();
|
|
ClassModel cm;
|
|
try (var is = UndefinedAccessFlagTest.class.getResourceAsStream(
|
|
"/UndefinedAccessFlagTest$SampleInnerClass.class"
|
|
)) {
|
|
cm = cf.parse(is.readAllBytes());
|
|
}
|
|
var bytes = cf.transformClass(cm, (cb, ce) -> {
|
|
switch (ce) {
|
|
case AccessFlags flags when location == TestLocation.CLASS -> cb
|
|
.withFlags(flags.flagsMask() | ACC_PRIVATE);
|
|
case FieldModel f when location == TestLocation.FIELD -> cb
|
|
.transformField(f, (fb, fe) -> {
|
|
if (fe instanceof AccessFlags flags) {
|
|
fb.withFlags(flags.flagsMask() | ACC_SYNCHRONIZED);
|
|
} else {
|
|
fb.with(fe);
|
|
}
|
|
});
|
|
case MethodModel m when location == TestLocation.METHOD -> cb
|
|
.transformMethod(m, (mb, me) -> {
|
|
if (me instanceof AccessFlags flags) {
|
|
mb.withFlags(flags.flagsMask() | ACC_INTERFACE);
|
|
} else {
|
|
mb.with(me);
|
|
}
|
|
});
|
|
case InnerClassesAttribute attr when location == TestLocation.INNER_CLASS -> cb
|
|
.with(InnerClassesAttribute.of(attr.classes().stream()
|
|
.map(ic -> InnerClassInfo.of(ic.innerClass(), ic.outerClass(), ic.innerName(), ic.flagsMask() | 0x0050))
|
|
.toList()));
|
|
default -> cb.with(ce);
|
|
}
|
|
});
|
|
|
|
Files.write(Path.of("transformed.class"), bytes);
|
|
|
|
var lines = new JavapTask(toolBox)
|
|
.classes("transformed.class")
|
|
.options("-c", "-p", "-v")
|
|
.run(location.fails ? Task.Expect.FAIL : Task.Expect.SUCCESS)
|
|
.writeAll()
|
|
.getOutputLines(Task.OutputKind.DIRECT);
|
|
|
|
// No termination when access flag error happens
|
|
assertTrue(lines.stream().anyMatch(l -> l.contains("java.lang.String field;")));
|
|
assertTrue(lines.stream().anyMatch(l -> l.contains("UndefinedAccessFlagTest$SampleInnerClass();")));
|
|
assertTrue(lines.stream().anyMatch(l -> l.contains("void method();")));
|
|
assertTrue(lines.stream().anyMatch(l -> l.contains("SampleInnerClass=class UndefinedAccessFlagTest$SampleInnerClass of class UndefinedAccessFlagTest")));
|
|
|
|
// Remove non-error lines
|
|
assertTrue(lines.removeIf(st -> !st.startsWith("Error:")));
|
|
// Desired locations has errors
|
|
assertTrue(location == TestLocation.NONE || !lines.isEmpty());
|
|
// Access Flag errors only
|
|
assertTrue(lines.stream().allMatch(l -> l.contains("Access Flags:")), () -> String.join("\n", lines));
|
|
}
|
|
|
|
static class SampleInnerClass {
|
|
String field;
|
|
void method() {}
|
|
}
|
|
}
|