<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class=""><a href="https://bugs.openjdk.java.net/browse/JDK-8155571" class="">https://bugs.openjdk.java.net/browse/JDK-8155571</a></div><div class=""><a href="http://cr.openjdk.java.net/~twisti/8155571/webrev.01/" class="">http://cr.openjdk.java.net/~twisti/8155571/webrev.01/</a></div><div class=""><br class=""></div>Read the JIRA entry why we need this change.  Most changes are moving files around and fixing up tests.<div class=""><br class=""></div><div class="">Top-level changes:</div><div class=""><br class=""></div><div class=""><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(45, 230, 33);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">diff -r e51a92f0f1ac make/CompileJavaModules.gmk</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(195, 55, 32);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">--- a/make/CompileJavaModules.gmk<span class="Apple-tab-span" style="white-space:pre">     </span>Tue Apr 19 15:26:51 2016 -0400</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+++ b/make/CompileJavaModules.gmk<span class="Apple-tab-span" style="white-space:pre">      </span>Wed May 04 09:45:13 2016 -1000</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 187, 199);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">@@ -483,11 +483,11 @@ MODULESOURCEPATH := $(call GetModuleSrcP</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> # Add imported modules to the modulepath</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> MODULEPATH := $(call PathList, $(IMPORT_MODULES_CLASSES))</span></div><p style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; min-height: 14px;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> </span><br class="webkit-block-placeholder"></p><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(195, 55, 32);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">-ifeq ($(MODULE), jdk.vm.ci)</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(195, 55, 32);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">-  ## WORKAROUND jdk.vm.ci source structure issue</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+## WORKAROUND jdk.vm.ci source structure</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+ifneq ($(filter $(MODULE), jdk.vm.ci jdk.vm.ci.hotspot), )</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">   JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(195, 55, 32);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">-      $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(195, 55, 32);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">-          $(wildcard $(HOTSPOT_TOPDIR)/src/jdk.vm.ci/share/classes/*/src)))</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+      $(subst src/$(MODULE)/,src/*/, $(filter-out %processor/src, \</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+          $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">   MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> endif</span></div><p style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; min-height: 14px;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> </span><br class="webkit-block-placeholder"></p><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(45, 230, 33);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">diff -r e51a92f0f1ac make/common/Modules.gmk</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(195, 55, 32);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">--- a/make/common/Modules.gmk<span class="Apple-tab-span" style="white-space:pre">     </span>Tue Apr 19 15:26:51 2016 -0400</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+++ b/make/common/Modules.gmk<span class="Apple-tab-span" style="white-space:pre">  </span>Wed May 04 09:45:13 2016 -1000</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 187, 199);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">@@ -68,6 +68,7 @@ BOOT_MODULES += \</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">     jdk.security.jgss \</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">     jdk.unsupported \</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">     jdk.vm.ci \</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+    jdk.vm.ci.hotspot \</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">     #</span></div><p style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; min-height: 14px;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> </span><br class="webkit-block-placeholder"></p><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class=""> # to be deprivileged</span></div></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><br class=""></span></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><br class=""></span></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class="">jdk/ changes:</span></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><br class=""></span></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(45, 230, 33);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">diff -r 909f38c3d339 src/java.base/share/classes/module-info.java</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(195, 55, 32);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">--- a/src/java.base/share/classes/module-info.java<span class="Apple-tab-span" style="white-space:pre">       </span>Wed May 04 17:17:28 2016 +0300</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+++ b/src/java.base/share/classes/module-info.java<span class="Apple-tab-span" style="white-space:pre">     </span>Wed May 04 09:46:02 2016 -1000</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 187, 199);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">@@ -138,7 +138,7 @@ module java.base {</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">     exports jdk.internal.org.objectweb.asm to</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">         jdk.jlink,</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">         jdk.scripting.nashorn,</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(195, 55, 32);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">-        jdk.vm.ci;</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+        jdk.vm.ci.hotspot;</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">     exports jdk.internal.org.objectweb.asm.tree to</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">         jdk.jlink;</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">     exports jdk.internal.org.objectweb.asm.util to</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 187, 199);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">@@ -173,7 +173,8 @@ module java.base {</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">         jdk.charsets,</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">         jdk.scripting.nashorn,</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">         jdk.unsupported,</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(195, 55, 32);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">-        jdk.vm.ci;</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+        jdk.vm.ci,</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco; color: rgb(52, 189, 38);" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">+        jdk.vm.ci.hotspot;</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">     exports jdk.internal.perf to</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">         java.desktop,</span></div><div style="margin: 0px; font-size: 10px; line-height: normal; font-family: Monaco;" class=""><span style="font-variant-ligatures: no-common-ligatures" class="">         java.management,</span></div><div class=""><span style="font-variant-ligatures: no-common-ligatures" class=""><br class=""></span></div></span></div></body></html>