From 18af38e9271220076edef0c35d01e86c399e14aa Mon Sep 17 00:00:00 2001 From: Alan Bateman Date: Thu, 1 Dec 2016 08:56:28 +0000 Subject: [PATCH] 8169069: Module system implementation refresh (11/2016) Co-authored-by: Mandy Chung Co-authored-by: Erik Joelsson Co-authored-by: Jonathan Gibbons Reviewed-by: alanb, mchung --- common/autoconf/generated-configure.sh | 8 ++- common/autoconf/source-dirs.m4 | 6 ++ common/conf/jib-profiles.js | 2 +- make/GensrcModuleInfo.gmk | 80 +++++--------------------- make/Javadoc.gmk | 2 +- make/common/Modules.gmk | 7 ++- test/lib/sun/hotspot/WhiteBox.java | 2 - 7 files changed, 35 insertions(+), 72 deletions(-) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 238387046d6..cea02c099b8 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -5093,7 +5093,7 @@ VS_SDK_PLATFORM_NAME_2013= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1479120453 +DATE_WHEN_GENERATED=1479992729 ############################################################################### # @@ -31196,6 +31196,12 @@ $as_echo "$as_me: The path of IMPORT_MODULES_TOPDIR, which resolves as \"$path\" if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src" fi + # Workaround for using different imported module-info.java in Jake due to a + # change in format. Remove once new format is standard in JDK 9 and javafx + # delivers just that. + if test -d "$IMPORT_MODULES_TOPDIR/modules_src_jake"; then + IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src_jake $IMPORT_MODULES_SRC" + fi if test -d "$IMPORT_MODULES_TOPDIR/make"; then IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make" fi diff --git a/common/autoconf/source-dirs.m4 b/common/autoconf/source-dirs.m4 index 940707e81a0..81137cf95ff 100644 --- a/common/autoconf/source-dirs.m4 +++ b/common/autoconf/source-dirs.m4 @@ -126,6 +126,12 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_IMPORT_MODULES], if test -d "$IMPORT_MODULES_TOPDIR/modules_src"; then IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src" fi + # Workaround for using different imported module-info.java in Jake due to a + # change in format. Remove once new format is standard in JDK 9 and javafx + # delivers just that. + if test -d "$IMPORT_MODULES_TOPDIR/modules_src_jake"; then + IMPORT_MODULES_SRC="$IMPORT_MODULES_TOPDIR/modules_src_jake $IMPORT_MODULES_SRC" + fi if test -d "$IMPORT_MODULES_TOPDIR/make"; then IMPORT_MODULES_MAKE="$IMPORT_MODULES_TOPDIR/make" fi diff --git a/common/conf/jib-profiles.js b/common/conf/jib-profiles.js index fa3c5749f8c..a40c8b05eef 100644 --- a/common/conf/jib-profiles.js +++ b/common/conf/jib-profiles.js @@ -427,7 +427,7 @@ var getJibProfilesDependencies = function (input, common) { jtreg: { server: "javare", revision: "4.2", - build_number: "b03", + build_number: "b04", checksum_file: "MD5_VALUES", file: "jtreg_bin-4.2.zip", environment_name: "JT_HOME", diff --git a/make/GensrcModuleInfo.gmk b/make/GensrcModuleInfo.gmk index cd0c3af9f00..25ade7f131e 100644 --- a/make/GensrcModuleInfo.gmk +++ b/make/GensrcModuleInfo.gmk @@ -60,8 +60,8 @@ TOOL_GENMODULEINFOSOURCE = $(JAVA_SMALL) \ ################################################################################ -# Name of data file. Keep module-info.java.ext until javafx has changed. -MOD_FILENAME := module-info.java.extra module-info.java.ext +# Name of modification file. +MOD_FILENAME := module-info.java.extra # Construct all possible src directories for the module. MODULE_CLASSES_DIRS := $(call FindModuleSrcDirs, $(MODULE)) @@ -74,74 +74,24 @@ ifneq ($(MOD_FILES), ) # Only make this call if modification files are found for this module ALL_MODULES := $(call FindAllModules) - # Read the contents of all the files into a variable. Replace space with / to - # let space represent new lines in the variable as $(shell) normalizes all - # whitespace. - $(foreach f, $(MOD_FILES), \ - $(eval MOD_FILE_CONTENTS += $(shell $(GREP) -v -e ".\*" -e "//" $f | $(TR) ' ' '/'))) - - # Separate the modifications into qualified exports and the rest - MODS_QUALIFIED_EXPORTS := $(call containing, /to/, $(MOD_FILE_CONTENTS)) - MODS_REST := $(filter-out $(MODS_QUALIFIED_EXPORTS), $(MOD_FILE_CONTENTS)) - - # Filter the contents for modules that are actually being built - ALL_MODULES_FILTER := $(addprefix %/, $(addsuffix ;, $(ALL_MODULES))) - MODIFICATIONS := $(filter $(ALL_MODULES_FILTER), $(MODS_QUALIFIED_EXPORTS)) \ - $(MODS_REST) - - # Returns non empty if the package exists in the current module - # Param 1 - Name of package with dots - PackageExists = \ - $(strip $(wildcard $(addsuffix $(subst .,/,/$(strip $1)), \ - $(MODULE_CLASSES_DIRS) \ - $(addsuffix /$(MODULE), $(IMPORT_MODULES_CLASSES)) \ - $(JDK_OUTPUTDIR)/modules/$(MODULE) \ - ))) - - # Convert the modification lines into arguments for the modification tool. - # Filter out modifications for non existing to-modules. - $(foreach line, $(MODIFICATIONS), \ - $(eval split_line := $(subst /,$(SPACE),$(line))) \ - $(eval command := $(word 1, $(split_line))) \ - $(if $(filter $(command), exports), \ - $(eval package := $(patsubst %;,%,$(word 2, $(split_line)))) \ - $(if $(call PackageExists, $(package)), \ - $(eval to_module := $(patsubst %;,%,$(word 4, $(split_line)))) \ - $(if $(to_module), \ - $(eval ARGS += -$(command) $(package)/$(to_module)) \ - , \ - $(eval ARGS += -$(command) $(package)) \ - ) \ - ) \ - , \ - $(if $(filter $(command), provides), \ - $(eval provider := $(patsubst %;,%,$(word 2, $(split_line)))) \ - $(eval class := $(patsubst %;,%,$(word 4, $(split_line)))) \ - $(eval ARGS += -$(command) $(provider)/$(class)) \ - , \ - $(error A module-info.extra in $(MODULE) contains invalid command $(command)) \ - ) \ - ) \ - ) - - ifneq ($(ARGS), ) - $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java: \ - $(firstword $(call FindAllModuleInfos, $(MODULE))) \ - $(BUILD_TOOLS_JDK) \ - $(call DependOnVariable, ARGS) + $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java: \ + $(firstword $(call FindAllModuleInfos, $(MODULE))) \ + $(BUILD_TOOLS_JDK) \ + $(MOD_FILES) \ + $(call DependOnVariable, ALL_MODULES) $(MKDIR) -p $(@D) $(RM) $@ $@.tmp - $(TOOL_GENMODULEINFOSOURCE) $(ARGS) -o $@.tmp $< + $(TOOL_GENMODULEINFOSOURCE) -o $@.tmp \ + --source-file $< \ + --modules $(call CommaList, $(ALL_MODULES)) \ + $(MOD_FILES) $(MV) $@.tmp $@ - TARGETS += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java - endif + TARGETS += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java -endif - -# If no modifications are found for this module, remove any module-info.java -# created by a previous build since that is no longer valid. -ifeq ($(MODIFICATIONS), ) +else + # If no modifications are found for this module, remove any module-info.java + # created by a previous build since that is no longer valid. ifneq ($(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java), ) $(shell $(RM) $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/module-info.java) endif diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk index 98bf06f2e28..bb491ecf109 100644 --- a/make/Javadoc.gmk +++ b/make/Javadoc.gmk @@ -33,7 +33,7 @@ include MakeBase.gmk # Allow custom to overwrite. JAVADOC_SOURCE_DIRS = \ $(SUPPORT_OUTPUTDIR)/gensrc/* \ - $(if $(IMPORT_MODULES_SRC), $(IMPORT_MODULES_SRC)/*) \ + $(addsuffix /*, $(IMPORT_MODULES_SRC)) \ $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS)/classes \ $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS_TYPE)/classes \ $(JDK_TOPDIR)/src/*/share/classes \ diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk index bb1d05979dd..eeb82b0f118 100644 --- a/make/common/Modules.gmk +++ b/make/common/Modules.gmk @@ -171,12 +171,15 @@ SRC_SUBDIRS += share/classes # Find all module-info.java files for the current build target platform and # configuration. +# TODO: The $(firstword call is part of a workaround for using different +# imported module-info.java in Jake due to a change in format. Remove once +# new format is standard in JDK 9 and javafx delivers just that. # Param 1 - Module to find for, set to * for finding all FindAllModuleInfos = \ $(wildcard \ $(foreach sub, $(SRC_SUBDIRS), \ $(patsubst %,%/$(strip $1)/$(sub)/module-info.java, $(TOP_SRC_DIRS))) \ - $(patsubst %,%/$(strip $1)/module-info.java, $(IMPORT_MODULES_SRC))) + $(patsubst %,%/$(strip $1)/module-info.java, $(firstword $(IMPORT_MODULES_SRC)))) # Find module-info.java files in the specific source dir # Param 1 - Src dir to find module-info.java files in @@ -244,7 +247,7 @@ $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \ BEGIN { if (MODULE != "java.base") printf(" java.base"); } \ /requires/ { sub(/;/, ""); \ sub(/requires/, ""); \ - sub(/public/, ""); \ + sub(/transitive/, ""); \ sub(/\/\/.*/, ""); \ sub(/\/\*.*\*\//, ""); \ gsub(/^ +\*.*/, ""); \ diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java index 9d3c38750b5..c01657f020e 100644 --- a/test/lib/sun/hotspot/WhiteBox.java +++ b/test/lib/sun/hotspot/WhiteBox.java @@ -453,8 +453,6 @@ public class WhiteBox { Object[] packages); public native void AddModuleExports(Object from_module, String pkg, Object to_module); public native void AddReadsModule(Object from_module, Object source_module); - public native boolean CanReadModule(Object asking_module, Object source_module); - public native boolean IsExportedToModule(Object from_module, String pkg, Object to_module); public native void AddModulePackage(Object module, String pkg); public native void AddModuleExportsToAllUnnamed(Object module, String pkg); public native void AddModuleExportsToAll(Object module, String pkg);