From d3abf01c3e8236d37ec369429e17f35afeb7ab88 Mon Sep 17 00:00:00 2001 From: Volker Simonis Date: Wed, 1 Jan 2025 17:20:27 +0000 Subject: [PATCH] 8346101: [JVMCI] Export jdk.internal.misc to jdk.graal.compiler Reviewed-by: dnsimon, phh --- src/java.base/share/classes/module-info.java | 3 ++- src/jdk.graal.compiler/share/classes/module-info.java | 4 ++-- test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/java.base/share/classes/module-info.java b/src/java.base/share/classes/module-info.java index 614842e064c5e..2904f66573211 100644 --- a/src/java.base/share/classes/module-info.java +++ b/src/java.base/share/classes/module-info.java @@ -226,7 +226,8 @@ jdk.jshell, jdk.nio.mapmode, jdk.unsupported, - jdk.internal.vm.ci; + jdk.internal.vm.ci, + jdk.graal.compiler; exports jdk.internal.module to java.instrument, java.management.rmi, diff --git a/src/jdk.graal.compiler/share/classes/module-info.java b/src/jdk.graal.compiler/share/classes/module-info.java index bc8987ee919f1..f2bc1ae9842e3 100644 --- a/src/jdk.graal.compiler/share/classes/module-info.java +++ b/src/jdk.graal.compiler/share/classes/module-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2024, 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 @@ -30,7 +30,7 @@ * external implementation of a JVMCI compiler. It must be upgradeable so * that it can be replaced when jlinking a new JDK image without failing * the hash check for the qualified exports in jdk.internal.vm.ci's - * module descriptor. + * and java.base's module descriptors. * * @moduleGraph * @since 22 diff --git a/test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java b/test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java index 4718e10e8629d..551e3792fc236 100644 --- a/test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java +++ b/test/jdk/jdk/modules/etc/JdkQualifiedExportTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2024, 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 @@ -74,7 +74,8 @@ static void check(ModuleDescriptor md) { "jdk.internal.vm.ci/jdk.vm.ci.hotspot", "jdk.internal.vm.ci/jdk.vm.ci.meta", "jdk.internal.vm.ci/jdk.vm.ci.code", - "java.base/jdk.internal.javac"); + "java.base/jdk.internal.javac", + "java.base/jdk.internal.misc"); static void checkExports(ModuleDescriptor md) { // build a map of upgradeable module to Exports that are qualified to it