RFR: 8155571: [JVMCI] split jdk.vm.ci module into jdk.vm.ci and jdk.vm.ci.hotspot
Doug Simon
doug.simon at oracle.com
Wed May 4 23:43:31 UTC 2016
In light of the Services.exportJVMCITo method being proposed in http://cr.openjdk.java.net/~dnsimon/8155023, how do you want to handle security checks and dynamically exporting packages in the jdk.vm.ci.hotspot module to JVMCI client modules?
-Doug
> https://bugs.openjdk.java.net/browse/JDK-8155571
> http://cr.openjdk.java.net/~twisti/8155571/webrev.01/
>
> Read the JIRA entry why we need this change. Most changes are moving files around and fixing up tests.
>
> Top-level changes:
>
> diff -r e51a92f0f1ac make/CompileJavaModules.gmk
> --- a/make/CompileJavaModules.gmk Tue Apr 19 15:26:51 2016 -0400
> +++ b/make/CompileJavaModules.gmk Wed May 04 09:45:13 2016 -1000
> @@ -483,11 +483,11 @@ MODULESOURCEPATH := $(call GetModuleSrcP
> # Add imported modules to the modulepath
> MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES))
>
> -ifeq ($(MODULE), jdk.vm.ci)
> - ## WORKAROUND jdk.vm.ci source structure issue
> +## WORKAROUND jdk.vm.ci source structure
> +ifneq ($(filter $(MODULE), jdk.vm.ci jdk.vm.ci.hotspot), )
> JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
> - $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
> - $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src)))
> + $(subst src/$(MODULE)/,src/*/, $(filter-out %processor/src, \
> + $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
> MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
> endif
>
> diff -r e51a92f0f1ac make/common/Modules.gmk
> --- a/make/common/Modules.gmk Tue Apr 19 15:26:51 2016 -0400
> +++ b/make/common/Modules.gmk Wed May 04 09:45:13 2016 -1000
> @@ -68,6 +68,7 @@ BOOT_MODULES += \
> jdk.security.jgss \
> jdk.unsupported \
> jdk.vm.ci \
> + jdk.vm.ci.hotspot \
> #
>
> # to be deprivileged
>
>
> jdk/ changes:
>
> diff -r 909f38c3d339 src/java.base/share/classes/module-info.java
> --- a/src/java.base/share/classes/module-info.java Wed May 04 17:17:28 2016 +0300
> +++ b/src/java.base/share/classes/module-info.java Wed May 04 09:46:02 2016 -1000
> @@ -138,7 +138,7 @@ module java.base {
> exports jdk.internal.org.objectweb.asm to
> jdk.jlink,
> jdk.scripting.nashorn,
> - jdk.vm.ci;
> + jdk.vm.ci.hotspot;
> exports jdk.internal.org.objectweb.asm.tree to
> jdk.jlink;
> exports jdk.internal.org.objectweb.asm.util to
> @@ -173,7 +173,8 @@ module java.base {
> jdk.charsets,
> jdk.scripting.nashorn,
> jdk.unsupported,
> - jdk.vm.ci;
> + jdk.vm.ci,
> + jdk.vm.ci.hotspot;
> exports jdk.internal.perf to
> java.desktop,
> java.management,
>
More information about the hotspot-compiler-dev
mailing list