Skip to content

8318027: Support alternative name to jdk.internal.vm.compiler #16189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

8318027: Support alternative name to jdk.internal.vm.compiler #16189

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b72956
rename jdk.internal.vm.compiler* to jdk.compiler.graal*
dougxc Oct 13, 2023
cc0474b
fix copyright dates and @since tags to reflect history
dougxc Oct 20, 2023
193e22a
re-fix since tags to reflect current JDK release
dougxc Oct 20, 2023
210c9bd
rename jdk.compiler.graal to jdk.graal.compiler
dougxc Oct 21, 2023
3014f40
Merge tag 'jdk-22+18' into JDK-8318027_rename
dougxc Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions make/common/Modules.gmk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ endif
# Filter out jvmci specific modules if jvmci is disabled
ifeq ($(INCLUDE_JVMCI), false)
MODULES_FILTER += jdk.internal.vm.ci
MODULES_FILTER += jdk.compiler.graal
MODULES_FILTER += jdk.compiler.graal.management
MODULES_FILTER += jdk.graal.compiler
MODULES_FILTER += jdk.graal.compiler.management
endif

# jpackage is only on windows, macosx, and linux
Expand Down
4 changes: 2 additions & 2 deletions make/conf/module-loader-map.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ BOOT_MODULES= \
# should carefully be considered if it should be upgradeable or not.
UPGRADEABLE_PLATFORM_MODULES= \
java.compiler \
jdk.compiler.graal \
jdk.compiler.graal.management \
jdk.graal.compiler \
jdk.graal.compiler.management \
#

PLATFORM_MODULES= \
Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/lib/security/default.policy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ grant codeBase "jrt:/jdk.internal.le" {
permission java.security.AllPermission;
};

grant codeBase "jrt:/jdk.compiler.graal" {
grant codeBase "jrt:/jdk.graal.compiler" {
permission java.security.AllPermission;
};

Expand Down
2 changes: 1 addition & 1 deletion ...management/share/classes/module-info.java → ...management/share/classes/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* @moduleGraph
* @since 22
*/
module jdk.compiler.graal.management {
module jdk.graal.compiler.management {
requires jdk.internal.vm.ci;
}

2 changes: 1 addition & 1 deletion ...iler.graal/share/classes/module-info.java → ...l.compiler/share/classes/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@
* @since 22
*/

module jdk.compiler.graal {
module jdk.graal.compiler {
requires jdk.internal.vm.ci;
}
14 changes: 7 additions & 7 deletions src/jdk.internal.vm.ci/share/classes/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@

module jdk.internal.vm.ci {
exports jdk.vm.ci.services to
jdk.compiler.graal,
jdk.compiler.graal.management;
jdk.graal.compiler,
jdk.graal.compiler.management;
exports jdk.vm.ci.runtime to
jdk.compiler.graal,
jdk.compiler.graal.management;
exports jdk.vm.ci.meta to jdk.compiler.graal;
exports jdk.vm.ci.code to jdk.compiler.graal;
exports jdk.vm.ci.hotspot to jdk.compiler.graal;
jdk.graal.compiler,
jdk.graal.compiler.management;
exports jdk.vm.ci.meta to jdk.graal.compiler;
exports jdk.vm.ci.code to jdk.graal.compiler;
exports jdk.vm.ci.hotspot to jdk.graal.compiler;

uses jdk.vm.ci.services.JVMCIServiceLocator;
uses jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;
Expand Down
2 changes: 1 addition & 1 deletion test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ static Set<String> systemModules() {
Set<String> mods = Set.of(
// All JVMCI packages other than jdk.vm.ci.services are dynamically
// exported to Graal
"jdk.compiler.graal", "jdk.compiler.graal.management"
"jdk.graal.compiler", "jdk.graal.compiler.management"
);
// Filters all modules that directly or indirectly require Graal modules
// as these are upgradeable and also provide APIs to add qualified exports dynamically
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/jdk/modules/etc/UpgradeableModules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
public class UpgradeableModules {
private static final List<String> UPGRADEABLE_MODULES =
List.of("java.compiler",
"jdk.compiler.graal",
"jdk.compiler.graal.management");
"jdk.graal.compiler",
"jdk.graal.compiler.management");


public static void main(String... args) {
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/tools/jimage/VerifyJimage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ private String toClassName(String entry) {
}

// All JVMCI packages other than jdk.vm.ci.services are dynamically
// exported to jdk.compiler.graal
private static Set<String> EXCLUDED_MODULES = Set.of("jdk.compiler.graal");
// exported to jdk.graal.compiler
private static Set<String> EXCLUDED_MODULES = Set.of("jdk.graal.compiler");

private boolean accept(String entry) {
int index = entry.indexOf('/', 1);
Expand Down