rename jdk.compiler.graal to jdk.graal.compiler

Author: dougxc

make/common/Modules.gmk

@@ -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.internal.vm.compiler
-  MODULES_FILTER += jdk.internal.vm.compiler.management
+  MODULES_FILTER += jdk.graal.compiler
+  MODULES_FILTER += jdk.graal.compiler.management
   MODULES_FILTER += jdk.compiler.graal
   MODULES_FILTER += jdk.compiler.graal.management
 endif

make/conf/module-loader-map.conf

@@ -60,8 +60,8 @@ BOOT_MODULES= \
 # should carefully be considered if it should be upgradeable or not.
 UPGRADEABLE_PLATFORM_MODULES= \
     java.compiler \
-    jdk.internal.vm.compiler \
-    jdk.internal.vm.compiler.management \
+    jdk.graal.compiler \
+    jdk.graal.compiler.management \
     jdk.compiler.graal \
     jdk.compiler.graal.management \
     #

src/java.base/share/lib/security/default.policy

@@ -167,6 +167,10 @@ grant codeBase "jrt:/jdk.internal.vm.compiler" {
     permission java.security.AllPermission;
 };
 
+grant codeBase "jrt:/jdk.graal.compiler" {
+    permission java.security.AllPermission;
+};
+
 grant codeBase "jrt:/jdk.compiler.graal" {
     permission java.security.AllPermission;
 };

src/jdk.internal.vm.compiler.management/share/classes/module-info.java renamed to src/jdk.graal.compiler.management/share/classes/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -33,9 +33,9 @@
  * module descriptor.
  *
  * @moduleGraph
- * @since 10
+ * @since 22
  */
-module jdk.internal.vm.compiler.management {
+module jdk.graal.compiler.management {
     requires jdk.internal.vm.ci;
 }
 

src/jdk.internal.vm.compiler/share/classes/module-info.java renamed to src/jdk.graal.compiler/share/classes/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -33,9 +33,9 @@
   * module descriptor.
   *
   * @moduleGraph
-  * @since 9
+  * @since 22
   */
 
-module jdk.internal.vm.compiler {
+module jdk.graal.compiler {
     requires jdk.internal.vm.ci;
 }

src/jdk.internal.vm.ci/share/classes/module-info.java

@@ -25,18 +25,18 @@
 
 module jdk.internal.vm.ci {
     exports jdk.vm.ci.services to
-        jdk.internal.vm.compiler,
-        jdk.internal.vm.compiler.management,
+        jdk.graal.compiler,
+        jdk.graal.compiler.management,
         jdk.compiler.graal,
         jdk.compiler.graal.management;
     exports jdk.vm.ci.runtime to
-        jdk.internal.vm.compiler,
-        jdk.internal.vm.compiler.management,
+        jdk.graal.compiler,
+        jdk.graal.compiler.management,
         jdk.compiler.graal,
         jdk.compiler.graal.management;
-    exports jdk.vm.ci.meta to jdk.internal.vm.compiler, jdk.compiler.graal;
-    exports jdk.vm.ci.code to jdk.internal.vm.compiler, jdk.compiler.graal;
-    exports jdk.vm.ci.hotspot to jdk.internal.vm.compiler, jdk.compiler.graal;
+    exports jdk.vm.ci.meta to jdk.graal.compiler, jdk.compiler.graal;
+    exports jdk.vm.ci.code to jdk.graal.compiler, jdk.compiler.graal;
+    exports jdk.vm.ci.hotspot to jdk.graal.compiler, jdk.compiler.graal;
 
     uses jdk.vm.ci.services.JVMCIServiceLocator;
     uses jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;

test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java

@@ -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

test/jdk/jdk/modules/etc/UpgradeableModules.java

@@ -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) {

test/jdk/tools/jimage/VerifyJimage.java

@@ -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);