diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index 0eb0fb2ddc1..bcbb6d1bab1 100644 --- a/make/common/Modules.gmk +++ b/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 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 index cc7e7d5a652..ca09d23b02b 100644 --- a/make/conf/module-loader-map.conf +++ b/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 \ # PLATFORM_MODULES= \ diff --git a/src/java.base/share/lib/security/default.policy b/src/java.base/share/lib/security/default.policy index 33774adce08..aa67bd6b53e 100644 --- a/src/java.base/share/lib/security/default.policy +++ b/src/java.base/share/lib/security/default.policy @@ -163,22 +163,10 @@ 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.internal.vm.compiler.management" { - permission java.lang.RuntimePermission "accessClassInPackage.jdk.internal.vm.compiler.collections"; - permission java.lang.RuntimePermission "accessClassInPackage.jdk.vm.ci.runtime"; - permission java.lang.RuntimePermission "accessClassInPackage.jdk.vm.ci.services"; - permission java.lang.RuntimePermission "accessClassInPackage.org.graalvm.compiler.core.common"; - permission java.lang.RuntimePermission "accessClassInPackage.org.graalvm.compiler.debug"; - permission java.lang.RuntimePermission "accessClassInPackage.org.graalvm.compiler.hotspot"; - permission java.lang.RuntimePermission "accessClassInPackage.org.graalvm.compiler.options"; - permission java.lang.RuntimePermission "accessClassInPackage.org.graalvm.compiler.phases.common.jmx"; - permission java.lang.RuntimePermission "accessClassInPackage.org.graalvm.compiler.serviceprovider"; -}; - grant codeBase "jrt:/jdk.jsobject" { permission java.security.AllPermission; }; diff --git a/src/jdk.internal.vm.compiler.management/share/classes/module-info.java b/src/jdk.graal.compiler.management/share/classes/module-info.java similarity index 92% rename from src/jdk.internal.vm.compiler.management/share/classes/module-info.java rename to src/jdk.graal.compiler.management/share/classes/module-info.java index 88a5d933fca..976bf369819 100644 --- a/src/jdk.internal.vm.compiler.management/share/classes/module-info.java +++ b/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; } diff --git a/src/jdk.internal.vm.compiler/share/classes/module-info.java b/src/jdk.graal.compiler/share/classes/module-info.java similarity index 93% rename from src/jdk.internal.vm.compiler/share/classes/module-info.java rename to src/jdk.graal.compiler/share/classes/module-info.java index 7284f2f225d..bc8987ee919 100644 --- a/src/jdk.internal.vm.compiler/share/classes/module-info.java +++ b/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; } diff --git a/src/jdk.internal.vm.ci/share/classes/module-info.java b/src/jdk.internal.vm.ci/share/classes/module-info.java index b4b93f6a747..14f97412b3d 100644 --- a/src/jdk.internal.vm.ci/share/classes/module-info.java +++ b/src/jdk.internal.vm.ci/share/classes/module-info.java @@ -25,14 +25,14 @@ 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; exports jdk.vm.ci.runtime to - jdk.internal.vm.compiler, - jdk.internal.vm.compiler.management; - exports jdk.vm.ci.meta to jdk.internal.vm.compiler; - exports jdk.vm.ci.code to jdk.internal.vm.compiler; - exports jdk.vm.ci.hotspot to jdk.internal.vm.compiler; + 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; diff --git a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java index 8f645f6ed97..fdcf72f6548 100644 --- a/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java +++ b/test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java @@ -27,7 +27,6 @@ * @requires vm.graal.enabled & vm.compMode == "Xmixed" * @library /test/lib / * @library ../common/patches - * @modules jdk.internal.vm.compiler * @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.org.objectweb.asm * java.base/jdk.internal.org.objectweb.asm.tree diff --git a/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java b/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java index 624b287b0bf..ede0bfcb9e1 100644 --- a/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java +++ b/test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java @@ -311,12 +311,11 @@ public class FieldSetAccessibleTest { Set mods = Set.of( // All JVMCI packages other than jdk.vm.ci.services are dynamically - // exported to jdk.internal.vm.compiler - "jdk.internal.vm.compiler", "jdk.internal.vm.compiler.management" + // exported to Graal + "jdk.graal.compiler", "jdk.graal.compiler.management" ); - // Filters all modules that directly or indirectly require jdk.internal.vm.compiler - // and jdk.internal.vm.compiler.management, as these are upgradeable and - // also provide APIs to add qualified exports dynamically + // Filters all modules that directly or indirectly require Graal modules + // as these are upgradeable and also provide APIs to add qualified exports dynamically Set filters = mods.stream().flatMap(mn -> findDeps(mn, inverseDeps).stream()) .collect(Collectors.toSet()); System.out.println("Filtered modules: " + filters); diff --git a/test/jdk/jdk/modules/etc/UpgradeableModules.java b/test/jdk/jdk/modules/etc/UpgradeableModules.java index 59ff5aa6b23..3616c6b6d4d 100644 --- a/test/jdk/jdk/modules/etc/UpgradeableModules.java +++ b/test/jdk/jdk/modules/etc/UpgradeableModules.java @@ -44,8 +44,8 @@ import java.util.stream.Collectors; public class UpgradeableModules { private static final List UPGRADEABLE_MODULES = List.of("java.compiler", - "jdk.internal.vm.compiler", - "jdk.internal.vm.compiler.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 index 59d0a5cecf4..6da0e719950 100644 --- a/test/jdk/tools/jimage/VerifyJimage.java +++ b/test/jdk/tools/jimage/VerifyJimage.java @@ -196,8 +196,8 @@ public class VerifyJimage { } // All JVMCI packages other than jdk.vm.ci.services are dynamically - // exported to jdk.internal.vm.compiler - private static Set EXCLUDED_MODULES = Set.of("jdk.internal.vm.compiler"); + // exported to jdk.graal.compiler + private static Set EXCLUDED_MODULES = Set.of("jdk.graal.compiler"); private boolean accept(String entry) { int index = entry.indexOf('/', 1);