Merge pull request #318 from JasonFengJ9/mergetmp

Merge master jdk-17.0.11+1 into openj9-staging

.github/scripts/gen-test-summary.sh

@@ -42,6 +42,7 @@ error_count=$(echo $errors | wc -w || true)
 
 if [[ "$failures" = "" && "$errors" = "" ]]; then
  # We know something went wrong, but not what
+ echo 'failure=true' >> $GITHUB_OUTPUT
  echo 'error-message=Unspecified test suite failure. Please see log for job for details.' >> $GITHUB_OUTPUT
  exit 0
 fi

.github/workflows/test.yml

@@ -60,7 +60,9 @@ jobs:
  - 'jdk/tier1 part 3'
  - 'langtools/tier1'
  - 'hs/tier1 common'
- - 'hs/tier1 compiler'
+ - 'hs/tier1 compiler part 1'
+ - 'hs/tier1 compiler part 2'
+ - 'hs/tier1 compiler part 3'
  - 'hs/tier1 gc'
  - 'hs/tier1 runtime'
  - 'hs/tier1 serviceability'
@@ -83,8 +85,16 @@ jobs:
  test-suite: 'test/hotspot/jtreg/:tier1_common'
  debug-suffix: -debug
 
- - test-name: 'hs/tier1 compiler'
- test-suite: 'test/hotspot/jtreg/:tier1_compiler'
+ - test-name: 'hs/tier1 compiler part 1'
+ test-suite: 'test/hotspot/jtreg/:tier1_compiler_1'
+ debug-suffix: -debug
+
+ - test-name: 'hs/tier1 compiler part 2'
+ test-suite: 'test/hotspot/jtreg/:tier1_compiler_2 test/hotspot/jtreg/:tier1_compiler_not_xcomp'
+ debug-suffix: -debug
+
+ - test-name: 'hs/tier1 compiler part 3'
+ test-suite: 'test/hotspot/jtreg/:tier1_compiler_3'
  debug-suffix: -debug
 
  - test-name: 'hs/tier1 gc'

.jcheck/conf

@@ -1,7 +1,7 @@
 [general]
 project=jdk-updates
 jbs=JDK
-version=17.0.10
+version=17.0.11
 
 [checks]
 error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists

closed/custom/ReleaseFile.gmk

@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2017, 2022 All Rights Reserved
+# (c) Copyright IBM Corp. 2017, 2024 All Rights Reserved
 # ===========================================================================
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
@@ -21,3 +21,6 @@
 SOURCE_REVISION := OpenJDK:$(shell $(GIT) -C $(TOPDIR) rev-parse --short HEAD)
 SOURCE_REVISION += OpenJ9:$(shell $(GIT) -C $(OPENJ9_TOPDIR) rev-parse --short HEAD)
 SOURCE_REVISION += OMR:$(shell $(GIT) -C $(OPENJ9OMR_TOPDIR) rev-parse --short HEAD)
+ifeq (true,$(BUILD_OPENJCEPLUS))
+ SOURCE_REVISION += OpenJCEPlus:$(shell $(GIT) -C $(OPENJCEPLUS_TOPDIR) rev-parse --short HEAD)
+endif

closed/make/modules/openjceplus/Copy.gmk

@@ -1,5 +1,5 @@
 # ===========================================================================
-# (c) Copyright IBM Corp. 2023, 2023 All Rights Reserved
+# (c) Copyright IBM Corp. 2023, 2024 All Rights Reserved
 # ===========================================================================
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
@@ -21,6 +21,15 @@
 include $(TOPDIR)/closed/CopySupport.gmk
 
 ifeq (true,$(BUILD_OPENJCEPLUS))
+ # Copy OpenJCEPlus legal files.
+ $(call openj9_copy_files,, \
+ $(OPENJCEPLUS_TOPDIR)/LICENSE \
+ $(LEGAL_DST_DIR)/OPENJCEPLUS_LICENSE)
+
+ $(call openj9_copy_files,, \
+ $(OPENJCEPLUS_TOPDIR)/NOTICES.md \
+ $(LEGAL_DST_DIR)/NOTICES.md)
+
  # Copy OpenJCEPlus native libraries.
  $(eval $(call SetupCopyFiles, OPENJCEPLUS_JGSKIT_LIBS_COPY, \
  SRC := $(OPENJCEPLUS_TOPDIR)/target, \

closed/openjdk-tag.gmk

@@ -1 +1 @@
-OPENJDK_TAG := jdk-17.0.10+7
+OPENJDK_TAG := jdk-17.0.11+1

make/RunTests.gmk

@@ -785,8 +785,10 @@ define SetupRunJtregTestBody
  $1_JTREG_BASIC_OPTIONS += -e:JDK8_HOME=$$(BOOT_JDK)
  # If running on Windows, propagate the _NT_SYMBOL_PATH to enable
  # symbol lookup in hserr files
+ # The minidumps are disabled by default on client Windows, so enable them
  ifeq ($$(call isTargetOs, windows), true)
  $1_JTREG_BASIC_OPTIONS += -e:_NT_SYMBOL_PATH
+ $1_JTREG_BASIC_OPTIONS += -vmoption:-XX:+CreateCoredumpOnCrash
  endif
 
  $1_JTREG_BASIC_OPTIONS += \
@@ -846,7 +848,7 @@ define SetupRunJtregTestBody
  $$(RM) -r $$($1_TEST_RESULTS_DIR)
 
  $1_COMMAND_LINE := \
- $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
+ $$(JTREG_JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
  -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
  $$($1_JTREG_BASIC_OPTIONS) \
  -testjdk:$$(JDK_UNDER_TEST) \

make/RunTestsPrebuilt.gmk

@@ -122,6 +122,7 @@ $(eval $(call SetupVariable,JT_HOME))
 $(eval $(call SetupVariable,JDK_IMAGE_DIR,$(OUTPUTDIR)/images/jdk))
 $(eval $(call SetupVariable,TEST_IMAGE_DIR,$(OUTPUTDIR)/images/test))
 $(eval $(call SetupVariable,SYMBOLS_IMAGE_DIR,$(OUTPUTDIR)/images/symbols,NO_CHECK))
+$(eval $(call SetupVariable,JTREG_JDK,$(BOOT_JDK)))
 
 # Provide default values for tools that we need
 $(eval $(call SetupVariable,MAKE,make,NO_CHECK))
@@ -255,6 +256,7 @@ $(call CreateNewSpec, $(NEW_SPEC), \
  TOPDIR := $(TOPDIR), \
  OUTPUTDIR := $(OUTPUTDIR), \
  BOOT_JDK := $(BOOT_JDK), \
+ JTREG_JDK := $(JTREG_JDK), \
  JT_HOME := $(JT_HOME), \
  JDK_IMAGE_DIR := $(JDK_IMAGE_DIR), \
  JCOV_IMAGE_DIR := $(JCOV_IMAGE_DIR), \

make/RunTestsPrebuiltSpec.gmk

@@ -124,6 +124,8 @@ JAR := $(FIXPATH) $(JAR_CMD)
 JLINK := $(FIXPATH) $(JLINK_CMD)
 JMOD := $(FIXPATH) $(JMOD_CMD)
 
+JTREG_JAVA := $(FIXPATH) $(JTREG_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
+
 BUILD_JAVA := $(JDK_IMAGE_DIR)/bin/JAVA
 ################################################################################
 # Some common tools. Assume most common name and no path.

make/autoconf/flags-cflags.m4

@@ -171,6 +171,8 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
  if test "x$TOOLCHAIN_VERSION" = x2017; then
  # VS2017 incorrectly triggers this warning for constexpr
  DISABLED_WARNINGS+=" 4307"
+ # VS2017 incorrectly triggers this warning for static cast (test_atomic.cpp)
+ DISABLED_WARNINGS+=" 4309"
  fi
  ;;
 

make/autoconf/lib-tests.m4

@@ -233,12 +233,47 @@ AC_DEFUN_ONCE([LIB_TESTS_SETUP_JTREG],
  UTIL_FIXUP_PATH(JT_HOME)
  AC_SUBST(JT_HOME)
 
+ # Specify a JDK for running jtreg. Defaults to the BOOT_JDK.
+ AC_ARG_WITH(jtreg-jdk, [AS_HELP_STRING([--with-jdk],
+ [path to JDK for running jtreg @<:@BOOT_JDK@:>@])])
+
+ AC_MSG_CHECKING([for jtreg jdk])
+ if test "x${with_jtreg_jdk}" != x; then
+ if test "x${with_jtreg_jdk}" = xno; then
+ AC_MSG_RESULT([no, jtreg jdk not specified])
+ elif test "x${with_jtreg_jdk}" = xyes; then
+ AC_MSG_RESULT([not specified])
+ AC_MSG_ERROR([--with-jtreg-jdk needs a value])
+ else
+ JTREG_JDK="${with_jtreg_jdk}"
+ AC_MSG_RESULT([$JTREG_JDK])
+ UTIL_FIXUP_PATH(JTREG_JDK)
+ if test ! -f "$JTREG_JDK/bin/java"; then
+ AC_MSG_ERROR([Could not find jtreg java at $JTREG_JDK/bin/java])
+ fi
+ fi
+ else
+ JTREG_JDK="${BOOT_JDK}"
+ AC_MSG_RESULT([no, using BOOT_JDK])
+ fi
+
+ UTIL_FIXUP_PATH(JTREG_JDK)
+ AC_SUBST([JTREG_JDK])
+ # For use in the configure script
+ JTREG_JAVA="$FIXPATH $JTREG_JDK/bin/java"
+
  # Verify jtreg version
  if test "x$JT_HOME" != x; then
+ AC_MSG_CHECKING([jtreg jar existence])
+ if test ! -f "$JT_HOME/lib/jtreg.jar"; then
+ AC_MSG_ERROR([Could not find jtreg jar at $JT_HOME/lib/jtreg.jar])
+ fi
+
  AC_MSG_CHECKING([jtreg version number])
  # jtreg -version looks like this: "jtreg 6.1+1-19"
  # Extract actual version part ("6.1" in this case)
- jtreg_version_full=`$JAVA -jar $JT_HOME/lib/jtreg.jar -version | $HEAD -n 1 | $CUT -d ' ' -f 2`
+ jtreg_version_full=$($JTREG_JAVA -jar $JT_HOME/lib/jtreg.jar -version | $HEAD -n 1 | $CUT -d ' ' -f 2)
+
  jtreg_version=${jtreg_version_full/%+*}
  AC_MSG_RESULT([$jtreg_version])
 

make/autoconf/spec.gmk.in

@@ -653,6 +653,9 @@ JAR = $(JAR_CMD)
 JLINK = $(JLINK_CMD)
 JMOD = $(JMOD_CMD) $(JAVA_TOOL_FLAGS_SMALL)
 
+JTREG_JDK := @JTREG_JDK@
+JTREG_JAVA = @FIXPATH@ $(JTREG_JDK)/bin/java $(JAVA_FLAGS_BIG) $(JAVA_FLAGS)
+
 BUILD_JAVA_FLAGS := @BOOTCYCLE_JVM_ARGS_BIG@
 BUILD_JAVA=@FIXPATH@ $(BUILD_JDK)/bin/java $(BUILD_JAVA_FLAGS)
 BUILD_JAVAC=@FIXPATH@ $(BUILD_JDK)/bin/javac

make/autoconf/toolchain.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, 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
@@ -369,6 +369,10 @@ AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION],
  # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2"
  CFLAGS="$ORG_CFLAGS"
  CXXFLAGS="$ORG_CXXFLAGS"
+
+ # filter out some unwanted additions autoconf may add to CXX; we saw this on macOS with autoconf 2.72
+ UTIL_GET_NON_MATCHING_VALUES(cxx_filtered, $CXX, -std=c++11 -std=gnu++11)
+ CXX="$cxx_filtered"
 ])
 
 # Check if a compiler is of the toolchain type we expect, and save the version

make/autoconf/util.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2024, 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
@@ -203,7 +203,7 @@ AC_DEFUN([UTIL_GET_NON_MATCHING_VALUES],
  if test -z "$legal_values"; then
  $1="$2"
  else
- result=`$GREP -Fvx "$legal_values" <<< "$values_to_check" | $GREP -v '^$'`
+ result=`$GREP -Fvx -- "$legal_values" <<< "$values_to_check" | $GREP -v '^$'`
  $1=${result//$'\n'/ }
  fi
 ])
@@ -230,7 +230,7 @@ AC_DEFUN([UTIL_GET_MATCHING_VALUES],
  if test -z "$illegal_values"; then
  $1=""
  else
- result=`$GREP -Fx "$illegal_values" <<< "$values_to_check" | $GREP -v '^$'`
+ result=`$GREP -Fx -- "$illegal_values" <<< "$values_to_check" | $GREP -v '^$'`
  $1=${result//$'\n'/ }
  fi
 ])

make/conf/version-numbers.conf

@@ -28,15 +28,15 @@
 
 DEFAULT_VERSION_FEATURE=17
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=10
+DEFAULT_VERSION_UPDATE=11
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2024-01-16
+DEFAULT_VERSION_DATE=2024-04-16
 DEFAULT_VERSION_CLASSFILE_MAJOR=61 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="16 17"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=17
-DEFAULT_PROMOTED_VERSION_PRE=
+DEFAULT_PROMOTED_VERSION_PRE=ea