[GR-49311] Synchronize branch release_jvmci_23.1.

PullRequest: labsjdk-ce-21/32

.github/workflows/build-cross-compile.yml

@@ -31,12 +31,6 @@ on:
  gcc-major-version:
  required: true
  type: string
- apt-gcc-version:
- required: true
- type: string
- apt-gcc-cross-version:
- required: true
- type: string
  extra-conf-options:
  required: false
  type: string
@@ -86,8 +80,7 @@ jobs:
  - target-cpu: riscv64
  gnu-arch: riscv64
  debian-arch: riscv64
- debian-repository: https://deb.debian.org/debian-ports
- debian-keyring: /usr/share/keyrings/debian-ports-archive-keyring.gpg
+ debian-repository: https://httpredir.debian.org/debian/
  debian-version: sid
 
  steps:
@@ -114,12 +107,11 @@ jobs:
  sudo apt-get update
  sudo apt-get install --only-upgrade apt
  sudo apt-get install \
- gcc-${{ inputs.gcc-major-version }}=${{ inputs.apt-gcc-version }} \
- g++-${{ inputs.gcc-major-version }}=${{ inputs.apt-gcc-version }} \
- gcc-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-cross-version }} \
- g++-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}}=${{ inputs.apt-gcc-cross-version }} \
- libxrandr-dev libxtst-dev libcups2-dev libasound2-dev \
- debian-ports-archive-keyring
+ gcc-${{ inputs.gcc-major-version }} \
+ g++-${{ inputs.gcc-major-version }} \
+ gcc-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}} \
+ g++-${{ inputs.gcc-major-version }}-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-abi}} \
+ libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
  sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
 
  - name: 'Check cache for sysroot'
@@ -138,9 +130,9 @@ jobs:
  sudo debootstrap
  --arch=${{ matrix.debian-arch }}
  --verbose
- --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev
+ --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev
  --resolve-deps
- $(test -n "${{ matrix.debian-keyring }}" && echo "--keyring=${{ matrix.debian-keyring }}")
+ --variant=minbase
  ${{ matrix.debian-version }}
  sysroot
  ${{ matrix.debian-repository }}
@@ -153,7 +145,8 @@ jobs:
  sudo chown ${USER} -R sysroot
  rm -rf sysroot/{dev,proc,run,sys,var}
  rm -rf sysroot/usr/{sbin,bin,share}
- rm -rf sysroot/usr/lib/{apt,udev,systemd}
+ rm -rf sysroot/usr/lib/{apt,gcc,udev,systemd}
+ rm -rf sysroot/usr/libexec/gcc
  if: steps.get-cached-sysroot.outputs.cache-hit != 'true'
 
  - name: 'Configure'

.github/workflows/build-linux.yml

@@ -49,9 +49,6 @@ on:
  required: false
  type: string
  default: ''
- apt-gcc-version:
- required: true
- type: string
  apt-architecture:
  required: false
  type: string
@@ -114,7 +111,7 @@ jobs:
  fi
  sudo apt-get update
  sudo apt-get install --only-upgrade apt
- sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }}=${{ inputs.apt-gcc-version }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }}=${{ inputs.apt-gcc-version }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
+ sudo apt-get install gcc-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} g++-${{ inputs.gcc-major-version }}${{ inputs.gcc-package-suffix }} libxrandr-dev${{ steps.arch.outputs.suffix }} libxtst-dev${{ steps.arch.outputs.suffix }} libcups2-dev${{ steps.arch.outputs.suffix }} libasound2-dev${{ steps.arch.outputs.suffix }} ${{ inputs.apt-extra-packages }}
  sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${{ inputs.gcc-major-version }} 100 --slave /usr/bin/g++ g++ /usr/bin/g++-${{ inputs.gcc-major-version }}
 
  - name: 'Configure'

.github/workflows/main.yml

@@ -130,7 +130,6 @@ jobs:
  with:
  platform: linux-x64
  gcc-major-version: '10'
- apt-gcc-version: '10.4.0-4ubuntu1~22.04'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
  # The linux-x64 jdk bundle is used as buildjdk for the cross-compile job
@@ -144,11 +143,10 @@ jobs:
  platform: linux-x86
  gcc-major-version: '10'
  gcc-package-suffix: '-multilib'
- apt-gcc-version: '10.4.0-4ubuntu1~22.04'
  apt-architecture: 'i386'
  # Some multilib libraries do not have proper inter-dependencies, so we have to
  # install their dependencies manually.
- apt-extra-packages: 'libfreetype6-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386'
+ apt-extra-packages: 'libfreetype-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libc6-i386 libgcc-s1:i386 libstdc++6:i386'
  extra-conf-options: '--with-target-bits=32'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -163,7 +161,6 @@ jobs:
  make-target: 'hotspot'
  debug-levels: '[ "debug" ]'
  gcc-major-version: '10'
- apt-gcc-version: '10.4.0-4ubuntu1~22.04'
  extra-conf-options: '--disable-precompiled-headers'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -178,7 +175,6 @@ jobs:
  make-target: 'hotspot'
  debug-levels: '[ "debug" ]'
  gcc-major-version: '10'
- apt-gcc-version: '10.4.0-4ubuntu1~22.04'
  extra-conf-options: '--with-jvm-variants=zero --disable-precompiled-headers'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -193,7 +189,6 @@ jobs:
  make-target: 'hotspot'
  debug-levels: '[ "debug" ]'
  gcc-major-version: '10'
- apt-gcc-version: '10.4.0-4ubuntu1~22.04'
  extra-conf-options: '--with-jvm-variants=minimal --disable-precompiled-headers'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -209,7 +204,6 @@ jobs:
  # Technically this is not the "debug" level, but we can't inject a new matrix state for just this job
  debug-levels: '[ "debug" ]'
  gcc-major-version: '10'
- apt-gcc-version: '10.4.0-4ubuntu1~22.04'
  extra-conf-options: '--with-debug-level=optimized --disable-precompiled-headers'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
@@ -223,8 +217,6 @@ jobs:
  uses: ./.github/workflows/build-cross-compile.yml
  with:
  gcc-major-version: '10'
- apt-gcc-version: '10.4.0-4ubuntu1~22.04'
- apt-gcc-cross-version: '10.4.0-4ubuntu1~22.04cross1'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
  if: needs.select.outputs.linux-cross-compile == 'true'
@@ -290,7 +282,6 @@ jobs:
  # build JDK, and we do not need the additional testing of the graphs.
  extra-conf-options: '--disable-full-docs'
  gcc-major-version: '10'
- apt-gcc-version: '10.4.0-4ubuntu1~22.04'
  configure-arguments: ${{ github.event.inputs.configure-arguments }}
  make-arguments: ${{ github.event.inputs.make-arguments }}
  if: needs.select.outputs.docs == 'true'

.jcheck/conf

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

ci.jsonnet

@@ -1,13 +1,13 @@
 # https://github.com/graalvm/labs-openjdk-21/blob/master/doc/testing.md
 local run_test_spec = "test/hotspot/jtreg/compiler/jvmci test/jdk/tools/jlink/plugins/SaveJlinkArgfilesPluginTest.java";
 
-local labsjdk_builder_version = "8928c95fac6928559341b784233d0f1b985a3a4f";
+local labsjdk_builder_version = "bcdc3fc82760543571fac7c1c35452dbb2ce6b9b";
 
 # Returns true if `str` contains `needle` as a substring.
 local contains(str, needle) = std.findSubstr(needle, str) != [];
 
 {
- overlay: "9aaf850438f4551337c76b9133b700c23abfd739",
+ overlay: "087852016f367deb24c7d893052ab48e04e698c1",
  specVersion: "3",
 
  mxDependencies:: {
@@ -29,7 +29,8 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
  JIB_PATH: "${PATH}",
  MAKE : "make",
  ZLIB_BUNDLING: "system",
- MX_PYTHON: "python3.8"
+ MX_PYTHON: "python3.8",
+ JVMCI_VERSION_CHECK: "ignore"
  },
  },
 
@@ -243,13 +244,13 @@ local contains(str, needle) = std.findSubstr(needle, str) != [];
  # Downstream Graal branch to test against. If you change this value to anything but
  # "master", you must create an ol-jira issue to change it back to master once the
  # next JVMCI release has been made. Add the issue id as a comment here.
- local downstream_branch = "master",
+ local downstream_branch = "me/ignore_jvmci_vesion_check",
 
  local clone_graal(defs) = {
  # Checkout the graal-enterprise repo to the "_gate" version of the
  # named downstream branch. This ensures the graal-enterprise and
  # graal repos will be in sync.
- local branch = if downstream_branch == "master" then "master" else downstream_branch + "_gate",
+ local branch = if downstream_branch == "cpu/graal-vm/23.1" then "cpu/graal-vm/23.1" else downstream_branch + "_gate",
 
  run+: [
  ["git", "clone", defs.graal_enterprise_url],

make/Init.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2023, 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
@@ -138,7 +138,10 @@ ifeq ($(HAS_SPEC),)
  # The spec files depend on the autoconf source code. This check makes sure
  # the configuration is up to date after changes to configure.
  $(SPECS): $(wildcard $(topdir)/make/autoconf/*) \
- $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*))
+ $(if $(CUSTOM_CONFIG_DIR), $(wildcard $(CUSTOM_CONFIG_DIR)/*)) \
+ $(addprefix $(topdir)/make/conf/, version-numbers.conf branding.conf) \
+ $(if $(CUSTOM_CONF_DIR), $(wildcard $(addprefix $(CUSTOM_CONF_DIR)/, \
+ version-numbers.conf branding.conf)))
  ifeq ($(CONF_CHECK), fail)
  @echo Error: The configuration is not up to date for \
  "'$(lastword $(subst /, , $(dir $@)))'."

make/autoconf/jdk-options.m4

@@ -822,6 +822,9 @@ AC_DEFUN([JDKOPT_CHECK_CODESIGN_PARAMS],
  $RM "$CODESIGN_TESTFILE"
  $TOUCH "$CODESIGN_TESTFILE"
  CODESIGN_SUCCESS=false
+
+ $ECHO "check codesign, calling $CODESIGN $PARAMS $CODESIGN_TESTFILE" >&AS_MESSAGE_LOG_FD
+
  eval \"$CODESIGN\" $PARAMS \"$CODESIGN_TESTFILE\" 2>&AS_MESSAGE_LOG_FD \
  >&AS_MESSAGE_LOG_FD && CODESIGN_SUCCESS=true
  $RM "$CODESIGN_TESTFILE"

make/autoconf/platform.m4

@@ -567,8 +567,6 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
  HOTSPOT_$1_CPU_DEFINE=PPC64
  elif test "x$OPENJDK_$1_CPU" = xppc64le; then
  HOTSPOT_$1_CPU_DEFINE=PPC64
- elif test "x$OPENJDK_$1_CPU" = xriscv32; then
- HOTSPOT_$1_CPU_DEFINE=RISCV32
  elif test "x$OPENJDK_$1_CPU" = xriscv64; then
  HOTSPOT_$1_CPU_DEFINE=RISCV64
 
@@ -577,10 +575,14 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS_HELPER],
  HOTSPOT_$1_CPU_DEFINE=SPARC
  elif test "x$OPENJDK_$1_CPU" = xppc; then
  HOTSPOT_$1_CPU_DEFINE=PPC32
+ elif test "x$OPENJDK_$1_CPU" = xriscv32; then
+ HOTSPOT_$1_CPU_DEFINE=RISCV32
  elif test "x$OPENJDK_$1_CPU" = xs390; then
  HOTSPOT_$1_CPU_DEFINE=S390
  elif test "x$OPENJDK_$1_CPU" = xs390x; then
  HOTSPOT_$1_CPU_DEFINE=S390
+ elif test "x$OPENJDK_$1_CPU" = xloongarch64; then
+ HOTSPOT_$1_CPU_DEFINE=LOONGARCH64
  elif test "x$OPENJDK_$1_CPU" != x; then
  HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
  fi

make/autoconf/toolchain.m4

@@ -804,7 +804,11 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
 
  case $TOOLCHAIN_TYPE in
  gcc|clang)
- UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, c++filt)
+ if test "x$OPENJDK_TARGET_OS" = xaix; then
+ UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, ibm-llvm-cxxfilt)
+ else
+ UTIL_REQUIRE_TOOLCHAIN_PROGS(CXXFILT, c++filt)
+ fi
  ;;
  esac
 ])

make/common/Modules.gmk

@@ -64,6 +64,8 @@ ifeq ($(INCLUDE_JVMCI), false)
  MODULES_FILTER += jdk.internal.vm.ci
  MODULES_FILTER += jdk.internal.vm.compiler
  MODULES_FILTER += jdk.internal.vm.compiler.management
+ MODULES_FILTER += jdk.compiler.graal
+ MODULES_FILTER += jdk.compiler.graal.management
 endif
 
 # jpackage is only on windows, macosx, and linux

make/conf/module-loader-map.conf

@@ -62,6 +62,8 @@ UPGRADEABLE_PLATFORM_MODULES= \
  java.compiler \
  jdk.internal.vm.compiler \
  jdk.internal.vm.compiler.management \
+ jdk.compiler.graal \
+ jdk.compiler.graal.management \
  #
 
 PLATFORM_MODULES= \

make/conf/version-numbers.conf

@@ -28,12 +28,12 @@
 
 DEFAULT_VERSION_FEATURE=21
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=0
+DEFAULT_VERSION_UPDATE=1
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2023-09-19
+DEFAULT_VERSION_DATE=2023-10-17
 DEFAULT_VERSION_CLASSFILE_MAJOR=65 # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11

make/devkit/createJMHBundle.sh

@@ -26,8 +26,8 @@
 # Create a bundle in the build directory, containing what's needed to
 # build and run JMH microbenchmarks from the OpenJDK build.
 
-JMH_VERSION=1.36
-COMMONS_MATH3_VERSION=3.2
+JMH_VERSION=1.37
+COMMONS_MATH3_VERSION=3.6.1
 JOPT_SIMPLE_VERSION=5.0.4
 
 BUNDLE_NAME=jmh-$JMH_VERSION.tar.gz

make/modules/java.desktop/lib/Awt2dLibraries.gmk

@@ -237,6 +237,8 @@ ifeq ($(call isTargetOs, windows macosx), false)
  DISABLED_WARNINGS_gcc_gtk3_interface.c := parentheses type-limits unused-function, \
  DISABLED_WARNINGS_gcc_OGLBufImgOps.c := format-nonliteral, \
  DISABLED_WARNINGS_gcc_OGLPaints.c := format-nonliteral, \
+ DISABLED_WARNINGS_gcc_screencast_pipewire.c := undef, \
+ DISABLED_WARNINGS_gcc_screencast_portal.c := undef, \
  DISABLED_WARNINGS_gcc_sun_awt_X11_GtkFileDialogPeer.c := parentheses, \
  DISABLED_WARNINGS_gcc_X11SurfaceData.c := implicit-fallthrough pointer-to-int-cast, \
  DISABLED_WARNINGS_gcc_XlibWrapper.c := type-limits pointer-to-int-cast, \
@@ -421,6 +423,7 @@ else
  LIBFREETYPE_LIBS := -lfreetype
  endif
 
+ # gcc_ftobjs.c := maybe-uninitialized required for GCC 7 builds.
  $(eval $(call SetupJdkLibrary, BUILD_LIBFREETYPE, \
  NAME := freetype, \
  OPTIMIZATION := HIGHEST, \
@@ -429,6 +432,7 @@ else
  EXTRA_HEADER_DIRS := $(BUILD_LIBFREETYPE_HEADER_DIRS), \
  DISABLED_WARNINGS_microsoft := 4267 4244 4996, \
  DISABLED_WARNINGS_gcc := dangling-pointer stringop-overflow, \
+ DISABLED_WARNINGS_gcc_ftobjs.c := maybe-uninitialized, \
  LDFLAGS := $(LDFLAGS_JDKLIB) \
  $(call SET_SHARED_LIBRARY_ORIGIN), \
  ))

src/hotspot/cpu/aarch64/frame_aarch64.cpp

@@ -508,7 +508,7 @@ bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
 
  // first the method
 
- Method* m = *interpreter_frame_method_addr();
+ Method* m = safe_interpreter_frame_method();
 
  // validate the method we'd find in this potential sender
  if (!Method::is_valid_method(m)) return false;

src/hotspot/cpu/arm/frame_arm.cpp

@@ -421,7 +421,7 @@ bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
 
  // first the method
 
- Method* m = *interpreter_frame_method_addr();
+ Method* m = safe_interpreter_frame_method();
 
  // validate the method we'd find in this potential sender
  if (!Method::is_valid_method(m)) return false;

src/hotspot/cpu/ppc/frame_ppc.cpp

@@ -324,7 +324,7 @@ bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
 
  // first the method
 
- Method* m = *interpreter_frame_method_addr();
+ Method* m = safe_interpreter_frame_method();
 
  // validate the method we'd find in this potential sender
  if (!Method::is_valid_method(m)) return false;

src/hotspot/cpu/riscv/assembler_riscv.hpp

@@ -2787,7 +2787,13 @@ enum Nf {
  c_slli(Rd, shamt); \
  return; \
  } \
- _slli(Rd, Rs1, shamt); \
+ if (shamt != 0) { \
+ _slli(Rd, Rs1, shamt); \
+ } else { \
+ if (Rd != Rs1) { \
+ addi(Rd, Rs1, 0); \
+ } \
+ } \
  }
 
  INSN(slli);
@@ -2802,7 +2808,13 @@ enum Nf {
  C_NAME(Rd, shamt); \
  return; \
  } \
- NORMAL_NAME(Rd, Rs1, shamt); \
+ if (shamt != 0) { \
+ NORMAL_NAME(Rd, Rs1, shamt); \
+ } else { \
+ if (Rd != Rs1) { \
+ addi(Rd, Rs1, 0); \
+ } \
+ } \
  }
 
  INSN(srai, c_srai, _srai);