Skip to content

Commit

Permalink
8318027: Support alternative name to jdk.internal.vm.compiler
Browse files Browse the repository at this point in the history
Reviewed-by: erikj, ihse, kvn, alanb, mli
  • Loading branch information
Doug Simon committed Oct 23, 2023
1 parent c2efd77 commit bd22d23
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 40 deletions.
4 changes: 2 additions & 2 deletions make/common/Modules.gmk
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.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
Expand Down
4 changes: 2 additions & 2 deletions make/conf/module-loader-map.conf
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.internal.vm.compiler \
jdk.internal.vm.compiler.management \
jdk.graal.compiler \
jdk.graal.compiler.management \
#

PLATFORM_MODULES= \
Expand Down
14 changes: 1 addition & 13 deletions src/java.base/share/lib/security/default.policy
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
}

Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 changes: 7 additions & 7 deletions src/jdk.internal.vm.ci/share/classes/module-info.java
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.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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -311,12 +311,11 @@ static Set<String> systemModules() {

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);
Expand Down
4 changes: 2 additions & 2 deletions test/jdk/jdk/modules/etc/UpgradeableModules.java
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.internal.vm.compiler",
"jdk.internal.vm.compiler.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
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.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);
Expand Down

1 comment on commit bd22d23

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.