stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: erikj, ihse, kvn, alanb, mli
This commit is contained in:
Doug Simon 2023-10-23 13:15:31 +00:00
parent c2efd77412
commit bd22d2381f
10 changed files with 26 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/common/Modules.gmk
View File

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

4
make/conf/module-loader-map.conf
View File

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

14
src/java.base/share/lib/security/default.policy
View File

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

6
src/jdk.internal.vm.compiler.management/share/classes/module-info.java → src/jdk.graal.compiler.management/share/classes/module-info.java
View File

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

6
src/jdk.internal.vm.compiler/share/classes/module-info.java → src/jdk.graal.compiler/share/classes/module-info.java
View File

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

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

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

1
test/hotspot/jtreg/compiler/jvmci/compilerToVM/IsCompilableTest.java
View File

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

9
test/jdk/java/lang/Class/getDeclaredField/FieldSetAccessibleTest.java
View File

@ -311,12 +311,11 @@ public class FieldSetAccessibleTest {
Set<String> 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<String> filters = mods.stream().flatMap(mn -> findDeps(mn, inverseDeps).stream())
.collect(Collectors.toSet());
System.out.println("Filtered modules: " + filters);

4
test/jdk/jdk/modules/etc/UpgradeableModules.java
View File

@ -44,8 +44,8 @@ import java.util.stream.Collectors;
public class UpgradeableModules {
private static final List<String> 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) {

4
test/jdk/tools/jimage/VerifyJimage.java
View File

@ -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<String> EXCLUDED_MODULES = Set.of("jdk.internal.vm.compiler");
// 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);