Merge pull request #1604 from SAP/pr-jdk-23+9

Merge to tag jdk-23+9

.github/actions/get-jtreg/action.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2023, 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
@@ -56,8 +56,14 @@ runs:
 
  - name: 'Build JTReg'
  run: |
+ # If runner architecture is x64 set JAVA_HOME_17_X64 otherwise set to JAVA_HOME_17_arm64
+ if [[ '${{ runner.arch }}' == 'X64' ]]; then
+ JDK="$JAVA_HOME_17_X64"
+ else
+ JDK="$JAVA_HOME_17_arm64"
+ fi
  # Build JTReg and move files to the proper locations
- bash make/build.sh --jdk "$JAVA_HOME_17_X64"
+ bash make/build.sh --jdk "$JDK"
  mkdir ../installed
  mv build/images/jtreg/* ../installed
  working-directory: jtreg/src

.github/workflows/build-macos.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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
@@ -31,6 +31,9 @@ on:
  platform:
  required: true
  type: string
+ runs-on:
+ required: true
+ type: string
  extra-conf-options:
  required: false
  type: string
@@ -55,7 +58,7 @@ on:
 jobs:
  build-macos:
  name: build
- runs-on: macos-13
+ runs-on: ${{ inputs.runs-on }}
 
  strategy:
  fail-fast: false
@@ -74,7 +77,7 @@ jobs:
  id: bootjdk
  uses: ./.github/actions/get-bootjdk
  with:
- platform: macos-x64
+ platform: ${{ inputs.platform }}
 
  - name: 'Get JTReg'
  id: jtreg
@@ -87,7 +90,7 @@ jobs:
  - name: 'Install toolchain and dependencies'
  run: |
  # Run Homebrew installation and xcode-select
- brew install make
+ brew install autoconf make
  sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-toolset-version }}.app/Contents/Developer
  # This will make GNU make available as 'make' and not only as 'gmake'
  echo '/usr/local/opt/make/libexec/gnubin' >> $GITHUB_PATH

.github/workflows/main.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2022, 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
@@ -235,6 +235,7 @@ jobs:
  uses: ./.github/workflows/build-macos.yml
  with:
  platform: macos-x64
+ runs-on: 'macos-13'
  xcode-toolset-version: '14.3.1'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -246,8 +247,8 @@ jobs:
  uses: ./.github/workflows/build-macos.yml
  with:
  platform: macos-aarch64
+ runs-on: 'macos-14'
  xcode-toolset-version: '14.3.1'
- extra-conf-options: '--openjdk-target=aarch64-apple-darwin'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
  if: needs.select.outputs.macos-aarch64 == 'true'
@@ -328,6 +329,16 @@ jobs:
  bootjdk-platform: macos-x64
  runs-on: macos-13
 
+ test-macos-aarch64:
+ name: macos-aarch64
+ needs:
+ - build-macos-aarch64
+ uses: ./.github/workflows/test.yml
+ with:
+ platform: macos-aarch64
+ bootjdk-platform: macos-aarch64
+ runs-on: macos-14
+
  test-windows-x64:
  name: windows-x64
  needs:

.github/workflows/test.yml

@@ -63,6 +63,7 @@ jobs:
  - 'hs/tier1 compiler part 1'
  - 'hs/tier1 compiler part 2'
  - 'hs/tier1 compiler part 3'
+ - 'hs/tier1 compiler not-xcomp'
  - 'hs/tier1 gc'
  - 'hs/tier1 runtime'
  - 'hs/tier1 serviceability'
@@ -90,13 +91,17 @@ jobs:
  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'
+ test-suite: 'test/hotspot/jtreg/:tier1_compiler_2'
  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 compiler not-xcomp'
+ test-suite: 'test/hotspot/jtreg/:tier1_compiler_not_xcomp'
+ debug-suffix: -debug
+
  - test-name: 'hs/tier1 gc'
  test-suite: 'test/hotspot/jtreg/:tier1_gc'
  debug-suffix: -debug

make/autoconf/basic.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, 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
@@ -123,6 +123,22 @@ AC_DEFUN_ONCE([BASIC_SETUP_BUILD_ENV],
  ]
  )
  AC_SUBST(BUILD_ENV)
+
+ if test "x$LOCALE" != x; then
+ # Check if we actually have C.UTF-8; if so, use it
+ if $LOCALE -a | $GREP -q -E "^C\.(utf8|UTF-8)$"; then
+ LOCALE_USED=C.UTF-8
+ else
+ AC_MSG_WARN([C.UTF-8 locale not found, using C locale])
+ LOCALE_USED=C
+ fi
+ else
+ AC_MSG_WARN([locale command not not found, using C locale])
+ LOCALE_USED=C
+ fi
+
+ export LC_ALL=$LOCALE_USED
+ AC_SUBST(LOCALE_USED)
 ])
 
 ###############################################################################

make/autoconf/basic_tools.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, 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
@@ -54,6 +54,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
  UTIL_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
 
  # Tools only needed on some platforms
+ UTIL_LOOKUP_PROGS(LOCALE, locale)
  UTIL_LOOKUP_PROGS(PATHTOOL, cygpath wslpath)
  UTIL_LOOKUP_PROGS(CMD, cmd.exe, $PATH:/cygdrive/c/windows/system32:/mnt/c/windows/system32:/c/windows/system32)
 ])

make/autoconf/flags-cflags.m4

@@ -485,7 +485,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_HELPER],
  CFLAGS_OS_DEF_JVM="-D_ALLBSD_SOURCE -D_DARWIN_C_SOURCE -D_XOPEN_SOURCE"
  CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE -D_DARWIN_UNLIMITED_SELECT"
  elif test "x$OPENJDK_TARGET_OS" = xaix; then
- CFLAGS_OS_DEF_JVM="-DAIX"
+ CFLAGS_OS_DEF_JVM="-DAIX -D_LARGE_FILES"
  elif test "x$OPENJDK_TARGET_OS" = xbsd; then
  CFLAGS_OS_DEF_JDK="-D_ALLBSD_SOURCE"
  elif test "x$OPENJDK_TARGET_OS" = xwindows; then

make/autoconf/spec.gmk.template

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2023, 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
@@ -56,8 +56,8 @@ COMMA := ,
 # What make to use for main processing, after bootstrapping top-level Makefile.
 MAKE := @MAKE@
 
-# Make sure all shell commands are executed with the C locale
-export LC_ALL := C
+# Make sure all shell commands are executed with a proper locale
+export LC_ALL := @LOCALE_USED@
 
 # Make sure we override any local CLASSPATH variable
 export CLASSPATH := @CLASSPATH@

make/conf/github-actions.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -36,6 +36,10 @@ MACOS_X64_BOOT_JDK_EXT=tar.gz
 MACOS_X64_BOOT_JDK_URL=https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.2/sapmachine-jdk-21.0.2_macos-x64_bin.tar.gz
 MACOS_X64_BOOT_JDK_SHA256=826fb6c8c5b4c24a1150ad3e393114a8be9072b9f9a65bc10ec8343971eb48fc
 
+MACOS_AARCH64_BOOT_JDK_EXT=tar.gz
+MACOS_AARCH64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk21/fd2272bbf8e04c3dbaee13770090416c/35/GPL/openjdk-21_macos-aarch64_bin.tar.gz
+MACOS_AARCH64_BOOT_JDK_SHA256=f12e1e0a2dffc847951598f597c8ee60fb0913932f24b2b09c62cfd2f0f4dfb9
+
 WINDOWS_X64_BOOT_JDK_EXT=zip
 WINDOWS_X64_BOOT_JDK_URL=https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.2/sapmachine-jdk-21.0.2_windows-x64_bin.zip
 WINDOWS_X64_BOOT_JDK_SHA256=8b2bc8007381240728ca50a23f020a3603ca84314308df707d4b3eff5b3bcfd5

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -51,7 +51,7 @@ ifeq ($(call check-jvm-feature, compiler2), true)
  endif
 
  # Set the C++ standard
- ADLC_CFLAGS += $(ADLC_LANGSTD_CXXFLAG)
+ ADLC_CFLAGS += $(ADLC_LANGSTD_CXXFLAGS)
 
  # NOTE: The old build didn't set -DASSERT for windows but it doesn't seem to
  # hurt.

make/jdk/src/classes/build/tools/classlist/HelloClasslist.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -35,6 +35,7 @@
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystems;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -132,6 +133,8 @@ public static void main(String ... args) throws Throwable {
  String oldDate = String.format("%s%n",
  DateFormat.getDateInstance(DateFormat.DEFAULT, Locale.ROOT)
  .format(new Date()));
+ StandardCharsets.US_ASCII.encode("");
+ StandardCharsets.UTF_8.encode("");
 
  // A selection of trivial and common reflection operations
  var instance = HelloClasslist.class.getConstructor().newInstance();

make/modules/java.base/Java.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -23,7 +23,11 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape restricted
+# The base module should be built with all warnings enabled. When a
+# new warning is added to javac, it can be temporarily added to the
+# disabled warnings list.
+#
+# DISABLED_WARNINGS_java +=
 
 DOCLINT += -Xdoclint:all/protected \
  '-Xdoclint/package:java.*,javax.*'

make/modules/java.compiler/Java.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -23,6 +23,10 @@
 # questions.
 #
 
+# To the extent technically possible, this module should be built with
+# -Werror and all lint warnings enabled. In particular,
+# DISABLED_WARNINGS_java should not be augmented.
+
 DOCLINT += -Xdoclint:all/protected \
  '-Xdoclint/package:java.*,javax.*'
 

make/modules/jdk.compiler/Java.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -23,6 +23,10 @@
 # questions.
 #
 
+# To the extent technically possible, this module should be built with
+# -Werror and all lint warnings enabled. In particular,
+# DISABLED_WARNINGS_java should not be augmented.
+
 DOCLINT += -Xdoclint:all/protected \
  '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*'
 JAVAC_FLAGS += -XDstringConcat=inline

make/modules/jdk.javadoc/Java.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 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
@@ -23,6 +23,8 @@
 # questions.
 #
 
-DISABLED_WARNINGS_java += this-escape
+# To the extent technically possible, this module should be built with
+# -Werror and all lint warnings enabled. In particular,
+# DISABLED_WARNINGS_java should not be augmented.
 
 COPY += .xml .css .svg .js .js.template .png .txt