JBR-4099 add env.JBSDK_VERSION into test binaries

.github/workflows/submit.yml

@@ -341,7 +341,6 @@ jobs:
         run: >
           if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then
             cat build/*/test-results/*/text/newfailures.txt ;
-            cat build/*/test-results/*/text/other_errors.txt ;
             exit 1 ;
           fi
 
@@ -808,7 +807,6 @@ jobs:
         run: >
           if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then
             cat build/*/test-results/*/text/newfailures.txt ;
-            cat build/*/test-results/*/text/other_errors.txt ;
             exit 1 ;
           fi
 
@@ -1220,7 +1218,6 @@ jobs:
         run: >
           if ((Get-ChildItem -Path build\*\test-results\test-summary.txt -Recurse | Select-String -Pattern "TEST SUCCESS" ).Count -eq 0) {
             Get-Content -Path build\*\test-results\*\*\newfailures.txt ;
-            Get-Content -Path build\*\test-results\*\*\other_errors.txt ;
             exit 1
           }
 
@@ -1614,7 +1611,6 @@ jobs:
         run: >
           if ! grep --include=test-summary.txt -lqr build/*/test-results -e "TEST SUCCESS" ; then
             cat build/*/test-results/*/text/newfailures.txt ;
-            cat build/*/test-results/*/text/other_errors.txt ;
             exit 1 ;
           fi
 

.jcheck/conf

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

README.md

@@ -11,7 +11,6 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
 
 | IDE Version | Latest JBR | Date Released |
 |  ---        | ---        | ---           |
-| 2022.1      | [17_0_2-b315.1](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr17_0_2b315.1) | 09-Feb-2022 |
 | 2021.3      | [17_0_1-b164.8](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr17_0_1b164.8) | 15-Nov-2021 |
 
 ## Contents

doc/building.html

@@ -507,7 +507,7 @@
 </ul>
 <h2 id="running-tests">Running Tests</h2>
 <p>Most of the JDK tests are using the <a href="http://openjdk.java.net/jtreg">JTReg</a> test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc.</p>
-<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
+<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
 <p>Building of Hotspot Gtest suite requires the source code of Google Test framework. The top directory, which contains both <code>googletest</code> and <code>googlemock</code> directories, should be specified via <code>--with-gtest</code>. The supported version of Google Test is 1.8.1, whose source code can be obtained:</p>
 <ul>
 <li>by downloading and unpacking the source bundle from <a href="https://github.com/google/googletest/releases/tag/release-1.8.1">here</a></li>

doc/building.md

@@ -848,7 +848,7 @@ containing `lib/jtreg.jar` etc.
 
 The [Adoption Group](https://wiki.openjdk.java.net/display/Adoption) provides
 recent builds of jtreg [here](
-https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/).
+https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact).
 Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
 `jtreg` directory that you just unpacked.
 

doc/testing.html

@@ -193,9 +193,7 @@ TEST FAILURE</code></pre>
 <h4 id="aot_modules-1">AOT_MODULES</h4>
 <p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
 <h4 id="retry_count">RETRY_COUNT</h4>
-<p>Retry failed tests up to a set number of times, until they pass. This allows to pass the tests with intermittent failures. Defaults to 0.</p>
-<h4 id="repeat_count">REPEAT_COUNT</h4>
-<p>Repeat the tests up to a set number of times, stopping at first failure. This helps to reproduce intermittent test failures. Defaults to 0.</p>
+<p>Retry failed tests up to a set number of times. Defaults to 0.</p>
 <h3 id="gtest-keywords">Gtest keywords</h3>
 <h4 id="repeat">REPEAT</h4>
 <p>The number of times to repeat the tests (<code>--gtest_repeat</code>).</p>

doc/testing.md

@@ -419,15 +419,7 @@ modules. If multiple modules are specified, they should be separated by space
 
 #### RETRY_COUNT
 
-Retry failed tests up to a set number of times, until they pass.
-This allows to pass the tests with intermittent failures.
-Defaults to 0.
-
-#### REPEAT_COUNT
-
-Repeat the tests up to a set number of times, stopping at first failure.
-This helps to reproduce intermittent test failures.
-Defaults to 0.
+Retry failed tests up to a set number of times. Defaults to 0.
 
 ### Gtest keywords
 

jb/project/docker/Dockerfile.aarch64

@@ -31,7 +31,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         libxt-dev \
         libxtst-dev \
         make \
-        rsync \
         tar \
         unzip \
         zip && \

jb/project/docker/Dockerfile.musl_aarch64

@@ -1,22 +0,0 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_aarch64.sh script.
-
-# Pull a concrete version of Linux that does NOT recieve updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-FROM arm64v8/alpine:3.12
-
-# Install the necessary build tools
-RUN     apk --no-cache add --update bash grep tar zip bzip2 rsync fontconfig build-base \
-	    git libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev \
-	    libxtst-dev autoconf freetype-dev cups-dev alsa-lib-dev file \
-	    fontconfig fontconfig-dev linux-headers
-
-# Set up boot JDK for building
-COPY boot_jdk_musl_aarch64.tar.gz /jdk17/
-RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_musl_aarch64.tar.gz && rm /jdk17/boot_jdk_musl_aarch64.tar.gz
-ENV BOOT_JDK=/jdk17
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"

jb/project/docker/Dockerfile.musl_x64

@@ -1,22 +0,0 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_musl_x64.sh script.
-
-# Pull a concrete version of Linux that does NOT recieve updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-FROM alpine:3.5
-
-# Install the necessary build tools
-RUN     apk --no-cache add --update bash grep tar zip bzip2 rsync fontconfig build-base \
-	    git libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev \
-	    libxtst-dev autoconf freetype-dev cups-dev alsa-lib-dev file \
-	    fontconfig fontconfig-dev linux-headers
-
-# Set up boot JDK for building
-COPY boot_jdk_musl_amd64.tar.gz /jdk17/
-RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_musl_amd64.tar.gz && rm /jdk17/boot_jdk_musl_amd64.tar.gz
-ENV BOOT_JDK=/jdk17
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"

jb/project/docker/Dockerfile.x86

@@ -1,55 +1,7 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_x86.sh script.
+FROM i386/ubuntu:xenial
 
-# Pull a concrete version of Linux that does NOT receive updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-#FROM i386/ubuntu:xenial
-#FROM i386/ubuntu:bionic
-FROM i386/ubuntu:focal
-
-RUN linux32 \
-    apt-get update && apt-get install -y --no-install-recommends apt-utils
-RUN export DEBIAN_FRONTEND=noninteractive \
-    export DEBCONF_NONINTERACTIVE_SEEN=true && \
-    echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections; \
-    echo 'tzdata tzdata/Zones/Etc select UTC' | debconf-set-selections; \
-    linux32 \
-    apt-get -y install \
-        autoconf \
-        build-essential \
-        curl \
-        file \
-        git \
-        libx11-dev \
-        libxext-dev \
-        libxrender-dev \
-        libxrandr-dev \
-        libxtst-dev \
-        libxt-dev \
-        libcups2-dev \
-        libasound2-data \
-#        libpng12-0 \
-        libasound2 \
-        libfreetype6 \
-        libfontconfig1-dev \
-        libasound2-dev \
-        rsync \
-        unzip \
-        zip
-RUN linux32 \
-    apt-get -y install \
-        g++-10 \
-        gcc-10 && \
-    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10 && \
-    apt-get clean -qy && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-# Set up boot JDK for building
-COPY boot_jdk_x86.tar.gz /jdk17/
-RUN cd /jdk17 && tar --strip-components=1 -xzf boot_jdk_x86.tar.gz && rm /jdk17/boot_jdk_x86.tar.gz
-ENV BOOT_JDK=/jdk17
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"
+RUN linux32 apt-get update && apt-get install -y --no-install-recommends apt-utils
+COPY jbrsdk-11.0.5-b1 /jbrsdk-11.0.5-b1
+RUN linux32 apt-get -y install file build-essential zip unzip curl libx11-dev libxext-dev \
+  libxrender-dev libxrandr-dev libxtst-dev libxt-dev libcups2-dev libasound2-data \
+  libpng12-0 libasound2 libfreetype6 libfontconfig1-dev libasound2-dev autoconf

jb/project/docker/mkdocker_aarch64.sh

@@ -1,7 +1,4 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 # This script creates a Docker image suitable for building AArch64 variant
 # of the JetBrains Runtime version 17.

jb/project/docker/mkdocker_musl_aarch64.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# This script creates a Docker image suitable for building musl AArch64 variant
-# of the JetBrains Runtime version 17.
-
-BOOT_JDK_REMOTE_FILE=zulu17.32.13-ca-jdk17.0.2-linux_musl_aarch64.tar.gz
-BOOT_JDK_SHA=6b920559abafbe9bdef386a20ecf3a2f318bc1f0d8359eb1f95aee26606bbc70
-BOOT_JDK_LOCAL_FILE=boot_jdk_musl_aarch64.tar.gz
-
-if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
-    # Obtain "boot JDK" from outside of the container.
-    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
-else
-    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
-fi
-
-# Verify that what we've downloaded can be trusted.
-sha256sum -c - <<EOF
-$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
-EOF
-
-docker build -t jbr17buildenv -f Dockerfile.musl_aarch64 .
-
-# NB: the resulting container can (and should) be used without the network
-# connection (--network none) during build in order to reduce the chance
-# of build contamination.

jb/project/docker/mkdocker_musl_x64.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
-
-# This script creates a Docker image suitable for building musl-x64 variant
-# of the JetBrains Runtime version 17.
-
-BOOT_JDK_REMOTE_FILE=zulu17.32.13-ca-jdk17.0.2-linux_musl_x64.tar.gz
-BOOT_JDK_SHA=bcc5342011bd9f3643372aadbdfa68d47463ff0d8621668a0bdf2910614d95c6
-BOOT_JDK_LOCAL_FILE=boot_jdk_musl_amd64.tar.gz
-
-if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
-    # Obtain "boot JDK" from outside of the container.
-    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
-else
-    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
-fi
-
-# Verify that what we've downloaded can be trusted.
-sha256sum -c - <<EOF
-$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
-EOF
-
-docker build -t jbr17buildenv -f Dockerfile.musl_x64 .
-
-# NB: the resulting container can (and should) be used without the network
-# connection (--network none) during build in order to reduce the chance
-# of build contamination.

jb/project/docker/mkdocker_x86.sh

@@ -1,26 +0,0 @@
-#!/bin/bash -x
-
-# This script creates a Docker image suitable for building x86 variant
-# of the JetBrains Runtime version 17.
-
-BOOT_JDK_REMOTE_FILE=zulu17.34.19-ca-jdk17.0.3-linux_i686.tar.gz
-BOOT_JDK_SHA=1c35c374ba0001e675d6e80819d5be900c4e141636d5e484992a8c550be14481
-BOOT_JDK_LOCAL_FILE=boot_jdk_x86.tar.gz
-
-if [ ! -f $BOOT_JDK_LOCAL_FILE ]; then
-    # Obtain "boot JDK" from outside of the container.
-    wget -nc https://cdn.azul.com/zulu/bin/${BOOT_JDK_REMOTE_FILE} -O $BOOT_JDK_LOCAL_FILE
-else
-    echo "boot JDK \"$BOOT_JDK_LOCAL_FILE\" present, skipping download"
-fi
-
-# Verify that what we've downloaded can be trusted.
-sha256sum -c - <<EOF
-$BOOT_JDK_SHA *$BOOT_JDK_LOCAL_FILE
-EOF
-
-docker build -t jetbrains/runtime:jbr17env_x86 -f Dockerfile.x86 .
-
-# NB: the resulting container can (and should) be used without the network
-# connection (--network none) during build in order to reduce the chance
-# of build contamination.

jb/project/tools/common/scripts/build-jbr-api.sh

@@ -1,6 +1,4 @@
-#!/bin/bash
-
-set -euo pipefail
+#!/bin/sh
 
 # $1 - Boot JDK
 # $2 - JBR part of API version

jb/project/tools/common/scripts/common.sh

@@ -1,65 +1,44 @@
-#!/bin/bash
+#!/bin/bash -x
 
-set -euo pipefail
-set -x
-
-function check_bundle_type_maketest() {
-  # check whether last char is 't', if so remove it
-  if [ "${bundle_type: -1}" == "t" ]; then
-    bundle_type="${bundle_type%?}"
-    do_maketest=1
-  else
-    do_maketest=0
-  fi
-}
-
-function getVersionProp() {
-  grep "^${1}" make/conf/version-numbers.conf | cut -d'=' -f2
-}
+tag_prefix="jbr-"
 
 while getopts ":i?" o; do
     case "${o}" in
-        i) INC_BUILD=1 ;;
+        i)
+            i="incremental build"
+            INC_BUILD=1
+            ;;
     esac
 done
 shift $((OPTIND-1))
 
-if [[ $# -lt 2 ]]; then
-  echo "Required at least two arguments: build_number bundle_type"
-  exit 1
+if [ $# -le $min_parameters_count ]; then
+  build_number=$1
+  bundle_type=$2
+  architecture=$3 # aarch64 or x64
+else
+  JBSDK_VERSION=$1
+  JDK_BUILD_NUMBER=$2
+  build_number=$3
+  bundle_type=$4
+  architecture=$5 # aarch64 or x64
 fi
 
-build_number=$1
-bundle_type=$2
-# shellcheck disable=SC2034
-architecture=${3:-x64} # aarch64 or x64
-
-check_bundle_type_maketest
-
-tag_prefix="jbr-"
-OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "$tag_prefix" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1 | tr -d ",")
-VERSION_FEATURE=$(getVersionProp "DEFAULT_VERSION_FEATURE")
-VERSION_INTERIM=$(getVersionProp "DEFAULT_VERSION_INTERIM")
-VERSION_UPDATE=$(getVersionProp "DEFAULT_VERSION_UPDATE")
-[[ $VERSION_UPDATE = 0 ]] && JBSDK_VERSION="$VERSION_FEATURE" || JBSDK_VERSION="${VERSION_FEATURE}.${VERSION_INTERIM}.${VERSION_UPDATE}"
+OPENJDK_TAG=$(git log --simplify-by-decoration --decorate=short --pretty=short | grep "$tag_prefix" | cut -d "(" -f2 | cut -d ")" -f1 | awk '{print $2}' | sort -t "-" -k 2 -g | tail -n 1)
+JBSDK_VERSION=${JBSDK_VERSION:=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $2}')}
 echo "##teamcity[setParameter name='env.JBSDK_VERSION' value='${JBSDK_VERSION}']"
 JDK_BUILD_NUMBER=${JDK_BUILD_NUMBER:=$(echo $OPENJDK_TAG | awk -F "-|[+]" '{print $3}')}
-[ -z $JDK_BUILD_NUMBER ] && JDK_BUILD_NUMBER=1
 echo "##teamcity[setParameter name='env.JDK_UPDATE_NUMBER' value='${JDK_BUILD_NUMBER}']"
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 
 VENDOR_NAME="JetBrains s.r.o."
-VENDOR_VERSION_STRING="JBR-${JBSDK_VERSION}+${JDK_BUILD_NUMBER}-${build_number}"
+VENDOR_VERSION_STRING="JBR-${JBSDK_VERSION_WITH_DOTS}+${JDK_BUILD_NUMBER}-${build_number}"
 [ -z "$bundle_type" ] || VENDOR_VERSION_STRING="${VENDOR_VERSION_STRING}-${bundle_type}"
 
 do_reset_changes=0
 do_reset_dcevm=0
 HEAD_REVISION=0
 
-STATIC_CONF_ARGS=""
-common_conf_props_file="jb/project/tools/common/static_conf_args.txt"
-if [[ -f "$common_conf_props_file" ]]; then
-    STATIC_CONF_ARGS=$(<$common_conf_props_file)
-fi
 OS_NAME=$(uname -s)
 # Enable reproducible builds
 TZ=UTC
@@ -75,40 +54,26 @@ case "$OS_NAME" in
         BUILD_TIME="$(date --utc --date=@$SOURCE_DATE_EPOCH +%F)"
         REPRODUCIBLE_TAR_OPTS="--mtime=@$SOURCE_DATE_EPOCH --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
         ;;
-    CYGWIN*)
-        COPYRIGHT_YEAR="$(date --utc --date=@$SOURCE_DATE_EPOCH +%Y)"
-        BUILD_TIME="$(date --utc --date=@$SOURCE_DATE_EPOCH +%F)"
-        REPRODUCIBLE_TAR_OPTS="--mtime=@$SOURCE_DATE_EPOCH --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"
-        ;;
     Darwin)
         COPYRIGHT_YEAR="$(date -u -r $SOURCE_DATE_EPOCH +%Y)"
         BUILD_TIME="$(date -u -r $SOURCE_DATE_EPOCH +%F)"
         TOUCH_TIME="$(date -u -r $SOURCE_DATE_EPOCH +%Y%m%d%H%M.%S)"
         REPRODUCIBLE_TAR_OPTS="--uid 0 --gid 0 --numeric-owner"
         ;;
+    *)
+        # TODO: Windows
+        ;;
 esac
 
-WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS="--with-native-debug-symbols=zipped"
-
 REPRODUCIBLE_BUILD_OPTS="--enable-reproducible-build
   --with-source-date=$SOURCE_DATE_EPOCH
   --with-hotspot-build-time=$BUILD_TIME
   --with-copyright-year=$COPYRIGHT_YEAR
   --disable-absolute-paths-in-output"
 
-function zip_native_debug_symbols() {
-  image_bundle_path=$(echo $1 | cut -d"/" -f-4)
-  jbr_diz_name=$2
-
-  (cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} ../../../../dizfiles \; )
-
-  (cd dizfiles && find . -print0 | COPYFILE_DISABLE=1 \
-    tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
-}
-
 function do_exit() {
   exit_code=$1
-  [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+  [ $do_reset_changes -eq 1 ] && git checkout HEAD modules.list src/java.desktop/share/classes/module-info.java
   if [ $do_reset_dcevm -eq 1 ]; then
     [ ! -z $HEAD_REVISION ] && git reset --hard $HEAD_REVISION
   fi

jb/project/tools/common/static_conf_args.txt

@@ -1 +0,0 @@
---with-vendor-vm-bug-url=https://youtrack.jetbrains.com/issues/JBR

jb/project/tools/linux/scripts/mkimages_aarch64.sh

@@ -1,163 +1,82 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 # The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
 #
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
-# Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_linux_aarch64
 
+min_parameters_count=1
 source jb/project/tools/common/scripts/common.sh
 
-JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64}
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 
-function do_configure {
-  sh configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build="$JDK_BUILD_NUMBER" \
-    --with-version-opt=b"$build_number" \
-    --with-boot-jdk="$BOOT_JDK" \
-    --enable-cds=yes \
-    $STATIC_CONF_ARGS \
-    $REPRODUCIBLE_BUILD_OPTS \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    || do_exit $?
-}
+sh configure \
+  --with-debug-level=release \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-jvm-features=shenandoahgc \
+  --with-version-pre= \
+  --with-version-build="${JDK_BUILD_NUMBER}" \
+  --with-version-opt=b${build_number} \
+  --with-boot-jdk=${BOOT_JDK} \
+  --enable-cds=yes \
+  $REPRODUCIBLE_BUILD_OPTS \
+  || exit $?
+make clean CONF=linux-aarch64-server-release || exit $?
+make images CONF=linux-aarch64-server-release test-image || exit $?
 
-function is_musl {
-  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
-  if [ -z $libc ]; then
-    # This is not Musl, return 1 == false
-    return 1
-  fi
-  return 0
-}
-
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
-
-  libc_type_suffix=''
-  fastdebug_infix=''
-
-  if is_musl; then libc_type_suffix='musl-' ; fi
-
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}aarch64-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-${libc_type_suffix}aarch64-${fastdebug_infix:-}b${build_number%%.*}
-
-
-  echo Running jlink....
-  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
-  $JSDK/bin/jlink \
-    --module-path "$__modules_path" --no-man-pages --compress=2 \
-    --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
-    mv release "$IMAGES_DIR"/"$__root_dir"/release
-    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
-  fi
-
-  # jmod does not preserve file permissions (JDK-8173610)
-  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
-
-  echo Creating "$JBR".tar.gz ...
-
-  (cd "$IMAGES_DIR" &&
-    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
-    tar $REPRODUCIBLE_TAR_OPTS \
-      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
-  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
-  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
-  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
-  gzip "$JBR".tar || do_exit $?
-  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=linux-aarch64-server-release
-
-case "$bundle_type" in
-  "jcef")
-    do_reset_changes=1
-    do_maketest=1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "fd")
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=linux-aarch64-server-fastdebug
-    ;;
-esac
-
-if [ -z "${INC_BUILD:-}" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBSDK=${JBRSDK_BASE_NAME}-linux-aarch64-b${build_number}
+BASE_DIR=build/linux-aarch64-server-release/images
+JSDK=${BASE_DIR}/jdk
 JBRSDK_BUNDLE=jbrsdk
 
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
-  update_jsdk_mods $JSDK $JCEF_PATH/jmods $JSDK/jmods $JSDK_MODS_DIR || do_exit $?
-  cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
+rm -rf $BASE_DIR/$JBRSDK_BUNDLE
+cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
+echo Creating $JBSDK.tar.gz ...
+sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
+mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
 
-# create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+# NB: --sort=name requires tar1.28
+tar $REPRODUCIBLE_TAR_OPTS --sort=name -pcf $JBSDK.tar \
+  --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
+  -C $BASE_DIR ${JBRSDK_BUNDLE} || exit $?
+touch -c -d @$SOURCE_DATE_EPOCH $JBRSDK.tar
+gzip $JBSDK.tar || exit $?
 
-# create sdk image bundle
-modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
-  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
-fi
-create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
+JBR_BUNDLE=jbr
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+rm -rf $BASE_DIR/$JBR_BUNDLE
 
-if [ $do_maketest -eq 1 ]; then
-    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-aarch64-b${build_number}
-    echo Creating "$JBRSDK_TEST" ...
-    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
-    make test-image CONF=$RELEASE_NAME || do_exit $?
-    tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
-    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
-    gzip "$JBRSDK_TEST".tar || do_exit $?
-fi
+JBR=$JBR_BASE_NAME-linux-aarch64-b$build_number
+grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.aarch64
+echo Running jlink....
+${JSDK}/bin/jlink \
+  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+  --add-modules $(xargs < modules.list.aarch64 | sed s/" "//g | sed s/',$'//g) \
+  --output ${BASE_DIR}/${JBR_BUNDLE} || exit $?
 
-do_exit 0
+echo Modifying release info ...
+grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${BASE_DIR}/${JBR_BUNDLE}/release
+
+echo Creating $JBR.tar.gz ...
+tar $REPRODUCIBLE_TAR_OPTS --sort=name -pcf $JBR.tar -C $BASE_DIR ${JBR_BUNDLE} || exit $?
+touch -c -d @$SOURCE_DATE_EPOCH $JBR.tar
+gzip $JBR.tar || exit $?
+
+JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-aarch64-b$build_number
+echo Creating $JBRSDK_TEST.tar.gz ...
+tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
+gzip $JBRSDK_TEST.tar || exit $?

jb/project/tools/linux/scripts/mkimages_x64.sh

@@ -1,25 +1,27 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 # The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
+#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to be built; possible values:
+#                        <empty> or nomod - the release bundles without any additional modules (jcef)
+#                        jcef - the release bundles with jcef
+#                        fd - the fastdebug bundles which also include the jcef module
 #
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
 # Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
 #   JCEF_PATH - specifies the path to the directory with JCEF binaries.
 #               By default JCEF binaries should be located in ./jcef_linux_x64
 
+min_parameters_count=2
 source jb/project/tools/common/scripts/common.sh
 
 JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
@@ -35,65 +37,46 @@ function do_configure {
     --with-version-opt=b"$build_number" \
     --with-boot-jdk="$BOOT_JDK" \
     --enable-cds=yes \
-    $STATIC_CONF_ARGS \
     $REPRODUCIBLE_BUILD_OPTS \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
     || do_exit $?
 }
 
-function is_musl {
-  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
-  if [ -z $libc ]; then
-    # This is not Musl, return 1 == false
-    return 1
-  fi
-  return 0
-}
-
 function create_image_bundle {
   __bundle_name=$1
   __arch_name=$2
   __modules_path=$3
   __modules=$4
 
-  libc_type_suffix=''
-  fastdebug_infix=''
-
-  if is_musl; then libc_type_suffix='musl-' ; fi
-
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x64-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-${libc_type_suffix}x64-${fastdebug_infix:-}b${build_number%%.*}
+  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-x64-${fastdebug_infix}b${build_number}
 
   echo Running jlink....
-  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+  [ -d "$IMAGES_DIR"/"$__arch_name" ] && rm -rf "${IMAGES_DIR:?}"/"$__arch_name"
   $JSDK/bin/jlink \
     --module-path "$__modules_path" --no-man-pages --compress=2 \
-    --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
+    --add-modules "$__modules" --output "$IMAGES_DIR"/"$__arch_name"
 
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__arch_name"/release
   if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
-    mv release "$IMAGES_DIR"/"$__root_dir"/release
-    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
+    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__arch_name"/release > release
+    mv release "$IMAGES_DIR"/"$__arch_name"/release
+    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__arch_name"/jmods
   fi
 
   # jmod does not preserve file permissions (JDK-8173610)
-  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
+  [ -f "$IMAGES_DIR"/"$__arch_name"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__arch_name"/lib/jcef_helper
 
   echo Creating "$JBR".tar.gz ...
 
   (cd "$IMAGES_DIR" &&
-    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
+    find "$__arch_name" -print0 | LC_ALL=C sort -z | \
     tar $REPRODUCIBLE_TAR_OPTS \
       --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
   mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
   [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
   touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
   gzip "$JBR".tar || do_exit $?
-  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
+  rm -rf "${IMAGES_DIR:?}"/"$__arch_name"
 }
 
 WITH_DEBUG_LEVEL="--with-debug-level=release"
@@ -102,7 +85,6 @@ RELEASE_NAME=linux-x86_64-server-release
 case "$bundle_type" in
   "jcef")
     do_reset_changes=1
-    do_maketest=1
     ;;
   "nomod" | "")
     bundle_type=""
@@ -114,7 +96,7 @@ case "$bundle_type" in
     ;;
 esac
 
-if [ -z "${INC_BUILD:-}" ]; then
+if [ -z "$INC_BUILD" ]; then
   do_configure || do_exit $?
   make clean CONF=$RELEASE_NAME || do_exit $?
 fi
@@ -134,12 +116,10 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
   cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
 
   jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
 fi
 
 # create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
 create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
 
 # create sdk image bundle
@@ -149,10 +129,10 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
 
-if [ $do_maketest -eq 1 ]; then
-    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x64-b${build_number}
+if [ "$bundle_type" == "jcef" ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-test-x64-b${build_number}
     echo Creating "$JBRSDK_TEST" ...
-    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD modules.list src/java.desktop/share/classes/module-info.java
     make test-image CONF=$RELEASE_NAME || do_exit $?
     tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
     [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"

jb/project/tools/linux/scripts/mkimages_x86.sh

@@ -1,143 +1,80 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 # The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
 #
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 
 source jb/project/tools/common/scripts/common.sh
 
-function do_configure {
-  linux32 bash configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build="$JDK_BUILD_NUMBER" \
-    --with-version-opt=b"$build_number" \
-    --with-boot-jdk="$BOOT_JDK" \
-    $STATIC_CONF_ARGS \
-    --enable-cds=yes \
-    $REPRODUCIBLE_BUILD_OPTS \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    || do_exit $?
-}
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 
-function is_musl {
-  libc=$(ldd /bin/ls | grep 'musl' | head -1 | cut -d ' ' -f1)
-  if [ -z $libc ]; then
-    # This is not Musl, return 1 == false
-    return 1
-  fi
-  return 0
-}
+[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
 
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
+linux32 bash configure \
+  --with-debug-level=release \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-version-pre= \
+  --with-version-build=$JDK_BUILD_NUMBER \
+  --with-version-opt=b${build_number} \
+  --with-boot-jdk=${BOOT_JDK} \
+  --enable-cds=yes || exit $?
+make clean CONF=linux-x86-server-release || exit $?
+make images CONF=linux-x86-server-release test-image || exit $?
 
-  libc_type_suffix=''
-  fastdebug_infix=''
-
-  if is_musl; then libc_type_suffix='musl-' ; fi
-
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-${libc_type_suffix}x86-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-${libc_type_suffix}x86-${fastdebug_infix:-}b${build_number%%.*}
-
-  echo Running jlink....
-  [ -d "$IMAGES_DIR"/"$__root_dir" ] && rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
-  $JSDK/bin/jlink \
-    --module-path "$__modules_path" --no-man-pages --compress=2 \
-    --add-modules "$__modules" --output "$IMAGES_DIR"/"$__root_dir"
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__root_dir"/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__root_dir"/release > release
-    mv release "$IMAGES_DIR"/"$__root_dir"/release
-    cp $IMAGES_DIR/jdk/lib/src.zip "$IMAGES_DIR"/"$__root_dir"/lib
-    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__root_dir"/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk "${JBR}_diz"
-  fi
-
-  # jmod does not preserve file permissions (JDK-8173610)
-  [ -f "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__root_dir"/lib/jcef_helper
-
-  echo Creating "$JBR".tar.gz ...
-
-  (cd "$IMAGES_DIR" &&
-    find "$__root_dir" -print0 | LC_ALL=C sort -z | \
-    tar $REPRODUCIBLE_TAR_OPTS \
-      --no-recursion --null -T - -cf "$JBR".tar) || do_exit $?
-  mv "$IMAGES_DIR"/"$JBR".tar ./"$JBR".tar
-  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
-  touch -c -d "@$SOURCE_DATE_EPOCH" "$JBR".tar
-  gzip "$JBR".tar || do_exit $?
-  rm -rf "${IMAGES_DIR:?}"/"$__root_dir"
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=linux-x86-server-release
-
-case "$bundle_type" in
-  "jcef")
-    echo "not implemented" && do_exit 1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "fd")
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=linux-x86-server-fastdebug
-    ;;
-esac
-
-if [ -z "${INC_BUILD:-}" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBSDK=${JBRSDK_BASE_NAME}-linux-x86-b${build_number}
+BASE_DIR=build/linux-x86-server-release/images
+JSDK=${BASE_DIR}/jdk
 JBRSDK_BUNDLE=jbrsdk
 
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
+rm -rf $BASE_DIR/$JBRSDK_BUNDLE
+cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
-# create runtime image bundle
-modules=$(grep -v "jdk.internal.vm" jb/project/tools/common/modules.list | xargs | sed s/" "//g) || do_exit $?
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
+echo Creating $JBSDK.tar.gz ...
+sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
+mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
 
-# create sdk image bundle
-modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
-create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
+tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man -C $BASE_DIR ${JBRSDK_BUNDLE} || exit $?
+gzip $JBSDK.tar || exit $?
 
-if [ $do_maketest -eq 1 ]; then
-    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-${libc_type_suffix}test-x86-b${build_number}
-    echo Creating "$JBRSDK_TEST" ...
-    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
-    make test-image CONF=$RELEASE_NAME || do_exit $?
-    tar -pcf "$JBRSDK_TEST".tar -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
-    [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
-    gzip "$JBRSDK_TEST".tar || do_exit $?
-fi
+JBR_BUNDLE=jbr
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+rm -rf $BASE_DIR/$JBR_BUNDLE
 
-do_exit 0
+JBR=$JBR_BASE_NAME-linux-x86-b$build_number
+grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.x86
+echo Running jlink....
+${JSDK}/bin/jlink \
+  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+  --add-modules $(xargs < modules.list.x86 | sed s/" "//g | sed s/,$//g) --output ${BASE_DIR}/${JBR_BUNDLE} || exit $?
+
+echo Modifying release info ...
+grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${BASE_DIR}/${JBR_BUNDLE}/release
+
+echo Creating $JBR.tar.gz ...
+tar -pcf $JBR.tar -C $BASE_DIR $JBR_BUNDLE || exit $?
+gzip $JBR.tar || exit $?
+
+JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x86-b$build_number
+echo Creating $JBRSDK_TEST.tar.gz ...
+tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' --exclude='test/hotspot/gtest' test || exit $?
+gzip $JBRSDK_TEST.tar || exit $?

jb/project/tools/mac/scripts/mkimages.sh

@@ -1,30 +1,33 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 # The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
+#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to be built; possible values:
+#                        <empty> or nomod - the release bundles without any additional modules (jcef)
+#                        jcef - the release bundles with jcef
+#                        fd - the fastdebug bundles which also include the jcef module
 #
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
 # Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
 #   JCEF_PATH - specifies the path to the directory with JCEF binaries.
 #               By default JCEF binaries should be located in ./jcef_mac
 #   MACOSX_VERSION_MAX - specifies value for the --with-macosx-version-max parameter. By default it is 10.12.00 for x64
 #               and 11.00.00 for aarch64
 
+min_parameters_count=3
 source jb/project/tools/common/scripts/common.sh
 
 JCEF_PATH=${JCEF_PATH:=./jcef_mac}
+architecture=${architecture:=x64}
 BOOT_JDK=${BOOT_JDK:=$(/usr/libexec/java_home -v 16)}
 
 function do_configure {
@@ -46,9 +49,7 @@ function do_configure {
       --with-extra-cflags="-F$(pwd)/Frameworks" \
       --with-extra-cxxflags="-F$(pwd)/Frameworks" \
       --with-extra-ldflags="-F$(pwd)/Frameworks" \
-      $STATIC_CONF_ARGS \
       $REPRODUCIBLE_BUILD_OPTS \
-      $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
       || do_exit $?
   else
     sh configure \
@@ -64,9 +65,7 @@ function do_configure {
       --with-boot-jdk="$BOOT_JDK" \
       --with-macosx-version-max="${MACOSX_VERSION_MAX:="10.12.00"}" \
       --enable-cds=yes \
-      $STATIC_CONF_ARGS \
       $REPRODUCIBLE_BUILD_OPTS \
-      $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
       || do_exit $?
   fi
 }
@@ -77,16 +76,13 @@ function create_image_bundle {
   __modules_path=$3
   __modules=$4
 
-  fastdebug_infix=''
-
   tmp=.bundle.$$.tmp
   mkdir "$tmp" || do_exit $?
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix:-}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-${architecture}-${fastdebug_infix:-}b${build_number%%.*}
+  JBR=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix}b${build_number}
 
-  JRE_CONTENTS=$tmp/$__root_dir/Contents
+  JRE_CONTENTS=$tmp/$__arch_name/Contents
   mkdir -p "$JRE_CONTENTS" || do_exit $?
 
   echo Running jlink...
@@ -98,9 +94,7 @@ function create_image_bundle {
   if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
     sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
     mv release $JRE_CONTENTS/Home/release
-    cp $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home/lib/src.zip $JRE_CONTENTS/Home/lib
     copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
-    zip_native_debug_symbols $IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk "${JBR}_diz"
   fi
 
   cp -R "$JSDK"/../MacOS "$JRE_CONTENTS"
@@ -110,10 +104,10 @@ function create_image_bundle {
 
   echo Creating "$JBR".tar.gz ...
   # Normalize timestamp
-  find "$tmp"/"$__root_dir" -print0 | xargs -0 touch -c -h -t "$TOUCH_TIME"
+  find "$tmp"/"$__arch_name" -print0 | xargs -0 touch -c -h -t "$TOUCH_TIME"
 
   (cd "$tmp" &&
-      find "$__root_dir" -print0 | LC_ALL=C sort -z | \
+      find "$__arch_name" -print0 | LC_ALL=C sort -z | \
       COPYFILE_DISABLE=1 tar $REPRODUCIBLE_TAR_OPTS  --no-recursion --null -T - \
                              -czf "$JBR".tar.gz --exclude='*.dSYM' --exclude='man') || do_exit $?
   mv "$tmp"/"$JBR".tar.gz  "$JBR".tar.gz
@@ -130,7 +124,6 @@ RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-release
 case "$bundle_type" in
   "jcef")
     do_reset_changes=1
-    do_maketest=1
     ;;
   "nomod" | "")
     bundle_type=""
@@ -143,7 +136,7 @@ case "$bundle_type" in
     ;;
 esac
 
-if [ -z "${INC_BUILD:-}" ]; then
+if [ -z "$INC_BUILD" ]; then
   do_configure || do_exit $?
   make clean CONF=$RELEASE_NAME || do_exit $?
 fi
@@ -151,7 +144,10 @@ make images CONF=$RELEASE_NAME || do_exit $?
 
 IMAGES_DIR=build/$RELEASE_NAME/images
 
-JSDK=$IMAGES_DIR/jdk-bundle/jdk-$JBSDK_VERSION.jdk/Contents/Home
+major_version=$(echo "$JBSDK_VERSION_WITH_DOTS" | awk -F "." '{print $1}')
+minor_version=$(echo "$JBSDK_VERSION_WITH_DOTS" | awk -F "." '{print $3}')
+[ -z "$minor_version"  -o "$minor_version" = "0" ] && version_dir=$major_version || version_dir=$JBSDK_VERSION_WITH_DOTS
+JSDK=$IMAGES_DIR/jdk-bundle/jdk-$version_dir.jdk/Contents/Home
 JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
@@ -161,12 +157,10 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
   cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
 
   jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
 fi
 
 # create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
+modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
 create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
 
 # create sdk image bundle
@@ -176,10 +170,10 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
 
-if [ $do_maketest -eq 1 ]; then
+if [ "$bundle_type" == "jcef" ]; then
     JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-osx-test-${architecture}-b${build_number}
     echo Creating "$JBRSDK_TEST" ...
-    [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
+    [ $do_reset_changes -eq 1 ] && git checkout HEAD modules.list src/java.desktop/share/classes/module-info.java
     make test-image CONF=$RELEASE_NAME || do_exit $?
     [ -f "$JBRSDK_TEST.tar.gz" ] && rm "$JBRSDK_TEST.tar.gz"
     COPYFILE_DISABLE=1 tar -pczf "$JBRSDK_TEST".tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?

jb/project/tools/mac/scripts/notarize.sh

@@ -1,7 +1,4 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 APP_DIRECTORY=$1
 APPL_USER=$2

jb/project/tools/mac/scripts/sign.sh

@@ -1,7 +1,4 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 APPLICATION_PATH=$1
 APP_NAME=$2
@@ -100,11 +97,8 @@ BUILD_NAME=$(echo $APPLICATION_PATH | awk -F"/" '{ print $2 }')
 
 log "Creating $APP_NAME.pkg..."
 rm -rf "$APP_NAME.pkg"
-
-mkdir -p unsigned
-pkgbuild --identifier $BUNDLE_ID --root $APPLICATION_PATH \
-    --install-location /Library/Java/JavaVirtualMachines/${BUILD_NAME} unsigned/${APP_NAME}.pkg
-productsign --timestamp --sign "$JB_INSTALLER_CERT" unsigned/${APP_NAME}.pkg ${APP_NAME}.pkg
+pkgbuild --identifier $BUNDLE_ID --sign "$JB_INSTALLER_CERT" --root $APPLICATION_PATH \
+    --install-location /Library/Java/JavaVirtualMachines/${BUILD_NAME} ${APP_NAME}.pkg
 
 #log "Signing whole app..."
 #codesign --timestamp \

jb/project/tools/mac/scripts/signapp.sh

@@ -1,8 +1,7 @@
-#!/bin/bash
+#!/bin/bash -x
 
 #immediately exit script with an error if a command fails
 set -euo pipefail
-set -x
 
 export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
 export COPYFILE_DISABLE=true
@@ -45,7 +44,8 @@ fi
 log "$INPUT_FILE extracted and removed"
 
 APP_NAME=$(echo ${INPUT_FILE} | awk -F".tar" '{ print $1 }')
-APPLICATION_PATH=$EXPLODED/$(ls $EXPLODED)
+APPLICATION_PATH=$(sed "s/osx-//" <<< "$EXPLODED/$APP_NAME")
+mv $EXPLODED/$BUILD_NAME $APPLICATION_PATH
 
 find "$APPLICATION_PATH/Contents/Home/bin" \
   -maxdepth 1 -type f -name '*.jnilib' -print0 |

jb/project/tools/patches/add_jcef_module.patch

@@ -1,8 +1,8 @@
-diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
-index 522acb7cb43..c40e689d5de 100644
---- jb/project/tools/common/modules.list
-+++ jb/project/tools/common/modules.list
-@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
+diff --git modules.list modules.list
+index 054f21d1ee0..d9a121f0273 100644
+--- modules.list
++++ modules.list
+@@ -49,4 +49,7 @@ jdk.unsupported,
  jdk.xml.dom,
  jdk.zipfs,
  jdk.hotspot.agent,

jb/project/tools/patches/add_jcef_module_aarch64.patch

@@ -1,30 +0,0 @@
-diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
-index 522acb7..c40e689 100644
---- jb/project/tools/common/modules.list
-+++ jb/project/tools/common/modules.list
-@@ -51,4 +51,7 @@ jdk.unsupported.desktop,
- jdk.xml.dom,
- jdk.zipfs,
- jdk.hotspot.agent,
--jdk.jcmd
-+jdk.jcmd,
-+jcef,
-+gluegen.rt,
-+jogl.all
-diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
-index 897647e..781d180 100644
---- src/java.desktop/share/classes/module-info.java
-+++ src/java.desktop/share/classes/module-info.java
-@@ -116,7 +116,11 @@ module java.desktop {
-     // see make/GensrcModuleInfo.gmk
-     exports sun.awt to
-         jdk.accessibility,
--        jdk.unsupported.desktop;
-+        jdk.unsupported.desktop,
-+        jcef,
-+        jogl.all;
-+
-+    exports java.awt.peer to jcef;
-
-     exports java.awt.dnd.peer to jdk.unsupported.desktop;
-     exports sun.awt.dnd to jdk.unsupported.desktop;

jb/project/tools/test/check_jbr_size.sh

@@ -1,17 +1,5 @@
 #!/bin/bash
 
-set -euo pipefail
-
-while getopts ":t" o; do
-    case "${o}" in
-        t)
-          t="With Teamcity tests info"
-          TC_PRINT=1
-          ;;
-    esac
-done
-shift $((OPTIND-1))
-
 NEWFILEPATH=$1
 CONFIGID=$2
 BUILDID=$3
@@ -19,7 +7,6 @@ TOKEN=$4
 #
 # Get the size of new artifact
 #
-
 unameOut="$(uname -s)"
 case "${unameOut}" in
     Linux*)
@@ -29,11 +16,7 @@ case "${unameOut}" in
       NEWFILESIZE=$(stat -f%z "$NEWFILEPATH")
       ;;
     CYGWIN*)
-      NEWFILESIZE=$(stat -c%s$4
-#
-# Get the size of new artifact
-#
- "$NEWFILEPATH")
+      NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
       ;;
     MINGW*)
       NEWFILESIZE=$(stat -c%s "$NEWFILEPATH")
@@ -42,88 +25,32 @@ case "${unameOut}" in
       echo "Unknown machine: ${unameOut}"
       exit 1
 esac
-FILENAME=$(basename ${NEWFILEPATH})
 
-#
-# Get pattern of artifact name
-# Base filename pattern: <BUNDLE_TYPE>-<JDK_VERSION>-<OS>-<ARCH>-b<BUILD>.tar.gz: jbr_dcevm-17.0.2-osx-x64-b1234.tar.gz
-# BUNDLE_TYPE: jbr, jbrsdk, jbr_dcevm, jbrsdk_jcef etc.
-# OS_ARCH_PATTERN - <os_architecture>: osx-x64, linux-aarch64, windows-x64 etc.
+echo "New size of $NEWFILEPATH = $NEWFILESIZE bytes."
 
-BUNDLE_TYPE=jbrsdk
-OS_ARCH_PATTERN=""
-FILE_EXTENSION=tar.gz
+# example: IntellijCustomJdk_Jdk17_Master_LinuxX64jcef
 
-re='(jbr[a-z_]*).*-[0-9_\.]+-(.+)-b[0-9]+(.+)'
-if [[ $FILENAME =~ $re ]]; then
-  BUNDLE_TYPE=${BASH_REMATCH[1]}
-  OS_ARCH_PATTERN=${BASH_REMATCH[2]}
-  FILE_EXTENSION=${BASH_REMATCH[3]}
-fi
-
-if [ $TC_PRINT -eq 1 ]; then
-  testname_file_ext=`echo $FILE_EXTENSION | sed 's/\./_/g'`
-  testname=$BUNDLE_TYPE"_"$OS_ARCH_PATTERN$testname_file_ext
-  echo \#\#teamcity[testStarted name=\'$testname\']
-fi
-
-
-echo "BUNDLE_TYPE: "  $BUNDLE_TYPE
-echo "OS_ARCH_PATTERN: " $OS_ARCH_PATTERN
-echo "FILE_EXTENSION: " $FILE_EXTENSION
-echo "New size of $FILENAME = $NEWFILESIZE bytes."
-
-
-function test_failed_msg() {
-  if [ $3 -eq 1 ]; then
-    echo \#\#teamcity[testFailed name=\'$1\' message=\'$2\']
-  fi
-}
-
-function test_finished_msg() {
-  if [ $2 -eq 1 ]; then
-    echo \#\#teamcity[testFinished name=\'$1\']
-  fi
-}
-
-#
-# Get previous successful build ID
-# Example:
-# CONFIGID=IntellijCustomJdk_Jdk17_Master_LinuxX64jcef
-# BUILDID=12345678
-#
-# expected return value
-# id="123".number="567"
-#
 CURL_RESPONSE=$(curl --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/?locator=buildType:(id:$CONFIGID),status:success,count:1,finishDate:(build:$BUILDID,condition:before)")
-re='id=\"([0-9]+)\".+number=\"([0-9\.]+)\"'
 
-# ID: Previous successful build id
+re='id=\"([0-9]+)\".+number=\"([0-9]+)\"'
 ID=0
+
 if [[ $CURL_RESPONSE =~ $re ]]; then
   ID=${BASH_REMATCH[1]}
   echo "BUILD Number: ${BASH_REMATCH[2]}"
 else
-  msg="ERROR: can't find previous build"
-  echo $msg
+  echo "ERROR: can't find previous build"
   echo $CURL_RESPONSE
-  test_failed_msg $testname $msg $TC_PRINT
-  test_finished_msg $testname $TC_PRINT
   exit 1
 fi
 
-#
-# Get artifacts from previous successful build
-#
-# expected return value
-# name="jbrsdk_jcef*.tar.gz size="123'
-#
 CURL_RESPONSE=$(curl --header "Authorization: Bearer $TOKEN" "https://buildserver.labs.intellij.net/app/rest/builds/$ID?fields=id,number,artifacts(file(name,size))")
-echo "Atrifacts of previous build of $CONFIGID :"
+
+echo "Atrifacts of last pinned build of $CONFIGID :\n"
 echo $CURL_RESPONSE
 
-# Find binary size (in response) with reg exp
-re='name=\"('$BUNDLE_TYPE'[^\"]+'${OS_ARCH_PATTERN}'[^\"]+'${FILE_EXTENSION}')\" size=\"([0-9]+)\"'
+# Find size (in response) with reg exp
+re='name=\"(jbrsdk_jcef[^\"]+\.tar\.gz)\" size=\"([0-9]+)\"'
 
 if [[ $CURL_RESPONSE =~ $re ]]; then
   OLDFILENAME=${BASH_REMATCH[1]}
@@ -134,20 +61,12 @@ if [[ $CURL_RESPONSE =~ $re ]]; then
   let allowedSize=OLDFILESIZE+OLDFILESIZE/20 # use 5% threshold
   echo "Allowed size = $allowedSize"
   if [[ "$NEWFILESIZE" -gt "$allowedSize" ]]; then
-    msg="ERROR: new size is significally greater than prev size (need to investigate)"
-    echo $msg
-    test_failed_msg $testname $msg $TC_PRINT
-    test_finished_msg $testname $TC_PRINT
+    echo "ERROR: new size is significally greater than prev size (need to investigate)"
     exit 1
-  else
-    echo "PASSED"
-   test_finished_msg $testname $TC_PRINT
   fi
 else
-  msg="ERROR: can't find string with size in xml response:"
-  echo $msg
+  echo "ERROR: can't find string with size in xml response:"
   echo $CURL_RESPONSE
-  test_failed_msg $testname $msg $TC_PRINT
-  test_finished_msg $testname $TC_PRINT
   exit 1
 fi
+

jb/project/tools/test/perfcmp.sh

@@ -1,7 +1,4 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 usage ()
 {

jb/project/tools/windows/scripts/mkimages_x64.sh

@@ -1,25 +1,27 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 # The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
+#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
+#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to be built; possible values:
+#                        <empty> or nomod - the release bundles without any additional modules (jcef)
+#                        jcef - the release bundles with jcef
+#                        fd - the fastdebug bundles which also include the jcef module
 #
-# This script makes test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
 # Environment variables:
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument
-#               to configure
-#               By default JDK_BUILD_NUMBER is set zero
 #   JCEF_PATH - specifies the path to the directory with JCEF binaries.
 #               By default JCEF binaries should be located in ./jcef_win_x64
 
+min_parameters_count=2
 source jb/project/tools/common/scripts/common.sh
 
 WORK_DIR=$(pwd)
@@ -37,10 +39,7 @@ function do_configure {
     --with-toolchain-version=$TOOLCHAIN_VERSION \
     --with-boot-jdk=$BOOT_JDK \
     --disable-ccache \
-    --enable-cds=yes \
-    $STATIC_CONF_ARGS \
-    $REPRODUCIBLE_BUILD_OPTS \
-    || do_exit $?
+    --enable-cds=yes || do_exit $?
 }
 
 function create_image_bundle {
@@ -49,22 +48,18 @@ function create_image_bundle {
   __modules_path=$3
   __modules=$4
 
-  fastdebug_infix=''
-
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-x64-${fastdebug_infix:-}b${build_number%%.*}
 
   echo Running jlink ...
   ${JSDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
-    --add-modules $__modules --output $__root_dir || do_exit $?
+    --add-modules $__modules --output $__arch_name || do_exit $?
 
   grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__arch_name/release
   if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
-    mv release $__root_dir/release
-    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
+    sed 's/JBR/JBRSDK/g' $__arch_name/release > release
+    mv release $__arch_name/release
+    copy_jmods "$__modules" "$__modules_path" "$__arch_name"/jmods
   fi
 }
 
@@ -74,7 +69,6 @@ RELEASE_NAME=windows-x86_64-server-release
 case "$bundle_type" in
   "jcef")
     do_reset_changes=0
-    do_maketest=1
     ;;
   "nomod" | "")
     bundle_type=""
@@ -86,15 +80,15 @@ case "$bundle_type" in
     ;;
 esac
 
-if [ -z "${INC_BUILD:-}" ]; then
+if [ -z "$INC_BUILD" ]; then
   do_configure || do_exit $?
-  if [ $do_maketest -eq 1 ]; then
+  if [ "$bundle_type" == "jcef" ]; then
     make LOG=info CONF=$RELEASE_NAME clean images test-image || do_exit $?
   else
     make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
   fi
 else
-  if [ $do_maketest -eq 1 ]; then
+  if [ "$bundle_type" == "jcef" ]; then
     make LOG=info CONF=$RELEASE_NAME images test-image || do_exit $?
   else
     make LOG=info CONF=$RELEASE_NAME images || do_exit $?
@@ -112,13 +106,10 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
   cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
 
   jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
 fi
 
 # create runtime image bundle
-modules=$(xargs < jb/project/tools/common/modules.list | sed s/" "//g) || do_exit $?
-modules+=",jdk.crypto.mscapi"
+modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
 create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
 
 # create sdk image bundle
@@ -128,4 +119,4 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type
 fi
 create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
 
-do_exit 0
+do_exit 0

jb/project/tools/windows/scripts/mkimages_x86.sh

@@ -1,14 +1,12 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 # The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 #
 # $ ./java --version
 # openjdk 11.0.6 2020-01-14
@@ -16,110 +14,49 @@ set -x
 # OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
 
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+
 source jb/project/tools/common/scripts/common.sh
 
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 WORK_DIR=$(pwd)
 
-function do_configure {
-  sh ./configure \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="$VENDOR_NAME" \
-    --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=$JDK_BUILD_NUMBER \
-    --with-version-opt=b${build_number} \
-    --with-toolchain-version=$TOOLCHAIN_VERSION \
-    --with-boot-jdk=$BOOT_JDK \
-    --disable-ccache \
-    --enable-cds=yes \
-    $STATIC_CONF_ARGS \
-    $REPRODUCIBLE_BUILD_OPTS \
-    || do_exit $?
-}
+[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
 
-function create_image_bundle {
-  __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
+PATH="/usr/local/bin:/usr/bin:${PATH}"
+./configure \
+  --with-target-bits=32 \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  --with-toolchain-version=${TOOLCHAIN_VERSION} \
+  --with-boot-jdk=${BOOT_JDK} \
+  --disable-ccache \
+  --enable-cds=yes || exit 1
+make clean CONF=windows-x86-server-release || exit 1
+make LOG=info images CONF=windows-x86-server-release test-image || exit 1
 
-  fastdebug_infix=''
-
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-x86-${fastdebug_infix:-}b${build_number%%.*}
-
-  echo Running jlink ...
-  ${JSDK}/bin/jlink \
-    --module-path $__modules_path --no-man-pages --compress=2 \
-    --add-modules $__modules --output $__root_dir || do_exit $?
-
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__arch_name/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' $__root_dir/release > release
-    mv release $__root_dir/release
-    cp $IMAGES_DIR/jdk/lib/src.zip $__root_dir/lib
-    copy_jmods "$__modules" "$__modules_path" "$__root_dir"/jmods
-  fi
-}
-
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=windows-x86_64-server-release
-
-case "$bundle_type" in
-  "jcef")
-    echo "not implemented" && do_exit 1
-    ;;
-  "nomod" | "")
-    bundle_type=""
-    ;;
-  "fd")
-    do_reset_changes=0
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=windows-x86_64-server-fastdebug
-    ;;
-esac
-
-if [ -z "${INC_BUILD:-}" ]; then
-  do_configure || do_exit $?
-  if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME clean images test-image || do_exit $?
-  else
-    make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
-  fi
-else
-  if [ $do_maketest -eq 1 ]; then
-    make LOG=info CONF=$RELEASE_NAME images test-image || do_exit $?
-  else
-    make LOG=info CONF=$RELEASE_NAME images || do_exit $?
-  fi
-fi
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBSDK=${JBRSDK_BASE_NAME}-windows-x86-b${build_number}
+BASE_DIR=build/windows-x86-server-release/images
+JSDK=${BASE_DIR}/jdk
 JBRSDK_BUNDLE=jbrsdk
 
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ]; then
-  git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-  update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?
-  cp $JCEF_PATH/jmods/* ${JSDK_MODS_DIR} # $JSDK/jmods is not unchanged
+rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || exit 1
+sed 's/JBR/JBRSDK/g' ${JSDK}/release > release
+mv release ${JBRSDK_BUNDLE}/release
 
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
+JBR_BUNDLE=jbr
+rm -rf ${JBR_BUNDLE}
+grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.x86
+${JSDK}/bin/jlink \
+  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+  --add-modules $(xargs < modules.list.x86 | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
 
-# create runtime image bundle
-modules=$(grep -v "jdk.internal.vm" jb/project/tools/common/modules.list | xargs | sed s/" "//g) || do_exit $?
-modules+=",jdk.crypto.mscapi"
-create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
-
-# create sdk image bundle
-modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
-  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
-fi
-create_image_bundle "$JBRSDK_BUNDLE${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
-
-do_exit 0
+echo Modifying release info ...
+#grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${JBR_BUNDLE}/release

jb/project/tools/windows/scripts/pack_x64.sh

@@ -1,36 +1,40 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 # The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               jcef - the release bundles with jcef
-#               fd - the fastdebug bundles which also include the jcef module
+#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
+#   JDK_BUILD_NUMBER - specifies udate release of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to be built; possible values:
+#                        <empty> or nomod - the bundles without any additional modules (jcef)
+#                        jcef - the bundles with jcef
+#                        fd - the fastdebug bundles which also include the jcef module
 #
-# This script packs test-image along with JDK images when bundle_type is set to "jcef".
-# If the character 't' is added at the end of bundle_type then it also makes test-image along with JDK images.
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
 
 source jb/project/tools/common/scripts/common.sh
 
-[ "$bundle_type" == "jcef" ] && do_maketest=1
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+bundle_type=$4
 
 function pack_jbr {
   __bundle_name=$1
   __arch_name=$2
 
-  fastdebug_infix=''
-
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-x64-${fastdebug_infix:-}b${build_number%%.*}
 
   echo Creating $JBR.tar.gz ...
 
-  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__arch_name || do_exit $?
 }
 
 [ "$bundle_type" == "nomod" ] && bundle_type=""
@@ -42,14 +46,12 @@ BASE_DIR=.
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
   jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
 fi
 
 pack_jbr jbr${jbr_name_postfix} jbr
 pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
 
-if [ $do_maketest -eq 1 ]; then
+if [ "$bundle_type" == "jcef" ]; then
   JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-x64-b$build_number
   echo Creating $JBRSDK_TEST.tar.gz ...
   /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?

jb/project/tools/windows/scripts/pack_x86.sh

@@ -1,50 +1,42 @@
-#!/bin/bash
-
-set -euo pipefail
-set -x
+#!/bin/bash -x
 
 # The following parameters must be specified:
-#   build_number - specifies the number of JetBrainsRuntime build
-#   bundle_type  - specifies bundle to be built;possible values:
-#               <empty> or nomod - the release bundles without any additional modules (jcef)
-#               fd - the fastdebug bundles which also include the jcef module
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
 
-source jb/project/tools/common/scripts/common.sh
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
 
-[ "$bundle_type" == "jcef" ] && echo "not implemented" && do_exit 1
+JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
 
-function pack_jbr {
-  __bundle_name=$1
-  __arch_name=$2
-
-  fastdebug_infix=''
-
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x86-${fastdebug_infix}b${build_number}
-  __root_dir=${__bundle_name}-${JBSDK_VERSION}-x86-${fastdebug_infix:-}b${build_number%%.*}
-
-  echo Creating $JBR.tar.gz ...
-
-  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__root_dir || do_exit $?
-}
-
-[ "$bundle_type" == "nomod" ] && bundle_type=""
-
-JBRSDK_BUNDLE=jbrsdk
+IMAGES_DIR=build/windows-x86-server-release/images
+JSDK=$IMAGES_DIR/jdk
+JBSDK=$JBRSDK_BASE_NAME-windows-x86-b$build_number
 BASE_DIR=.
 
-if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
-  jbr_name_postfix="_${bundle_type}"
-else
-  jbr_name_postfix=""
-fi
+JBRSDK_BUNDLE=jbrsdk
+echo Creating $JBSDK.tar.gz ...
+/usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
 
-pack_jbr jbr${jbr_name_postfix} jbr
-pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
+JBR_BUNDLE=jbr
+JBR_BASE_NAME=jbr-${JBSDK_VERSION}
 
-if [ $do_maketest -eq 1 ]; then
-  JBRSDK_TEST=$JBRSDK_BUNDLE-$JBSDK_VERSION-windows-test-x86-b$build_number
-  echo Creating $JBRSDK_TEST.tar.gz ...
-  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $BASE_DIR --exclude='test/jdk/demos' test || do_exit $?
-fi
+JBR=$JBR_BASE_NAME-windows-x86-b$build_number
+echo Creating $JBR.tar.gz ...
+/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR ${JBR_BUNDLE} || exit 1
+
+JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x86-b$build_number
+echo Creating $JBRSDK_TEST.tar.gz ...
+/usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || exit 1

make/RunTests.gmk

@@ -200,7 +200,7 @@ $(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG))
 $(eval $(call ParseKeywordVariable, JTREG, \
     SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \
         TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS \
-        RETRY_COUNT REPEAT_COUNT MAX_OUTPUT, \
+        RETRY_COUNT MAX_OUTPUT, \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \
         EXTRA_PROBLEM_LISTS LAUNCHER_OPTIONS, \
 ))
@@ -744,15 +744,6 @@ define SetupRunJtregTestBody
   JTREG_RETAIN ?= fail,error
   JTREG_RUN_PROBLEM_LISTS ?= false
   JTREG_RETRY_COUNT ?= 0
-  JTREG_REPEAT_COUNT ?= 0
-
-  ifneq ($$(JTREG_RETRY_COUNT), 0)
-    ifneq ($$(JTREG_REPEAT_COUNT), 0)
-      $$(info Error: Cannot use both JTREG_RETRY_COUNT and JTREG_REPEAT_COUNT together.)
-      $$(info Please choose one or the other.)
-      $$(error Cannot continue)
-    endif
-  endif
 
   ifneq ($$(JTREG_LAUNCHER_OPTIONS), )
     $1_JTREG_LAUNCHER_OPTIONS += $$(JTREG_LAUNCHER_OPTIONS)
@@ -884,18 +875,6 @@ define SetupRunJtregTestBody
         done
   endif
 
-  ifneq ($$(JTREG_REPEAT_COUNT), 0)
-    $1_COMMAND_LINE := \
-        for i in {1..$$(JTREG_REPEAT_COUNT)}; do \
-          $$(PRINTF) "\nRepeating Jtreg run: $$$$i out of $$(JTREG_REPEAT_COUNT)\n"; \
-          $$($1_COMMAND_LINE); \
-          if [ "`$$(CAT) $$($1_EXITCODE)`" != "0" ]; then \
-            $$(PRINTF) "\nFailures detected, no more repeats.\n"; \
-            break; \
-          fi; \
-        done
-  endif
-
   run-test-$1: pre-run-test clean-workdir-$1
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')

make/autoconf/flags-cflags.m4

@@ -95,24 +95,8 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
   # info flags for toolchains unless we know they work.
   # See JDK-8207057.
   ASFLAGS_DEBUG_SYMBOLS=""
-
-  # Debug prefix mapping if supported by compiler
-  DEBUG_PREFIX_CFLAGS=
-
   # Debug symbols
   if test "x$TOOLCHAIN_TYPE" = xgcc; then
-    if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
-      # Check if compiler supports -fdebug-prefix-map. If so, use that to make
-      # the debug symbol paths resolve to paths relative to the workspace root.
-      workspace_root_trailing_slash="${WORKSPACE_ROOT%/}/"
-      DEBUG_PREFIX_CFLAGS="-fdebug-prefix-map=${workspace_root_trailing_slash}="
-      FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${DEBUG_PREFIX_CFLAGS}],
-        IF_FALSE: [
-            DEBUG_PREFIX_CFLAGS=
-        ]
-      )
-    fi
-
     CFLAGS_DEBUG_SYMBOLS="-g"
     ASFLAGS_DEBUG_SYMBOLS="-g"
   elif test "x$TOOLCHAIN_TYPE" = xclang; then
@@ -124,11 +108,6 @@ AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
     CFLAGS_DEBUG_SYMBOLS="-Z7"
   fi
 
-  if test "x$DEBUG_PREFIX_CFLAGS" != x; then
-    CFLAGS_DEBUG_SYMBOLS="$CFLAGS_DEBUG_SYMBOLS $DEBUG_PREFIX_CFLAGS"
-    ASFLAGS_DEBUG_SYMBOLS="$ASFLAGS_DEBUG_SYMBOLS $DEBUG_PREFIX_CFLAGS"
-  fi
-
   AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
   AC_SUBST(ASFLAGS_DEBUG_SYMBOLS)
 ])
@@ -799,12 +778,16 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
               FILE_MACRO_CFLAGS=
           ]
       )
+      # -fdebug-prefix-map is supported by all modern versions of gcc/clang
+      DEBUG_PREFIX_CFLAGS=" -fdebug-prefix-map=${workspace_root_trailing_slash}="
     elif test "x$TOOLCHAIN_TYPE" = xmicrosoft &&
         test "x$ENABLE_REPRODUCIBLE_BUILD" = xtrue; then
       # There is a known issue with the pathmap if the mapping is made to the
       # empty string. Add a minimal string "s" as prefix to work around this.
+      workspace_root_win=`$FIXPATH_BASE print "${WORKSPACE_ROOT%/}"`
       # PATHMAP_FLAGS is also added to LDFLAGS in flags-ldflags.m4.
-      PATHMAP_FLAGS="-pathmap:${WORKSPACE_ROOT}=s"
+      PATHMAP_FLAGS="-pathmap:${workspace_root_win//\//\\\\}=s \
+          -pathmap:${workspace_root_win}=s"
       FILE_MACRO_CFLAGS="$PATHMAP_FLAGS"
       FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${FILE_MACRO_CFLAGS}],
           PREFIX: $3,
@@ -829,12 +812,12 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       $TOOLCHAIN_CFLAGS_JVM ${$1_TOOLCHAIN_CFLAGS_JVM} \
       $OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
       $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG $FILE_MACRO_CFLAGS \
-      $REPRODUCIBLE_CFLAGS"
+      $REPRODUCIBLE_CFLAGS $DEBUG_PREFIX_CFLAGS"
 
   CFLAGS_JDK_COMMON="$ALWAYS_CFLAGS_JDK $ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
       $OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
       $WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK \
-      $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS"
+      $FILE_MACRO_CFLAGS $REPRODUCIBLE_CFLAGS $DEBUG_PREFIX_CFLAGS"
 
   # Use ${$2EXTRA_CFLAGS} to block EXTRA_CFLAGS to be added to build flags.
   # (Currently we don't have any OPENJDK_BUILD_EXTRA_CFLAGS, but that might

make/autoconf/flags-other.m4

@@ -82,6 +82,14 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
     BASIC_ASFLAGS="-nologo -c"
   fi
+
+  if test "x$ALLOW_ABSOLUTE_PATHS_IN_OUTPUT" = "xfalse"; then
+    if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
+      workspace_root_trailing_slash="${WORKSPACE_ROOT%/}/"
+      BASIC_ASFLAGS+=" -fdebug-prefix-map=${workspace_root_trailing_slash}="
+    fi
+  fi
+
   AC_SUBST(BASIC_ASFLAGS)
 
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then

make/autoconf/jdk-options.m4

@@ -169,23 +169,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
   fi
   AC_SUBST(CACERTS_FILE)
 
-  # Choose cacerts source folder for user provided PEM files
-  AC_ARG_WITH(cacerts-src, [AS_HELP_STRING([--with-cacerts-src],
-      [specify alternative cacerts source folder containing certificates])])
-  CACERTS_SRC=""
-  AC_MSG_CHECKING([for cacerts source])
-  if test "x$with_cacerts_src" == x; then
-    AC_MSG_RESULT([default])
-  else
-    CACERTS_SRC=$with_cacerts_src
-    if test ! -d "$CACERTS_SRC"; then
-      AC_MSG_RESULT([fail])
-      AC_MSG_ERROR([Specified cacerts source folder "$CACERTS_SRC" does not exist])
-    fi
-    AC_MSG_RESULT([$CACERTS_SRC])
-  fi
-  AC_SUBST(CACERTS_SRC)
-
   # Enable or disable unlimited crypto
   UTIL_ARG_ENABLE(NAME: unlimited-crypto, DEFAULT: true, RESULT: UNLIMITED_CRYPTO,
       DESC: [enable unlimited crypto policy])

make/autoconf/spec.gmk.in

@@ -412,8 +412,6 @@ GTEST_FRAMEWORK_SRC := @GTEST_FRAMEWORK_SRC@
 
 # Source file for cacerts
 CACERTS_FILE=@CACERTS_FILE@
-# Source folder for user provided cacerts PEM files 
-CACERTS_SRC=@CACERTS_SRC@
 
 # Enable unlimited crypto policy
 UNLIMITED_CRYPTO=@UNLIMITED_CRYPTO@

make/autoconf/toolchain.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -234,7 +234,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     if test -n "$XCODEBUILD"; then
       # On Mac OS X, default toolchain to clang after Xcode 5
-      XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version | $HEAD -n 1`
+      XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2>&1 | $HEAD -n 1`
       $ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null
       if test $? -ne 0; then
         AC_MSG_NOTICE([xcodebuild output: $XCODE_VERSION_OUTPUT])

make/autoconf/toolchain_microsoft.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -25,7 +25,7 @@
 
 ################################################################################
 # The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2019 2017 2022"
+VALID_VS_VERSIONS="2019 2017"
 
 VS_DESCRIPTION_2017="Microsoft Visual Studio 2017"
 VS_VERSION_INTERNAL_2017=141
@@ -56,21 +56,6 @@ VS_SDK_PLATFORM_NAME_2019=
 VS_SUPPORTED_2019=true
 VS_TOOLSET_SUPPORTED_2019=true
 
-VS_DESCRIPTION_2022="Microsoft Visual Studio 2022"
-VS_VERSION_INTERNAL_2022=143
-VS_MSVCR_2022=vcruntime140.dll
-VS_VCRUNTIME_1_2022=vcruntime140_1.dll
-VS_MSVCP_2022=msvcp140.dll
-VS_ENVVAR_2022="VS170COMNTOOLS"
-VS_USE_UCRT_2022="true"
-VS_VS_INSTALLDIR_2022="Microsoft Visual Studio/2022"
-VS_EDITIONS_2022="BuildTools Community Professional Enterprise"
-VS_SDK_INSTALLDIR_2022=
-VS_VS_PLATFORM_NAME_2022="v143"
-VS_SDK_PLATFORM_NAME_2022=
-VS_SUPPORTED_2022=true
-VS_TOOLSET_SUPPORTED_2022=true
-
 ################################################################################
 
 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],

make/autoconf/util.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -230,6 +230,8 @@ AC_DEFUN([UTIL_GET_MATCHING_VALUES],
 # Converts an ISO-8601 date/time string to a unix epoch timestamp. If no
 # suitable conversion method was found, an empty string is returned.
 #
+# Sets the specified variable to the resulting list.
+#
 # $1: result variable name
 # $2: input date/time string
 AC_DEFUN([UTIL_GET_EPOCH_TIMESTAMP],
@@ -239,16 +241,11 @@ AC_DEFUN([UTIL_GET_EPOCH_TIMESTAMP],
     timestamp=$($DATE --utc --date=$2 +"%s" 2> /dev/null)
   else
     # BSD date
-    # ISO-8601 date&time in Zulu 'date'T'time'Z
-    timestamp=$($DATE -u -j -f "%FT%TZ" "$2" "+%s" 2> /dev/null)
+    timestamp=$($DATE -u -j -f "%F %T" "$2" "+%s" 2> /dev/null)
     if test "x$timestamp" = x; then
-      # BSD date cannot handle trailing milliseconds.
-      # Try again ignoring characters at end
-      timestamp=$($DATE -u -j -f "%Y-%m-%dT%H:%M:%S" "$2" "+%s" 2> /dev/null)
-    fi
-    if test "x$timestamp" = x; then
-      # Perhaps the time was missing.
-      timestamp=$($DATE -u -j -f "%FT%TZ" "$2""T00:00:00Z" "+%s" 2> /dev/null)
+      # Perhaps the time was missing
+      timestamp=$($DATE -u -j -f "%F %T" "$2 00:00:00" "+%s" 2> /dev/null)
+      # If this did not work, we give up and return the empty string
     fi
   fi
   $1=$timestamp

make/autoconf/version-numbers

@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2011, 2019, 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
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+# Default version, product, and vendor information to use,
+# unless overridden by configure
+
+DEFAULT_VERSION_FEATURE=15
+DEFAULT_VERSION_INTERIM=0
+DEFAULT_VERSION_UPDATE=0
+DEFAULT_VERSION_PATCH=0
+DEFAULT_VERSION_EXTRA1=0
+DEFAULT_VERSION_EXTRA2=0
+DEFAULT_VERSION_EXTRA3=0
+DEFAULT_VERSION_DATE=2020-09-15
+DEFAULT_VERSION_CLASSFILE_MAJOR=59  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_CLASSFILE_MINOR=0
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="14 15"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=15
+DEFAULT_PROMOTED_VERSION_PRE=
+
+LAUNCHER_NAME=openjdk
+PRODUCT_NAME=OpenJDK
+PRODUCT_SUFFIX="Runtime Environment"
+JDK_RC_PLATFORM_NAME=Platform
+COMPANY_NAME=N/A
+HOTSPOT_VM_DISTRO="Dynamic Code Evolution"
+VENDOR_URL=https://openjdk.java.net/
+VENDOR_URL_BUG=https://bugreport.java.com/bugreport/
+VENDOR_URL_VM_BUG=https://bugreport.java.com/bugreport/crash.jsp
+
+# Might need better names for these
+MACOSX_BUNDLE_NAME_BASE="OpenJDK"
+MACOSX_BUNDLE_ID_BASE="net.java.openjdk"

make/common/JarArchive.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -193,8 +193,7 @@ define SetupJarArchiveBody
   $1_UPDATE_CONTENTS=\
       if [ "`$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'`" -gt "0" ]; then \
         $(ECHO) "  updating" `$(WC) -l $$($1_BIN)/_the.$$($1_JARNAME)_contents | $(AWK) '{ print $$$$1 }'` files && \
-        $(SORT) $$($1_BIN)/_the.$$($1_JARNAME)_contents > $$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted && \
-        $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted; \
+        $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents; \
       fi $$(NEWLINE)
   # The s-variants of the above macros are used when the jar is created from scratch.
   # NOTICE: please leave the parentheses space separated otherwise the AIX build will break!
@@ -213,9 +212,7 @@ define SetupJarArchiveBody
             | $(SED) 's|$$(src)/|-C $$(src) |g' >> \
         $$($1_BIN)/_the.$$($1_JARNAME)_contents) $$(NEWLINE) )
   endif
-  $1_SUPDATE_CONTENTS=\
-      $(SORT) $$($1_BIN)/_the.$$($1_JARNAME)_contents > $$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted && \
-      $$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents_sorted $$(NEWLINE)
+  $1_SUPDATE_CONTENTS=$$($1_JAR_CMD) --update $$($1_JAR_OPTIONS) --file $$@ @$$($1_BIN)/_the.$$($1_JARNAME)_contents $$(NEWLINE)
 
   # Use a slightly shorter name for logging, but with enough path to identify this jar.
   $1_NAME:=$$(subst $$(OUTPUTDIR)/,,$$($1_JAR))

make/common/NativeCompilation.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2022, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2021, 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
@@ -358,20 +358,6 @@ define SetupCompileNativeFileBody
       # Compile as preprocessed assembler file
       $1_FLAGS := $(BASIC_ASFLAGS) $$($1_BASE_ASFLAGS)
       $1_COMPILER := $(AS)
-
-      # gcc assembly files must contain an appropriate relative .file
-      # path for reproducible builds.
-      ifeq ($(TOOLCHAIN_TYPE), gcc)
-        # If no absolute paths allowed, work out relative source file path
-        # for assembly .file substitution, otherwise use full file path
-        ifeq ($(ALLOW_ABSOLUTE_PATHS_IN_OUTPUT), false)
-          $1_REL_ASM_SRC := $$(call RelativePath, $$($1_FILE), $(WORKSPACE_ROOT))
-        else
-          $1_REL_ASM_SRC := $$($1_FILE)
-        endif
-        $1_FLAGS := $$($1_FLAGS) -DASSEMBLY_SRC_FILE='"$$($1_REL_ASM_SRC)"' \
-            -include $(TOPDIR)/make/data/autoheaders/assemblyprefix.h
-      endif
     else ifneq ($$(filter %.cpp %.cc %.mm, $$($1_FILENAME)), )
       # Compile as a C++ or Objective-C++ file
       $1_FLAGS := $(CFLAGS_CCACHE) $$($1_USE_PCH_FLAGS) $$($1_BASE_CXXFLAGS) \
@@ -403,12 +389,6 @@ define SetupCompileNativeFileBody
     $1_OBJ_DEPS := $$($1_SRC_FILE) $$($$($1_BASE)_COMPILE_VARDEPS_FILE) \
         $$($$($1_BASE)_EXTRA_DEPS) $$($1_VARDEPS_FILE)
     $1_COMPILE_OPTIONS := $$($1_FLAGS) $(CC_OUT_OPTION)$$($1_OBJ) $$($1_SRC_FILE)
-    # For reproducible builds with gcc ensure random symbol generation is seeded deterministically
-    ifeq ($(TOOLCHAIN_TYPE), gcc)
-       ifeq ($$(ENABLE_REPRODUCIBLE_BUILD), true)
-         $1_COMPILE_OPTIONS += -frandom-seed="$$($1_FILENAME)"
-       endif
-    endif
 
     $$($1_OBJ_JSON): $$($1_OBJ_DEPS)
 	$$(call WriteCompileCommandsFragment, $$@, $$(PWD), $$($1_SRC_FILE), \

make/conf/version-numbers.conf

@@ -28,12 +28,12 @@
 
 DEFAULT_VERSION_FEATURE=17
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=3
+DEFAULT_VERSION_UPDATE=2
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2022-04-19
+DEFAULT_VERSION_DATE=2022-01-18
 DEFAULT_VERSION_CLASSFILE_MAJOR=61  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11

make/data/autoheaders/assemblyprefix.h

@@ -1,29 +0,0 @@
-#
-# Copyright (c) 2022, 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
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-// ASSEMBLY_SRC_FILE gets replaced by relative or absolute file path
-// in NativeCompilation.gmk for gcc tooling on Linux. This ensures a
-// reproducible object file through a predictable value of the STT_FILE
-// symbol, and subsequently a reproducible .debuginfo.
-.file ASSEMBLY_SRC_FILE
-

make/data/currency/CurrencyData.properties

@@ -32,7 +32,7 @@ formatVersion=3
 # Version of the currency code information in this class.
 # It is a serial number that accompanies with each amendment.
 
-dataVersion=170
+dataVersion=169
 
 # List of all valid ISO 4217 currency codes.
 # To ensure compatibility, do not remove codes.
@@ -54,7 +54,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
     SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
     SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
     TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
-    UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
+    UYU858-UZS860-VEB862-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
     XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\
     XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\
     ZWN942-ZWR935

make/devkit/createJMHBundle.sh

@@ -26,7 +26,7 @@
 # Create a bundle in the build directory, containing what's needed to
 # build and run JMH microbenchmarks from the OpenJDK build.
 
-JMH_VERSION=1.34
+JMH_VERSION=1.32
 COMMONS_MATH3_VERSION=3.2
 JOPT_SIMPLE_VERSION=4.6
 

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -58,9 +58,6 @@ ifeq ($(call check-jvm-feature, compiler2), true)
 
   ADLC_CFLAGS += -I$(TOPDIR)/src/hotspot/share
 
-  # Add file macro mappings
-  ADLC_CFLAGS += $(FILE_MACRO_CFLAGS)
-
   $(eval $(call SetupNativeCompilation, BUILD_ADLC, \
       NAME := adlc, \
       TYPE := EXECUTABLE, \

make/hotspot/lib/JvmFeatures.gmk

@@ -84,7 +84,7 @@ ifneq ($(call check-jvm-feature, jvmti), true)
       jvmtiImpl.cpp jvmtiManageCapabilities.cpp jvmtiRawMonitor.cpp jvmtiUtil.cpp jvmtiTrace.cpp \
       jvmtiCodeBlobEvents.cpp jvmtiEnv.cpp jvmtiRedefineClasses.cpp jvmtiEnvBase.cpp jvmtiEnvThreadState.cpp \
       jvmtiTagMap.cpp jvmtiEventController.cpp evmCompat.cpp jvmtiEnter.xsl jvmtiExport.cpp \
-      jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp jvmtiEnhancedRedefineClasses.cpp
+      jvmtiClassFileReconstituter.cpp jvmtiTagMapTable.cpp
 endif
 
 ifneq ($(call check-jvm-feature, jvmci), true)

make/jdk/src/classes/build/tools/makezipreproducible/MakeZipReproducible.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 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
@@ -204,10 +204,6 @@ public class MakeZipReproducible {
             entry.setTimeLocal(timestamp);
         }
 
-        // Ensure "extra" field is not set from original ZipEntry info that may be not deterministic
-        // eg.may contain specific UID/GID
-        entry.setExtra(null);
-
         zos.putNextEntry(entry);
         if (entry.getSize() > 0 && entryInputStream != null) {
             entryInputStream.transferTo(zos);

make/modules/java.base/Gendata.gmk

@@ -60,11 +60,7 @@ TARGETS += $(GENDATA_CURDATA)
 
 ################################################################################
 
-ifneq ($(CACERTS_SRC), )
-  GENDATA_CACERTS_SRC := $(CACERTS_SRC)
-else
-  GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
-endif
+GENDATA_CACERTS_SRC := $(TOPDIR)/make/data/cacerts/
 GENDATA_CACERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/security/cacerts
 
 $(GENDATA_CACERTS): $(BUILD_TOOLS_JDK) $(wildcard $(GENDATA_CACERTS_SRC)/*)

make/modules/java.desktop/Copy.gmk

@@ -84,7 +84,7 @@ TARGETS += $(COPY_LEGAL)
 ################################################################################
 
 FONTFILE_SRC_DIR := $(TOPDIR)/src/java.desktop/share
-FONTFILE_SRCS := $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.ttf) $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.otf) $(FONTFILE_SRC_DIR)/fonts/fonts.dir $(FONTFILE_SRC_DIR)/fonts/font.conf
+FONTFILE_SRCS := $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.ttf) $(FONTFILE_SRC_DIR)/fonts/fonts.dir $(FONTFILE_SRC_DIR)/fonts/font.conf
 FONTFILE_TARGET_FILES := $(subst $(FONTFILE_SRC_DIR),$(LIB_DST_DIR),$(FONTFILE_SRCS))
 
 $(LIB_DST_DIR)/fonts/%: $(FONTFILE_SRC_DIR)/fonts/%

make/test/JtregNativeHotspot.gmk

@@ -863,7 +863,7 @@ ifeq ($(call isTargetOs, linux), true)
     BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeFPRegs := -ldl
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libAsyncGetCallTraceTest := -ldl
 else
-  BUILD_HOTSPOT_JTREG_EXCLUDE += libtest-rw.c libtest-rwx.c \
+  BUILD_HOTSPOT_JTREG_EXCLUDE += libtest-rw.c libtest-rwx.c libTestJNI.c \
       exeinvoke.c exestack-gap.c exestack-tls.c libAsyncGetCallTraceTest.cpp
 endif
 
@@ -871,7 +871,7 @@ BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exesigtest := -ljvm
 
 ifeq ($(call isTargetOs, windows), true)
     BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
-    BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c libTestJNI.c
+    BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c libterminatedThread.c
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libatExit := jvm.lib
 else
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread

src/demo/share/jfc/SwingSet2/TableDemo.java

@@ -741,13 +741,4 @@ public class TableDemo extends DemoModule {
         footerTextField.setDragEnabled(dragEnabled);
     }
 
-    @Override
-    public ImageIcon createImageIcon(String filename, String description) {
-        ImageIcon imageIcon = super.createImageIcon(filename, description);
-        AccessibleContext context = imageIcon.getAccessibleContext();
-        if (context!= null) {
-            context.setAccessibleName(description);
-        }
-        return imageIcon;
-    }
 }

src/hotspot/cpu/aarch64/aarch64.ad

@@ -2373,8 +2373,6 @@ const bool Matcher::match_rule_supported(int opcode) {
 
   bool ret_value = true;
   switch (opcode) {
-    case Op_OnSpinWait:
-      return VM_Version::supports_on_spin_wait();
     case Op_CacheWB:
     case Op_CacheWBPreSync:
     case Op_CacheWBPostSync:
@@ -3850,7 +3848,7 @@ encode %{
     // Try to CAS m->owner from NULL to current thread.
     __ add(tmp, disp_hdr, (ObjectMonitor::owner_offset_in_bytes()-markWord::monitor_value));
     __ cmpxchg(tmp, zr, rthread, Assembler::xword, /*acquire*/ true,
-               /*release*/ true, /*weak*/ false, rscratch1); // Sets flags for result
+               /*release*/ true, /*weak*/ false, noreg); // Sets flags for result
 
     // Store a non-null value into the box to avoid looking like a re-entrant
     // lock. The fast-path monitor unlock code checks for
@@ -3859,15 +3857,6 @@ encode %{
     __ mov(tmp, (address)markWord::unused_mark().value());
     __ str(tmp, Address(box, BasicLock::displaced_header_offset_in_bytes()));
 
-    __ br(Assembler::EQ, cont); // CAS success means locking succeeded
-
-    __ cmp(rscratch1, rthread);
-    __ br(Assembler::NE, cont); // Check for recursive locking
-
-    // Recursive lock case
-    __ increment(Address(disp_hdr, ObjectMonitor::recursions_offset_in_bytes() - markWord::monitor_value), 1);
-    // flag == EQ still from the cmp above, checking if this is a reentrant lock
-
     __ bind(cont);
     // flag == EQ indicates success
     // flag == NE indicates failure
@@ -3915,20 +3904,11 @@ encode %{
     __ add(tmp, tmp, -(int)markWord::monitor_value); // monitor
     __ ldr(rscratch1, Address(tmp, ObjectMonitor::owner_offset_in_bytes()));
     __ ldr(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset_in_bytes()));
-
-    Label notRecursive;
-    __ cmp(rscratch1, rthread);
+    __ eor(rscratch1, rscratch1, rthread); // Will be 0 if we are the owner.
+    __ orr(rscratch1, rscratch1, disp_hdr); // Will be 0 if there are 0 recursions
+    __ cmp(rscratch1, zr); // Sets flags for result
     __ br(Assembler::NE, cont);
 
-    __ cbz(disp_hdr, notRecursive);
-
-    // Recursive lock
-    __ sub(disp_hdr, disp_hdr, 1u);
-    __ str(disp_hdr, Address(tmp, ObjectMonitor::recursions_offset_in_bytes()));
-    // flag == EQ was set in the ownership check above
-    __ b(cont);
-
-    __ bind(notRecursive);
     __ ldr(rscratch1, Address(tmp, ObjectMonitor::EntryList_offset_in_bytes()));
     __ ldr(disp_hdr, Address(tmp, ObjectMonitor::cxq_offset_in_bytes()));
     __ orr(rscratch1, rscratch1, disp_hdr); // Will be 0 if both are 0.
@@ -14341,18 +14321,6 @@ instruct signumF_reg(vRegF dst, vRegF src, vRegF zero, vRegF one) %{
   ins_pipe(fp_uop_d);
 %}
 
-instruct onspinwait() %{
-  match(OnSpinWait);
-  ins_cost(INSN_COST);
-
-  format %{ "onspinwait" %}
-
-  ins_encode %{
-    __ spin_wait();
-  %}
-  ins_pipe(pipe_class_empty);
-%}
-
 // ============================================================================
 // Logical Instructions
 

src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp

@@ -2988,7 +2988,7 @@ void LIR_Assembler::membar_loadstore() { __ membar(MacroAssembler::LoadStore); }
 void LIR_Assembler::membar_storeload() { __ membar(MacroAssembler::StoreLoad); }
 
 void LIR_Assembler::on_spin_wait() {
-  __ spin_wait();
+  Unimplemented();
 }
 
 void LIR_Assembler::get_thread(LIR_Opr result_reg) {

src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.cpp

@@ -355,7 +355,7 @@ void C1_MacroAssembler::remove_frame(int framesize) {
 }
 
 
-void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
+void C1_MacroAssembler::verified_entry() {
   // If we have to make this method not-entrant we'll overwrite its
   // first instruction with a jump.  For this action to be legal we
   // must ensure that this first instruction is a B, BL, NOP, BKPT,

src/hotspot/cpu/aarch64/globals_aarch64.hpp

@@ -111,15 +111,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
   product(int, SoftwarePrefetchHintDistance, -1,                        \
           "Use prfm hint with specified distance in compiled code."     \
           "Value -1 means off.")                                        \
-          range(-1, 4096)                                               \
-  product(ccstr, OnSpinWaitInst, "none", DIAGNOSTIC,                    \
-          "The instruction to use to implement "                        \
-          "java.lang.Thread.onSpinWait()."                              \
-          "Options: none, nop, isb, yield.")                            \
-  product(uint, OnSpinWaitInstCount, 1, DIAGNOSTIC,                     \
-          "The number of OnSpinWaitInst instructions to generate."      \
-          "It cannot be used with OnSpinWaitInst=none.")                \
-          range(1, 99)
+          range(-1, 4096)
 
 // end of ARCH_FLAGS
 

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -2027,6 +2027,15 @@ void MacroAssembler::increment(Address dst, int value)
   str(rscratch1, dst);
 }
 
+
+void MacroAssembler::pusha() {
+  push(0x7fffffff, sp);
+}
+
+void MacroAssembler::popa() {
+  pop(0x7fffffff, sp);
+}
+
 // Push lots of registers in the bit set supplied.  Don't push sp.
 // Return the number of words pushed
 int MacroAssembler::push(unsigned int bitset, Register stack) {
@@ -2668,7 +2677,7 @@ void MacroAssembler::pop_call_clobbered_registers_except(RegSet exclude) {
 
 void MacroAssembler::push_CPU_state(bool save_vectors, bool use_sve,
                                     int sve_vector_size_in_bytes) {
-  push(RegSet::range(r0, r29), sp); // integer registers except lr & sp
+  push(0x3fffffff, sp);         // integer registers except lr & sp
   if (save_vectors && use_sve && sve_vector_size_in_bytes > 16) {
     sub(sp, sp, sve_vector_size_in_bytes * FloatRegisterImpl::number_of_registers);
     for (int i = 0; i < FloatRegisterImpl::number_of_registers; i++) {
@@ -2704,14 +2713,7 @@ void MacroAssembler::pop_CPU_state(bool restore_vectors, bool use_sve,
     reinitialize_ptrue();
   }
 
-  // integer registers except lr & sp
-  pop(RegSet::range(r0, r17), sp);
-#ifdef R18_RESERVED
-  ldp(zr, r19, Address(post(sp, 2 * wordSize)));
-  pop(RegSet::range(r20, r29), sp);
-#else
-  pop(RegSet::range(r18_tls, r29), sp);
-#endif
+  pop(0x3fffffff, sp);         // integer registers except lr & sp
 }
 
 /**
@@ -5352,21 +5354,3 @@ void MacroAssembler::verify_cross_modify_fence_not_required() {
   }
 }
 #endif
-
-void MacroAssembler::spin_wait() {
-  for (int i = 0; i < VM_Version::spin_wait_desc().inst_count(); ++i) {
-    switch (VM_Version::spin_wait_desc().inst()) {
-      case SpinWait::NOP:
-        nop();
-        break;
-      case SpinWait::ISB:
-        isb();
-        break;
-      case SpinWait::YIELD:
-        yield();
-        break;
-      default:
-        ShouldNotReachHere();
-    }
-  }
-}

src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp

@@ -1123,6 +1123,10 @@ public:
   void push(Register src);
   void pop(Register dst);
 
+  // push all registers onto the stack
+  void pusha();
+  void popa();
+
   void repne_scan(Register addr, Register value, Register count,
                   Register scratch);
   void repne_scanw(Register addr, Register value, Register count,
@@ -1410,9 +1414,6 @@ public:
   void cache_wb(Address line);
   void cache_wbsync(bool is_pre);
 
-  // Code for java.lang.Thread::onSpinWait() intrinsic.
-  void spin_wait();
-
 private:
   // Check the current thread doesn't need a cross modify fence.
   void verify_cross_modify_fence_not_required() PRODUCT_RETURN;

src/hotspot/cpu/aarch64/spin_wait_aarch64.hpp

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2021, Amazon.com Inc. 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
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef CPU_AARCH64_SPIN_WAIT_AARCH64_HPP
-#define CPU_AARCH64_SPIN_WAIT_AARCH64_HPP
-
-class SpinWait {
-public:
-  enum Inst {
-    NONE = -1,
-    NOP,
-    ISB,
-    YIELD
-  };
-
-private:
-  Inst _inst;
-  int _count;
-
-public:
-  SpinWait(Inst inst = NONE, int count = 0) : _inst(inst), _count(count) {}
-
-  Inst inst() const { return _inst; }
-  int inst_count() const { return _count; }
-};
-
-#endif // CPU_AARCH64_SPIN_WAIT_AARCH64_HPP

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

@@ -3223,194 +3223,6 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
-  // Arguments:
-  //
-  // Inputs:
-  //   c_rarg0   - byte[]  source+offset
-  //   c_rarg1   - int[]   SHA.state
-  //   c_rarg2   - int     offset
-  //   c_rarg3   - int     limit
-  //
-  address generate_md5_implCompress(bool multi_block, const char *name) {
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, "StubRoutines", name);
-    address start = __ pc();
-
-    Register buf       = c_rarg0;
-    Register state     = c_rarg1;
-    Register ofs       = c_rarg2;
-    Register limit     = c_rarg3;
-    Register a         = r4;
-    Register b         = r5;
-    Register c         = r6;
-    Register d         = r7;
-    Register rscratch3 = r10;
-    Register rscratch4 = r11;
-
-    Label keys;
-    Label md5_loop;
-
-    __ BIND(md5_loop);
-
-    // Save hash values for addition after rounds
-    __ ldrw(a, Address(state,  0));
-    __ ldrw(b, Address(state,  4));
-    __ ldrw(c, Address(state,  8));
-    __ ldrw(d, Address(state, 12));
-
-#define FF(r1, r2, r3, r4, k, s, t)              \
-    __ eorw(rscratch3, r3, r4);                  \
-    __ movw(rscratch2, t);                       \
-    __ andw(rscratch3, rscratch3, r2);           \
-    __ addw(rscratch4, r1, rscratch2);           \
-    __ ldrw(rscratch1, Address(buf, k*4));       \
-    __ eorw(rscratch3, rscratch3, r4);           \
-    __ addw(rscratch3, rscratch3, rscratch1);    \
-    __ addw(rscratch3, rscratch3, rscratch4);    \
-    __ rorw(rscratch2, rscratch3, 32 - s);       \
-    __ addw(r1, rscratch2, r2);
-
-#define GG(r1, r2, r3, r4, k, s, t)              \
-    __ eorw(rscratch2, r2, r3);                  \
-    __ ldrw(rscratch1, Address(buf, k*4));       \
-    __ andw(rscratch3, rscratch2, r4);           \
-    __ movw(rscratch2, t);                       \
-    __ eorw(rscratch3, rscratch3, r3);           \
-    __ addw(rscratch4, r1, rscratch2);           \
-    __ addw(rscratch3, rscratch3, rscratch1);    \
-    __ addw(rscratch3, rscratch3, rscratch4);    \
-    __ rorw(rscratch2, rscratch3, 32 - s);       \
-    __ addw(r1, rscratch2, r2);
-
-#define HH(r1, r2, r3, r4, k, s, t)              \
-    __ eorw(rscratch3, r3, r4);                  \
-    __ movw(rscratch2, t);                       \
-    __ addw(rscratch4, r1, rscratch2);           \
-    __ ldrw(rscratch1, Address(buf, k*4));       \
-    __ eorw(rscratch3, rscratch3, r2);           \
-    __ addw(rscratch3, rscratch3, rscratch1);    \
-    __ addw(rscratch3, rscratch3, rscratch4);    \
-    __ rorw(rscratch2, rscratch3, 32 - s);       \
-    __ addw(r1, rscratch2, r2);
-
-#define II(r1, r2, r3, r4, k, s, t)              \
-    __ movw(rscratch3, t);                       \
-    __ ornw(rscratch2, r2, r4);                  \
-    __ addw(rscratch4, r1, rscratch3);           \
-    __ ldrw(rscratch1, Address(buf, k*4));       \
-    __ eorw(rscratch3, rscratch2, r3);           \
-    __ addw(rscratch3, rscratch3, rscratch1);    \
-    __ addw(rscratch3, rscratch3, rscratch4);    \
-    __ rorw(rscratch2, rscratch3, 32 - s);       \
-    __ addw(r1, rscratch2, r2);
-
-    // Round 1
-    FF(a, b, c, d,  0,  7, 0xd76aa478)
-    FF(d, a, b, c,  1, 12, 0xe8c7b756)
-    FF(c, d, a, b,  2, 17, 0x242070db)
-    FF(b, c, d, a,  3, 22, 0xc1bdceee)
-    FF(a, b, c, d,  4,  7, 0xf57c0faf)
-    FF(d, a, b, c,  5, 12, 0x4787c62a)
-    FF(c, d, a, b,  6, 17, 0xa8304613)
-    FF(b, c, d, a,  7, 22, 0xfd469501)
-    FF(a, b, c, d,  8,  7, 0x698098d8)
-    FF(d, a, b, c,  9, 12, 0x8b44f7af)
-    FF(c, d, a, b, 10, 17, 0xffff5bb1)
-    FF(b, c, d, a, 11, 22, 0x895cd7be)
-    FF(a, b, c, d, 12,  7, 0x6b901122)
-    FF(d, a, b, c, 13, 12, 0xfd987193)
-    FF(c, d, a, b, 14, 17, 0xa679438e)
-    FF(b, c, d, a, 15, 22, 0x49b40821)
-
-    // Round 2
-    GG(a, b, c, d,  1,  5, 0xf61e2562)
-    GG(d, a, b, c,  6,  9, 0xc040b340)
-    GG(c, d, a, b, 11, 14, 0x265e5a51)
-    GG(b, c, d, a,  0, 20, 0xe9b6c7aa)
-    GG(a, b, c, d,  5,  5, 0xd62f105d)
-    GG(d, a, b, c, 10,  9, 0x02441453)
-    GG(c, d, a, b, 15, 14, 0xd8a1e681)
-    GG(b, c, d, a,  4, 20, 0xe7d3fbc8)
-    GG(a, b, c, d,  9,  5, 0x21e1cde6)
-    GG(d, a, b, c, 14,  9, 0xc33707d6)
-    GG(c, d, a, b,  3, 14, 0xf4d50d87)
-    GG(b, c, d, a,  8, 20, 0x455a14ed)
-    GG(a, b, c, d, 13,  5, 0xa9e3e905)
-    GG(d, a, b, c,  2,  9, 0xfcefa3f8)
-    GG(c, d, a, b,  7, 14, 0x676f02d9)
-    GG(b, c, d, a, 12, 20, 0x8d2a4c8a)
-
-    // Round 3
-    HH(a, b, c, d,  5,  4, 0xfffa3942)
-    HH(d, a, b, c,  8, 11, 0x8771f681)
-    HH(c, d, a, b, 11, 16, 0x6d9d6122)
-    HH(b, c, d, a, 14, 23, 0xfde5380c)
-    HH(a, b, c, d,  1,  4, 0xa4beea44)
-    HH(d, a, b, c,  4, 11, 0x4bdecfa9)
-    HH(c, d, a, b,  7, 16, 0xf6bb4b60)
-    HH(b, c, d, a, 10, 23, 0xbebfbc70)
-    HH(a, b, c, d, 13,  4, 0x289b7ec6)
-    HH(d, a, b, c,  0, 11, 0xeaa127fa)
-    HH(c, d, a, b,  3, 16, 0xd4ef3085)
-    HH(b, c, d, a,  6, 23, 0x04881d05)
-    HH(a, b, c, d,  9,  4, 0xd9d4d039)
-    HH(d, a, b, c, 12, 11, 0xe6db99e5)
-    HH(c, d, a, b, 15, 16, 0x1fa27cf8)
-    HH(b, c, d, a,  2, 23, 0xc4ac5665)
-
-    // Round 4
-    II(a, b, c, d,  0,  6, 0xf4292244)
-    II(d, a, b, c,  7, 10, 0x432aff97)
-    II(c, d, a, b, 14, 15, 0xab9423a7)
-    II(b, c, d, a,  5, 21, 0xfc93a039)
-    II(a, b, c, d, 12,  6, 0x655b59c3)
-    II(d, a, b, c,  3, 10, 0x8f0ccc92)
-    II(c, d, a, b, 10, 15, 0xffeff47d)
-    II(b, c, d, a,  1, 21, 0x85845dd1)
-    II(a, b, c, d,  8,  6, 0x6fa87e4f)
-    II(d, a, b, c, 15, 10, 0xfe2ce6e0)
-    II(c, d, a, b,  6, 15, 0xa3014314)
-    II(b, c, d, a, 13, 21, 0x4e0811a1)
-    II(a, b, c, d,  4,  6, 0xf7537e82)
-    II(d, a, b, c, 11, 10, 0xbd3af235)
-    II(c, d, a, b,  2, 15, 0x2ad7d2bb)
-    II(b, c, d, a,  9, 21, 0xeb86d391)
-
-#undef FF
-#undef GG
-#undef HH
-#undef II
-
-    // write hash values back in the correct order
-    __ ldrw(rscratch1, Address(state,  0));
-    __ addw(rscratch1, rscratch1, a);
-    __ strw(rscratch1, Address(state,  0));
-
-    __ ldrw(rscratch2, Address(state,  4));
-    __ addw(rscratch2, rscratch2, b);
-    __ strw(rscratch2, Address(state,  4));
-
-    __ ldrw(rscratch3, Address(state,  8));
-    __ addw(rscratch3, rscratch3, c);
-    __ strw(rscratch3, Address(state,  8));
-
-    __ ldrw(rscratch4, Address(state, 12));
-    __ addw(rscratch4, rscratch4, d);
-    __ strw(rscratch4, Address(state, 12));
-
-    if (multi_block) {
-      __ add(buf, buf, 64);
-      __ add(ofs, ofs, 64);
-      __ cmp(ofs, limit);
-      __ br(Assembler::LE, md5_loop);
-      __ mov(c_rarg0, ofs); // return ofs
-    }
-
-    __ ret(lr);
-
-    return start;
-  }
-
   // Arguments:
   //
   // Inputs:
@@ -6370,18 +6182,6 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
-  // Support for spin waits.
-  address generate_spin_wait() {
-    __ align(CodeEntryAlignment);
-    StubCodeMark mark(this, "StubRoutines", "spin_wait");
-    address start = __ pc();
-
-    __ spin_wait();
-    __ ret(lr);
-
-    return start;
-  }
-
 #ifdef LINUX
 
   // ARMv8.1 LSE versions of the atomic stubs used by Atomic::PlatformXX.
@@ -7664,10 +7464,6 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_counterMode_AESCrypt = generate_counterMode_AESCrypt();
     }
 
-    if (UseMD5Intrinsics) {
-      StubRoutines::_md5_implCompress      = generate_md5_implCompress(false,    "md5_implCompress");
-      StubRoutines::_md5_implCompressMB    = generate_md5_implCompress(true,     "md5_implCompressMB");
-    }
     if (UseSHA1Intrinsics) {
       StubRoutines::_sha1_implCompress     = generate_sha1_implCompress(false,   "sha1_implCompress");
       StubRoutines::_sha1_implCompressMB   = generate_sha1_implCompress(true,    "sha1_implCompressMB");
@@ -7690,8 +7486,6 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_updateBytesAdler32 = generate_updateBytesAdler32();
     }
 
-    StubRoutines::aarch64::_spin_wait = generate_spin_wait();
-
 #ifdef LINUX
 
     generate_atomic_entry_points();

src/hotspot/cpu/aarch64/stubRoutines_aarch64.cpp

@@ -57,10 +57,6 @@ address StubRoutines::aarch64::_string_indexof_linear_uu = NULL;
 address StubRoutines::aarch64::_string_indexof_linear_ul = NULL;
 address StubRoutines::aarch64::_large_byte_array_inflate = NULL;
 address StubRoutines::aarch64::_method_entry_barrier = NULL;
-
-static void empty_spin_wait() { }
-address StubRoutines::aarch64::_spin_wait = CAST_FROM_FN_PTR(address, empty_spin_wait);
-
 bool StubRoutines::aarch64::_completed = false;
 
 /**

src/hotspot/cpu/aarch64/stubRoutines_aarch64.hpp

@@ -36,7 +36,7 @@ static bool    returns_to_call_stub(address return_pc)   {
 
 enum platform_dependent_constants {
   code_size1 = 19000,          // simply increase if too small (assembler will crash if too small)
-  code_size2 = 45000           // simply increase if too small (assembler will crash if too small)
+  code_size2 = 32000           // simply increase if too small (assembler will crash if too small)
 };
 
 class aarch64 {
@@ -72,8 +72,6 @@ class aarch64 {
 
   static address _method_entry_barrier;
 
-  static address _spin_wait;
-
   static bool _completed;
 
  public:
@@ -179,10 +177,6 @@ class aarch64 {
     return _method_entry_barrier;
   }
 
-  static address spin_wait() {
-    return _spin_wait;
-  }
-
   static bool complete() {
     return _completed;
   }

src/hotspot/cpu/aarch64/templateInterpreterGenerator_aarch64.cpp

@@ -1397,12 +1397,11 @@ address TemplateInterpreterGenerator::generate_native_entry(bool synchronized) {
     __ cmp(rscratch1, (u1)StackOverflow::stack_guard_yellow_reserved_disabled);
     __ br(Assembler::NE, no_reguard);
 
-    __ push_call_clobbered_registers();
+    __ pusha(); // XXX only save smashed registers
     __ mov(c_rarg0, rthread);
     __ mov(rscratch2, CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages));
     __ blr(rscratch2);
-    __ pop_call_clobbered_registers();
-
+    __ popa(); // XXX only restore smashed registers
     __ bind(no_reguard);
   }
 

src/hotspot/cpu/aarch64/vm_version_aarch64.cpp

@@ -46,26 +46,6 @@ int VM_Version::_dcache_line_size;
 int VM_Version::_icache_line_size;
 int VM_Version::_initial_sve_vector_length;
 
-SpinWait VM_Version::_spin_wait;
-
-static SpinWait get_spin_wait_desc() {
-  if (strcmp(OnSpinWaitInst, "nop") == 0) {
-    return SpinWait(SpinWait::NOP, OnSpinWaitInstCount);
-  } else if (strcmp(OnSpinWaitInst, "isb") == 0) {
-    return SpinWait(SpinWait::ISB, OnSpinWaitInstCount);
-  } else if (strcmp(OnSpinWaitInst, "yield") == 0) {
-    return SpinWait(SpinWait::YIELD, OnSpinWaitInstCount);
-  } else if (strcmp(OnSpinWaitInst, "none") != 0) {
-    vm_exit_during_initialization("The options for OnSpinWaitInst are nop, isb, yield, and none", OnSpinWaitInst);
-  }
-
-  if (!FLAG_IS_DEFAULT(OnSpinWaitInstCount) && OnSpinWaitInstCount > 0) {
-    vm_exit_during_initialization("OnSpinWaitInstCount cannot be used for OnSpinWaitInst 'none'");
-  }
-
-  return SpinWait{};
-}
-
 void VM_Version::initialize() {
   _supports_cx8 = true;
   _supports_atomic_getset4 = true;
@@ -202,14 +182,6 @@ void VM_Version::initialize() {
     if (FLAG_IS_DEFAULT(UseSIMDForMemoryOps)) {
       FLAG_SET_DEFAULT(UseSIMDForMemoryOps, true);
     }
-
-    if (FLAG_IS_DEFAULT(OnSpinWaitInst)) {
-      FLAG_SET_DEFAULT(OnSpinWaitInst, "isb");
-    }
-
-    if (FLAG_IS_DEFAULT(OnSpinWaitInstCount)) {
-      FLAG_SET_DEFAULT(OnSpinWaitInstCount, 1);
-    }
   }
 
   if (_cpu == CPU_ARM) {
@@ -300,8 +272,9 @@ void VM_Version::initialize() {
     FLAG_SET_DEFAULT(UseFMA, true);
   }
 
-  if (FLAG_IS_DEFAULT(UseMD5Intrinsics)) {
-    UseMD5Intrinsics = true;
+  if (UseMD5Intrinsics) {
+    warning("MD5 intrinsics are not available on this CPU");
+    FLAG_SET_DEFAULT(UseMD5Intrinsics, false);
   }
 
   if (_features & (CPU_SHA1 | CPU_SHA2 | CPU_SHA3 | CPU_SHA512)) {
@@ -477,7 +450,5 @@ void VM_Version::initialize() {
   }
 #endif
 
-  _spin_wait = get_spin_wait_desc();
-
   UNSUPPORTED_OPTION(CriticalJNINatives);
 }

src/hotspot/cpu/aarch64/vm_version_aarch64.hpp

@@ -26,7 +26,6 @@
 #ifndef CPU_AARCH64_VM_VERSION_AARCH64_HPP
 #define CPU_AARCH64_VM_VERSION_AARCH64_HPP
 
-#include "spin_wait_aarch64.hpp"
 #include "runtime/abstract_vm_version.hpp"
 #include "utilities/sizes.hpp"
 
@@ -46,8 +45,6 @@ protected:
   static int _icache_line_size;
   static int _initial_sve_vector_length;
 
-  static SpinWait _spin_wait;
-
   // Read additional info using OS-specific interfaces
   static void get_os_cpu_info();
 
@@ -145,10 +142,6 @@ public:
 
   static void get_compatible_board(char *buf, int buflen);
 
-  static const SpinWait& spin_wait_desc() { return _spin_wait; }
-
-  static bool supports_on_spin_wait() { return _spin_wait.inst() != SpinWait::NONE; }
-
 #ifdef __APPLE__
   // Is the CPU running emulated (for example macOS Rosetta running x86_64 code on M1 ARM (aarch64)
   static bool is_cpu_emulated();

src/hotspot/cpu/arm/assembler_arm_32.cpp

@@ -47,7 +47,7 @@
 // Convert the raw encoding form into the form expected by the
 // constructor for Address.
 Address Address::make_raw(int base, int index, int scale, int disp, relocInfo::relocType disp_reloc) {
-  RelocationHolder rspec = RelocationHolder::none;
+  RelocationHolder rspec;
   if (disp_reloc != relocInfo::none) {
     rspec = Relocation::spec_simple(disp_reloc);
   }

src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp

@@ -1685,9 +1685,6 @@ void LIR_Assembler::logic_op(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Opr
     } else {
       assert(right->is_constant(), "must be");
       const uint c = (uint)right->as_constant_ptr()->as_jint();
-      if (!Assembler::is_arith_imm_in_range(c)) {
-        BAILOUT("illegal arithmetic operand");
-      }
       switch (code) {
         case lir_logic_and: __ and_32(res, lreg, c); break;
         case lir_logic_or:  __ orr_32(res, lreg, c); break;
@@ -1828,8 +1825,8 @@ void LIR_Assembler::comp_op(LIR_Condition condition, LIR_Opr opr1, LIR_Opr opr2,
         __ teq(xhi, yhi);
         __ teq(xlo, ylo, eq);
       } else {
-        __ subs(Rtemp, xlo, ylo);
-        __ sbcs(Rtemp, xhi, yhi);
+        __ subs(xlo, xlo, ylo);
+        __ sbcs(xhi, xhi, yhi);
       }
     } else {
       ShouldNotReachHere();

src/hotspot/cpu/arm/c1_MacroAssembler_arm.cpp

@@ -70,8 +70,8 @@ void C1_MacroAssembler::remove_frame(int frame_size_in_bytes) {
   raw_pop(FP, LR);
 }
 
-void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
-  if (breakAtEntry) {
+void C1_MacroAssembler::verified_entry() {
+  if (C1Breakpoint) {
     breakpoint();
   }
 }

src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp

@@ -81,6 +81,8 @@ void RangeCheckStub::emit_code(LIR_Assembler* ce) {
 
   if (_info->deoptimize_on_exception()) {
     address a = Runtime1::entry_for(Runtime1::predicate_failed_trap_id);
+    // May be used by optimizations like LoopInvariantCodeMotion or RangeCheckEliminator.
+    DEBUG_ONLY( __ untested("RangeCheckStub: predicate_failed_trap_id"); )
     //__ load_const_optimized(R0, a);
     __ add_const_optimized(R0, R29_TOC, MacroAssembler::offset_to_global_toc(a));
     __ mtctr(R0);

src/hotspot/cpu/ppc/c1_MacroAssembler_ppc.cpp

@@ -87,8 +87,8 @@ void C1_MacroAssembler::build_frame(int frame_size_in_bytes, int bang_size_in_by
 }
 
 
-void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
-  if (breakAtEntry) illtrap();
+void C1_MacroAssembler::verified_entry() {
+  if (C1Breakpoint) illtrap();
   // build frame
 }
 

src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.cpp

@@ -41,18 +41,17 @@
 // Compress char[] to byte[] by compressing 16 bytes at once.
 void C2_MacroAssembler::string_compress_16(Register src, Register dst, Register cnt,
                                            Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5,
-                                           Label& Lfailure, bool ascii) {
+                                           Label& Lfailure) {
 
   const Register tmp0 = R0;
-  const int byte_mask = ascii ? 0x7F : 0xFF;
   assert_different_registers(src, dst, cnt, tmp0, tmp1, tmp2, tmp3, tmp4, tmp5);
   Label Lloop, Lslow;
 
   // Check if cnt >= 8 (= 16 bytes)
-  lis(tmp1, byte_mask);           // tmp1 = 0x00FF00FF00FF00FF (non ascii case)
+  lis(tmp1, 0xFF);                // tmp1 = 0x00FF00FF00FF00FF
   srwi_(tmp2, cnt, 3);
   beq(CCR0, Lslow);
-  ori(tmp1, tmp1, byte_mask);
+  ori(tmp1, tmp1, 0xFF);
   rldimi(tmp1, tmp1, 32, 0);
   mtctr(tmp2);
 
@@ -68,7 +67,7 @@ void C2_MacroAssembler::string_compress_16(Register src, Register dst, Register
   rldimi(tmp4, tmp4, 2*8, 2*8);   // _4_6_7_7
 
   andc_(tmp0, tmp0, tmp1);
-  bne(CCR0, Lfailure);            // Not latin1/ascii.
+  bne(CCR0, Lfailure);            // Not latin1.
   addi(src, src, 16);
 
   rlwimi(tmp3, tmp2, 0*8, 24, 31);// _____1_3
@@ -88,49 +87,20 @@ void C2_MacroAssembler::string_compress_16(Register src, Register dst, Register
 }
 
 // Compress char[] to byte[]. cnt must be positive int.
-void C2_MacroAssembler::string_compress(Register src, Register dst, Register cnt, Register tmp,
-                                        Label& Lfailure, bool ascii) {
-  const int byte_mask = ascii ? 0x7F : 0xFF;
+void C2_MacroAssembler::string_compress(Register src, Register dst, Register cnt, Register tmp, Label& Lfailure) {
   Label Lloop;
   mtctr(cnt);
 
   bind(Lloop);
   lhz(tmp, 0, src);
-  cmplwi(CCR0, tmp, byte_mask);
-  bgt(CCR0, Lfailure);            // Not latin1/ascii.
+  cmplwi(CCR0, tmp, 0xff);
+  bgt(CCR0, Lfailure);            // Not latin1.
   addi(src, src, 2);
   stb(tmp, 0, dst);
   addi(dst, dst, 1);
   bdnz(Lloop);
 }
 
-void C2_MacroAssembler::encode_iso_array(Register src, Register dst, Register len,
-                                         Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5,
-                                         Register result, bool ascii) {
-  Label Lslow, Lfailure1, Lfailure2, Ldone;
-
-  string_compress_16(src, dst, len, tmp1, tmp2, tmp3, tmp4, tmp5, Lfailure1, ascii);
-  rldicl_(result, len, 0, 64-3); // Remaining characters.
-  beq(CCR0, Ldone);
-  bind(Lslow);
-  string_compress(src, dst, result, tmp2, Lfailure2, ascii);
-  li(result, 0);
-  b(Ldone);
-
-  bind(Lfailure1);
-  mr(result, len);
-  mfctr(tmp1);
-  rldimi_(result, tmp1, 3, 0); // Remaining characters.
-  beq(CCR0, Ldone);
-  b(Lslow);
-
-  bind(Lfailure2);
-  mfctr(result); // Remaining characters.
-
-  bind(Ldone);
-  subf(result, result, len);
-}
-
 // Inflate byte[] to char[] by inflating 16 bytes at once.
 void C2_MacroAssembler::string_inflate_16(Register src, Register dst, Register cnt,
                                           Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5) {

src/hotspot/cpu/ppc/c2_MacroAssembler_ppc.hpp

@@ -32,16 +32,10 @@
   // Compress char[] to byte[] by compressing 16 bytes at once.
   void string_compress_16(Register src, Register dst, Register cnt,
                           Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5,
-                          Label& Lfailure, bool ascii = false);
+                          Label& Lfailure);
 
   // Compress char[] to byte[]. cnt must be positive int.
-  void string_compress(Register src, Register dst, Register cnt, Register tmp,
-                       Label& Lfailure, bool ascii = false);
-
-  // Encode UTF16 to ISO_8859_1 or ASCII. Return len on success or position of first mismatch.
-  void encode_iso_array(Register src, Register dst, Register len,
-                        Register tmp1, Register tmp2, Register tmp3, Register tmp4, Register tmp5,
-                        Register result, bool ascii);
+  void string_compress(Register src, Register dst, Register cnt, Register tmp, Label& Lfailure);
 
   // Inflate byte[] to char[] by inflating 16 bytes at once.
   void string_inflate_16(Register src, Register dst, Register cnt,

src/hotspot/cpu/ppc/frame_ppc.cpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2021 SAP SE. 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
@@ -294,57 +294,9 @@ void frame::patch_pc(Thread* thread, address pc) {
 }
 
 bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
+  // Is there anything to do?
   assert(is_interpreted_frame(), "Not an interpreted frame");
-  // These are reasonable sanity checks
-  if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) {
-    return false;
-  }
-  if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) {
-    return false;
-  }
-  int min_frame_slots = (abi_minframe_size + ijava_state_size) / sizeof(intptr_t);
-  if (fp() - min_frame_slots < sp()) {
-    return false;
-  }
-  // These are hacks to keep us out of trouble.
-  // The problem with these is that they mask other problems
-  if (fp() <= sp()) {        // this attempts to deal with unsigned comparison above
-    return false;
-  }
-
-  // do some validation of frame elements
-
-  // first the method
-
-  Method* m = *interpreter_frame_method_addr();
-
-  // validate the method we'd find in this potential sender
-  if (!Method::is_valid_method(m)) return false;
-
-  // stack frames shouldn't be much larger than max_stack elements
-  // this test requires the use of unextended_sp which is the sp as seen by
-  // the current frame, and not sp which is the "raw" pc which could point
-  // further because of local variables of the callee method inserted after
-  // method arguments
-  if (fp() - unextended_sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) {
-    return false;
-  }
-
-  // validate bci/bcx
-
-  address  bcp    = interpreter_frame_bcp();
-  if (m->validate_bci_from_bcp(bcp) < 0) {
-    return false;
-  }
-
-  // validate constantPoolCache*
-  ConstantPoolCache* cp = *interpreter_frame_cache_addr();
-  if (MetaspaceObj::is_valid(cp) == false) return false;
-
-  // validate locals
-
-  address locals =  (address) *interpreter_frame_locals_addr();
-  return thread->is_in_stack_range_incl(locals, (address)fp());
+  return true;
 }
 
 BasicType frame::interpreter_frame_result(oop* oop_result, jvalue* value_result) {

src/hotspot/cpu/ppc/matcher_ppc.hpp

@@ -157,6 +157,6 @@
   }
 
   // Implements a variant of EncodeISOArrayNode that encode ASCII only
-  static const bool supports_encode_ascii_array = true;
+  static const bool supports_encode_ascii_array = false;
 
 #endif // CPU_PPC_MATCHER_PPC_HPP

src/hotspot/cpu/ppc/ppc.ad

@@ -12798,26 +12798,30 @@ instruct encode_iso_array(rarg1RegP src, rarg2RegP dst, iRegIsrc len, iRegIdst r
   effect(TEMP_DEF result, TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, TEMP tmp5,
          USE_KILL src, USE_KILL dst, KILL ctr, KILL cr0);
   ins_cost(300);
-  format %{ "Encode iso array $src,$dst,$len -> $result \t// KILL $tmp1, $tmp2, $tmp3, $tmp4, $tmp5" %}
+  format %{ "Encode array $src,$dst,$len -> $result \t// KILL $tmp1, $tmp2, $tmp3, $tmp4, $tmp5" %}
   ins_encode %{
-    __ encode_iso_array($src$$Register, $dst$$Register, $len$$Register, $tmp1$$Register, $tmp2$$Register,
-                        $tmp3$$Register, $tmp4$$Register, $tmp5$$Register, $result$$Register, false);
-  %}
-  ins_pipe(pipe_class_default);
-%}
+    Label Lslow, Lfailure1, Lfailure2, Ldone;
+    __ string_compress_16($src$$Register, $dst$$Register, $len$$Register, $tmp1$$Register,
+                          $tmp2$$Register, $tmp3$$Register, $tmp4$$Register, $tmp5$$Register, Lfailure1);
+    __ rldicl_($result$$Register, $len$$Register, 0, 64-3); // Remaining characters.
+    __ beq(CCR0, Ldone);
+    __ bind(Lslow);
+    __ string_compress($src$$Register, $dst$$Register, $result$$Register, $tmp2$$Register, Lfailure2);
+    __ li($result$$Register, 0);
+    __ b(Ldone);
 
-// encode char[] to byte[] in ASCII
-instruct encode_ascii_array(rarg1RegP src, rarg2RegP dst, iRegIsrc len, iRegIdst result, iRegLdst tmp1,
-                          iRegLdst tmp2, iRegLdst tmp3, iRegLdst tmp4, iRegLdst tmp5, regCTR ctr, flagsRegCR0 cr0) %{
-  predicate(((EncodeISOArrayNode*)n)->is_ascii());
-  match(Set result (EncodeISOArray src (Binary dst len)));
-  effect(TEMP_DEF result, TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, TEMP tmp5,
-         USE_KILL src, USE_KILL dst, KILL ctr, KILL cr0);
-  ins_cost(300);
-  format %{ "Encode ascii array $src,$dst,$len -> $result \t// KILL $tmp1, $tmp2, $tmp3, $tmp4, $tmp5" %}
-  ins_encode %{
-    __ encode_iso_array($src$$Register, $dst$$Register, $len$$Register, $tmp1$$Register, $tmp2$$Register,
-                        $tmp3$$Register, $tmp4$$Register, $tmp5$$Register, $result$$Register, true);
+    __ bind(Lfailure1);
+    __ mr($result$$Register, $len$$Register);
+    __ mfctr($tmp1$$Register);
+    __ rldimi_($result$$Register, $tmp1$$Register, 3, 0); // Remaining characters.
+    __ beq(CCR0, Ldone);
+    __ b(Lslow);
+
+    __ bind(Lfailure2);
+    __ mfctr($result$$Register); // Remaining characters.
+
+    __ bind(Ldone);
+    __ subf($result$$Register, $result$$Register, $len$$Register);
   %}
   ins_pipe(pipe_class_default);
 %}

src/hotspot/cpu/s390/c1_MacroAssembler_s390.cpp

@@ -74,8 +74,8 @@ void C1_MacroAssembler::build_frame(int frame_size_in_bytes, int bang_size_in_by
   push_frame(frame_size_in_bytes);
 }
 
-void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
-  if (breakAtEntry) z_illtrap(0xC1);
+void C1_MacroAssembler::verified_entry() {
+  if (C1Breakpoint) z_illtrap(0xC1);
 }
 
 void C1_MacroAssembler::lock_object(Register hdr, Register obj, Register disp_hdr, Label& slow_case) {

src/hotspot/cpu/s390/frame_s390.cpp

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2016, 2022 SAP SE. All rights reserved.
+ * Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019 SAP SE. 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
@@ -117,8 +117,8 @@ bool frame::safe_for_sender(JavaThread *thread) {
       return false;
     }
 
-    z_abi_16* sender_abi = (z_abi_16*)fp;
-    intptr_t* sender_sp = (intptr_t*) fp;
+    z_abi_160* sender_abi = (z_abi_160*) fp;
+    intptr_t* sender_sp = (intptr_t*) sender_abi->callers_sp;
     address   sender_pc = (address)   sender_abi->return_pc;
 
     // We must always be able to find a recognizable pc.
@@ -142,7 +142,7 @@ bool frame::safe_for_sender(JavaThread *thread) {
     // sender_fp must be within the stack and above (but not
     // equal) current frame's fp.
     if (!thread->is_in_stack_range_excl(sender_fp, fp)) {
-      return false;
+        return false;
     }
 
     // If the potential sender is the interpreter then we can do some more checking.
@@ -298,55 +298,9 @@ void frame::patch_pc(Thread* thread, address pc) {
 }
 
 bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
+  // Is there anything to do?
   assert(is_interpreted_frame(), "Not an interpreted frame");
-  // These are reasonable sanity checks
-  if (fp() == 0 || (intptr_t(fp()) & (wordSize-1)) != 0) {
-    return false;
-  }
-  if (sp() == 0 || (intptr_t(sp()) & (wordSize-1)) != 0) {
-    return false;
-  }
-  int min_frame_slots = (z_abi_16_size + z_ijava_state_size) / sizeof(intptr_t);
-  if (fp() - min_frame_slots < sp()) {
-    return false;
-  }
-  // These are hacks to keep us out of trouble.
-  // The problem with these is that they mask other problems
-  if (fp() <= sp()) {        // this attempts to deal with unsigned comparison above
-    return false;
-  }
-
-  // do some validation of frame elements
-
-  // first the method
-  // Need to use "unchecked" versions to avoid "z_istate_magic_number" assertion.
-  Method* m = (Method*)(ijava_state_unchecked()->method);
-
-  // validate the method we'd find in this potential sender
-  if (!Method::is_valid_method(m)) return false;
-
-  // stack frames shouldn't be much larger than max_stack elements
-  // this test requires the use of unextended_sp which is the sp as seen by
-  // the current frame, and not sp which is the "raw" pc which could point
-  // further because of local variables of the callee method inserted after
-  // method arguments
-  if (fp() - unextended_sp() > 1024 + m->max_stack()*Interpreter::stackElementSize) {
-    return false;
-  }
-
-  // validate bci/bcx
-  address bcp = (address)(ijava_state_unchecked()->bcp);
-  if (m->validate_bci_from_bcp(bcp) < 0) {
-    return false;
-  }
-
-  // validate constantPoolCache*
-  ConstantPoolCache* cp = (ConstantPoolCache*)(ijava_state_unchecked()->cpoolCache);
-  if (MetaspaceObj::is_valid(cp) == false) return false;
-
-  // validate locals
-  address locals = (address)(ijava_state_unchecked()->locals);
-  return thread->is_in_stack_range_incl(locals, (address)fp());
+  return true;
 }
 
 BasicType frame::interpreter_frame_result(oop* oop_result, jvalue* value_result) {

src/hotspot/cpu/x86/assembler_x86.cpp

@@ -187,7 +187,7 @@ Address::Address(address loc, RelocationHolder spec) {
 // Address.  An index of 4 (rsp) corresponds to having no index, so convert
 // that to noreg for the Address constructor.
 Address Address::make_raw(int base, int index, int scale, int disp, relocInfo::relocType disp_reloc) {
-  RelocationHolder rspec = RelocationHolder::none;
+  RelocationHolder rspec;
   if (disp_reloc != relocInfo::none) {
     rspec = Relocation::spec_simple(disp_reloc);
   }

src/hotspot/cpu/x86/c1_MacroAssembler_x86.cpp

@@ -354,18 +354,18 @@ void C1_MacroAssembler::remove_frame(int frame_size_in_bytes) {
 }
 
 
-void C1_MacroAssembler::verified_entry(bool breakAtEntry) {
-  if (breakAtEntry || VerifyFPU) {
+void C1_MacroAssembler::verified_entry() {
+  if (C1Breakpoint || VerifyFPU) {
     // Verified Entry first instruction should be 5 bytes long for correct
     // patching by patch_verified_entry().
     //
-    // Breakpoint and VerifyFPU have one byte first instruction.
+    // C1Breakpoint and VerifyFPU have one byte first instruction.
     // Also first instruction will be one byte "push(rbp)" if stack banging
     // code is not generated (see build_frame() above).
     // For all these cases generate long instruction first.
     fat_nop();
   }
-  if (breakAtEntry) int3();
+  if (C1Breakpoint)int3();
   // build frame
   IA32_ONLY( verify_FPU(0, "method_entry"); )
 }

src/hotspot/cpu/x86/c2_MacroAssembler_x86.cpp

@@ -602,13 +602,8 @@ void C2_MacroAssembler::fast_lock(Register objReg, Register boxReg, Register tmp
   // Unconditionally set box->_displaced_header = markWord::unused_mark().
   // Without cast to int32_t this style of movptr will destroy r10 which is typically obj.
   movptr(Address(boxReg, 0), (int32_t)intptr_t(markWord::unused_mark().value()));
+  // Intentional fall-through into DONE_LABEL ...
   // Propagate ICC.ZF from CAS above into DONE_LABEL.
-  jcc(Assembler::equal, DONE_LABEL);           // CAS above succeeded; propagate ZF = 1 (success)
-
-  cmpptr(r15_thread, rax);                     // Check if we are already the owner (recursive lock)
-  jcc(Assembler::notEqual, DONE_LABEL);        // If not recursive, ZF = 0 at this point (fail)
-  incq(Address(scrReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(recursions)));
-  xorq(rax, rax); // Set ZF = 1 (success) for recursive lock, denoting locking success
 #endif // _LP64
 #if INCLUDE_RTM_OPT
   } // use_rtm()
@@ -710,6 +705,10 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
   // Refer to the comments in synchronizer.cpp for how we might encode extra
   // state in _succ so we can avoid fetching EntryList|cxq.
   //
+  // I'd like to add more cases in fast_lock() and fast_unlock() --
+  // such as recursive enter and exit -- but we have to be wary of
+  // I$ bloat, T$ effects and BP$ effects.
+  //
   // If there's no contention try a 1-0 exit.  That is, exit without
   // a costly MEMBAR or CAS.  See synchronizer.cpp for details on how
   // we detect and recover from the race that the 1-0 exit admits.
@@ -757,16 +756,9 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
   bind (CheckSucc);
 #else // _LP64
   // It's inflated
-  Label LNotRecursive, LSuccess, LGoSlowPath;
-
-  cmpptr(Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(recursions)), 0);
-  jccb(Assembler::equal, LNotRecursive);
-
-  // Recursive inflated unlock
-  decq(Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(recursions)));
-  jmpb(LSuccess);
-
-  bind(LNotRecursive);
+  xorptr(boxReg, boxReg);
+  orptr(boxReg, Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(recursions)));
+  jccb  (Assembler::notZero, DONE_LABEL);
   movptr(boxReg, Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(cxq)));
   orptr(boxReg, Address(tmpReg, OM_OFFSET_NO_MONITOR_VALUE_TAG(EntryList)));
   jccb  (Assembler::notZero, CheckSucc);
@@ -775,6 +767,7 @@ void C2_MacroAssembler::fast_unlock(Register objReg, Register boxReg, Register t
   jmpb  (DONE_LABEL);
 
   // Try to avoid passing control into the slow_path ...
+  Label LSuccess, LGoSlowPath ;
   bind  (CheckSucc);
 
   // The following optional optimization can be elided if necessary

src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp

@@ -155,15 +155,14 @@ void CodeInstaller::pd_relocate_JavaMethod(CodeBuffer &, JVMCIObject hotspot_met
     method = JVMCIENV->asMethod(hotspot_method);
   }
 #endif
-  NativeCall* call = NULL;
   switch (_next_call_type) {
     case INLINE_INVOKE:
-      return;
+      break;
     case INVOKEVIRTUAL:
     case INVOKEINTERFACE: {
       assert(method == NULL || !method->is_static(), "cannot call static method with invokeinterface");
 
-      call = nativeCall_at(_instructions->start() + pc_offset);
+      NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
       call->set_destination(SharedRuntime::get_resolve_virtual_call_stub());
       _instructions->relocate(call->instruction_address(),
                                              virtual_call_Relocation::spec(_invoke_mark_pc),
@@ -173,7 +172,7 @@ void CodeInstaller::pd_relocate_JavaMethod(CodeBuffer &, JVMCIObject hotspot_met
     case INVOKESTATIC: {
       assert(method == NULL || method->is_static(), "cannot call non-static method with invokestatic");
 
-      call = nativeCall_at(_instructions->start() + pc_offset);
+      NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
       call->set_destination(SharedRuntime::get_resolve_static_call_stub());
       _instructions->relocate(call->instruction_address(),
                                              relocInfo::static_call_type, Assembler::call32_operand);
@@ -181,18 +180,15 @@ void CodeInstaller::pd_relocate_JavaMethod(CodeBuffer &, JVMCIObject hotspot_met
     }
     case INVOKESPECIAL: {
       assert(method == NULL || !method->is_static(), "cannot call static method with invokespecial");
-      call = nativeCall_at(_instructions->start() + pc_offset);
+      NativeCall* call = nativeCall_at(_instructions->start() + pc_offset);
       call->set_destination(SharedRuntime::get_resolve_opt_virtual_call_stub());
       _instructions->relocate(call->instruction_address(),
                               relocInfo::opt_virtual_call_type, Assembler::call32_operand);
       break;
     }
     default:
-      JVMCI_ERROR("invalid _next_call_type value: %d", _next_call_type);
-      return;
-  }
-  if (!call->is_displacement_aligned()) {
-    JVMCI_ERROR("unaligned displacement for call at offset %d", pc_offset);
+      JVMCI_ERROR("invalid _next_call_type value");
+      break;
   }
 }
 

src/hotspot/cpu/x86/nativeInst_x86.cpp

@@ -260,9 +260,6 @@ void NativeCall::replace_mt_safe(address instr_addr, address code_buffer) {
 
 }
 
-bool NativeCall::is_displacement_aligned() {
-  return (uintptr_t) displacement_address() % 4 == 0;
-}
 
 // Similar to replace_mt_safe, but just changes the destination.  The
 // important thing is that free-running threads are able to execute this
@@ -285,7 +282,8 @@ void NativeCall::set_destination_mt_safe(address dest) {
          CompiledICLocker::is_safe(instruction_address()), "concurrent code patching");
   // Both C1 and C2 should now be generating code which aligns the patched address
   // to be within a single cache line.
-  bool is_aligned = is_displacement_aligned();
+  bool is_aligned = ((uintptr_t)displacement_address() + 0) / cache_line_size ==
+                    ((uintptr_t)displacement_address() + 3) / cache_line_size;
 
   guarantee(is_aligned, "destination must be aligned");
 

src/hotspot/cpu/x86/nativeInst_x86.hpp

@@ -160,6 +160,8 @@ class NativeCall: public NativeInstruction {
     return_address_offset       =    5
   };
 
+  enum { cache_line_size = BytesPerWord };  // conservative estimate!
+
   address instruction_address() const       { return addr_at(instruction_offset); }
   address next_instruction_address() const  { return addr_at(return_address_offset); }
   int   displacement() const                { return (jint) int_at(displacement_offset); }
@@ -173,11 +175,9 @@ class NativeCall: public NativeInstruction {
 #endif // AMD64
     set_int_at(displacement_offset, dest - return_address());
   }
-  // Returns whether the 4-byte displacement operand is 4-byte aligned.
-  bool  is_displacement_aligned();
   void  set_destination_mt_safe(address dest);
 
-  void  verify_alignment() { assert(is_displacement_aligned(), "displacement of call is not aligned"); }
+  void  verify_alignment() { assert((intptr_t)addr_at(displacement_offset) % BytesPerInt == 0, "must be aligned"); }
   void  verify();
   void  print();
 

src/hotspot/cpu/x86/vmreg_x86.hpp

@@ -90,13 +90,7 @@ inline   bool is_concrete() {
 #ifndef AMD64
   if (is_Register()) return true;
 #endif // AMD64
-  // Do not use is_XMMRegister() here as it depends on the UseAVX setting.
-  if (value() >= ConcreteRegisterImpl::max_fpr && value() < ConcreteRegisterImpl::max_xmm) {
-    int base = value() - ConcreteRegisterImpl::max_fpr;
-    return base % XMMRegisterImpl::max_slots_per_register == 0;
-  } else {
-    return is_even(value());   // General, float, and K registers are all two slots wide
-  }
+  return is_even(value());
 }
 
 #endif // CPU_X86_VMREG_X86_HPP

src/hotspot/cpu/x86/x86.ad

@@ -1621,21 +1621,6 @@ const bool Matcher::match_rule_supported(int opcode) {
         return false;
       }
       break;
-    case Op_SqrtF:
-      if (UseSSE < 1) {
-        return false;
-      }
-      break;
-    case Op_SqrtD:
-#ifdef _LP64
-      if (UseSSE < 2) {
-        return false;
-      }
-#else
-      // x86_32.ad has a special match rule for SqrtD.
-      // Together with common x86 rules, this handles all UseSSE cases.
-#endif
-      break;
   }
   return true;  // Match rules are supported by default.
 }

src/hotspot/cpu/x86/x86_32.ad

@@ -755,7 +755,6 @@ static enum RC rc_class( OptoReg::Name reg ) {
     assert(UseSSE < 2, "shouldn't be used in SSE2+ mode");
     return rc_float;
   }
-  if (r->is_KRegister()) return rc_kreg;
   assert(r->is_XMMRegister(), "must be");
   return rc_xmm;
 }
@@ -1250,6 +1249,26 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
     return size;
   }
 
+  assert( size > 0, "missed a case" );
+
+  // --------------------------------------------------------------------
+  // Check for second bits still needing moving.
+  if( src_second == dst_second )
+    return size;               // Self copy; no move
+  assert( src_second_rc != rc_bad && dst_second_rc != rc_bad, "src_second & dst_second cannot be Bad" );
+
+  // Check for second word int-int move
+  if( src_second_rc == rc_int && dst_second_rc == rc_int )
+    return impl_mov_helper(cbuf,do_size,src_second,dst_second,size, st);
+
+  // Check for second word integer store
+  if( src_second_rc == rc_int && dst_second_rc == rc_stack )
+    return impl_helper(cbuf,do_size,false,ra_->reg2offset(dst_second),src_second,0x89,"MOV ",size, st);
+
+  // Check for second word integer load
+  if( dst_second_rc == rc_int && src_second_rc == rc_stack )
+    return impl_helper(cbuf,do_size,true ,ra_->reg2offset(src_second),dst_second,0x8B,"MOV ",size, st);
+
   // AVX-512 opmask specific spilling.
   if (src_first_rc == rc_stack && dst_first_rc == rc_kreg) {
     assert((src_first & 1) == 0 && src_first + 1 == src_second, "invalid register pair");
@@ -1287,26 +1306,6 @@ uint MachSpillCopyNode::implementation( CodeBuffer *cbuf, PhaseRegAlloc *ra_, bo
     return 0;
   }
 
-  assert( size > 0, "missed a case" );
-
-  // --------------------------------------------------------------------
-  // Check for second bits still needing moving.
-  if( src_second == dst_second )
-    return size;               // Self copy; no move
-  assert( src_second_rc != rc_bad && dst_second_rc != rc_bad, "src_second & dst_second cannot be Bad" );
-
-  // Check for second word int-int move
-  if( src_second_rc == rc_int && dst_second_rc == rc_int )
-    return impl_mov_helper(cbuf,do_size,src_second,dst_second,size, st);
-
-  // Check for second word integer store
-  if( src_second_rc == rc_int && dst_second_rc == rc_stack )
-    return impl_helper(cbuf,do_size,false,ra_->reg2offset(dst_second),src_second,0x89,"MOV ",size, st);
-
-  // Check for second word integer load
-  if( dst_second_rc == rc_int && src_second_rc == rc_stack )
-    return impl_helper(cbuf,do_size,true ,ra_->reg2offset(src_second),dst_second,0x8B,"MOV ",size, st);
-
   Unimplemented();
   return 0; // Mute compiler
 }

src/hotspot/cpu/zero/globals_zero.hpp

@@ -70,7 +70,8 @@ define_pd_global(uintx, TypeProfileLevel, 0);
 
 define_pd_global(bool, PreserveFramePointer, false);
 
-define_pd_global(bool, CompactStrings, true);
+// No performance work done here yet.
+define_pd_global(bool, CompactStrings, false);
 
 #define ARCH_FLAGS(develop,                                                 \
                    product,                                                 \

src/hotspot/cpu/zero/vm_version_zero.cpp

@@ -52,8 +52,4 @@ void VM_Version::initialize() {
 
   // Not implemented
   UNSUPPORTED_OPTION(CriticalJNINatives);
-  UNSUPPORTED_OPTION(UseCompiler);
-#ifdef ASSERT
-  UNSUPPORTED_OPTION(CountCompiledCalls);
-#endif
 }

src/hotspot/cpu/zero/zeroInterpreter_zero.cpp

@@ -68,6 +68,14 @@ void ZeroInterpreter::initialize_code() {
     ZeroInterpreterGenerator g(_code);
     if (PrintInterpreter) print();
   }
+
+  // Allow c++ interpreter to do one initialization now that switches are set, etc.
+  BytecodeInterpreter start_msg(BytecodeInterpreter::initialize);
+  if (JvmtiExport::can_post_interpreter_events()) {
+    BytecodeInterpreter::run<true>(&start_msg);
+  } else {
+    BytecodeInterpreter::run<false>(&start_msg);
+  }
 }
 
 void ZeroInterpreter::invoke_method(Method* method, address entry_point, TRAPS) {

src/hotspot/os/bsd/decoder_machO.cpp

@@ -52,12 +52,6 @@ bool MachODecoder::demangle(const char* symbol, char *buf, int buflen) {
 
 bool MachODecoder::decode(address addr, char *buf,
       int buflen, int *offset, const void *mach_base) {
-  if (addr == (address)(intptr_t)-1) {
-    // dladdr() in macOS12/Monterey returns success for -1, but that addr value
-    // won't work in this function. Should have been handled by the caller.
-    ShouldNotReachHere();
-    return false;
-  }
   struct symtab_command * symt = (struct symtab_command *)
     mach_find_command((struct mach_header_64 *)mach_base, LC_SYMTAB);
   if (symt == NULL) {

src/hotspot/os/bsd/os_bsd.cpp

@@ -903,17 +903,6 @@ int os::current_process_id() {
 
 const char* os::dll_file_extension() { return JNI_LIB_SUFFIX; }
 
-static int local_dladdr(const void* addr, Dl_info* info) {
-#ifdef __APPLE__
-  if (addr == (void*)-1) {
-    // dladdr() in macOS12/Monterey returns success for -1, but that addr
-    // value should not be allowed to work to avoid confusion.
-    return 0;
-  }
-#endif
-  return dladdr(addr, info);
-}
-
 // This must be hard coded because it's the system's temporary
 // directory not the java application's temp directory, ala java.io.tmpdir.
 #ifdef __APPLE__
@@ -953,6 +942,9 @@ bool os::address_is_in_vm(address addr) {
   return false;
 }
 
+
+#define MACH_MAXSYMLEN 256
+
 bool os::dll_address_to_function_name(address addr, char *buf,
                                       int buflen, int *offset,
                                       bool demangle) {
@@ -960,8 +952,9 @@ bool os::dll_address_to_function_name(address addr, char *buf,
   assert(buf != NULL, "sanity check");
 
   Dl_info dlinfo;
+  char localbuf[MACH_MAXSYMLEN];
 
-  if (local_dladdr((void*)addr, &dlinfo) != 0) {
+  if (dladdr((void*)addr, &dlinfo) != 0) {
     // see if we have a matching symbol
     if (dlinfo.dli_saddr != NULL && dlinfo.dli_sname != NULL) {
       if (!(demangle && Decoder::demangle(dlinfo.dli_sname, buf, buflen))) {
@@ -970,14 +963,6 @@ bool os::dll_address_to_function_name(address addr, char *buf,
       if (offset != NULL) *offset = addr - (address)dlinfo.dli_saddr;
       return true;
     }
-
-#ifndef __APPLE__
-    // The 6-parameter Decoder::decode() function is not implemented on macOS.
-    // The Mach-O binary format does not contain a "list of files" with address
-    // ranges like ELF. That makes sense since Mach-O can contain binaries for
-    // than one instruction set so there can be more than one address range for
-    // each "file".
-
     // no matching symbol so try for just file info
     if (dlinfo.dli_fname != NULL && dlinfo.dli_fbase != NULL) {
       if (Decoder::decode((address)(addr - (address)dlinfo.dli_fbase),
@@ -986,10 +971,6 @@ bool os::dll_address_to_function_name(address addr, char *buf,
       }
     }
 
-#else  // __APPLE__
-    #define MACH_MAXSYMLEN 256
-
-    char localbuf[MACH_MAXSYMLEN];
     // Handle non-dynamic manually:
     if (dlinfo.dli_fbase != NULL &&
         Decoder::decode(addr, localbuf, MACH_MAXSYMLEN, offset,
@@ -999,9 +980,6 @@ bool os::dll_address_to_function_name(address addr, char *buf,
       }
       return true;
     }
-
-    #undef MACH_MAXSYMLEN
-#endif  // __APPLE__
   }
   buf[0] = '\0';
   if (offset != NULL) *offset = -1;
@@ -1016,7 +994,7 @@ bool os::dll_address_to_library_name(address addr, char* buf,
 
   Dl_info dlinfo;
 
-  if (local_dladdr((void*)addr, &dlinfo) != 0) {
+  if (dladdr((void*)addr, &dlinfo) != 0) {
     if (dlinfo.dli_fname != NULL) {
       jio_snprintf(buf, buflen, "%s", dlinfo.dli_fname);
     }
@@ -1418,17 +1396,13 @@ void os::get_summary_cpu_info(char* buf, size_t buflen) {
       strncpy(machine, "", sizeof(machine));
   }
 
+  const char* emulated = "";
 #if defined(__APPLE__) && !defined(ZERO)
   if (VM_Version::is_cpu_emulated()) {
-    snprintf(buf, buflen, "\"%s\" %s (EMULATED) %d MHz", model, machine, mhz);
-  } else {
-    NOT_AARCH64(snprintf(buf, buflen, "\"%s\" %s %d MHz", model, machine, mhz));
-    // aarch64 CPU doesn't report its speed
-    AARCH64_ONLY(snprintf(buf, buflen, "\"%s\" %s", model, machine));
+    emulated = " (EMULATED)";
   }
-#else
-  snprintf(buf, buflen, "\"%s\" %s %d MHz", model, machine, mhz);
 #endif
+  snprintf(buf, buflen, "\"%s\" %s%s %d MHz", model, machine, emulated, mhz);
 }
 
 void os::print_memory_info(outputStream* st) {

src/hotspot/os/linux/cgroupSubsystem_linux.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, 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
@@ -34,15 +34,11 @@
 #include "runtime/os.hpp"
 #include "utilities/globalDefinitions.hpp"
 
-// controller names have to match the *_IDX indices
-static const char* cg_controller_name[] = { "cpu", "cpuset", "cpuacct", "memory", "pids" };
-
 CgroupSubsystem* CgroupSubsystemFactory::create() {
   CgroupV1MemoryController* memory = NULL;
   CgroupV1Controller* cpuset = NULL;
   CgroupV1Controller* cpu = NULL;
   CgroupV1Controller* cpuacct = NULL;
-  CgroupV1Controller* pids = NULL;
   CgroupInfo cg_infos[CG_INFO_LENGTH];
   u1 cg_type_flags = INVALID_CGROUPS_GENERIC;
   const char* proc_cgroups = "/proc/cgroups";
@@ -97,29 +93,22 @@ CgroupSubsystem* CgroupSubsystemFactory::create() {
   assert(is_cgroup_v1(&cg_type_flags), "Cgroup v1 expected");
   for (int i = 0; i < CG_INFO_LENGTH; i++) {
     CgroupInfo info = cg_infos[i];
-    if (info._data_complete) { // pids controller might have incomplete data
-      if (strcmp(info._name, "memory") == 0) {
-        memory = new CgroupV1MemoryController(info._root_mount_path, info._mount_path);
-        memory->set_subsystem_path(info._cgroup_path);
-      } else if (strcmp(info._name, "cpuset") == 0) {
-        cpuset = new CgroupV1Controller(info._root_mount_path, info._mount_path);
-        cpuset->set_subsystem_path(info._cgroup_path);
-      } else if (strcmp(info._name, "cpu") == 0) {
-        cpu = new CgroupV1Controller(info._root_mount_path, info._mount_path);
-        cpu->set_subsystem_path(info._cgroup_path);
-      } else if (strcmp(info._name, "cpuacct") == 0) {
-        cpuacct = new CgroupV1Controller(info._root_mount_path, info._mount_path);
-        cpuacct->set_subsystem_path(info._cgroup_path);
-      } else if (strcmp(info._name, "pids") == 0) {
-        pids = new CgroupV1Controller(info._root_mount_path, info._mount_path);
-        pids->set_subsystem_path(info._cgroup_path);
-      }
-    } else {
-      log_debug(os, container)("CgroupInfo for %s not complete", cg_controller_name[i]);
+    if (strcmp(info._name, "memory") == 0) {
+      memory = new CgroupV1MemoryController(info._root_mount_path, info._mount_path);
+      memory->set_subsystem_path(info._cgroup_path);
+    } else if (strcmp(info._name, "cpuset") == 0) {
+      cpuset = new CgroupV1Controller(info._root_mount_path, info._mount_path);
+      cpuset->set_subsystem_path(info._cgroup_path);
+    } else if (strcmp(info._name, "cpu") == 0) {
+      cpu = new CgroupV1Controller(info._root_mount_path, info._mount_path);
+      cpu->set_subsystem_path(info._cgroup_path);
+    } else if (strcmp(info._name, "cpuacct") == 0) {
+      cpuacct = new CgroupV1Controller(info._root_mount_path, info._mount_path);
+      cpuacct->set_subsystem_path(info._cgroup_path);
     }
   }
   cleanup(cg_infos);
-  return new CgroupV1Subsystem(cpuset, cpu, cpuacct, pids, memory);
+  return new CgroupV1Subsystem(cpuset, cpu, cpuacct, memory);
 }
 
 bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
@@ -133,10 +122,9 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
   char buf[MAXPATHLEN+1];
   char *p;
   bool is_cgroupsV2;
-  // true iff all required controllers, memory, cpu, cpuset, cpuacct are enabled
+  // true iff all controllers, memory, cpu, cpuset, cpuacct are enabled
   // at the kernel level.
-  // pids might not be enabled on older Linux distros (SLES 12.1, RHEL 7.1)
-  bool all_required_controllers_enabled;
+  bool all_controllers_enabled;
 
   /*
    * Read /proc/cgroups so as to be able to distinguish cgroups v2 vs cgroups v1.
@@ -148,9 +136,10 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
    */
   cgroups = fopen(proc_cgroups, "r");
   if (cgroups == NULL) {
-    log_debug(os, container)("Can't open %s, %s", proc_cgroups, os::strerror(errno));
-    *flags = INVALID_CGROUPS_GENERIC;
-    return false;
+      log_debug(os, container)("Can't open %s, %s",
+                               proc_cgroups, os::strerror(errno));
+      *flags = INVALID_CGROUPS_GENERIC;
+      return false;
   }
 
   while ((p = fgets(buf, MAXPATHLEN, cgroups)) != NULL) {
@@ -178,30 +167,19 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
       cg_infos[CPUACCT_IDX]._name = os::strdup(name);
       cg_infos[CPUACCT_IDX]._hierarchy_id = hierarchy_id;
       cg_infos[CPUACCT_IDX]._enabled = (enabled == 1);
-    } else if (strcmp(name, "pids") == 0) {
-      log_debug(os, container)("Detected optional pids controller entry in %s", proc_cgroups);
-      cg_infos[PIDS_IDX]._name = os::strdup(name);
-      cg_infos[PIDS_IDX]._hierarchy_id = hierarchy_id;
-      cg_infos[PIDS_IDX]._enabled = (enabled == 1);
     }
   }
   fclose(cgroups);
 
   is_cgroupsV2 = true;
-  all_required_controllers_enabled = true;
+  all_controllers_enabled = true;
   for (int i = 0; i < CG_INFO_LENGTH; i++) {
-    // pids controller is optional. All other controllers are required
-    if (i != PIDS_IDX) {
-      is_cgroupsV2 = is_cgroupsV2 && cg_infos[i]._hierarchy_id == 0;
-      all_required_controllers_enabled = all_required_controllers_enabled && cg_infos[i]._enabled;
-    }
-    if (log_is_enabled(Debug, os, container) && !cg_infos[i]._enabled) {
-      log_debug(os, container)("controller %s is not enabled\n", cg_controller_name[i]);
-    }
+    is_cgroupsV2 = is_cgroupsV2 && cg_infos[i]._hierarchy_id == 0;
+    all_controllers_enabled = all_controllers_enabled && cg_infos[i]._enabled;
   }
 
-  if (!all_required_controllers_enabled) {
-    // one or more required controllers disabled, disable container support
+  if (!all_controllers_enabled) {
+    // one or more controllers disabled, disable container support
     log_debug(os, container)("One or more required controllers disabled at kernel level.");
     cleanup(cg_infos);
     *flags = INVALID_CGROUPS_GENERIC;
@@ -242,21 +220,17 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
 
     while (!is_cgroupsV2 && (token = strsep(&controllers, ",")) != NULL) {
       if (strcmp(token, "memory") == 0) {
-        assert(hierarchy_id == cg_infos[MEMORY_IDX]._hierarchy_id, "/proc/cgroups and /proc/self/cgroup hierarchy mismatch for memory");
+        assert(hierarchy_id == cg_infos[MEMORY_IDX]._hierarchy_id, "/proc/cgroups and /proc/self/cgroup hierarchy mismatch");
         cg_infos[MEMORY_IDX]._cgroup_path = os::strdup(cgroup_path);
       } else if (strcmp(token, "cpuset") == 0) {
-        assert(hierarchy_id == cg_infos[CPUSET_IDX]._hierarchy_id, "/proc/cgroups and /proc/self/cgroup hierarchy mismatch for cpuset");
+        assert(hierarchy_id == cg_infos[CPUSET_IDX]._hierarchy_id, "/proc/cgroups and /proc/self/cgroup hierarchy mismatch");
         cg_infos[CPUSET_IDX]._cgroup_path = os::strdup(cgroup_path);
       } else if (strcmp(token, "cpu") == 0) {
-        assert(hierarchy_id == cg_infos[CPU_IDX]._hierarchy_id, "/proc/cgroups and /proc/self/cgroup hierarchy mismatch for cpu");
+        assert(hierarchy_id == cg_infos[CPU_IDX]._hierarchy_id, "/proc/cgroups and /proc/self/cgroup hierarchy mismatch");
         cg_infos[CPU_IDX]._cgroup_path = os::strdup(cgroup_path);
       } else if (strcmp(token, "cpuacct") == 0) {
-        assert(hierarchy_id == cg_infos[CPUACCT_IDX]._hierarchy_id, "/proc/cgroups and /proc/self/cgroup hierarchy mismatch for cpuacc");
+        assert(hierarchy_id == cg_infos[CPUACCT_IDX]._hierarchy_id, "/proc/cgroups and /proc/self/cgroup hierarchy mismatch");
         cg_infos[CPUACCT_IDX]._cgroup_path = os::strdup(cgroup_path);
-      } else if (strcmp(token, "pids") == 0) {
-        assert(hierarchy_id == cg_infos[PIDS_IDX]._hierarchy_id, "/proc/cgroups (%d) and /proc/self/cgroup (%d) hierarchy mismatch for pids",
-                                                                 cg_infos[PIDS_IDX]._hierarchy_id, hierarchy_id);
-        cg_infos[PIDS_IDX]._cgroup_path = os::strdup(cgroup_path);
       }
     }
     if (is_cgroupsV2) {
@@ -307,15 +281,13 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
 
     /* Cgroup v1 relevant info
      *
-     * Find the cgroup mount point for memory, cpuset, cpu, cpuacct, pids
+     * Find the cgroup mount point for memory, cpuset, cpu, cpuacct
      *
      * Example for docker:
      * 219 214 0:29 /docker/7208cebd00fa5f2e342b1094f7bed87fa25661471a4637118e65f1c995be8a34 /sys/fs/cgroup/memory ro,nosuid,nodev,noexec,relatime - cgroup cgroup rw,memory
      *
      * Example for host:
      * 34 28 0:29 / /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime shared:16 - cgroup cgroup rw,memory
-     *
-     * 44 31 0:39 / /sys/fs/cgroup/pids rw,nosuid,nodev,noexec,relatime shared:23 - cgroup cgroup rw,pids
      */
     if (sscanf(p, "%*d %*d %*d:%*d %s %s %*[^-]- %s %*s %s", tmproot, tmpmount, tmp_fs_type, tmpcgroups) == 4) {
       if (strcmp("cgroup", tmp_fs_type) != 0) {
@@ -361,12 +333,6 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
           cg_infos[CPUACCT_IDX]._mount_path = os::strdup(tmpmount);
           cg_infos[CPUACCT_IDX]._root_mount_path = os::strdup(tmproot);
           cg_infos[CPUACCT_IDX]._data_complete = true;
-        } else if (strcmp(token, "pids") == 0) {
-          any_cgroup_mounts_found = true;
-          assert(cg_infos[PIDS_IDX]._mount_path == NULL, "stomping of _mount_path");
-          cg_infos[PIDS_IDX]._mount_path = os::strdup(tmpmount);
-          cg_infos[PIDS_IDX]._root_mount_path = os::strdup(tmproot);
-          cg_infos[PIDS_IDX]._data_complete = true;
         }
       }
     }
@@ -421,13 +387,10 @@ bool CgroupSubsystemFactory::determine_type(CgroupInfo* cg_infos,
     *flags = INVALID_CGROUPS_V1;
     return false;
   }
-  if (log_is_enabled(Debug, os, container) && !cg_infos[PIDS_IDX]._data_complete) {
-    log_debug(os, container)("Optional cgroup v1 pids subsystem not found");
-    // keep the other controller info, pids is optional
-  }
   // Cgroups v1 case, we have all the info we need.
   *flags = CGROUPS_V1;
   return true;
+
 };
 
 void CgroupSubsystemFactory::cleanup(CgroupInfo* cg_infos) {
@@ -551,22 +514,3 @@ jlong CgroupSubsystem::memory_limit_in_bytes() {
   memory_limit->set_value(mem_limit, OSCONTAINER_CACHE_TIMEOUT);
   return mem_limit;
 }
-
-jlong CgroupSubsystem::limit_from_str(char* limit_str) {
-  if (limit_str == NULL) {
-    return OSCONTAINER_ERROR;
-  }
-  // Unlimited memory in cgroups is the literal string 'max' for
-  // some controllers, for example the pids controller.
-  if (strcmp("max", limit_str) == 0) {
-    os::free(limit_str);
-    return (jlong)-1;
-  }
-  julong limit;
-  if (sscanf(limit_str, JULONG_FORMAT, &limit) != 1) {
-    os::free(limit_str);
-    return OSCONTAINER_ERROR;
-  }
-  os::free(limit_str);
-  return (jlong)limit;
-}

src/hotspot/os/linux/cgroupSubsystem_linux.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, 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
@@ -61,13 +61,12 @@
 #define INVALID_CGROUPS_NO_MOUNT 5
 #define INVALID_CGROUPS_GENERIC  6
 
-// Five controllers: cpu, cpuset, cpuacct, memory, pids
-#define CG_INFO_LENGTH 5
+// Four controllers: cpu, cpuset, cpuacct, memory
+#define CG_INFO_LENGTH 4
 #define CPUSET_IDX     0
 #define CPU_IDX        1
 #define CPUACCT_IDX    2
 #define MEMORY_IDX     3
-#define PIDS_IDX       4
 
 typedef char * cptr;
 
@@ -157,10 +156,8 @@ PRAGMA_DIAG_POP
                                      NULL,                                \
                                      scan_fmt,                            \
                                      &variable);                          \
-  if (err != 0) {                                                         \
-    log_trace(os, container)(logstring, (return_type) OSCONTAINER_ERROR); \
+  if (err != 0)                                                           \
     return (return_type) OSCONTAINER_ERROR;                               \
-  }                                                                       \
                                                                           \
   log_trace(os, container)(logstring, variable);                          \
 }
@@ -241,13 +238,10 @@ class CgroupSubsystem: public CHeapObj<mtInternal> {
   public:
     jlong memory_limit_in_bytes();
     int active_processor_count();
-    jlong limit_from_str(char* limit_str);
 
     virtual int cpu_quota() = 0;
     virtual int cpu_period() = 0;
     virtual int cpu_shares() = 0;
-    virtual jlong pids_max() = 0;
-    virtual jlong pids_current() = 0;
     virtual jlong memory_usage_in_bytes() = 0;
     virtual jlong memory_and_swap_limit_in_bytes() = 0;
     virtual jlong memory_soft_limit_in_bytes() = 0;

src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, 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
@@ -241,43 +241,3 @@ int CgroupV1Subsystem::cpu_shares() {
 
   return shares;
 }
-
-
-char* CgroupV1Subsystem::pids_max_val() {
-  GET_CONTAINER_INFO_CPTR(cptr, _pids, "/pids.max",
-                     "Maximum number of tasks is: %s", "%s %*d", pidsmax, 1024);
-  if (pidsmax == NULL) {
-    return NULL;
-  }
-  return os::strdup(pidsmax);
-}
-
-/* pids_max
- *
- * Return the maximum number of tasks available to the process
- *
- * return:
- *    maximum number of tasks
- *    -1 for unlimited
- *    OSCONTAINER_ERROR for not supported
- */
-jlong CgroupV1Subsystem::pids_max() {
-  if (_pids == NULL) return OSCONTAINER_ERROR;
-  char * pidsmax_str = pids_max_val();
-  return limit_from_str(pidsmax_str);
-}
-
-/* pids_current
- *
- * The number of tasks currently in the cgroup (and its descendants) of the process
- *
- * return:
- *    current number of tasks
- *    OSCONTAINER_ERROR for not supported
- */
-jlong CgroupV1Subsystem::pids_current() {
-  if (_pids == NULL) return OSCONTAINER_ERROR;
-  GET_CONTAINER_INFO(jlong, _pids, "/pids.current",
-                     "Current number of tasks is: " JLONG_FORMAT, JLONG_FORMAT, pids_current);
-  return pids_current;
-}

src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2020, 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
@@ -87,9 +87,6 @@ class CgroupV1Subsystem: public CgroupSubsystem {
 
     int cpu_shares();
 
-    jlong pids_max();
-    jlong pids_current();
-
     const char * container_type() {
       return "cgroupv1";
     }
@@ -104,20 +101,15 @@ class CgroupV1Subsystem: public CgroupSubsystem {
     CgroupV1Controller* _cpuset = NULL;
     CachingCgroupController* _cpu = NULL;
     CgroupV1Controller* _cpuacct = NULL;
-    CgroupV1Controller* _pids = NULL;
-
-    char * pids_max_val();
 
   public:
     CgroupV1Subsystem(CgroupV1Controller* cpuset,
                       CgroupV1Controller* cpu,
                       CgroupV1Controller* cpuacct,
-                      CgroupV1Controller* pids,
                       CgroupV1MemoryController* memory) {
       _cpuset = cpuset;
       _cpu = new CachingCgroupController(cpu);
       _cpuacct = cpuacct;
-      _pids = pids;
       _memory = new CachingCgroupController(memory);
       _unlimited_memory = (LONG_MAX / os::vm_page_size()) * os::vm_page_size();
     }

src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2022, Red Hat Inc.
+ * Copyright (c) 2020, Red Hat Inc.
  * 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,7 +36,7 @@
  */
 int CgroupV2Subsystem::cpu_shares() {
   GET_CONTAINER_INFO(int, _unified, "/cpu.weight",
-                     "Raw value for CPU Shares is: %d", "%d", shares);
+                     "Raw value for CPU shares is: %d", "%d", shares);
   // Convert default value of 100 to no shares setup
   if (shares == 100) {
     log_debug(os, container)("CPU Shares is: %d", -1);
@@ -203,6 +203,24 @@ jlong CgroupV2Subsystem::read_memory_limit_in_bytes() {
   return limit;
 }
 
+jlong CgroupV2Subsystem::limit_from_str(char* limit_str) {
+  if (limit_str == NULL) {
+    return OSCONTAINER_ERROR;
+  }
+  // Unlimited memory in Cgroups V2 is the literal string 'max'
+  if (strcmp("max", limit_str) == 0) {
+    os::free(limit_str);
+    return (jlong)-1;
+  }
+  julong limit;
+  if (sscanf(limit_str, JULONG_FORMAT, &limit) != 1) {
+    os::free(limit_str);
+    return OSCONTAINER_ERROR;
+  }
+  os::free(limit_str);
+  return (jlong)limit;
+}
+
 char* CgroupV2Subsystem::mem_limit_val() {
   GET_CONTAINER_INFO_CPTR(cptr, _unified, "/memory.max",
                          "Raw value for memory limit is: %s", "%s", mem_limit_str, 1024);
@@ -226,39 +244,3 @@ char* CgroupV2Controller::construct_path(char* mount_path, char *cgroup_path) {
   return os::strdup(buf);
 }
 
-char* CgroupV2Subsystem::pids_max_val() {
-  GET_CONTAINER_INFO_CPTR(cptr, _unified, "/pids.max",
-                     "Maximum number of tasks is: %s", "%s %*d", pidsmax, 1024);
-  if (pidsmax == NULL) {
-    return NULL;
-  }
-  return os::strdup(pidsmax);
-}
-
-/* pids_max
- *
- * Return the maximum number of tasks available to the process
- *
- * return:
- *    maximum number of tasks
- *    -1 for unlimited
- *    OSCONTAINER_ERROR for not supported
- */
-jlong CgroupV2Subsystem::pids_max() {
-  char * pidsmax_str = pids_max_val();
-  return limit_from_str(pidsmax_str);
-}
-
-/* pids_current
- *
- * The number of tasks currently in the cgroup (and its descendants) of the process
- *
- * return:
- *    current number of tasks
- *    OSCONTAINER_ERROR for not supported
- */
-jlong CgroupV2Subsystem::pids_current() {
-  GET_CONTAINER_INFO(jlong, _unified, "/pids.current",
-                     "Current number of tasks is: " JLONG_FORMAT, JLONG_FORMAT, pids_current);
-  return pids_current;
-}