[GR-49610] Rename jdk.compiler.graal to jdk.graal.compiler.

PullRequest: labsjdk-ce-21/35
graalvm · Oct 21, 2023 · b04c6ce · b04c6ce
2 parents 2466fc6 + be11f09
commit b04c6ce
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 27 deletions.
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -1,13 +1,13 @@
 # https://github.com/graalvm/labs-openjdk-21/blob/master/doc/testing.md
 local run_test_spec = "test/hotspot/jtreg/compiler/jvmci test/jdk/tools/jlink/plugins/SaveJlinkArgfilesPluginTest.java";
 
-local labsjdk_builder_version = "bcdc3fc82760543571fac7c1c35452dbb2ce6b9b";
+local labsjdk_builder_version = "181ae3a6077f9bf0a117cc34562c33e871cd4ede";
 
 # Returns true if `str` contains `needle` as a substring.
 local contains(str, needle) = std.findSubstr(needle, str) != [];
 
 {
-    overlay: "087852016f367deb24c7d893052ab48e04e698c1",
+    overlay: "616937561244a0b2c6ff8e001b11b4e304a85a8a",
     specVersion: "3",
 
     mxDependencies:: {
@@ -29,8 +29,7 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
             JIB_PATH: "${PATH}",
             MAKE : "make",
             ZLIB_BUNDLING: "system",
-            MX_PYTHON: "python3.8",
-            JVMCI_VERSION_CHECK: "ignore"
+            MX_PYTHON: "python3.8"
         },
     },
 
@@ -244,7 +243,7 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
     # Downstream Graal branch to test against. If you change this value to anything but
     # "master", you must create an ol-jira issue to change it back to master once the
     # next JVMCI release has been made. Add the issue id as a comment here.
-    local downstream_branch = "me/ignore_jvmci_vesion_check",
+    local downstream_branch = "cpu/graal-vm/23.1",
 
     local clone_graal(defs) = {
         # Checkout the graal-enterprise repo to the "_gate" version of the

diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
@@ -64,8 +64,8 @@ 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.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

diff --git a/make/conf/module-loader-map.conf b/make/conf/module-loader-map.conf
@@ -62,8 +62,8 @@ UPGRADEABLE_PLATFORM_MODULES= \
     java.compiler \
     jdk.internal.vm.compiler \
     jdk.internal.vm.compiler.management \
-    jdk.compiler.graal \
-    jdk.compiler.graal.management \
+    jdk.graal.compiler \
+    jdk.graal.compiler.management \
     #
 
 PLATFORM_MODULES= \

diff --git a/src/java.base/share/lib/security/default.policy b/src/java.base/share/lib/security/default.policy
@@ -172,11 +172,11 @@ grant codeBase "jrt:/jdk.internal.le" {
     permission java.security.AllPermission;
 };
 
-grant codeBase "jrt:/jdk.internal.vm.compiler" {
+grant codeBase "jrt:/jdk.graal.compiler" {
     permission java.security.AllPermission;
 };
 
-grant codeBase "jrt:/jdk.compiler.graal" {
+grant codeBase "jrt:/jdk.internal.vm.compiler" {
     permission java.security.AllPermission;
 };
 

diff --git a/...management/share/classes/module-info.java → ...management/share/classes/module-info.java b/...management/share/classes/module-info.java → ...management/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 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
@@ -35,7 +35,7 @@
  * @moduleGraph
  * @since 22
  */
-module jdk.compiler.graal.management {
+module jdk.graal.compiler.management {
     requires jdk.internal.vm.ci;
 }
 
diff --git a/...iler.graal/share/classes/module-info.java → ...l.compiler/share/classes/module-info.java b/...iler.graal/share/classes/module-info.java → ...l.compiler/share/classes/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023, 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
@@ -36,6 +36,6 @@
   * @since 22
   */
 
-module jdk.compiler.graal {
+module jdk.graal.compiler {
     requires jdk.internal.vm.ci;
 }
diff --git a/src/jdk.internal.vm.ci/share/classes/module-info.java b/src/jdk.internal.vm.ci/share/classes/module-info.java
@@ -27,16 +27,16 @@
     exports jdk.vm.ci.services to
         jdk.internal.vm.compiler,
         jdk.internal.vm.compiler.management,
-        jdk.compiler.graal,
-        jdk.compiler.graal.management;
+        jdk.graal.compiler,
+        jdk.graal.compiler.management;
     exports jdk.vm.ci.runtime to
         jdk.internal.vm.compiler,
         jdk.internal.vm.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;
+        jdk.graal.compiler,
+        jdk.graal.compiler.management;
+    exports jdk.vm.ci.meta to jdk.internal.vm.compiler, jdk.graal.compiler;
+    exports jdk.vm.ci.code to jdk.internal.vm.compiler, jdk.graal.compiler;
+    exports jdk.vm.ci.hotspot to jdk.internal.vm.compiler, jdk.graal.compiler;
 
     uses jdk.vm.ci.services.JVMCIServiceLocator;
     uses jdk.vm.ci.hotspot.HotSpotJVMCIBackendFactory;

diff --git a/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java b/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
@@ -313,7 +313,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

diff --git a/test/jdk/jdk/modules/etc/UpgradeableModules.java b/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) {

diff --git a/test/jdk/tools/jimage/VerifyJimage.java b/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);