Merge branch 'master' of https://git.openjdk.org/jdk into JDK-8330694

.jcheck/conf

@@ -5,6 +5,7 @@ version=23
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
+warning=issuestitle
 
 [repository]
 tags=(?:jdk-(?:[1-9]([0-9]*)(?:\.(?:0|[1-9][0-9]*)){0,4})(?:\+(?:(?:[0-9]+))|(?:-ga)))|(?:jdk[4-9](?:u\d{1,3})?-(?:(?:b\d{2,3})|(?:ga)))|(?:hs\d\d(?:\.\d{1,2})?-b\d\d)

make/CompileDemos.gmk

@@ -183,7 +183,7 @@ $(eval $(call SetupBuildDemo, SwingSet2, \
 ))
 
 $(eval $(call SetupBuildDemo, Font2DTest, \
- DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape, \
+ DISABLED_WARNINGS := rawtypes deprecation unchecked serial cast this-escape dangling-doc-comments, \
  DEMO_SUBDIR := jfc, \
 ))
 

make/Docs.gmk

@@ -681,28 +681,25 @@ ifeq ($(ENABLE_PANDOC), true)
  $(TOPDIR)/make/jdk/src/classes/build/tools/pandocfilter)
 
  $(foreach m, $(ALL_MODULES), \
- $(eval MAN_$m := $(call FindModuleManDirs, $m)) \
- $(foreach d, $(MAN_$m), \
- $(foreach f, $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, $d))), \
- $(eval $m_$f_NAME := MAN_TO_HTML_$m_$(strip $(call RelativePath, $f, $(TOPDIR)))) \
- $(eval $(call SetupProcessMarkdown, $($m_$f_NAME), \
- SRC := $d, \
- FILES := $f, \
- DEST := $(DOCS_OUTPUTDIR)/specs/man, \
- FILTER := $(PANDOC_HTML_MANPAGE_FILTER), \
- CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
- REPLACEMENTS := \
- @@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
- @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
- @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
- OPTIONS := --toc -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \
- POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info '$(HEADER_RIGHT_SIDE_INFO)' \
- --nav-subdirs 1 --nav-link-guides, \
- EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
- $(PANDOC_HTML_MANPAGE_FILTER_SOURCE), \
- )) \
- $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \
- ) \
+ $(eval MAN_$m := $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, \
+ $(call FindModuleManDirs, $m))))) \
+ $(if $(MAN_$m), \
+ $(eval $(call SetupProcessMarkdown, MAN_TO_HTML_$m, \
+ FILES := $(MAN_$m), \
+ DEST := $(DOCS_OUTPUTDIR)/specs/man, \
+ FILTER := $(PANDOC_HTML_MANPAGE_FILTER), \
+ CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
+ REPLACEMENTS := \
+ @@COPYRIGHT_YEAR@@ => $(COPYRIGHT_YEAR) ; \
+ @@VERSION_SHORT@@ => $(VERSION_SHORT) ; \
+ @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION), \
+ OPTIONS := --toc -V include-before='$(SPECS_TOP)' -V include-after='$(SPECS_BOTTOM_1)', \
+ POST_PROCESS := $(TOOL_FIXUPPANDOC) --insert-nav --nav-right-info '$(HEADER_RIGHT_SIDE_INFO)' \
+ --nav-subdirs 1 --nav-link-guides, \
+ EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
+ $(PANDOC_HTML_MANPAGE_FILTER_SOURCE), \
+ )) \
+ $(eval JDK_SPECS_TARGETS += $(MAN_TO_HTML_$m)) \
  ) \
  )
 

make/InitSupport.gmk

@@ -501,9 +501,12 @@ else # $(HAS_SPEC)=true
  # Failure logs are only supported for "parallel" main targets, not the
  # (trivial) sequential make targets (such as clean and reconfigure),
  # since the failure-logs directory creation will conflict with clean.
+ # We also make sure the javatmp directory exists, which is needed if a java
+ # process (like javac) is using java.io.tmpdir.
  define PrepareFailureLogs
  $(RM) -r $(MAKESUPPORT_OUTPUTDIR)/failure-logs 2> /dev/null && \
  $(MKDIR) -p $(MAKESUPPORT_OUTPUTDIR)/failure-logs
+ $(MKDIR) -p $(JAVA_TMP_DIR)
  $(RM) $(MAKESUPPORT_OUTPUTDIR)/exit-with-error 2> /dev/null
  endef
 

make/TestImage.gmk

@@ -28,6 +28,9 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+# Hook to include the corresponding custom file, if present.
+$(eval $(call IncludeCustomExtension, TestImage-pre.gmk))
+
 ############################################################################
 
 BUILD_INFO_PROPERTIES := $(TEST_IMAGE_DIR)/build-info.properties

make/autoconf/flags-ldflags.m4

@@ -118,7 +118,6 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_HELPER],
 
  # Setup LDFLAGS for linking executables
  if test "x$TOOLCHAIN_TYPE" = xgcc; then
- EXECUTABLE_LDFLAGS="$EXECUTABLE_LDFLAGS -Wl,--allow-shlib-undefined"
  # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
  # java heap.
  if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then

make/autoconf/jdk-options.m4

@@ -190,6 +190,17 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
  fi
  AC_SUBST(INCLUDE_SA)
 
+ # Setup default CDS alignment. On platforms where one build may run on machines with different
+ # page sizes, the JVM choses a compatible alignment to fit all possible page sizes. This slightly
+ # increases archive size.
+ # The only platform having this problem at the moment is Linux on aarch64, which may encounter
+ # three different page sizes: 4K, 64K, and if run on Mac m1 hardware, 16K.
+ COMPATIBLE_CDS_ALIGNMENT_DEFAULT=false
+ if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+ COMPATIBLE_CDS_ALIGNMENT_DEFAULT=true
+ fi
+ AC_SUBST(COMPATIBLE_CDS_ALIGNMENT_DEFAULT)
+
  # Compress jars
  COMPRESS_JARS=false
 
@@ -673,7 +684,7 @@ AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
 #
 AC_DEFUN([JDKOPT_ENABLE_DISABLE_COMPATIBLE_CDS_ALIGNMENT],
 [
- UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: false,
+ UTIL_ARG_ENABLE(NAME: compatible-cds-alignment, DEFAULT: $COMPATIBLE_CDS_ALIGNMENT_DEFAULT,
  RESULT: ENABLE_COMPATIBLE_CDS_ALIGNMENT,
  DESC: [enable use alternative compatible cds core region alignment],
  DEFAULT_DESC: [disabled],

make/autoconf/spec.gmk.template

@@ -353,6 +353,8 @@ BUNDLES_OUTPUTDIR = $(OUTPUTDIR)/bundles
 TESTMAKE_OUTPUTDIR = $(OUTPUTDIR)/test-make
 MAKESUPPORT_OUTPUTDIR = $(OUTPUTDIR)/make-support
 
+JAVA_TMP_DIR = $(SUPPORT_OUTPUTDIR)/javatmp
+
 # This does not get overridden in a bootcycle build
 CONFIGURESUPPORT_OUTPUTDIR := @CONFIGURESUPPORT_OUTPUTDIR@
 BUILDJDK_OUTPUTDIR = $(OUTPUTDIR)/buildjdk
@@ -634,7 +636,8 @@ STATIC_BUILD := @STATIC_BUILD@
 
 STRIPFLAGS := @STRIPFLAGS@
 
-JAVA_FLAGS := @JAVA_FLAGS@
+JAVA_FLAGS_TMPDIR := -Djava.io.tmpdir=$(JAVA_TMP_DIR)
+JAVA_FLAGS := @JAVA_FLAGS@ $(JAVA_FLAGS_TMPDIR)
 JAVA_FLAGS_BIG := @JAVA_FLAGS_BIG@
 JAVA_FLAGS_SMALL := @JAVA_FLAGS_SMALL@
 BUILD_JAVA_FLAGS_SMALL := @BUILD_JAVA_FLAGS_SMALL@
@@ -675,7 +678,7 @@ DOCS_REFERENCE_JAVADOC := @DOCS_REFERENCE_JAVADOC@
 SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker
 
 # Interim langtools modules and arguments
-INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.javadoc
+INTERIM_LANGTOOLS_BASE_MODULES := java.compiler jdk.compiler jdk.internal.md jdk.javadoc
 INTERIM_LANGTOOLS_MODULES := $(addsuffix .interim, $(INTERIM_LANGTOOLS_BASE_MODULES))
 INTERIM_LANGTOOLS_ADD_EXPORTS := \
  --add-exports java.base/sun.reflect.annotation=jdk.compiler.interim \

make/common/JavaCompilation.gmk

@@ -197,7 +197,7 @@ define SetupJavaCompilationBody
 
  ifeq ($$($1_COMPILER), bootjdk)
  # Javac server is not available when using the bootjdk compiler.
- $1_JAVAC_CMD := $$(JAVAC)
+ $1_JAVAC_CMD := $$(JAVAC) -J$$(JAVA_FLAGS_TMPDIR)
 
  ifeq ($$($1_SMALL_JAVA), true)
  $1_FLAGS += $$(addprefix -J, $$(JAVA_FLAGS_SMALL))
@@ -211,7 +211,7 @@ define SetupJavaCompilationBody
  $1_TARGET_RELEASE := $$(TARGET_RELEASE_BOOTJDK)
  endif
  else ifeq ($$($1_COMPILER), buildjdk)
- $1_JAVAC_CMD := $$(BUILD_JAVAC)
+ $1_JAVAC_CMD := $$(BUILD_JAVAC) -J$$(JAVA_FLAGS_TMPDIR)
 
  ifeq ($$($1_TARGET_RELEASE), )
  # If unspecified, default to the new jdk we're building

make/common/ProcessMarkdown.gmk

@@ -38,48 +38,53 @@ define ProcessMarkdown
  $1_$2_INPUT_FILE := $3/$2
  $1_$2_MARKER := $$(subst /,_,$1_$2)
 
- ifneq ($$($1_REPLACEMENTS), )
- $1_$2_PANDOC_INPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_pre.tmp
-
- $$(eval $$(call SetupTextFileProcessing, $1_$2_PREPROCESSED, \
- SOURCE_FILES := $$($1_$2_INPUT_FILE), \
- OUTPUT_FILE := $$($1_$2_PANDOC_INPUT), \
- REPLACEMENTS := $$($1_REPLACEMENTS), \
- ))
- else
- $1_$2_PANDOC_INPUT := $$($1_$2_INPUT_FILE)
- endif
-
- ifneq ($$($1_POST_PROCESS), )
- $1_$2_PANDOC_OUTPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post.tmp
- else
- $1_$2_PANDOC_OUTPUT := $$($1_$2_OUTPUT_FILE)
- endif
+ # Only continue if this target file hasn't been processed already. This lets
+ # the first found source file override any other with the same name.
+ ifeq ($$($1_$2_OUTPUT_FILE_PROCESSED), )
+ $1_$2_OUTPUT_FILE_PROCESSED := true
+
+ ifneq ($$($1_REPLACEMENTS), )
+ $1_$2_PANDOC_INPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_pre.tmp
+
+ $$(eval $$(call SetupTextFileProcessing, $1_$2_PREPROCESSED, \
+ SOURCE_FILES := $$($1_$2_INPUT_FILE), \
+ OUTPUT_FILE := $$($1_$2_PANDOC_INPUT), \
+ REPLACEMENTS := $$($1_REPLACEMENTS), \
+ ))
+ else
+ $1_$2_PANDOC_INPUT := $$($1_$2_INPUT_FILE)
+ endif
 
- ifneq ($$($1_CSS), )
- ifneq ($$(findstring https:/, $$($1_CSS)), )
- $1_$2_CSS_OPTION := --css '$$($1_CSS)'
+ ifneq ($$($1_POST_PROCESS), )
+ $1_$2_PANDOC_OUTPUT := $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post.tmp
  else
- $1_$2_CSS := $$(strip $$(call RelativePath, $$($1_CSS), $$($1_$2_TARGET_DIR)))
- $1_$2_CSS_OPTION := --css '$$($1_$2_CSS)'
+ $1_$2_PANDOC_OUTPUT := $$($1_$2_OUTPUT_FILE)
  endif
- endif
 
- # This does not need to be included in VARDEPS since it's from the actual
- # source file. Only run the shell if the recipe gets executed below.
- $1_$2_OPTIONS_FROM_SRC = \
- $$(shell $$(GREP) _pandoc-options_: $3/$2 | $$(CUT) -d : -f 2-)
+ ifneq ($$($1_CSS), )
+ ifneq ($$(findstring https:/, $$($1_CSS)), )
+ $1_$2_CSS_OPTION := --css '$$($1_CSS)'
+ else
+ $1_$2_CSS := $$(strip $$(call RelativePath, $$($1_CSS), $$($1_$2_TARGET_DIR)))
+ $1_$2_CSS_OPTION := --css '$$($1_$2_CSS)'
+ endif
+ endif
 
- ifneq ($$($1_FILTER), )
- $1_$2_OPTIONS := --filter $$($1_FILTER)
- endif
+ # This does not need to be included in VARDEPS since it's from the actual
+ # source file. Only run the shell if the recipe gets executed below.
+ $1_$2_OPTIONS_FROM_SRC = \
+ $$(shell $$(GREP) _pandoc-options_: $3/$2 | $$(CUT) -d : -f 2-)
+
+ ifneq ($$($1_FILTER), )
+ $1_$2_OPTIONS := --filter $$($1_FILTER)
+ endif
 
- $1_$2_VARDEPS := $$($1_OPTIONS) $$($1_$2_OPTIONS) $$($1_CSS) \
- $$($1_REPLACEMENTS) $$($1_POST_PROCESS)
- $1_$2_VARDEPS_FILE := $$(call DependOnVariable, $1_$2_VARDEPS, \
- $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER).vardeps)
+  $1_$2_VARDEPS := $$($1_OPTIONS) $$($1_$2_OPTIONS) $$($1_CSS) \
+  $$($1_REPLACEMENTS) $$($1_POST_PROCESS)
+  $1_$2_VARDEPS_FILE := $$(call DependOnVariable, $1_$2_VARDEPS, \
+  $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER).vardeps)
 
- $$($1_$2_PANDOC_OUTPUT): $$($1_$2_PANDOC_INPUT) $$($1_$2_VARDEPS_FILE) $$($1_EXTRA_DEPS)
+  $$($1_$2_PANDOC_OUTPUT): $$($1_$2_PANDOC_INPUT) $$($1_$2_VARDEPS_FILE) $$($1_EXTRA_DEPS)
  $$(call LogInfo, Converting $2 to $$($1_FORMAT))
  $$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$(dir $$($1_$2_PANDOC_OUTPUT)))
  $$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER), \
@@ -96,17 +101,18 @@ define ProcessMarkdown
  fi
  endif
 
- # If we have no post processing, PANDOC_OUTPUT is set to OUTPUT_FILE. Otherwise
- # PANDOC_OUTPUT is a temporary file, and we must now create the real OUTPUT_FILE.
- ifneq ($$($1_POST_PROCESS), )
- $$($1_$2_OUTPUT_FILE): $$($1_$2_PANDOC_OUTPUT)
+  # If we have no post processing, PANDOC_OUTPUT is set to OUTPUT_FILE. Otherwise
+  # PANDOC_OUTPUT is a temporary file, and we must now create the real OUTPUT_FILE.
+  ifneq ($$($1_POST_PROCESS), )
+  $$($1_$2_OUTPUT_FILE): $$($1_$2_PANDOC_OUTPUT)
  $$(call LogInfo, Post-processing markdown file $2)
  $$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$($1_$2_TARGET_DIR))
  $$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post, \
  ( $$($1_POST_PROCESS) $$($1_$2_PANDOC_OUTPUT) > $$($1_$2_OUTPUT_FILE) ) )
- endif
+  endif
 
- $1 += $$($1_$2_OUTPUT_FILE)
+ $1 += $$($1_$2_OUTPUT_FILE)
+ endif
 endef
 
 ################################################################################

make/conf/module-loader-map.conf

@@ -120,6 +120,7 @@ NATIVE_ACCESS_MODULES= \
  jdk.dynalink \
  jdk.httpserver \
  jdk.incubator.vector \
+ jdk.internal.le \
  jdk.internal.vm.ci \
  jdk.jfr \
  jdk.jsobject \