IDEA-152524 can't compile fontconfig changes on Windows

(cherry picked from commit 4c8351fecf)

(cherry picked from commit 5faebc73d5)

.jcheck/conf

@@ -1,32 +1,13 @@
-;
-; Copyright (c) 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
-; 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.
-;
-
 [general]
-project=lanai
+project=jdk
 jbs=JDK
 
 [checks]
-error=author,whitespace,executable
+error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace,problemlists
+
+[repository]
+tags=(?:jdk-(?:[1-9]([0-9]*)(?:\.(?:0|[1-9][0-9]*)){0,4})(?:\+(?:(?:[0-9]+))|(?:-ga)))|(?:jdk[4-9](?:u\d{1,3})?-(?:(?:b\d{2,3})|(?:ga)))|(?:hs\d\d(?:\.\d{1,2})?-b\d\d)
+branches=
 
 [census]
 version=0
@@ -35,3 +16,19 @@ domain=openjdk.org
 [checks "whitespace"]
 files=.*\.cpp|.*\.hpp|.*\.c|.*\.h|.*\.java|.*\.cc|.*\.hh|.*\.m|.*\.mm|.*\.gmk|.*\.m4|.*\.ac|Makefile
 ignore-tabs=.*\.gmk|Makefile
+
+[checks "merge"]
+message=Merge
+
+[checks "reviewers"]
+reviewers=1
+ignore=duke
+
+[checks "committer"]
+role=committer
+
+[checks "issues"]
+pattern=^([124-8][0-9]{6}): (\S.*)$
+
+[checks "problemlists"]
+dirs=test/jdk|test/langtools|test/lib-test|test/hotspot/jtreg|test/jaxp

doc/building.html

@@ -849,7 +849,7 @@ sudo mv /tmp/configure /usr/local/bin</code></pre>
 <p>If you update the repository and part of the configure script has changed, the build system will force you to re-run <code>configure</code>.</p>
 <p>Most of the time, you will be fine by running <code>configure</code> again with the same arguments as the last time, which can easily be performed by <code>make reconfigure</code>. To simplify this, you can use the <code>CONF_CHECK</code> make control variable, either as <code>make CONF_CHECK=auto</code>, or by setting an environment variable. For instance, if you add <code>export CONF_CHECK=auto</code> to your <code>.bashrc</code> file, <code>make</code> will always run <code>reconfigure</code> automatically whenever the configure script has changed.</p>
 <p>You can also use <code>CONF_CHECK=ignore</code> to skip the check for a needed configure update. This might speed up the build, but comes at the risk of an incorrect build result. This is only recommended if you know what you're doing.</p>
-<p>From time to time, you will also need to modify the command line to <code>configure</code> due to changes. Use <code>make print-configure</code> to show the command line used for your current configuration.</p>
+<p>From time to time, you will also need to modify the command line to <code>configure</code> due to changes. Use <code>make print-configuration</code> to show the command line used for your current configuration.</p>
 <h3 id="using-fine-grained-make-targets">Using Fine-Grained Make Targets</h3>
 <p>The default behavior for make is to create consistent and correct output, at the expense of build speed, if necessary.</p>
 <p>If you are prepared to take some risk of an incorrect build, and know enough of the system to understand how things build and interact, you can speed up the build process considerably by instructing make to only build a portion of the product.</p>

doc/building.md

@@ -1556,8 +1556,8 @@ update. This might speed up the build, but comes at the risk of an incorrect
 build result. This is only recommended if you know what you're doing.
 
 From time to time, you will also need to modify the command line to `configure`
-due to changes. Use `make print-configure` to show the command line used for
-your current configuration.
+due to changes. Use `make print-configuration` to show the command line used
+for your current configuration.
 
 ### Using Fine-Grained Make Targets
 

jb/project/docker/Dockerfile

@@ -2,9 +2,12 @@
 FROM centos:7
 RUN yum -y install centos-release-scl
 RUN yum -y install devtoolset-8
-RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel git
-# Install Java 11
-RUN wget https://download.java.net/java/GA/jdk13.0.1/cec27d702aa74d5a8630c65ae61e4305/9/GPL/openjdk-13.0.1_linux-x64_bin.tar.gz \
+RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool gcc gcc-c++ libstdc++-devel alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel git
+# Install Java 15
+RUN wget  https://cdn.azul.com/zulu/bin/zulu15.27.17-ca-jdk15.0.0-linux_x64.tar.gz \
 -O - | tar xz -C /
-ENV JAVA_HOME /jbrsdk
-ENV PATH $JAVA_HOME/bin:/opt/rh/devtoolset-8/root/usr/bin:$PATH
+RUN mv /zulu15.27.17-ca-jdk15.0.0-linux_x64 /jdk15.0.0
+ENV PATH /opt/rh/devtoolset-8/root/usr/bin:$PATH
+RUN mkdir .git
+RUN git config user.email "builduser@jetbrains.com"
+RUN git config user.name "builduser"

jb/project/java-gradle/build.gradle

@@ -1,135 +0,0 @@
-apply plugin: 'java'
-import org.gradle.internal.os.OperatingSystem
-
-repositories {
-    mavenCentral()
-}
-
-def test_jvm = {
-    if (project.hasProperty('jbsdkhome')) {
-        file(jbsdkhome + (OperatingSystem.current().isWindows()?"/bin/java.exe" : "/bin/java")).absolutePath
-    } else {
-        if (OperatingSystem.current().isMacOsX()) {
-            file('../../../build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-11.0.4.jdk/Contents/Home/bin/java').absolutePath
-        } else if (OperatingSystem.current().isLinux()) {
-            file('../../../build/linux-x86_64-normal-server-release/images/jdk/bin/java').absolutePath
-        } else {
-            file('../../../build/windows-x86_64-normal-server-release/images/jdk/bin/java.exe').absolutePath
-        }
-    }
-}
-
-dependencies {
-    testCompile('junit:junit:4.12'){
-        exclude group: 'org.hamcrest'
-    }
-    testCompile 'org.hamcrest:hamcrest-library:1.3'
-    testCompile 'net.java.dev.jna:jna:4.4.0'
-    testCompile 'com.twelvemonkeys.imageio:imageio-tiff:3.3.2'
-    testCompile 'org.apache.commons:commons-lang3:3.0'
-}
-
-def jdk_modules = ["java.base", "java.logging", "java.prefs",
-               "java.se.ee", "java.sql", "java.datatransfer",
-               "java.management", "java.rmi", "java.security.jgss",
-               "java.sql.rowset", "java.desktop", "java.management.rmi",
-               "java.scripting", "java.security.sasl", "java.transaction",
-               "java.instrument", "java.naming", "java.se",
-               "java.smartcardio", "java.xml.crypto"]
-
-def jdk_class_dirs = []
-
-jdk_modules.collect(jdk_class_dirs) {
-    new File("../../../src/" + it + "/share/classes")
-}
-
-if (OperatingSystem.current().isMacOsX())
-    jdk_modules.collect(jdk_class_dirs) {
-        "../../../src/" + it + "/macosx/classes"
-    }
-else if (OperatingSystem.current().isLinux()) {
-    jdk_modules.collect(jdk_class_dirs) {
-        "../../../src/" + it + "/solaris/classes"
-    }
-    jdk_modules.collect(jdk_class_dirs) {
-        "../../../src/" + it + "/unix/classes"
-    }
-} else
-    jdk_modules.collect(jdk_class_dirs) {
-        "../../../src/" + it + "/windows/classes"
-    }
-
-sourceSets.main.java.srcDirs = jdk_class_dirs
-
-sourceSets {
-    test {
-        java {
-            srcDir "../../../test/jdk/jbu"
-        }
-    }
-}
-
-test.dependsOn.clear()
-
-test.dependsOn tasks.compileTestJava
-
-test {
-    systemProperty "jb.java2d.metal", "true"
-    systemProperty "testdata", file('../../../test/jdk/jbu/testdata').absolutePath
-
-//  Generate golden images for DroidFontTest and MixedTextTest
-//    systemProperty "gentestdata", ""
-
-//  Enable Java2D logging (https://confluence.jetbrains.com/display/JRE/Java2D+Rendering+Logging)
-//  systemProperty "sun.java2d.trace", "log"
-//  systemProperty "sun.java2d.trace", "log,pimpl"
-
-    outputs.upToDateWhen { false }
-    executable = test_jvm()
-
-//  Enable async/dtrace profiler
-    jvmArgs  "-XX:+PreserveFramePointer"
-//  Enable native J2D logging (only in debug build)
-//  Can be turned on for J2D by adding "#define DEBUG 1" into jdk/src/share/native/sun/java2d/Trace.h
-
-//    environment 'J2D_TRACE_LEVEL', '4'
-}
-
-def buildDir = project.buildscript.sourceFile.parentFile.parentFile.parentFile.parentFile
-
-def make_cmd = "make"
-if (OperatingSystem.current().isWindows()) {
-    def cyg_make_cmd = new File("c:/cygwin64/bin/make.exe")
-    if (cyg_make_cmd.exists()) make_cmd = cyg_make_cmd.absolutePath
-}
-def test_run = false
-task make_images {
-    doLast {
-        if (!test_run) {
-            def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "images")
-            def proc = pb.redirectErrorStream(true).start()
-            proc.inputStream.eachLine { println it }
-            assert proc.waitFor() == 0
-        }
-    }
-}
-
-task make_clean {
-    doLast {
-        def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "clean")
-        def proc = pb.redirectErrorStream(true).start()
-        proc.inputStream.eachLine { println it }
-        assert proc.waitFor() == 0
-    }
-}
-
-task run_test {
-    doLast {
-        test_run = true
-    }
-}
-
-tasks.cleanTest.dependsOn tasks.run_test
-classes.dependsOn.clear()
-classes.dependsOn tasks.make_images
-tasks.cleanClasses.dependsOn tasks.make_clean

jb/project/java-gradle/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Thu Dec 06 20:31:44 MSK 2018
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

jb/project/java-gradle/gradlew

@@ -1,172 +0,0 @@
-#!/usr/bin/env sh
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
-exec "$JAVACMD" "$@"

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

@@ -0,0 +1,54 @@
+VENDOR_NAME="JetBrains s.r.o."
+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
+
+function do_exit() {
+  exit_code=$1
+  [ $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
+  exit "$exit_code"
+}
+
+function update_jsdk_mods() {
+  __jsdk=$1
+  __jcef_mods=$2
+  __orig_jsdk_mods=$3
+  __updated_jsdk_mods=$4
+  
+  # re-create java.desktop.jmod with updated module-info.class
+  tmp=.java.desktop.$$.tmp
+  mkdir "$tmp" || exit $?
+  "$__jsdk"/bin/jmod extract --dir "$tmp" "$__orig_jsdk_mods"/java.desktop.jmod || exit $?
+  "$__jsdk"/bin/javac \
+      --patch-module java.desktop="$__orig_jsdk_mods"/java.desktop.jmod \
+      --module-path "$__jcef_mods" -d "$tmp"/classes src/java.desktop/share/classes/module-info.java || exit $?
+  "$__jsdk"/bin/jmod \
+      create --class-path "$tmp"/classes --config "$tmp"/conf --header-files "$tmp"/include --legal-notice "$tmp"/legal --libs "$tmp"/lib \
+      java.desktop.jmod || exit $?
+  mv java.desktop.jmod "$__updated_jsdk_mods" || exit $?
+  rm -rf "$tmp"
+  
+  # re-create java.base.jmod with updated hashes
+  tmp=.java.base.$$.tmp
+  mkdir "$tmp" || exit $?
+  hash_modules=$("$JSDK"/bin/jmod describe "$__orig_jsdk_mods"/java.base.jmod | grep hashes | awk '{print $2}' | tr '\n' '|' | sed s/\|$//) || exit $?
+  "$__jsdk"/bin/jmod extract --dir "$tmp" "$__orig_jsdk_mods"/java.base.jmod || exit $?
+  rm "$__updated_jsdk_mods"/java.base.jmod || exit $? # temp exclude from path
+  "$__jsdk"/bin/jmod \
+      create --module-path "$__updated_jsdk_mods" --hash-modules "$hash_modules" \
+      --class-path "$tmp"/classes --cmds "$tmp"/bin --config "$tmp"/conf --header-files "$tmp"/include --legal-notice "$tmp"/legal --libs "$tmp"/lib \
+      java.base.jmod || exit $?
+  mv java.base.jmod "$__updated_jsdk_mods" || exit $?
+  rm -rf "$tmp"
+}
+
+function get_mods_list() {
+  __mods=$1
+  echo $(ls $__mods) | sed s/\.jmod/,/g | sed s/,$//g | sed s/' '//g
+}

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

@@ -1,9 +0,0 @@
-#!/bin/bash -x
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-script_dir=jb/project/tools/linux/scripts
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?

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

@@ -4,9 +4,6 @@
 #   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
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -21,22 +18,29 @@ 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}
 
+[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
+
 sh configure \
   --disable-warnings-as-errors \
   --with-debug-level=release \
-  --with-version-build=$JDK_BUILD_NUMBER \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
-  --with-version-opt=b$build_number \
-  --with-boot-jdk=amazon-corretto-11.0.5.10.1-linux-aarch64 \
-  --with-import-modules=./modular-sdk \
+  --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-aarch64-normal-server-release || exit $?
-make images CONF=linux-aarch64-normal-server-release test-image || exit $?
+make clean CONF=linux-aarch64-server-release || exit $?
+make images CONF=linux-aarch64-server-release test-image || exit $?
 
 JBSDK=${JBRSDK_BASE_NAME}-linux-aarch64-b${build_number}
-BASE_DIR=build/linux-aarch64-normal-server-release/images
+BASE_DIR=build/linux-aarch64-server-release/images
 JSDK=${BASE_DIR}/jdk
 JBRSDK_BUNDLE=jbrsdk
 
@@ -47,6 +51,9 @@ rm -rf $BASE_DIR/$JBRSDK_BUNDLE
 cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
 echo Creating $JBSDK.tar.gz ...
+sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
+mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
+
 tar -pcf $JBSDK.tar \
   --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
   -C $BASE_DIR ${JBRSDK_BUNDLE} || exit $?

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

@@ -1,12 +1,13 @@
 #!/bin/bash -x
 
 # The following parameters must be specified:
-#   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
+#   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 bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
+#   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
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -16,124 +17,121 @@
 # 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:
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_linux_x64
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
 
-function create_jbr {
+source jb/project/tools/common/scripts/common.sh
 
-  case "$1" in
-  "${bundle_type}_lw")
-    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
-    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
-    ;;
-  "jfx" | "jcef")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    cat modules.list > modules_tmp.list
-    ;;
-  "jfx_jcef")
-    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
-    cat modules.list > modules_tmp.list
-    ;;
-  *)
-    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
-    cat modules.list > modules_tmp.list
-    ;;
-  esac
-  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
 
-  JBR=$JBR_BASE_NAME-linux-x64-b$build_number
+  [ "$bundle_type" == "fd" ] && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-linux-x64-${fastdebug_infix}b${build_number}
 
   echo Running jlink....
+  [ -d "$IMAGES_DIR"/"$__arch_name" ] && rm -rf "${IMAGES_DIR:?}"/"$__arch_name"
   $JSDK/bin/jlink \
-    --module-path $JSDK/jmods --no-man-pages --compress=2 \
-    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $BASE_DIR/$JBR_BUNDLE
+    --module-path "$__modules_path" --no-man-pages --compress=2 \
+    --add-modules "$__modules" --output "$IMAGES_DIR"/"$__arch_name"
 
-  if [[ "$bundle_type" == *jcef* ]]; then
-    cp -R $BASE_DIR/$JBR_BUNDLE $BASE_DIR/jbr
-    cp -R jcef_linux_x64/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__arch_name"/release
+  if [ "$__bundle_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__arch_name"/release > release
+    mv release "$IMAGES_DIR"/"$__arch_name"/release
   fi
-  grep -v "^JAVA_VERSION" $JSDK/release | grep -v "^MODULES" >> $BASE_DIR/$JBR_BUNDLE/release
 
-  echo Creating $JBR.tar.gz ...
-  if [ ! -z "$bundle_type" ]; then
-    rm -rf ${BASE_DIR}/jbr
-    cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-  fi
-  tar -pcf $JBR.tar -C $BASE_DIR jbr || exit $?
-  gzip $JBR.tar || exit $?
-  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+  # jmod does not preserve file permissions (JDK-8173610)
+  [ -f "$IMAGES_DIR"/"$__arch_name"/lib/jcef_helper ] && chmod a+x "$IMAGES_DIR"/"$__arch_name"/lib/jcef_helper
+
+  echo Creating "$JBR".tar.gz ...
+  tar -pcf "$JBR".tar -C "$IMAGES_DIR" "$__arch_name" || do_exit $?
+  [ -f "$JBR".tar.gz ] && rm "$JBR.tar.gz"
+  gzip "$JBR".tar || do_exit $?
+  rm -rf "${IMAGES_DIR:?}"/"$__arch_name"
 }
 
-JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=linux-x86_64-server-release
 
-#git checkout -- modules.list src
 case "$bundle_type" in
-  "jfx")
-    git apply -p0 < jb/project/tools/exclude_jcef_module.patch
-    ;;
   "jcef")
-    git apply -p0 < jb/project/tools/exclude_jfx_module.patch
+    do_reset_changes=1
+    ;;
+  "dcevm")
+    HEAD_REVISION=$(git rev-parse HEAD)
+    git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
+    do_reset_dcevm=1
+    do_reset_changes=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=1
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=linux-x86_64-server-fastdebug
     ;;
 esac
 
-if [ -z "$bundle_type" ]; then
-  JBR_BUNDLE=jbr
-  sh configure \
-    --disable-warnings-as-errors \
-    --with-debug-level=release \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    --with-boot-jdk=$BOOT_JDK \
-    --enable-cds=yes || exit $?
-else
-  JBR_BUNDLE=jbr_${bundle_type}
-  sh configure \
-    --disable-warnings-as-errors \
-    --with-debug-level=release \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    --with-import-modules=./modular-sdk \
-    --with-boot-jdk=$BOOT_JDK \
-    --enable-cds=yes || exit $?
-fi
+sh configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --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 || do_exit $?
 
-make images CONF=linux-x86_64-server-release || exit $?
+make clean CONF=$RELEASE_NAME || exit $?
+make images CONF=$RELEASE_NAME || do_exit $?
 
-JSDK=build/linux-x86_64-server-release/images/jdk
-JBSDK=$JBRSDK_BASE_NAME-linux-x64-b$build_number
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
+JBRSDK_BUNDLE=jbrsdk
 
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-BASE_DIR=build/linux-x86_64-server-release/images
-JBRSDK_BUNDLE=jbrsdk
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$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 changed
 
-rm -rf $BASE_DIR/$JBRSDK_BUNDLE
-cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
-
-if [[ "$bundle_type" == *jcef* ]]; then
-  cp -R jcef_linux_x64/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
-fi
-if [[ "$bundle_type" == "jfx_jcef" || -z "$bundle_type" ]]; then
-  echo Creating $JBSDK.tar.gz ...
-  tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
-    -C $BASE_DIR $JBRSDK_BUNDLE || exit $?
-  gzip $JBSDK.tar || exit $?
+  jbr_name_postfix="_${bundle_type}"
 fi
 
-create_jbr ${bundle_type}
+# create runtime image bundle
+modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
 
-if [[ "$bundle_type" == "jfx_jcef" || -z "$bundle_type" ]]; then
-  make test-image || 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" == "dcevm" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle $JBRSDK_BUNDLE $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
 
-  JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x64-b$build_number
+if [ -z "$bundle_type" ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-test-x64-b${build_number}
+    echo Creating "$JBRSDK_TEST" ...
+    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
 
-  echo Creating $JBSDK_TEST.tar.gz ...
-  tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
-  gzip $JBRSDK_TEST.tar || exit $?
-fi
+do_exit 0

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

@@ -1,72 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   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
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# 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
-
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-
-sh configure \
-  --disable-warnings-as-errors \
-  --with-debug-level=fastdebug \
-  --with-version-build=$JDK_BUILD_NUMBER \
-  --with-version-pre= \
-  --with-version-opt=b$build_number \
-  --with-import-modules=./modular-sdk \
-  --enable-cds=yes || exit $?
-make clean CONF=linux-x86_64-normal-server-fastdebug || exit $?
-make images CONF=linux-x86_64-normal-server-fastdebug || exit $?
-
-JBSDK=${JBRSDK_BASE_NAME}-linux-x64-fastdebug-b${build_number}
-BASE_DIR=build/linux-x86_64-normal-server-fastdebug/images
-JSDK=${BASE_DIR}/jdk
-JBRSDK_BUNDLE=jbrsdk
-
-echo Fixing permissions
-chmod -R a+r $JSDK
-
-rm -rf $BASE_DIR/$JBRSDK_BUNDLE
-cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
-cp -R jcef_linux_x64/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
-
-echo Creating $JBSDK.tar.gz ...
-tar -pcf $JBSDK.tar \
-  --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
-  -C $BASE_DIR ${JBRSDK_BUNDLE} || exit $?
-gzip $JBSDK.tar || exit $?
-
-JBR_BUNDLE=jbr
-JBR_BASE_NAME=jbr-$JBSDK_VERSION
-rm -rf $BASE_DIR/$JBR_BUNDLE
-
-JBR=$JBR_BASE_NAME-linux-x64-fastdebug-b$build_number
-echo Running jlink....
-${JSDK}/bin/jlink \
-  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
-  --add-modules $(xargs < modules.list | sed s/" "//g | sed s/,$//g) \
-  --output ${BASE_DIR}/${JBR_BUNDLE} || exit $?
-cp -R jcef_linux_x64/* $BASE_DIR/$JBR_BUNDLE/lib || 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 -czf $JBR.tar -C $BASE_DIR ${JBR_BUNDLE} || exit $?
-gzip $JBR.tar || exit $?

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

@@ -4,9 +4,6 @@
 #   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
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -21,21 +18,29 @@ 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}
 
+[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
+
 linux32 bash configure \
   --disable-warnings-as-errors \
   --with-debug-level=release \
-  --with-version-build=$JDK_BUILD_NUMBER \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
   --with-version-pre= \
-  --with-version-opt=b$build_number \
-  --with-boot-jdk=/jbrsdk-11.0.5-b1 \
+  --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-normal-server-release || exit $?
-make images CONF=linux-x86-normal-server-release test-image || exit $?
+make clean CONF=linux-x86-server-release || exit $?
+make images CONF=linux-x86-server-release test-image || exit $?
 
 JBSDK=${JBRSDK_BASE_NAME}-linux-x86-b${build_number}
-BASE_DIR=build/linux-x86-normal-server-release/images
+BASE_DIR=build/linux-x86-server-release/images
 JSDK=${BASE_DIR}/jdk
 JBRSDK_BUNDLE=jbrsdk
 
@@ -46,6 +51,9 @@ rm -rf $BASE_DIR/$JBRSDK_BUNDLE
 cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
 echo Creating $JBSDK.tar.gz ...
+sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
+mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
+
 tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man -C $BASE_DIR ${JBRSDK_BUNDLE} || exit $?
 gzip $JBSDK.tar || exit $?
 

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

@@ -1,9 +0,0 @@
-#!/bin/bash -x
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-script_dir=jb/project/tools/mac/scripts
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
-${script_dir}/mkimages.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?

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

@@ -1,12 +1,13 @@
 #!/bin/bash -x
 
 # The following parameters must be specified:
-#   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
+#   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 bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
+#   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
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -16,133 +17,123 @@
 # 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:
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_mac
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
+JBSDK_VERSION_WITH_DOTS=$(echo "$JBSDK_VERSION" | sed 's/_/\./g')
+JCEF_PATH=${JCEF_PATH:=./jcef_mac}
+MAJOR_JBSDK_VERSION=$(echo "$JBSDK_VERSION_WITH_DOTS" | awk -F "." '{print $1}')
+BOOT_JDK=${BOOT_JDK:=$(/usr/libexec/java_home -v 14)}
 
-function create_jbr {
+source jb/project/tools/common/scripts/common.sh
 
-  case "$1" in
-  "${bundle_type}_lw")
-    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
-    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
-    ;;
-  "jfx" | "jcef")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    cat modules.list > modules_tmp.list
-    ;;
-  "jfx_jcef")
-    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
-    cat modules.list > modules_tmp.list
-    ;;
-  *)
-    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
-    cat modules.list > modules_tmp.list
-    ;;
-  esac
-  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+function create_image_bundle {
+  __bundle_name=$1
+  __arch_name=$2
+  __modules_path=$3
+  __modules=$4
 
-  JRE_CONTENTS=${BASE_DIR}/${JBR_BUNDLE}/Contents
-  JRE_HOME=${JRE_CONTENTS}/Home
-  if [ -d "${JRE_CONTENTS}" ]; then
-    rm -rf ${JRE_CONTENTS}
-  fi
-  mkdir -p ${JRE_CONTENTS}
+  tmp=.bundle.$$.tmp
+  mkdir "$tmp" || do_exit $?
 
-  JBR=${JBR_BASE_NAME}-osx-x64-b${build_number}
+  [ "$bundle_type" == "fd" ] && fastdebug_infix="fastdebug-"
+  JBR=${__bundle_name}-${JBSDK_VERSION}-osx-x64-${fastdebug_infix}b${build_number}
 
-  ${BASE_DIR}/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
-      --module-path ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/jmods --no-man-pages --compress=2 \
-      --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JRE_HOME}  || exit $?
-  grep -v "^JAVA_VERSION" ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release | grep -v "^MODULES" >> ${JRE_HOME}/release
-  cp -R ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/MacOS ${JRE_CONTENTS}
-  cp ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Info.plist ${JRE_CONTENTS}
+  JRE_CONTENTS=$tmp/$__arch_name/Contents
+  mkdir -p "$JRE_CONTENTS" || do_exit $?
 
-  if [[ "${bundle_type}" == *jcef* ]]; then
-    rm -rf ${JRE_CONTENTS}/Frameworks || exit $?
-    rm -rf ${JRE_CONTENTS}/Helpers    || exit $?
-    cp -a jcef_mac/Frameworks ${JRE_CONTENTS} || exit $?
-    cp -a jcef_mac/Helpers    ${JRE_CONTENTS} || exit $?
+  echo Running jlink...
+  "$JSDK"/bin/jlink \
+    --module-path "$__modules_path" --no-man-pages --compress=2 \
+    --add-modules "$__modules" --output "$JRE_CONTENTS/Home" || do_exit $?
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$JRE_CONTENTS/Home/release"
+  if [ "$__bundle_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
+    mv release $JRE_CONTENTS/Home/release
   fi
 
-  echo Creating ${JBR}.tar.gz ...
-  if [ ! -z "$bundle_type" ]; then
-    rm -rf ${BASE_DIR}/jbr
-    cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-  fi
-  COPYFILE_DISABLE=1 tar -pczf ${JBR}.tar.gz --exclude='*.dSYM' --exclude='man' -C ${BASE_DIR} jbr || exit $?
-  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+  cp -R "$JSDK"/../MacOS "$JRE_CONTENTS"
+  cp "$JSDK"/../Info.plist "$JRE_CONTENTS"
+  [ -n "$bundle_type" ] && (cp -a $JCEF_PATH/Frameworks "$JRE_CONTENTS" || do_exit $?)
+
+  echo Creating "$JBR".tar.gz ...
+  COPYFILE_DISABLE=1 tar -pczf "$JBR".tar.gz --exclude='*.dSYM' --exclude='man' -C "$tmp" "$__arch_name" || do_exit $?
+  rm -rf "$tmp"
 }
 
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=macosx-x86_64-server-release
 
-#git checkout -- modules.list src
 case "$bundle_type" in
-  "jfx")
-    git apply -p0 < jb/project/tools/exclude_jcef_module.patch
-    ;;
   "jcef")
-    git apply -p0 < jb/project/tools/exclude_jfx_module.patch
+    do_reset_changes=1
+    ;;
+  "dcevm")
+    HEAD_REVISION=$(git rev-parse HEAD)
+    git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
+    do_reset_dcevm=1
+    do_reset_changes=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=1
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=macosx-x86_64-server-fastdebug
     ;;
 esac
 
-if [ -z "$bundle_type" ]; then
-  JBR_BUNDLE=jbr
-  sh configure \
+sh configure \
   --disable-warnings-as-errors \
-  --with-debug-level=release \
+  $WITH_DEBUG_LEVEL \
+  --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=`/usr/libexec/java_home -v $BOOT_JDK` \
-  --enable-cds=yes || exit $?
-else
-  JBR_BUNDLE=jbr_${bundle_type}
-  sh configure \
-    --disable-warnings-as-errors \
-    --with-debug-level=release \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    --with-import-modules=./modular-sdk \
-    --with-boot-jdk=`/usr/libexec/java_home -v $BOOT_JDK` \
-    --enable-cds=yes || exit $?
-fi
-make images CONF=macosx-x86_64-server-release || exit $?
+  --with-version-build="$JDK_BUILD_NUMBER" \
+  --with-version-opt=b"$build_number" \
+  --with-boot-jdk="$BOOT_JDK" \
+  --enable-cds=yes || do_exit $?
 
-JSDK=build/macosx-x86_64-server-release/images/jdk-bundle
-JBSDK=${JBRSDK_BASE_NAME}-osx-x64-b${build_number}
+make clean CONF=$RELEASE_NAME || do_exit $?
+make images CONF=$RELEASE_NAME || do_exit $?
 
-BASE_DIR=jre
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk-bundle/jdk-$MAJOR_JBSDK_VERSION.jdk/Contents/Home
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
-rm -rf $BASE_DIR
-mkdir $BASE_DIR || exit $?
-JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$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 changed
 
-if [[ "$bundle_type" == *jcef* ]]; then
-  cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/ || exit $?
-  cp -a jcef_mac/Helpers    $BASE_DIR/$JBRSDK_BUNDLE/Contents/ || exit $?
-fi
-if [[ "$bundle_type" == "jfx_jcef" || -z "$bundle_type" ]]; then
-  echo Creating $JBSDK.tar.gz ...
-  COPYFILE_DISABLE=1 tar -pczf $JBSDK.tar.gz -C $BASE_DIR \
-    --exclude='._*' --exclude='.DS_Store' --exclude='*~' \
-    --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
-    $JBRSDK_BUNDLE || exit $?
+  jbr_name_postfix="_${bundle_type}"
 fi
 
-create_jbr "${bundle_type}" || exit $?
+# create runtime image bundle
+modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
 
-if [[ "$bundle_type" == "jfx_jcef" || -z "$bundle_type" ]]; then
-  make test-image || 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" == "dcevm" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
 
-  JBRSDK_TEST=$JBRSDK_BASE_NAME-osx-test-x64-b$build_number
+if [ -z "$bundle_type" ]; then
+    JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-osx-test-x64-b${build_number}
+    echo Creating "$JBRSDK_TEST" ...
+    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 $?
+fi
 
-  echo Creating $JBRSDK_TEST.tar.gz ...
-  COPYFILE_DISABLE=1 tar -pczf $JBRSDK_TEST.tar.gz -C build/macosx-x86_64-server-release/images \
-    --exclude='test/jdk/demos' test || exit $?
-fi
+do_exit 0

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

@@ -1,83 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   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
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# 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
-
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-
-sh configure \
-  --disable-warnings-as-errors \
-  --with-debug-level=fastdebug \
-  --with-version-build=$JDK_BUILD_NUMBER \
-  --with-version-pre= \
-  --with-version-opt=b$build_number \
-  --with-import-modules=./modular-sdk \
-  --with-boot-jdk=`/usr/libexec/java_home -v 11` \
-  --enable-cds=yes || exit $?
-make clean CONF=macosx-x86_64-normal-server-fastdebug || exit $?
-make images CONF=macosx-x86_64-normal-server-fastdebug || exit $?
-
-JSDK=build/macosx-x86_64-normal-server-fastdebug/images/jdk-bundle
-JBSDK=${JBRSDK_BASE_NAME}-osx-x64-fastdebug-b${build_number}
-
-BASE_DIR=jre
-JBRSDK_BUNDLE=jbrsdk
-
-rm -rf $BASE_DIR
-mkdir $BASE_DIR || exit $?
-JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
-
-echo Creating $JBSDK.tar.gz ...
-cp -a jcef_mac/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
-cp -a jcef_mac/Helpers    $BASE_DIR/$JBRSDK_BUNDLE/Contents
-
-COPYFILE_DISABLE=1 \
-  tar -pczf ${JBSDK}.tar.gz -C ${BASE_DIR} \
-    --exclude='._*' --exclude='.DS_Store' --exclude='*~' \
-    --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
-    ${JBRSDK_BUNDLE} || exit $?
-
-JBR_BUNDLE=jbr
-JRE_CONTENTS=$BASE_DIR/$JBR_BUNDLE/Contents
-JRE_HOME=$JRE_CONTENTS/Home
-      JBR_BASE_NAME=jbr-$JBSDK_VERSION
-
-mkdir -p $JRE_CONTENTS
-
-if [ -d "$JRE_HOME" ]; then
-  rm -rf $JRE_HOME
-fi
-
-JBR=${JBR_BASE_NAME}-osx-x64-fastdebug-b${build_number}
-
-$BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
-    --module-path $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/jmods --no-man-pages --compress=2 \
-    --add-modules $(xargs < modules.list | sed s/" "//g) --output $JRE_HOME  || exit $?
-grep -v "^JAVA_VERSION" $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/release | grep -v "^MODULES" >> $JRE_HOME/release
-cp -R $BASE_DIR/$JBRSDK_BUNDLE/Contents/MacOS $JRE_CONTENTS
-cp $BASE_DIR/$JBRSDK_BUNDLE/Contents/Info.plist $JRE_CONTENTS
-cp -a jcef_mac/Frameworks ${JRE_CONTENTS} || exit $?
-cp -a jcef_mac/Helpers    ${JRE_CONTENTS} || exit $?
-
-
-echo Creating $JBR.tar.gz ...
-COPYFILE_DISABLE=1 tar -pczf $JBR.tar.gz --exclude='*.dSYM' --exclude='man' -C $BASE_DIR $JBR_BUNDLE || exit $?

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

@@ -26,7 +26,8 @@ log "Signing libraries and executables..."
 # -perm +111 searches for executables
 for f in \
    "Contents/Home/bin" \
-   "Contents/Home/lib"; do
+   "Contents/Home/lib" \
+   "Contents/Frameworks"; do
   if [ -d "$APP_DIRECTORY/$f" ]; then
     find "$APP_DIRECTORY/$f" \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -perm +111 \) \

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

@@ -37,14 +37,13 @@ BUILD_NAME="$(ls "$EXPLODED")"
 if test -d $EXPLODED/$BUILD_NAME/Contents/Home/jmods; then
   mv $EXPLODED/$BUILD_NAME/Contents/Home/jmods $BACKUP_JMODS
 fi
-if test -d $EXPLODED/$BUILD_NAME/Contents/Home/Frameworks; then
-  mv $EXPLODED/$BUILD_NAME/Contents/Home/Frameworks $BACKUP_JMODS
-fi
 if test -f $EXPLODED/$BUILD_NAME/Contents/MacOS/libjli.dylib; then
   mv $EXPLODED/$BUILD_NAME/Contents/MacOS/libjli.dylib $BACKUP_JMODS
 fi
+if test -d $EXPLODED/$BUILD_NAME/Contents/Home/Frameworks; then
+  mv $EXPLODED/$BUILD_NAME/Contents/Home/Frameworks $BACKUP_JMODS
+fi
 
-#log "$INPUT_FILE unzipped and removed"
 log "$INPUT_FILE extracted and removed"
 
 APPLICATION_PATH="$EXPLODED/$BUILD_NAME"
@@ -128,15 +127,9 @@ log "Zipping $BUILD_NAME to $INPUT_FILE ..."
 (
   #cd "$EXPLODED"
   #ditto -c -k --sequesterRsrc --keepParent "$BUILD_NAME" "../$INPUT_FILE"
-  if test ! -z $(ls $BACKUP_JMODS/libjli.dylib); then
-    mv $BACKUP_JMODS/libjli.dylib $EXPLODED/$BUILD_NAME/Contents/MacOS
-  fi
   if test -d $BACKUP_JMODS/jmods; then
     mv $BACKUP_JMODS/jmods $EXPLODED/$BUILD_NAME/Contents/Home
   fi
-  if test -d $BACKUP_JMODS/Frameworks; then
-    mv $BACKUP_JMODS/Frameworks $EXPLODED/$BUILD_NAME/Contents/Home
-  fi
 
   COPYFILE_DISABLE=1 tar -pczf $INPUT_FILE --exclude='*.dSYM' --exclude='man' -C $EXPLODED $BUILD_NAME
   log "Finished zipping"

jb/project/tools/patches/add_jcef_module.patch

@@ -0,0 +1,30 @@
+diff --git modules.list modules.list
+index 7c4b3e9cb6d..5ed60349ca7 100644
+--- modules.list
++++ modules.list
+@@ -53,4 +53,7 @@ jdk.security.jgss,
+ jdk.unsupported,
+ jdk.xml.dom,
+ jdk.zipfs,
+-jdk.hotspot.agent
++jdk.hotspot.agent,
++jcef,
++gluegen.rt,
++jogl.all
+diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
+index b663b382f52..3e9acdc0c27 100644
+--- src/java.desktop/share/classes/module-info.java
++++ src/java.desktop/share/classes/module-info.java
+@@ -109,7 +109,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/patches/dcevm/0003-Fix-class-cast-exception-on-redefinition-of-class-A-.patch

@@ -0,0 +1,29 @@
+From 960dafbeeba190911955c208b611fecc15d66738 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Wed, 11 Mar 2020 14:19:34 +0100
+Subject: [PATCH 03/34] Fix class cast exception on redefinition of class A,
+ that is superclass of B that has anonymous class C
+
+---
+ src/hotspot/share/oops/instanceKlass.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index 994fc8a3bc8..3be3a09ef8f 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -953,7 +953,10 @@ bool InstanceKlass::link_class_impl(TRAPS) {
+ 
+     if (!is_linked()) {
+       if (!is_rewritten()) {
+-        {
++        // (DCEVM): If class A is being redefined and class B->A (B is extended from A) and B is host class of anonymous class C
++        // then second redefinition fails with cannot cast klass exception. So we currently turn off bytecode verification
++        // on redefinition.
++        if (!AllowEnhancedClassRedefinition || !newest_version()->is_redefining()) {
+           bool verify_ok = verify_code(THREAD);
+           if (!verify_ok) {
+             return false;
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0005-Support-for-Lambda-class-redefinition.patch

@@ -0,0 +1,240 @@
+From 39df5f163d4a0f1fd6b92313a5570808f19d5e20 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 4 Oct 2020 21:12:12 +0200
+Subject: [PATCH 05/34] Support for Lambda class redefinition
+
+---
+ .../share/classfile/classLoaderData.cpp       |  9 +++
+ .../share/classfile/classLoaderData.hpp       |  2 +-
+ .../share/classfile/systemDictionary.cpp      | 12 +++-
+ .../share/classfile/systemDictionary.hpp      |  1 +
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 65 +++++++++++++++++--
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |  1 +
+ .../share/prims/resolvedMethodTable.cpp       |  2 +
+ src/hotspot/share/prims/unsafe.cpp            |  1 +
+ 8 files changed, 83 insertions(+), 10 deletions(-)
+
+diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
+index 0cd90bb8c27..4d64c6b454a 100644
+--- a/src/hotspot/share/classfile/classLoaderData.cpp
++++ b/src/hotspot/share/classfile/classLoaderData.cpp
+@@ -593,6 +593,15 @@ Dictionary* ClassLoaderData::create_dictionary() {
+   return new Dictionary(this, size, resizable);
+ }
+ 
++void ClassLoaderData::exchange_holders(ClassLoaderData* cld) {
++  oop holder_oop = _holder.peek();
++  _holder.replace(cld->_holder.peek());
++  cld->_holder.replace(holder_oop);
++  WeakHandle<vm_class_loader_data> exchange = _holder;
++  _holder = cld->_holder;
++  cld->_holder = exchange;
++}
++
+ // Tell the GC to keep this klass alive while iterating ClassLoaderDataGraph
+ oop ClassLoaderData::holder_phantom() const {
+   // A klass that was previously considered dead can be looked up in the
+diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp
+index ba2393f8dd0..e2ae0a77351 100644
+--- a/src/hotspot/share/classfile/classLoaderData.hpp
++++ b/src/hotspot/share/classfile/classLoaderData.hpp
+@@ -181,7 +181,7 @@ class ClassLoaderData : public CHeapObj<mtClass> {
+   bool has_accumulated_modified_oops()   { return _accumulated_modified_oops; }
+   oop holder_no_keepalive() const;
+   oop holder_phantom() const;
+-
++  void exchange_holders(ClassLoaderData* cld);
+  private:
+   void unload();
+   bool keep_alive() const       { return _keep_alive > 0; }
+diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
+index bd0cae7cb9b..8f2b46add4d 100644
+--- a/src/hotspot/share/classfile/systemDictionary.cpp
++++ b/src/hotspot/share/classfile/systemDictionary.cpp
+@@ -1062,10 +1062,14 @@ InstanceKlass* SystemDictionary::parse_stream(Symbol* class_name,
+                                               Handle class_loader,
+                                               ClassFileStream* st,
+                                               const ClassLoadInfo& cl_info,
++                                              InstanceKlass* old_klass,
+                                               TRAPS) {
+ 
+   EventClassLoad class_load_start_event;
+   ClassLoaderData* loader_data;
++  
++  bool is_redefining = (old_klass != NULL);
++  
+   bool is_unsafe_anon_class = cl_info.unsafe_anonymous_host() != NULL;
+ 
+   // - for unsafe anonymous class: create a new CLD whith a class holder that uses
+@@ -1094,8 +1098,12 @@ InstanceKlass* SystemDictionary::parse_stream(Symbol* class_name,
+                                                       class_name,
+                                                       loader_data,
+                                                       cl_info,
+-                                                      false, // pick_newest
++                                                      is_redefining, // pick_newest
+                                                       CHECK_NULL);
++  if (is_redefining && k != NULL) {
++    k->set_redefining(true);
++    k->set_old_version(old_klass);
++  }
+ 
+   if ((cl_info.is_hidden() || is_unsafe_anon_class) && k != NULL) {
+     // Hidden classes that are not strong and unsafe anonymous classes must update
+@@ -1998,7 +2006,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
+   k->remove_from_sibling_list();
+ }
+ 
+-// (DCEVM) 
++// (DCEVM)
+ void SystemDictionary::update_constraints_after_redefinition() {
+   constraints()->update_after_redefinition();
+ }
+diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
+index 4547449dbec..931e655d631 100644
+--- a/src/hotspot/share/classfile/systemDictionary.hpp
++++ b/src/hotspot/share/classfile/systemDictionary.hpp
+@@ -329,6 +329,7 @@ public:
+                                      Handle class_loader,
+                                      ClassFileStream* st,
+                                      const ClassLoadInfo& cl_info,
++                                     InstanceKlass* old_klass,
+                                      TRAPS);
+ 
+   // Resolve from stream (called by jni_DefineClass and JVM_DefineClass)
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 92ce6c27b8a..8b765623dcd 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -494,6 +494,8 @@ void VM_EnhancedRedefineClasses::doit() {
+     ClassLoaderDataGraph::classes_do(&clear_cpool_cache);
+ 
+ 
++    // SystemDictionary::methods_do(fix_invoke_method);
++
+   // JSR-292 support
+   if (_any_class_has_resolved_methods) {
+     bool trace_name_printed = false;
+@@ -756,12 +758,34 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+     // load hook event.
+     state->set_class_being_redefined(the_class, _class_load_kind);
+ 
+-    InstanceKlass* k = SystemDictionary::resolve_from_stream(the_class_sym,
+-                                                the_class_loader,
+-                                                protection_domain,
+-                                                &st,
+-                                                the_class,
+-                                                THREAD);
++    InstanceKlass* k;
++
++    if (InstanceKlass::cast(the_class)->is_anonymous()) {
++      const InstanceKlass* host_class = the_class->host_klass();
++
++      // Make sure it's the real host class, not another anonymous class.
++      while (host_class != NULL && host_class->is_anonymous()) {
++        host_class = host_class->host_klass();
++      }
++
++      k = SystemDictionary::parse_stream(the_class_sym,
++                                         the_class_loader,
++                                         protection_domain,
++                                         &st,
++                                         host_class,
++                                         the_class,
++                                         NULL,
++                                         THREAD);
++      k->class_loader_data()->exchange_holders(the_class->class_loader_data());
++      the_class->class_loader_data()->inc_keep_alive();
++    } else {
++      k = SystemDictionary::resolve_from_stream(the_class_sym,
++                                                  the_class_loader,
++                                                  protection_domain,
++                                                  &st,
++                                                  the_class,
++                                                  THREAD);
++    }
+     // Clear class_being_redefined just to be sure.
+     state->clear_class_being_redefined();
+ 
+@@ -1442,6 +1466,30 @@ void VM_EnhancedRedefineClasses::MethodDataCleaner::do_klass(Klass* k) {
+   }
+ }
+ 
++void VM_EnhancedRedefineClasses::fix_invoke_method(Method* method) {
++
++  constantPoolHandle other_cp = constantPoolHandle(method->constants());
++
++  for (int i = 0; i < other_cp->length(); i++) {
++    if (other_cp->tag_at(i).is_klass()) {
++      Klass* klass = other_cp->resolved_klass_at(i);
++      if (klass->new_version() != NULL) {
++        // Constant pool entry points to redefined class -- update to the new version
++        other_cp->klass_at_put(i, klass->newest_version());
++      }
++      assert(other_cp->resolved_klass_at(i)->new_version() == NULL, "Must be new klass!");
++    }
++  }
++
++  ConstantPoolCache* cp_cache = other_cp->cache();
++  if (cp_cache != NULL) {
++    cp_cache->clear_entries();
++  }
++
++}
++
++
++
+ void VM_EnhancedRedefineClasses::update_jmethod_ids() {
+   for (int j = 0; j < _matching_methods_length; ++j) {
+     Method* old_method = _matching_old_methods[j];
+@@ -1979,7 +2027,10 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
+   // Find classes not directly redefined, but affected by a redefinition (because one of its supertypes is redefined)
+   AffectedKlassClosure closure(_affected_klasses);
+   // Updated in j10, from original SystemDictionary::classes_do
+-  ClassLoaderDataGraph::dictionary_classes_do(&closure);
++
++  ClassLoaderDataGraph::classes_do(&closure);
++  //ClassLoaderDataGraph::dictionary_classes_do(&closure);
++
+   log_trace(redefine, class, load)("%d classes affected", _affected_klasses->length());
+ 
+   // Sort the affected klasses such that a supertype is always on a smaller array index than its subtype.
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 60b62c3170a..d8a11b51fe9 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -116,6 +116,7 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   void rollback();
+   static void mark_as_scavengable(nmethod* nm);
+   static void unpatch_bytecode(Method* method);
++  static void fix_invoke_method(Method* method);
+ 
+   // Figure out which new methods match old methods in name and signature,
+   // which methods have been added, and which are no longer present
+diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
+index 122bb8c186b..81b3aa96564 100644
+--- a/src/hotspot/share/prims/resolvedMethodTable.cpp
++++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
+@@ -414,6 +414,8 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+         InstanceKlass* newer_klass = InstanceKlass::cast(old_method->method_holder()->new_version());
+         Method* newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
+ 
++        log_info(redefine, class, load, exceptions)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
++
+         assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
+         assert(newer_method != NULL, "method_with_idnum() should not be NULL");
+         assert(old_method != newer_method, "sanity check");
+diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp
+index 72d81ec9d6c..027afa3fabd 100644
+--- a/src/hotspot/share/prims/unsafe.cpp
++++ b/src/hotspot/share/prims/unsafe.cpp
+@@ -865,6 +865,7 @@ Unsafe_DefineAnonymousClass_impl(JNIEnv *env,
+                                                 host_loader,
+                                                 &st,
+                                                 cl_info,
++                                                NULL,
+                                                 CHECK_NULL);
+   if (anonk == NULL) {
+     return NULL;
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0006-Fix-no-original-bytecode-found-error-if-method-with-.patch

@@ -0,0 +1,135 @@
+From 5af1daedc86b5fec0f222cbdda3afbdf518985ea Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sat, 23 May 2020 10:02:15 +0200
+Subject: [PATCH 06/34] Fix "no original bytecode found" error if method with
+ bkp is missing
+
+Sometimes IDE can deploy class with erroneous method, such method has
+n bytecode, but breakpoint position can still exist.
+---
+ src/hotspot/share/interpreter/bytecodes.cpp    |  2 +-
+ .../share/interpreter/interpreterRuntime.cpp   |  2 +-
+ src/hotspot/share/oops/method.cpp              |  8 ++++----
+ src/hotspot/share/oops/method.hpp              |  4 ++--
+ .../prims/jvmtiEnhancedRedefineClasses.cpp     | 18 ++++++++++--------
+ 5 files changed, 18 insertions(+), 16 deletions(-)
+
+diff --git a/src/hotspot/share/interpreter/bytecodes.cpp b/src/hotspot/share/interpreter/bytecodes.cpp
+index e377e36b88c..262ecc021b2 100644
+--- a/src/hotspot/share/interpreter/bytecodes.cpp
++++ b/src/hotspot/share/interpreter/bytecodes.cpp
+@@ -84,7 +84,7 @@ Bytecodes::Code Bytecodes::code_at(Method* method, int bci) {
+ Bytecodes::Code Bytecodes::non_breakpoint_code_at(const Method* method, address bcp) {
+   assert(method != NULL, "must have the method for breakpoint conversion");
+   assert(method->contains(bcp), "must be valid bcp in method");
+-  return method->orig_bytecode_at(method->bci_from(bcp));
++  return method->orig_bytecode_at(method->bci_from(bcp), false);
+ }
+ 
+ int Bytecodes::special_length_at(Bytecodes::Code code, address bcp, address end) {
+diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
+index ed3cc3eb6a2..504e59caf51 100644
+--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
++++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
+@@ -814,7 +814,7 @@ JRT_END
+ // Invokes
+ 
+ JRT_ENTRY(Bytecodes::Code, InterpreterRuntime::get_original_bytecode_at(JavaThread* thread, Method* method, address bcp))
+-  return method->orig_bytecode_at(method->bci_from(bcp));
++  return method->orig_bytecode_at(method->bci_from(bcp), false);
+ JRT_END
+ 
+ JRT_ENTRY(void, InterpreterRuntime::set_original_bytecode_at(JavaThread* thread, Method* method, address bcp, Bytecodes::Code new_code))
+diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
+index 516f2bb8f2f..1c88511a5fc 100644
+--- a/src/hotspot/share/oops/method.cpp
++++ b/src/hotspot/share/oops/method.cpp
+@@ -1853,14 +1853,14 @@ bool CompressedLineNumberReadStream::read_pair() {
+ 
+ #if INCLUDE_JVMTI
+ 
+-Bytecodes::Code Method::orig_bytecode_at(int bci) const {
++Bytecodes::Code Method::orig_bytecode_at(int bci, bool no_fatal) const {
+   BreakpointInfo* bp = method_holder()->breakpoints();
+   for (; bp != NULL; bp = bp->next()) {
+     if (bp->match(this, bci)) {
+       return bp->orig_bytecode();
+     }
+   }
+-  {
++  if (!no_fatal) {
+     ResourceMark rm;
+     fatal("no original bytecode found in %s at bci %d", name_and_sig_as_C_string(), bci);
+   }
+@@ -2006,7 +2006,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int bci) {
+   _signature_index = m->signature_index();
+   _orig_bytecode = (Bytecodes::Code) *m->bcp_from(_bci);
+   if (_orig_bytecode == Bytecodes::_breakpoint)
+-    _orig_bytecode = m->orig_bytecode_at(_bci);
++    _orig_bytecode = m->orig_bytecode_at(_bci, false);
+   _next = NULL;
+ }
+ 
+@@ -2015,7 +2015,7 @@ void BreakpointInfo::set(Method* method) {
+   {
+     Bytecodes::Code code = (Bytecodes::Code) *method->bcp_from(_bci);
+     if (code == Bytecodes::_breakpoint)
+-      code = method->orig_bytecode_at(_bci);
++      code = method->orig_bytecode_at(_bci, false);
+     assert(orig_bytecode() == code, "original bytecode must be the same");
+   }
+ #endif
+diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
+index 83ed2d9c3c1..4d4cc6dc012 100644
+--- a/src/hotspot/share/oops/method.hpp
++++ b/src/hotspot/share/oops/method.hpp
+@@ -230,7 +230,7 @@ class Method : public Metadata {
+ 
+   // JVMTI breakpoints
+ #if !INCLUDE_JVMTI
+-  Bytecodes::Code orig_bytecode_at(int bci) const {
++  Bytecodes::Code orig_bytecode_at(int bci, bool no_fatal) const {
+     ShouldNotReachHere();
+     return Bytecodes::_shouldnotreachhere;
+   }
+@@ -239,7 +239,7 @@ class Method : public Metadata {
+   };
+   u2   number_of_breakpoints() const {return 0;}
+ #else // !INCLUDE_JVMTI
+-  Bytecodes::Code orig_bytecode_at(int bci) const;
++  Bytecodes::Code orig_bytecode_at(int bci, bool no_fatal) const;
+   void set_orig_bytecode_at(int bci, Bytecodes::Code code);
+   void set_breakpoint(int bci);
+   void clear_breakpoint(int bci);
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 8b765623dcd..a859b8e1162 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -1362,14 +1362,16 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
+ 
+     if (code == Bytecodes::_breakpoint) {
+       int bci = method->bci_from(bcp);
+-      code = method->orig_bytecode_at(bci);
+-      java_code = Bytecodes::java_code(code);
+-      if (code != java_code &&
+-           (java_code == Bytecodes::_getfield ||
+-            java_code == Bytecodes::_putfield ||
+-            java_code == Bytecodes::_aload_0)) {
+-        // Let breakpoint table handling unpatch bytecode
+-        method->set_orig_bytecode_at(bci, java_code);
++      code = method->orig_bytecode_at(bci, true);
++      if (code != Bytecodes::_shouldnotreachhere) {
++        java_code = Bytecodes::java_code(code);
++        if (code != java_code &&
++             (java_code == Bytecodes::_getfield ||
++              java_code == Bytecodes::_putfield ||
++              java_code == Bytecodes::_aload_0)) {
++          // Let breakpoint table handling unpatch bytecode
++          method->set_orig_bytecode_at(bci, java_code);
++        }
+       }
+     } else {
+       java_code = Bytecodes::java_code(code);
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0007-Replace-deleted-method-with-Universe-throw_no_such_m.patch

@@ -0,0 +1,57 @@
+From 19d2274a5dff6e6b31474252b45e5e7484f0180b Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 24 May 2020 12:07:42 +0200
+Subject: [PATCH 07/34] Replace deleted method with
+ Universe::throw_no_such_method_error
+
+---
+ .../share/prims/resolvedMethodTable.cpp       | 28 +++++++++----------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
+index 81b3aa96564..caf03ffe56d 100644
+--- a/src/hotspot/share/prims/resolvedMethodTable.cpp
++++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
+@@ -404,25 +404,25 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+ 
+       if (old_method->is_old()) {
+ 
++        InstanceKlass* newer_klass = InstanceKlass::cast(old_method->method_holder()->new_version());
++        Method* newer_method;
++
+         // Method* new_method;
+         if (old_method->is_deleted()) {
+-          // FIXME:(DCEVM) - check if exception can be thrown
+-          // new_method = Universe::throw_no_such_method_error();
+-          continue;
+-        }
+-
+-        InstanceKlass* newer_klass = InstanceKlass::cast(old_method->method_holder()->new_version());
+-        Method* newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
++          newer_method = Universe::throw_no_such_method_error();
++        } else {
++          newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
+ 
+-        log_info(redefine, class, load, exceptions)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
++          log_info(redefine, class, load, exceptions)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
+ 
+-        assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
+-        assert(newer_method != NULL, "method_with_idnum() should not be NULL");
+-        assert(old_method != newer_method, "sanity check");
++          assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
++          assert(newer_method != NULL, "method_with_idnum() should not be NULL");
++          assert(old_method != newer_method, "sanity check");
+ 
+-        if (_the_table->lookup(newer_method) != NULL) {
+-          // old method was already adjusted if new method exists in _the_table
+-            continue;
++          if (_the_table->lookup(newer_method) != NULL) {
++            // old method was already adjusted if new method exists in _the_table
++              continue;
++          }
+         }
+ 
+         java_lang_invoke_ResolvedMethodName::set_vmtarget(mem_name, newer_method);
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0009-Change-log-level-in-advanced-redefinition.patch

@@ -0,0 +1,50 @@
+From ca47ab5a0a6ce8e2644736f323a335a957311af9 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sat, 13 Jun 2020 18:50:59 +0200
+Subject: [PATCH 09/34] Change log level in advanced redefinition
+
+- Change log level for "Comparing different class ver.." to debug
+- Fix adjust_method_entries_dcevm logging levels and severity
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 2 +-
+ src/hotspot/share/prims/resolvedMethodTable.cpp          | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 6c9eb40ecf5..b09ba554e07 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -916,7 +916,7 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+  // Calculated the difference between new and old class  (field change, method change, supertype change, ...).
+ int VM_EnhancedRedefineClasses::calculate_redefinition_flags(InstanceKlass* new_class) {
+   int result = Klass::NoRedefinition;
+-  log_info(redefine, class, load)("Comparing different class versions of class %s",new_class->name()->as_C_string());
++  log_debug(redefine, class, load)("Comparing different class versions of class %s",new_class->name()->as_C_string());
+ 
+   assert(new_class->old_version() != NULL, "must have old version");
+   InstanceKlass* the_class = InstanceKlass::cast(new_class->old_version());
+diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
+index caf03ffe56d..eb9fcda44f3 100644
+--- a/src/hotspot/share/prims/resolvedMethodTable.cpp
++++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
+@@ -413,7 +413,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+         } else {
+           newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
+ 
+-          log_info(redefine, class, load, exceptions)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
++          log_debug(redefine, class, update)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
+ 
+           assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
+           assert(newer_method != NULL, "method_with_idnum() should not be NULL");
+@@ -433,7 +433,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+ 
+         ResourceMark rm;
+         if (!(*trace_name_printed)) {
+-          log_info(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
++          log_debug(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
+            *trace_name_printed = true;
+         }
+         log_debug(redefine, class, update, constantpool)
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0010-AllowEnhancedClassRedefinition-is-false-disabled-by-.patch

@@ -0,0 +1,26 @@
+From 7e236beee0375656d1955fc1168143c1639fb7f1 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Tue, 6 Oct 2020 22:15:31 +0200
+Subject: [PATCH 10/34] AllowEnhancedClassRedefinition is false (disabled) by
+ default
+
+---
+ src/hotspot/share/runtime/globals.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
+index 5b367704800..2710c6ea0e5 100644
+--- a/src/hotspot/share/runtime/globals.hpp
++++ b/src/hotspot/share/runtime/globals.hpp
+@@ -2466,7 +2466,7 @@ const size_t minimumSymbolTableSize = 1024;
+   diagnostic(bool, DeoptimizeNMethodBarriersALot, false,                    \
+                 "Make nmethod barriers deoptimise a lot.")                  \
+                                                                             \
+-  product(bool, AllowEnhancedClassRedefinition, true,                       \
++  product(bool, AllowEnhancedClassRedefinition, false,                      \
+              "Allow enhanced class redefinition beyond swapping method "    \
+              "bodies")                                                      \
+                                                                             \
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0012-Set-HOTSPOT_VM_DISTRO-Dynamic-Code-Evolution.patch

@@ -0,0 +1,25 @@
+From d56e73885111b386771f564ec6beb305338993df Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Mon, 19 Oct 2020 20:00:04 +0200
+Subject: [PATCH 12/34] Set HOTSPOT_VM_DISTRO=Dynamic Code Evolution
+
+---
+ make/autoconf/version-numbers | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/make/autoconf/version-numbers b/make/autoconf/version-numbers
+index aabdc5bed20..df8025a2e84 100644
+--- a/make/autoconf/version-numbers
++++ b/make/autoconf/version-numbers
+@@ -45,7 +45,7 @@ PRODUCT_NAME=OpenJDK
+ PRODUCT_SUFFIX="Runtime Environment"
+ JDK_RC_PLATFORM_NAME=Platform
+ COMPANY_NAME=N/A
+-HOTSPOT_VM_DISTRO="OpenJDK"
++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
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0013-Fix-G1-nmethod-registration.patch

@@ -0,0 +1,71 @@
+From 7ebad43ed45805b0a3736c510f708ff17697ba7e Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 11 Oct 2020 10:43:28 +0200
+Subject: [PATCH 13/34] Fix G1 nmethod registration
+
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 19 ++++++++++++++++---
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |  3 ++-
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index b09ba554e07..718426f2819 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -216,7 +216,14 @@ void VM_EnhancedRedefineClasses::mark_as_scavengable(nmethod* nm) {
+   }
+ }
+ 
+-void VM_EnhancedRedefineClasses::mark_as_scavengable_g1(nmethod* nm) {
++void VM_EnhancedRedefineClasses::unregister_nmethod_g1(nmethod* nm) {
++  // It should work not only for G1 but also for another GCs, but this way is safer now
++  if (!nm->is_zombie() && !nm->is_unloaded()) {
++    Universe::heap()->unregister_nmethod(nm);
++  }
++}
++
++void VM_EnhancedRedefineClasses::register_nmethod_g1(nmethod* nm) {
+   // It should work not only for G1 but also for another GCs, but this way is safer now
+   if (!nm->is_zombie() && !nm->is_unloaded()) {
+     Universe::heap()->register_nmethod(nm);
+@@ -521,8 +528,9 @@ void VM_EnhancedRedefineClasses::doit() {
+     // For now, mark all nmethod's as scavengable that are not scavengable already
+     if (ScavengeRootsInCode) {
+       if (UseG1GC) {
+-        // this should work also for other GCs
+-        CodeCache::nmethods_do(mark_as_scavengable_g1);
++        // G1 holds references to nmethods in regions based on oops values. Since oops in nmethod can be changed in ChangePointers* closures
++        // we unregister nmethods from G1 heap, then closures are processed (oops are changed) and finally we register nmethod to G1 again
++        CodeCache::nmethods_do(unregister_nmethod_g1);
+       } else {
+         CodeCache::nmethods_do(mark_as_scavengable);
+       }
+@@ -545,6 +553,11 @@ void VM_EnhancedRedefineClasses::doit() {
+ 
+     Universe::root_oops_do(&oopClosureNoBarrier);
+ 
++    if (UseG1GC) {
++      // this should work also for other GCs
++      CodeCache::nmethods_do(register_nmethod_g1);
++    }
++
+   }
+   log_trace(redefine, class, obsolete, metadata)("After updating instances");
+ 
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 9755944d70b..4c0412d343d 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -116,7 +116,8 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+ 
+   void rollback();
+   static void mark_as_scavengable(nmethod* nm);
+-  static void mark_as_scavengable_g1(nmethod* nm);
++  static void unregister_nmethod_g1(nmethod* nm);
++  static void register_nmethod_g1(nmethod* nm);
+   static void unpatch_bytecode(Method* method);
+   static void fix_invoke_method(Method* method);
+ 
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0014-Initialize-method-s-_new_version-_old_version-to-NUL.patch

@@ -0,0 +1,26 @@
+From 5c7e5f245f79d7e8575461dab0c356ed74c8e9a3 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Thu, 22 Oct 2020 20:15:20 +0200
+Subject: [PATCH 14/34] Initialize method's _new_version/_old_version to NULL
+
+---
+ src/hotspot/share/oops/method.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
+index 1c88511a5fc..ce940cf10a9 100644
+--- a/src/hotspot/share/oops/method.cpp
++++ b/src/hotspot/share/oops/method.cpp
+@@ -91,7 +91,8 @@ Method* Method::allocate(ClassLoaderData* loader_data,
+   return new (loader_data, size, MetaspaceObj::MethodType, THREAD) Method(cm, access_flags);
+ }
+ 
+-Method::Method(ConstMethod* xconst, AccessFlags access_flags) {
++Method::Method(ConstMethod* xconst, AccessFlags access_flags) :  _new_version(NULL),
++                                                                 _old_version(NULL) {
+   NoSafepointVerifier no_safepoint;
+   set_constMethod(xconst);
+   set_access_flags(access_flags);
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0015-Clear-dcevm-code-separation.patch

@@ -0,0 +1,193 @@
+From 6ffac6e5064ec6633fdbeb8520333dca00bc6a62 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Fri, 23 Oct 2020 10:20:26 +0200
+Subject: [PATCH 15/34] Clear dcevm code separation
+
+---
+ src/hotspot/share/classfile/systemDictionary.cpp |  4 ++--
+ src/hotspot/share/gc/serial/genMarkSweep.cpp     |  8 +++++---
+ src/hotspot/share/interpreter/linkResolver.cpp   | 16 +++++++++++-----
+ .../instrumentation/jfrEventClassTransformer.cpp |  2 +-
+ src/hotspot/share/oops/instanceKlass.cpp         | 10 ++++++----
+ src/hotspot/share/oops/method.cpp                |  2 +-
+ .../share/prims/jvmtiGetLoadedClasses.cpp        |  2 +-
+ src/hotspot/share/runtime/reflection.cpp         |  2 +-
+ 8 files changed, 28 insertions(+), 18 deletions(-)
+
+diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
+index 8f2b46add4d..9ac6ec96cb5 100644
+--- a/src/hotspot/share/classfile/systemDictionary.cpp
++++ b/src/hotspot/share/classfile/systemDictionary.cpp
+@@ -1241,7 +1241,7 @@ InstanceKlass* SystemDictionary::resolve_from_stream(Symbol* class_name,
+     MutexLocker mu(THREAD, SystemDictionary_lock);
+ 
+     Klass* check = find_class(h_name, k->class_loader_data());
+-    assert((check == k && !k->is_redefining()) || (k->is_redefining() && check == k->old_version()), "should be present in the dictionary");
++    assert(check == k && !k->is_redefining() || k->is_redefining() && check == k->old_version(), "should be present in the dictionary");
+   } );
+ 
+   return k;
+@@ -2290,7 +2290,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
+       // also hold array classes.
+ 
+       assert(check->is_instance_klass(), "noninstance in systemdictionary");
+-      if ((defining == true) || ((k != check) && k->old_version() != check)) {
++      if ((defining == true) || (k != check && (!AllowEnhancedClassRedefinition || k->old_version() != check))) {
+         throwException = true;
+         ss.print("loader %s", loader_data->loader_name_and_id());
+         ss.print(" attempted duplicate %s definition for %s. (%s)",
+diff --git a/src/hotspot/share/gc/serial/genMarkSweep.cpp b/src/hotspot/share/gc/serial/genMarkSweep.cpp
+index 1d13c647452..548df01e557 100644
+--- a/src/hotspot/share/gc/serial/genMarkSweep.cpp
++++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp
+@@ -334,7 +334,9 @@ void GenMarkSweep::mark_sweep_phase4() {
+ 
+   GenCompactClosure blk;
+   gch->generation_iterate(&blk, true);
+-  DcevmSharedGC::copy_rescued_objects_back(MarkSweep::_rescued_oops, true);
+-  DcevmSharedGC::clear_rescued_objects_resource(MarkSweep::_rescued_oops);
+-  MarkSweep::_rescued_oops = NULL;
++  if (AllowEnhancedClassRedefinition) {
++    DcevmSharedGC::copy_rescued_objects_back(MarkSweep::_rescued_oops, true);
++    DcevmSharedGC::clear_rescued_objects_resource(MarkSweep::_rescued_oops);
++    MarkSweep::_rescued_oops = NULL;
++  }
+ }
+diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
+index b6e9e0a308d..b2f24ddbeda 100644
+--- a/src/hotspot/share/interpreter/linkResolver.cpp
++++ b/src/hotspot/share/interpreter/linkResolver.cpp
+@@ -282,9 +282,14 @@ void LinkResolver::check_klass_accessibility(Klass* ref_klass, Klass* sel_klass,
+   if (!base_klass->is_instance_klass()) {
+     return;  // no relevant check to do
+   }
+-
+-  Reflection::VerifyClassAccessResults vca_result =
+-    Reflection::verify_class_access(ref_klass->newest_version(), InstanceKlass::cast(base_klass->newest_version()), true);
++  Klass* refKlassNewest = ref_klass;
++  Klass* baseKlassNewest = base_klass;
++  if (AllowEnhancedClassRedefinition) {
++    refKlassNewest = ref_klass->newest_version();
++    baseKlassNewest = base_klass->newest_version();
++  }
++  Reflection::VerifyClassAccessResults vca_result = 
++    Reflection::verify_class_access(refKlassNewest, InstanceKlass::cast(baseKlassNewest), true);
+   if (vca_result != Reflection::ACCESS_OK) {
+     ResourceMark rm(THREAD);
+     char* msg = Reflection::verify_class_access_msg(ref_klass,
+@@ -566,7 +571,8 @@ void LinkResolver::check_method_accessability(Klass* ref_klass,
+   // We'll check for the method name first, as that's most likely
+   // to be false (so we'll short-circuit out of these tests).
+   if (sel_method->name() == vmSymbols::clone_name() &&
+-      sel_klass->newest_version() == SystemDictionary::Object_klass()->newest_version() &&
++      ( !AllowEnhancedClassRedefinition && sel_klass == SystemDictionary::Object_klass() ||
++      AllowEnhancedClassRedefinition && sel_klass->newest_version() == SystemDictionary::Object_klass()->newest_version()) &&
+       resolved_klass->is_array_klass()) {
+     // We need to change "protected" to "public".
+     assert(flags.is_protected(), "clone not protected?");
+@@ -1011,7 +1017,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
+     //     or by the <init> method (in case of an instance field).
+     if (is_put && fd.access_flags().is_final()) {
+ 
+-      if (sel_klass != current_klass && sel_klass != current_klass->active_version()) {
++      if (sel_klass != current_klass && (!AllowEnhancedClassRedefinition || sel_klass != current_klass->active_version())) {
+         ResourceMark rm(THREAD);
+         stringStream ss;
+         ss.print("Update to %s final field %s.%s attempted from a different class (%s) than the field's declaring class",
+diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
+index 96fc139bea3..f7284197c5a 100644
+--- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
++++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
+@@ -1471,7 +1471,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
+                              cld,
+                              &cl_info,
+                              ClassFileParser::INTERNAL, // internal visibility
+-							 false,
++                             false,
+                              THREAD);
+   if (HAS_PENDING_EXCEPTION) {
+     log_pending_exception(PENDING_EXCEPTION);
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index 3be3a09ef8f..f8e60941046 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -199,7 +199,9 @@ bool InstanceKlass::has_nest_member(InstanceKlass* k, TRAPS) const {
+         // able to perform that loading but we can't exclude the compiler threads from
+         // executing this logic. But it should actually be impossible to trigger loading here.
+         Klass* k2 = _constants->klass_at(cp_index, THREAD);
+-        k2 = k2->newest_version();
++        if (AllowEnhancedClassRedefinition) {
++          k2 = k2->newest_version();
++        }
+         assert(!HAS_PENDING_EXCEPTION || PENDING_EXCEPTION->is_a(SystemDictionary::VirtualMachineError_klass()),
+                "Exceptions should not be possible here");
+         if (k2 == k) {
+@@ -1003,7 +1005,7 @@ bool InstanceKlass::link_class_impl(TRAPS) {
+ #endif
+       set_init_state(linked);
+       // (DCEVM) Must check for old version in order to prevent infinite loops.
+-      if (JvmtiExport::should_post_class_prepare() && old_version() == NULL /* JVMTI deadlock otherwise */) {
++      if (JvmtiExport::should_post_class_prepare() && (!AllowEnhancedClassRedefinition || old_version() == NULL) /* JVMTI deadlock otherwise */) {
+         Thread *thread = THREAD;
+         assert(thread->is_Java_thread(), "thread->is_Java_thread()");
+         JvmtiExport::post_class_prepare((JavaThread *) thread, this);
+@@ -1084,7 +1086,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
+     // we might end up throwing IE from link/symbol resolution sites
+     // that aren't expected to throw.  This would wreak havoc.  See 6320309.
+     while ((is_being_initialized() && !is_reentrant_initialization(jt)) 
+-            || (old_version() != NULL && InstanceKlass::cast(old_version())->is_being_initialized())) {
++            || (AllowEnhancedClassRedefinition && old_version() != NULL && InstanceKlass::cast(old_version())->is_being_initialized())) {
+       wait = true;
+       jt->set_class_to_be_initialized(this);
+       ol.wait_uninterruptibly(jt);
+@@ -3782,7 +3784,7 @@ void InstanceKlass::verify_on(outputStream* st) {
+ 
+     guarantee(sib->is_klass(), "should be klass");
+     // TODO: (DCEVM) explain
+-    guarantee(sib->super() == super || super->newest_version() == SystemDictionary::Object_klass(), "siblings should have same superklass");
++    guarantee(sib->super() == super || AllowEnhancedClassRedefinition && super->newest_version() == SystemDictionary::Object_klass(), "siblings should have same superklass");
+   }
+ 
+   // Verify local interfaces
+diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
+index ce940cf10a9..2d8e5b0256b 100644
+--- a/src/hotspot/share/oops/method.cpp
++++ b/src/hotspot/share/oops/method.cpp
+@@ -2208,7 +2208,7 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
+ // Add a method id to the jmethod_ids
+ jmethodID Method::make_jmethod_id(ClassLoaderData* loader_data, Method* m) {
+   // FIXME: (DCEVM) ???
+-  if (m != m->newest_version()) {
++  if (AllowEnhancedClassRedefinition && m != m->newest_version()) {
+     m = m->newest_version();
+   }
+   ClassLoaderData* cld = loader_data;
+diff --git a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
+index 1c7677f270f..6c12ee64a6e 100644
+--- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
+@@ -75,7 +75,7 @@ public:
+     //         the new version (SystemDictionary stores only new versions). But the LoadedClassesClosure's functionality was
+     //         changed in java8  where jvmtiLoadedClasses collects all classes from all classloaders, therefore we
+     //         must use new versions only.
+-    if (k->new_version()==NULL) {
++    if (AllowEnhancedClassRedefinition && k->new_version()==NULL) {
+       _classStack.push((jclass) _env->jni_reference(Handle(_cur_thread, k->java_mirror())));
+       if (_dictionary_walk) {
+         // Collect array classes this way when walking the dictionary (because array classes are
+diff --git a/src/hotspot/share/runtime/reflection.cpp b/src/hotspot/share/runtime/reflection.cpp
+index 0e7722dba7d..d67457f02ac 100644
+--- a/src/hotspot/share/runtime/reflection.cpp
++++ b/src/hotspot/share/runtime/reflection.cpp
+@@ -628,7 +628,7 @@ bool Reflection::verify_member_access(const Klass* current_class,
+                                       TRAPS) {
+ 
+   // (DCEVM) Decide accessibility based on active version
+-  if (current_class != NULL) {
++  if (AllowEnhancedClassRedefinition && current_class != NULL) {
+     current_class = current_class->active_version();
+   }
+ 
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0016-Fix-LoadedClassesClosure-fixes-problems-with-remote-.patch

@@ -0,0 +1,26 @@
+From dc675de6ac42819b8536827ea450fcad13a97448 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Wed, 11 Nov 2020 18:45:15 +0100
+Subject: [PATCH 16/34] Fix LoadedClassesClosure - fixes problems with remote
+ debugging
+
+---
+ src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
+index 6c12ee64a6e..2a469555dbd 100644
+--- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
+@@ -75,7 +75,7 @@ public:
+     //         the new version (SystemDictionary stores only new versions). But the LoadedClassesClosure's functionality was
+     //         changed in java8  where jvmtiLoadedClasses collects all classes from all classloaders, therefore we
+     //         must use new versions only.
+-    if (AllowEnhancedClassRedefinition && k->new_version()==NULL) {
++    if (!AllowEnhancedClassRedefinition || k->new_version()==NULL) {
+       _classStack.push((jclass) _env->jni_reference(Handle(_cur_thread, k->java_mirror())));
+       if (_dictionary_walk) {
+         // Collect array classes this way when walking the dictionary (because array classes are
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0018-pre-dcevm15-fix-GC-spaces-originally-in-removed-CMS-.patch

@@ -0,0 +1,183 @@
+From 1d682efa88c716e1849163d5abff3a3367581d16 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Mon, 16 Nov 2020 21:11:19 +0100
+Subject: [PATCH 18/34] pre dcevm15 - fix GC spaces originally in removed CMS
+ patch
+
+---
+ src/hotspot/share/gc/shared/space.cpp            | 16 ++++++++--------
+ src/hotspot/share/gc/shared/space.hpp            |  6 +++---
+ src/hotspot/share/gc/shared/space.inline.hpp     | 14 ++++++++------
+ .../share/prims/jvmtiEnhancedRedefineClasses.cpp |  6 ++----
+ 4 files changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
+index 875a6dc854f..9772c32c42e 100644
+--- a/src/hotspot/share/gc/shared/space.cpp
++++ b/src/hotspot/share/gc/shared/space.cpp
+@@ -375,11 +375,11 @@ HeapWord* CompactibleSpace::forward_compact_top(size_t size, CompactPoint* cp, H
+ }
+ 
+ HeapWord* CompactibleSpace::forward(oop q, size_t size,
+-                                    CompactPoint* cp, HeapWord* compact_top) {
++                                    CompactPoint* cp, HeapWord* compact_top, bool force_forward) {
+   compact_top = forward_compact_top(size, cp, compact_top);
+ 
+   // store the forwarding pointer into the mark word
+-  if (cast_from_oop<HeapWord*>(q) != compact_top || (size_t)q->size() != size) {
++  if (force_forward || cast_from_oop<HeapWord*>(q) != compact_top || (size_t)q->size() != size) {
+     q->forward_to(oop(compact_top));
+     assert(q->is_gc_marked(), "encoding the pointer should preserve the mark");
+   } else {
+@@ -501,7 +501,7 @@ bool CompactibleSpace::must_rescue(oop old_obj, oop new_obj) {
+ 
+   } else {
+     assert(space_index(old_obj) != space_index(new_obj), "old_obj and new_obj must be in different spaces");
+-    if (tenured_gen->is_in_reserved(new_obj)) {
++    if (new_in_tenured) {
+       // Must never rescue when moving from the new into the old generation.
+       assert(GenCollectedHeap::heap()->young_gen()->is_in_reserved(old_obj), "old_obj must be in DefNewGeneration");
+       assert(space_index(old_obj) > space_index(new_obj), "must be");
+@@ -824,14 +824,14 @@ void OffsetTableContigSpace::verify() const {
+ // Compute the forward sizes and leave out objects whose position could
+ // possibly overlap other objects.
+ HeapWord* CompactibleSpace::forward_with_rescue(HeapWord* q, size_t size,
+-                                                CompactPoint* cp, HeapWord* compact_top) {
++                                                CompactPoint* cp, HeapWord* compact_top, bool force_forward) {
+   size_t forward_size = size;
+ 
+   // (DCEVM) There is a new version of the class of q => different size
+   if (oop(q)->klass()->new_version() != NULL) {
+ 
+     size_t new_size = oop(q)->size_given_klass(oop(q)->klass()->new_version());
+-    assert(size != new_size, "instances without changed size have to be updated prior to GC run");
++    // assert(size != new_size, "instances without changed size have to be updated prior to GC run");
+     forward_size = new_size;
+   }
+ 
+@@ -845,7 +845,7 @@ HeapWord* CompactibleSpace::forward_with_rescue(HeapWord* q, size_t size,
+     return compact_top;
+   }
+ 
+-  return forward(oop(q), forward_size, cp, compact_top);
++  return forward(oop(q), forward_size, cp, compact_top, force_forward);
+ }
+ 
+ // Compute the forwarding addresses for the objects that need to be rescued.
+@@ -861,11 +861,11 @@ HeapWord* CompactibleSpace::forward_rescued(CompactPoint* cp, HeapWord* compact_
+       // (DCEVM) There is a new version of the class of q => different size
+       if (oop(q)->klass()->new_version() != NULL) {
+         size_t new_size = oop(q)->size_given_klass(oop(q)->klass()->new_version());
+-        assert(size != new_size, "instances without changed size have to be updated prior to GC run");
++        // assert(size != new_size, "instances without changed size have to be updated prior to GC run");
+         size = new_size;
+       }
+ 
+-      compact_top = cp->space->forward(oop(q), size, cp, compact_top);
++      compact_top = cp->space->forward(oop(q), size, cp, compact_top, true);
+       assert(compact_top <= end(), "must not write over end of space!");
+     }
+     MarkSweep::_rescued_oops->clear();
+diff --git a/src/hotspot/share/gc/shared/space.hpp b/src/hotspot/share/gc/shared/space.hpp
+index c9bfc365f0f..f7648995454 100644
+--- a/src/hotspot/share/gc/shared/space.hpp
++++ b/src/hotspot/share/gc/shared/space.hpp
+@@ -405,7 +405,7 @@ public:
+   virtual void prepare_for_compaction(CompactPoint* cp) = 0;
+   // MarkSweep support phase3
+   DEBUG_ONLY(int space_index(oop obj));
+-  bool must_rescue(oop old_obj, oop new_obj);
++  virtual bool must_rescue(oop old_obj, oop new_obj);
+   HeapWord* rescue(HeapWord* old_obj);
+   virtual void adjust_pointers();
+   // MarkSweep support phase4
+@@ -436,11 +436,11 @@ public:
+   // function of the then-current compaction space, and updates "cp->threshold
+   // accordingly".
+   virtual HeapWord* forward(oop q, size_t size, CompactPoint* cp,
+-                    HeapWord* compact_top);
++                    HeapWord* compact_top, bool force_forward);
+   // (DCEVM) same as forwad, but can rescue objects. Invoked only during
+   // redefinition runs
+   HeapWord* forward_with_rescue(HeapWord* q, size_t size, CompactPoint* cp,
+-                                HeapWord* compact_top);
++                                HeapWord* compact_top, bool force_forward);
+ 
+   HeapWord* forward_rescued(CompactPoint* cp, HeapWord* compact_top);
+ 
+diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp
+index 5a93e93471b..fa645423685 100644
+--- a/src/hotspot/share/gc/shared/space.inline.hpp
++++ b/src/hotspot/share/gc/shared/space.inline.hpp
+@@ -163,6 +163,8 @@ inline void CompactibleSpace::scan_and_forward(SpaceType* space, CompactPoint* c
+   HeapWord* cur_obj = space->bottom();
+   HeapWord* scan_limit = space->scan_limit();
+ 
++  bool force_forward = false;
++
+   while (cur_obj < scan_limit) {
+     assert(!space->scanned_block_is_obj(cur_obj) ||
+            oop(cur_obj)->mark_raw().is_marked() || oop(cur_obj)->mark_raw().is_unlocked() ||
+@@ -174,14 +176,15 @@ inline void CompactibleSpace::scan_and_forward(SpaceType* space, CompactPoint* c
+       size_t size = space->scanned_block_size(cur_obj);
+ 
+       if (redefinition_run) {
+-        compact_top = cp->space->forward_with_rescue(cur_obj, size, cp, compact_top);
++        compact_top = cp->space->forward_with_rescue(cur_obj, size, cp, compact_top, force_forward);
+         if (first_dead == NULL && oop(cur_obj)->is_gc_marked()) {
+           /* Was moved (otherwise, forward would reset mark),
+              set first_dead to here */
+           first_dead = cur_obj;
++          force_forward = true;
+         }
+       } else {
+-        compact_top = cp->space->forward(oop(cur_obj), size, cp, compact_top);
++        compact_top = cp->space->forward(oop(cur_obj), size, cp, compact_top, false);
+       }
+ 
+       cur_obj += size;
+@@ -197,9 +200,9 @@ inline void CompactibleSpace::scan_and_forward(SpaceType* space, CompactPoint* c
+ 
+       // see if we might want to pretend this object is alive so that
+       // we don't have to compact quite as often.
+-      if (cur_obj == compact_top && dead_spacer.insert_deadspace(cur_obj, end)) {
++      if (!redefinition_run && cur_obj == compact_top && dead_spacer.insert_deadspace(cur_obj, end)) {
+         oop obj = oop(cur_obj);
+-        compact_top = cp->space->forward(obj, obj->size(), cp, compact_top);
++        compact_top = cp->space->forward(obj, obj->size(), cp, compact_top, force_forward);
+         end_of_live = end;
+       } else {
+         // otherwise, it really is a free region.
+@@ -362,8 +365,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
+       Prefetch::write(compaction_top, copy_interval);
+ 
+       // copy object and reinit its mark
+-      assert(cur_obj != compaction_top || oop(cur_obj)->klass()->new_version() != NULL,
+-             "everything in this pass should be moving");
++      assert(redefinition_run || cur_obj != compaction_top, "everything in this pass should be moving");
+       if (redefinition_run && oop(cur_obj)->klass()->new_version() != NULL) {
+         Klass* new_version = oop(cur_obj)->klass()->new_version();
+         if (new_version->update_information() == NULL) {
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 718426f2819..1da6661dd3e 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -431,13 +431,11 @@ public:
+       Klass* new_klass = obj->klass()->new_version();
+ 
+       if (new_klass->update_information() != NULL) {
+-        int size_diff = obj->size() - obj->size_given_klass(new_klass);
+-
+-        // Either new size is bigger or gap is to small to be filled
+-        if (size_diff < 0 || (size_diff > 0 && (size_t) size_diff < CollectedHeap::min_fill_size())) {
++        if (obj->size() - obj->size_given_klass(new_klass) != 0) {
+           // We need an instance update => set back to old klass
+           _needs_instance_update = true;
+         } else {
++          // Either new size is bigger or gap is to small to be filled
+           oop src = obj;
+           if (new_klass->is_copying_backwards()) {
+             copy_to_tmp(obj);
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0019-dcevm15-fix-java15-patch-compilation-issues.patch

@@ -0,0 +1,942 @@
+From 297f564f6af79fb824f5b4e9119f1d3d0c827fb0 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Mon, 16 Nov 2020 20:20:12 +0100
+Subject: [PATCH 19/34] dcevm15 - fix java15 patch compilation issues
+
+---
+ .../share/classfile/classFileParser.hpp       |   8 +-
+ .../share/classfile/classLoaderData.cpp       |   2 +-
+ src/hotspot/share/classfile/dictionary.hpp    |  10 +-
+ src/hotspot/share/classfile/javaClasses.hpp   |   2 +
+ .../share/gc/g1/g1FullGCCompactTask.cpp       |   4 +-
+ .../share/gc/g1/g1FullGCCompactionPoint.cpp   |   8 +-
+ .../share/gc/g1/g1FullGCPrepareTask.cpp       |   4 +-
+ src/hotspot/share/gc/shared/dcevmSharedGC.cpp |  14 +-
+ src/hotspot/share/gc/shared/dcevmSharedGC.hpp |   2 +-
+ src/hotspot/share/gc/shared/gcConfig.cpp      |   2 +-
+ src/hotspot/share/gc/shared/space.cpp         |   4 +-
+ .../share/interpreter/linkResolver.cpp        |   2 +-
+ src/hotspot/share/oops/instanceKlass.cpp      |  17 ++-
+ src/hotspot/share/oops/instanceKlass.hpp      |   1 +
+ src/hotspot/share/oops/klass.cpp              |   8 +-
+ src/hotspot/share/prims/jvm.cpp               |   2 +
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 129 +++++++++---------
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |  14 +-
+ src/hotspot/share/prims/jvmtiEnv.cpp          |  11 +-
+ .../share/prims/jvmtiRedefineClasses.cpp      |   1 +
+ src/hotspot/share/prims/methodHandles.hpp     |   3 +
+ src/hotspot/share/runtime/arguments.cpp       |  22 +--
+ src/hotspot/share/runtime/mutexLocker.cpp     |   2 +-
+ 23 files changed, 159 insertions(+), 113 deletions(-)
+
+diff --git a/src/hotspot/share/classfile/classFileParser.hpp b/src/hotspot/share/classfile/classFileParser.hpp
+index e5761e61767..0d266b9047e 100644
+--- a/src/hotspot/share/classfile/classFileParser.hpp
++++ b/src/hotspot/share/classfile/classFileParser.hpp
+@@ -150,9 +150,6 @@ class ClassFileParser {
+   const intArray* _method_ordering;
+   GrowableArray<Method*>* _all_mirandas;
+ 
+-  // Enhanced class redefinition
+-  const bool _pick_newest;
+-
+   enum { fixed_buffer_size = 128 };
+   u_char _linenumbertable_buffer[fixed_buffer_size];
+ 
+@@ -206,6 +203,9 @@ class ClassFileParser {
+   bool _has_vanilla_constructor;
+   int _max_bootstrap_specifier_index;  // detects BSS values
+ 
++  // (DCEVM) Enhanced class redefinition
++  const bool _pick_newest;
++
+   void parse_stream(const ClassFileStream* const stream, TRAPS);
+ 
+   void mangle_hidden_class_name(InstanceKlass* const ik);
+@@ -582,7 +582,7 @@ class ClassFileParser {
+   ClassLoaderData* loader_data() const { return _loader_data; }
+   const Symbol* class_name() const { return _class_name; }
+   const InstanceKlass* super_klass() const { return _super_klass; }
+-  Array<Klass*>* local_interfaces() const { return _local_interfaces; }
++  Array<InstanceKlass*>* local_interfaces() const { return _local_interfaces; }
+ 
+   ReferenceType reference_type() const { return _rt; }
+   AccessFlags access_flags() const { return _access_flags; }
+diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
+index 4d64c6b454a..aadcd50ef4a 100644
+--- a/src/hotspot/share/classfile/classLoaderData.cpp
++++ b/src/hotspot/share/classfile/classLoaderData.cpp
+@@ -597,7 +597,7 @@ void ClassLoaderData::exchange_holders(ClassLoaderData* cld) {
+   oop holder_oop = _holder.peek();
+   _holder.replace(cld->_holder.peek());
+   cld->_holder.replace(holder_oop);
+-  WeakHandle<vm_class_loader_data> exchange = _holder;
++  WeakHandle<vm_weak_data> exchange = _holder;
+   _holder = cld->_holder;
+   cld->_holder = exchange;
+ }
+diff --git a/src/hotspot/share/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp
+index 114a983e783..a50f4ff84d2 100644
+--- a/src/hotspot/share/classfile/dictionary.hpp
++++ b/src/hotspot/share/classfile/dictionary.hpp
+@@ -84,6 +84,11 @@ public:
+   void print_on(outputStream* st) const;
+   void verify();
+ 
++  // (DCEVM) Enhanced class redefinition
++  bool update_klass(unsigned int hash, Symbol* name, ClassLoaderData* loader_data, InstanceKlass* k, InstanceKlass* old_klass);
++
++  void rollback_redefinition();
++
+  private:
+   DictionaryEntry* new_entry(unsigned int hash, InstanceKlass* klass);
+ 
+@@ -106,11 +111,6 @@ public:
+ 
+   void free_entry(DictionaryEntry* entry);
+ 
+-  // Enhanced class redefinition
+-  bool update_klass(unsigned int hash, Symbol* name, ClassLoaderData* loader_data, InstanceKlass* k, InstanceKlass* old_klass);
+-
+-  void rollback_redefinition();
+-
+   // (DCEVM) return old class if redefining in AllowEnhancedClassRedefinition, otherwise return "k"
+   static InstanceKlass* old_if_redefined(InstanceKlass* k) {
+     return (k != NULL && k->is_redefining()) ? ((InstanceKlass* )k->old_version()) : k;
+diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
+index a68c5139151..9abf2e1d105 100644
+--- a/src/hotspot/share/classfile/javaClasses.hpp
++++ b/src/hotspot/share/classfile/javaClasses.hpp
+@@ -255,7 +255,9 @@ class java_lang_Class : AllStatic {
+   static void set_init_lock(oop java_class, oop init_lock);
+   static void set_protection_domain(oop java_class, oop protection_domain);
+   static void set_class_loader(oop java_class, oop class_loader);
++ public: // DCEVM
+   static void set_component_mirror(oop java_class, oop comp_mirror);
++ private:
+   static void initialize_mirror_fields(Klass* k, Handle mirror, Handle protection_domain,
+                                        Handle classData, TRAPS);
+   static void initialize_mirror_fields(Klass* k, Handle mirror, Handle protection_domain, TRAPS);
+diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
+index f70f4606dc8..a22ed48560d 100644
+--- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
++++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
+@@ -157,14 +157,14 @@ void G1FullGCCompactTask::serial_compaction_dcevm() {
+ 
+ size_t G1FullGCCompactTask::G1CompactRegionClosureDcevm::apply(oop obj) {
+   size_t size = obj->size();
+-  HeapWord* destination = (HeapWord*)obj->forwardee();
++  HeapWord* destination = cast_from_oop<HeapWord*>(obj->forwardee());
+   if (destination == NULL) {
+     // Object not moving
+     return size;
+   }
+ 
+   // copy object and reinit its mark
+-  HeapWord* obj_addr = (HeapWord*) obj;
++  HeapWord* obj_addr = cast_from_oop<HeapWord*>(obj);
+ 
+   if (!_rescue_oops_it->at_end() && **_rescue_oops_it == obj_addr) {
+     ++(*_rescue_oops_it);
+diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
+index 1e49571c999..755935a2c91 100644
+--- a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
++++ b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
+@@ -174,7 +174,7 @@ void G1FullGCCompactionPoint::forward_dcevm(oop object, size_t size, bool force_
+   assert(_current_region != NULL, "Must have been initialized");
+ 
+   // Store a forwarding pointer if the object should be moved.
+-  if ((HeapWord*)object != _compaction_top || force_forward) {
++  if (cast_from_oop<HeapWord*>(object) != _compaction_top || force_forward) {
+     object->forward_to(oop(_compaction_top));
+   } else {
+     if (object->forwardee() != NULL) {
+@@ -188,11 +188,11 @@ void G1FullGCCompactionPoint::forward_dcevm(oop object, size_t size, bool force_
+     } else {
+       // Make sure object has the correct mark-word set or that it will be
+       // fixed when restoring the preserved marks.
+-      assert(object->mark_raw() == markOopDesc::prototype_for_object(object) || // Correct mark
+-             object->mark_raw()->must_be_preserved(object) || // Will be restored by PreservedMarksSet
++      assert(object->mark_raw() == markWord::prototype_for_klass(object->klass()) || // Correct mark
++             object->mark_must_be_preserved() || // Will be restored by PreservedMarksSet
+              (UseBiasedLocking && object->has_bias_pattern_raw()), // Will be restored by BiasedLocking
+              "should have correct prototype obj: " PTR_FORMAT " mark: " PTR_FORMAT " prototype: " PTR_FORMAT,
+-             p2i(object), p2i(object->mark_raw()), p2i(markOopDesc::prototype_for_object(object)));
++             p2i(object), object->mark_raw().value(), markWord::prototype_for_klass(object->klass()).value());
+     }
+     assert(object->forwardee() == NULL, "should be forwarded to NULL");
+   }
+diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
+index a45681b60cf..2f06b9617e4 100644
+--- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
++++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
+@@ -269,7 +269,7 @@ size_t G1FullGCPrepareTask::G1PrepareCompactLiveClosureDcevm::apply(oop object)
+   HeapWord* compact_top = _cp->forward_compact_top(forward_size);
+ 
+   if (compact_top == NULL || must_rescue(object, oop(compact_top))) {
+-    _cp->rescued_oops()->append((HeapWord*)object);
++    _cp->rescued_oops()->append(cast_from_oop<HeapWord*>(object));
+   } else {
+     _cp->forward_dcevm(object, forward_size, (size != forward_size));
+   }
+@@ -295,7 +295,7 @@ bool G1FullGCPrepareTask::G1PrepareCompactLiveClosureDcevm::must_rescue(oop old_
+   int new_size = old_obj->size_given_klass(oop(old_obj)->klass()->new_version());
+   int original_size = old_obj->size();
+ 
+-  bool overlap = ((HeapWord*)old_obj + original_size < (HeapWord*)new_obj + new_size);
++  bool overlap = (cast_from_oop<HeapWord*>(old_obj) + original_size < cast_from_oop<HeapWord*>(new_obj) + new_size);
+ 
+   return overlap;
+ }
+diff --git a/src/hotspot/share/gc/shared/dcevmSharedGC.cpp b/src/hotspot/share/gc/shared/dcevmSharedGC.cpp
+index 803e645f843..3dee097f1d3 100644
+--- a/src/hotspot/share/gc/shared/dcevmSharedGC.cpp
++++ b/src/hotspot/share/gc/shared/dcevmSharedGC.cpp
+@@ -58,10 +58,10 @@ void DcevmSharedGC::copy_rescued_objects_back(GrowableArray<HeapWord*>* rescued_
+           DcevmSharedGC::update_fields(rescued_obj, new_obj);
+         } else {
+           rescued_obj->set_klass(new_klass);
+-          Copy::aligned_disjoint_words((HeapWord*)rescued_obj, (HeapWord*)new_obj, size);
++          Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(rescued_obj), cast_from_oop<HeapWord*>(new_obj), size);
+         }
+       } else {
+-        Copy::aligned_disjoint_words((HeapWord*)rescued_obj, (HeapWord*)new_obj, size);
++        Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(rescued_obj), cast_from_oop<HeapWord*>(new_obj), size);
+       }
+ 
+       new_obj->init_mark_raw();
+@@ -111,11 +111,11 @@ void DcevmSharedGC::update_fields(oop q, oop new_location) {
+ 
+   // Save object somewhere, there is an overlap in fields
+   if (new_klass_oop->is_copying_backwards()) {
+-    if (((HeapWord *)q >= (HeapWord *)new_location && (HeapWord *)q < (HeapWord *)new_location + new_size) ||
+-        ((HeapWord *)new_location >= (HeapWord *)q && (HeapWord *)new_location < (HeapWord *)q + size)) {
++    if ((cast_from_oop<HeapWord*>(q) >= cast_from_oop<HeapWord*>(new_location) && cast_from_oop<HeapWord*>(q) < cast_from_oop<HeapWord*>(new_location) + new_size) ||
++        (cast_from_oop<HeapWord*>(new_location) >= cast_from_oop<HeapWord*>(q) && cast_from_oop<HeapWord*>(new_location) < cast_from_oop<HeapWord*>(q) + size)) {
+        tmp = NEW_RESOURCE_ARRAY(HeapWord, size);
+        q = (oop) tmp;
+-       Copy::aligned_disjoint_words((HeapWord*)tmp_obj, (HeapWord*)q, size);
++       Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(tmp_obj), cast_from_oop<HeapWord*>(q), size);
+     }
+   }
+ 
+@@ -131,13 +131,13 @@ void DcevmSharedGC::update_fields(oop q, oop new_location) {
+ 
+ void DcevmSharedGC::update_fields(oop new_location, oop tmp_obj, int *cur) {
+   assert(cur != NULL, "just checking");
+-  char* to = (char*)(HeapWord*)new_location;
++  char* to = (char*)cast_from_oop<HeapWord*>(new_location);
+   while (*cur != 0) {
+     int size = *cur;
+     if (size > 0) {
+       cur++;
+       int offset = *cur;
+-      HeapWord* from = (HeapWord*)(((char *)(HeapWord*)tmp_obj) + offset);
++      HeapWord* from = (HeapWord*)(((char *)cast_from_oop<HeapWord*>(tmp_obj)) + offset);
+       if (size == HeapWordSize) {
+         *((HeapWord*)to) = *from;
+       } else if (size == HeapWordSize * 2) {
+diff --git a/src/hotspot/share/gc/shared/dcevmSharedGC.hpp b/src/hotspot/share/gc/shared/dcevmSharedGC.hpp
+index e2ef0171fb2..a4e27e00280 100644
+--- a/src/hotspot/share/gc/shared/dcevmSharedGC.hpp
++++ b/src/hotspot/share/gc/shared/dcevmSharedGC.hpp
+@@ -29,7 +29,7 @@
+ #include "gc/shared/genOopClosures.hpp"
+ #include "gc/shared/taskqueue.hpp"
+ #include "memory/iterator.hpp"
+-#include "oops/markOop.hpp"
++#include "oops/markWord.hpp"
+ #include "oops/oop.hpp"
+ #include "runtime/timer.hpp"
+ #include "utilities/growableArray.hpp"
+diff --git a/src/hotspot/share/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
+index f01d64d1434..5c1a09390f1 100644
+--- a/src/hotspot/share/gc/shared/gcConfig.cpp
++++ b/src/hotspot/share/gc/shared/gcConfig.cpp
+@@ -100,7 +100,7 @@ void GCConfig::fail_if_non_included_gc_is_selected() {
+ void GCConfig::select_gc_ergonomically() {
+   if (AllowEnhancedClassRedefinition && !UseG1GC) {
+     // Enhanced class redefinition only supports serial GC at the moment
+-    FLAG_SET_ERGO(bool, UseSerialGC, true);
++    FLAG_SET_ERGO(UseSerialGC, true);
+   } else if (os::is_server_class_machine()) {
+ #if INCLUDE_G1GC
+     FLAG_SET_ERGO_IF_DEFAULT(UseG1GC, true);
+diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
+index 9772c32c42e..e8e3d7884c2 100644
+--- a/src/hotspot/share/gc/shared/space.cpp
++++ b/src/hotspot/share/gc/shared/space.cpp
+@@ -440,7 +440,7 @@ int CompactibleSpace::space_index(oop obj) {
+     index++;
+   }
+ 
+-  tty->print_cr("could not compute space_index for %08xh", (HeapWord*)obj);
++  tty->print_cr("could not compute space_index for %08xh", cast_from_oop<HeapWord*>(obj));
+   index = 0;
+ 
+   Generation* gen = heap->old_gen();
+@@ -485,7 +485,7 @@ bool CompactibleSpace::must_rescue(oop old_obj, oop new_obj) {
+   bool new_in_tenured = tenured_gen->is_in_reserved(new_obj);
+   if (old_in_tenured == new_in_tenured) {
+     // Rescue if object may overlap with a higher memory address.
+-    bool overlap = ((HeapWord*)old_obj + original_size < (HeapWord*)new_obj + new_size);
++    bool overlap = (cast_from_oop<HeapWord*>(old_obj) + original_size < cast_from_oop<HeapWord*>(new_obj) + new_size);
+     if (old_in_tenured) {
+       // Old and new address are in same space, so just compare the address.
+       // Must rescue if object moves towards the top of the space.
+diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
+index b2f24ddbeda..9daeeb70b34 100644
+--- a/src/hotspot/share/interpreter/linkResolver.cpp
++++ b/src/hotspot/share/interpreter/linkResolver.cpp
+@@ -1031,7 +1031,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
+         assert(m != NULL, "information about the current method must be available for 'put' bytecodes");
+         bool is_initialized_static_final_update = (byte == Bytecodes::_putstatic &&
+                                                    fd.is_static() &&
+-                                                   !(m()->is_static_initializer() || m()->name() == vmSymbols::ha_class_initializer_name()));
++                                                   !(m->is_static_initializer() || m->name() == vmSymbols::ha_class_initializer_name()));
+         bool is_initialized_instance_final_update = ((byte == Bytecodes::_putfield || byte == Bytecodes::_nofast_putfield) &&
+                                                      !fd.is_static() &&
+                                                      !m->is_object_initializer());
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index f8e60941046..5e40d78a87e 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -1316,7 +1316,7 @@ void InstanceKlass::init_implementor() {
+ // (DCEVM) - init_implementor() for dcevm
+ void InstanceKlass::init_implementor_from_redefine() {
+   assert(is_interface(), "not interface");
+-  Klass** addr = adr_implementor();
++  Klass* volatile* addr = adr_implementor();
+   assert(addr != NULL, "null addr");
+   if (addr != NULL) {
+     *addr = NULL;
+@@ -1659,6 +1659,21 @@ void InstanceKlass::methods_do(void f(Method* method)) {
+   }
+ }
+ 
++void InstanceKlass::methods_do(void f(Method* method, TRAPS), TRAPS) {
++  // Methods aren't stable until they are loaded.  This can be read outside
++  // a lock through the ClassLoaderData for profiling
++  if (!is_loaded()) {
++    return;
++  }
++
++  int len = methods()->length();
++  for (int index = 0; index < len; index++) {
++    Method* m = methods()->at(index);
++    assert(m->is_method(), "must be method");
++    f(m, CHECK);
++  }
++}
++
+ //  (DCEVM) Update information contains mapping of fields from old class to the new class.
+ //  Info is stored on HEAP, you need to call clear_update_information to free the space.
+ void InstanceKlass::store_update_information(GrowableArray<int> &values) {
+diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
+index 6ead9426728..b56d42cb177 100644
+--- a/src/hotspot/share/oops/instanceKlass.hpp
++++ b/src/hotspot/share/oops/instanceKlass.hpp
+@@ -1069,6 +1069,7 @@ public:
+   void clear_update_information();
+ 
+   void methods_do(void f(Method* method));
++  void methods_do(void f(Method* method, TRAPS), TRAPS);
+   void array_klasses_do(void f(Klass* k));
+   void array_klasses_do(void f(Klass* k, TRAPS), TRAPS);
+ 
+diff --git a/src/hotspot/share/oops/klass.cpp b/src/hotspot/share/oops/klass.cpp
+index 352d8f84631..88f5ec9ba4a 100644
+--- a/src/hotspot/share/oops/klass.cpp
++++ b/src/hotspot/share/oops/klass.cpp
+@@ -200,13 +200,13 @@ void* Klass::operator new(size_t size, ClassLoaderData* loader_data, size_t word
+ Klass::Klass(KlassID id) : _id(id),
+                            _java_mirror(NULL),
+                            _prototype_header(markWord::prototype()),
+-                           _shared_class_path_index(-1),
+-                           _new_version(NULL),
+                            _old_version(NULL),
++                           _new_version(NULL),
++                           _redefinition_flags(Klass::NoRedefinition),
+                            _is_redefining(false),
++                           _update_information(NULL),
+                            _is_copying_backwards(false),
+-                           _redefinition_flags(Klass::NoRedefinition),
+-                           _update_information(NULL) {
++                           _shared_class_path_index(-1) {
+   CDS_ONLY(_shared_class_flags = 0;)
+   CDS_JAVA_HEAP_ONLY(_archived_mirror = 0;)
+   _primary_supers[0] = this;
+diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
+index 333b65ccfc1..13bcac352fb 100644
+--- a/src/hotspot/share/prims/jvm.cpp
++++ b/src/hotspot/share/prims/jvm.cpp
+@@ -1054,6 +1054,7 @@ static jclass jvm_lookup_define_class(JNIEnv *env, jclass lookup, const char *na
+                                                       class_loader,
+                                                       protection_domain,
+                                                       &st,
++                                                      NULL,
+                                                       CHECK_NULL);
+ 
+     if (log_is_enabled(Debug, class, resolve) && defined_k != NULL) {
+@@ -1074,6 +1075,7 @@ static jclass jvm_lookup_define_class(JNIEnv *env, jclass lookup, const char *na
+                                                class_loader,
+                                                &st,
+                                                cl_info,
++                                               NULL,
+                                                CHECK_NULL);
+     if (defined_k == NULL) {
+       THROW_MSG_0(vmSymbols::java_lang_Error(), "Failure to define a hidden class");
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 1da6661dd3e..619e3988e3a 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -24,11 +24,14 @@
+ 
+ #include "precompiled.hpp"
+ #include "aot/aotLoader.hpp"
++#include "classfile/classFileParser.hpp"
+ #include "classfile/classFileStream.hpp"
+ #include "classfile/metadataOnStackMark.hpp"
+ #include "classfile/systemDictionary.hpp"
+ #include "classfile/verifier.hpp"
+ #include "classfile/dictionary.hpp"
++#include "classfile/classLoaderDataGraph.hpp"
++#include "interpreter/linkResolver.hpp"
+ #include "interpreter/oopMapCache.hpp"
+ #include "interpreter/rewriter.hpp"
+ #include "logging/logStream.hpp"
+@@ -37,17 +40,22 @@
+ #include "memory/resourceArea.hpp"
+ #include "memory/iterator.inline.hpp"
+ #include "oops/fieldStreams.hpp"
++#include "oops/fieldStreams.inline.hpp"
+ #include "oops/klassVtable.hpp"
+ #include "oops/oop.inline.hpp"
+ #include "oops/constantPool.inline.hpp"
++#include "oops/metadata.hpp"
++#include "oops/methodData.hpp"
+ #include "prims/jvmtiImpl.hpp"
+ #include "prims/jvmtiClassFileReconstituter.hpp"
+ #include "prims/jvmtiEnhancedRedefineClasses.hpp"
+ #include "prims/methodComparator.hpp"
+ #include "prims/resolvedMethodTable.hpp"
++#include "prims/methodHandles.hpp"
+ #include "runtime/deoptimization.hpp"
+ #include "runtime/jniHandles.inline.hpp"
+ #include "runtime/relocator.hpp"
++#include "runtime/fieldDescriptor.hpp"
+ #include "runtime/fieldDescriptor.inline.hpp"
+ #include "utilities/bitMap.inline.hpp"
+ #include "prims/jvmtiThreadState.inline.hpp"
+@@ -55,6 +63,8 @@
+ #include "oops/constantPool.inline.hpp"
+ #include "gc/g1/g1CollectedHeap.hpp"
+ #include "gc/shared/dcevmSharedGC.hpp"
++#include "gc/shared/scavengableNMethods.hpp"
++#include "ci/ciObjectFactory.hpp"
+ 
+ Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
+ Array<Method*>* VM_EnhancedRedefineClasses::_new_methods = NULL;
+@@ -66,6 +76,7 @@ int         VM_EnhancedRedefineClasses::_matching_methods_length = 0;
+ int         VM_EnhancedRedefineClasses::_deleted_methods_length  = 0;
+ int         VM_EnhancedRedefineClasses::_added_methods_length    = 0;
+ Klass*      VM_EnhancedRedefineClasses::_the_class_oop = NULL;
++u8        VM_EnhancedRedefineClasses::_id_counter = 0;
+ 
+ //
+ // Create new instance of enhanced class redefiner.
+@@ -88,6 +99,7 @@ VM_EnhancedRedefineClasses::VM_EnhancedRedefineClasses(jint class_count, const j
+   _class_load_kind = class_load_kind;
+   _res = JVMTI_ERROR_NONE;
+   _any_class_has_resolved_methods = false;
++  _id = next_id();
+ }
+ 
+ static inline InstanceKlass* get_ik(jclass def) {
+@@ -211,9 +223,7 @@ class FieldCopier : public FieldClosure {
+ 
+ // TODO: review...
+ void VM_EnhancedRedefineClasses::mark_as_scavengable(nmethod* nm) {
+-  if (!nm->on_scavenge_root_list()) {
+-    CodeCache::add_scavenge_root_nmethod(nm);
+-  }
++  ScavengableNMethods::register_nmethod(nm);
+ }
+ 
+ void VM_EnhancedRedefineClasses::unregister_nmethod_g1(nmethod* nm) {
+@@ -414,7 +424,7 @@ public:
+       _tmp_obj_size = size;
+       _tmp_obj = (oop)resource_allocate_bytes(size * HeapWordSize);
+     }
+-    Copy::aligned_disjoint_words((HeapWord*)o, (HeapWord*)_tmp_obj, size);
++    Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(o), cast_from_oop<HeapWord*>(_tmp_obj), size);
+   }
+ 
+   virtual void do_object(oop obj) {
+@@ -505,9 +515,6 @@ void VM_EnhancedRedefineClasses::doit() {
+     ClearCpoolCacheAndUnpatch clear_cpool_cache(thread);
+     ClassLoaderDataGraph::classes_do(&clear_cpool_cache);
+ 
+-
+-    // SystemDictionary::methods_do(fix_invoke_method);
+-
+   // JSR-292 support
+   if (_any_class_has_resolved_methods) {
+     bool trace_name_printed = false;
+@@ -564,8 +571,8 @@ void VM_EnhancedRedefineClasses::doit() {
+     InstanceKlass* old = InstanceKlass::cast(cur->old_version());
+ 
+     // Swap marks to have same hashcodes
+-    markOop cur_mark = cur->prototype_header();
+-    markOop old_mark = old->prototype_header();
++    markWord cur_mark = cur->prototype_header();
++    markWord old_mark = old->prototype_header();
+     cur->set_prototype_header(old_mark);
+     old->set_prototype_header(cur_mark);
+ 
+@@ -579,14 +586,14 @@ void VM_EnhancedRedefineClasses::doit() {
+       // Revert pool holder for old version of klass (it was updated by one of ours closure!)
+     old->constants()->set_pool_holder(old);
+ 
+-    Klass* array_klasses = old->array_klasses();
++    ObjArrayKlass* array_klasses = old->array_klasses();
+     if (array_klasses != NULL) {
+       assert(cur->array_klasses() == NULL, "just checking");
+ 
+       // Transfer the array classes, otherwise we might get cast exceptions when casting array types.
+       // Also, set array klasses element klass.
+       cur->set_array_klasses(array_klasses);
+-      ObjArrayKlass::cast(array_klasses)->set_element_klass(cur);
++      array_klasses->set_element_klass(cur);
+       java_lang_Class::release_set_array_klass(cur->java_mirror(), array_klasses);
+       java_lang_Class::set_component_mirror(array_klasses->java_mirror(), cur->java_mirror());
+     }
+@@ -641,11 +648,15 @@ void VM_EnhancedRedefineClasses::doit() {
+   //ClassLoaderDataGraph::classes_do(&clean_weak_method_links);
+ 
+   // Disable any dependent concurrent compilations
+-  SystemDictionary::notice_modification();
++  // SystemDictionary::notice_modification();
++
++  JvmtiExport::increment_redefinition_count();
+ 
+   // Set flag indicating that some invariants are no longer true.
+   // See jvmtiExport.hpp for detailed explanation.
+-  JvmtiExport::set_has_redefined_a_class();
++
++  // dcevm15: handled by _redefinition_count
++  // JvmtiExport::set_has_redefined_a_class();
+ 
+ #ifdef PRODUCT
+   if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
+@@ -718,7 +729,7 @@ bool VM_EnhancedRedefineClasses::is_modifiable_class(oop klass_mirror) {
+   }
+ 
+   // Cannot redefine or retransform an anonymous class.
+-  if (InstanceKlass::cast(k)->is_anonymous()) {
++  if (InstanceKlass::cast(k)->is_unsafe_anonymous()) {
+     return false;
+   }
+   return true;
+@@ -804,22 +815,30 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+ 
+     InstanceKlass* k;
+ 
+-    if (InstanceKlass::cast(the_class)->is_anonymous()) {
+-      const InstanceKlass* host_class = the_class->host_klass();
++    if (InstanceKlass::cast(the_class)->is_unsafe_anonymous()) {
++      const InstanceKlass* host_class = the_class->unsafe_anonymous_host();
+ 
+       // Make sure it's the real host class, not another anonymous class.
+-      while (host_class != NULL && host_class->is_anonymous()) {
+-        host_class = host_class->host_klass();
++      while (host_class != NULL && host_class->is_unsafe_anonymous()) {
++        host_class = host_class->unsafe_anonymous_host();
+       }
+ 
++      ClassLoadInfo cl_info(protection_domain,
++                            host_class,
++                            NULL,     // dynamic_nest_host
++                            NULL,     // cp_patches
++                            Handle(), // classData
++                            false,    // is_hidden
++                            false,    // is_strong_hidden
++                            true);    // FIXME: check if correct. can_access_vm_annotations
++
+       k = SystemDictionary::parse_stream(the_class_sym,
+                                          the_class_loader,
+-                                         protection_domain,
+                                          &st,
+-                                         host_class,
++                                         cl_info,
+                                          the_class,
+-                                         NULL,
+                                          THREAD);
++
+       k->class_loader_data()->exchange_holders(the_class->class_loader_data());
+       the_class->class_loader_data()->inc_keep_alive();
+     } else {
+@@ -966,7 +985,7 @@ int VM_EnhancedRedefineClasses::calculate_redefinition_flags(InstanceKlass* new_
+   // Check interfaces
+ 
+   // Interfaces removed?
+-  Array<Klass*>* old_interfaces = the_class->transitive_interfaces();
++  Array<InstanceKlass*>* old_interfaces = the_class->transitive_interfaces();
+   for (i = 0; i < old_interfaces->length(); i++) {
+     InstanceKlass* old_interface = InstanceKlass::cast(old_interfaces->at(i));
+     if (!new_class->implements_interface_any_version(old_interface)) {
+@@ -976,7 +995,7 @@ int VM_EnhancedRedefineClasses::calculate_redefinition_flags(InstanceKlass* new_
+   }
+ 
+   // Interfaces added?
+-  Array<Klass*>* new_interfaces = new_class->transitive_interfaces();
++  Array<InstanceKlass*>* new_interfaces = new_class->transitive_interfaces();
+   for (i = 0; i<new_interfaces->length(); i++) {
+     if (!the_class->implements_interface_any_version(new_interfaces->at(i))) {
+       result = result | Klass::ModifyClass;
+@@ -1389,8 +1408,8 @@ void VM_EnhancedRedefineClasses::rollback() {
+ // Rewrite faster byte-codes back to their slower equivalent. Undoes rewriting happening in templateTable_xxx.cpp
+ // The reason is that once we zero cpool caches, we need to re-resolve all entries again. Faster bytecodes do not
+ // do that, they assume that cache entry is resolved already.
+-void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
+-  RawBytecodeStream bcs(method);
++void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method, TRAPS) {
++  RawBytecodeStream bcs(methodHandle(THREAD, method));
+   Bytecodes::Code code;
+   Bytecodes::Code java_code;
+   while (!bcs.is_last_bytecode()) {
+@@ -1454,11 +1473,11 @@ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+   HandleMark hm(_thread);
+   InstanceKlass *ik = InstanceKlass::cast(k);
+ 
+-  constantPoolHandle other_cp = constantPoolHandle(ik->constants());
++  constantPoolHandle other_cp = constantPoolHandle(_thread, ik->constants());
+ 
+   // Update host klass of anonymous classes (for example, produced by lambdas) to newest version.
+-  if (ik->is_anonymous() && ik->host_klass()->new_version() != NULL) {
+-    ik->set_host_klass(InstanceKlass::cast(ik->host_klass()->newest_version()));
++  if (ik->is_unsafe_anonymous() && ik->unsafe_anonymous_host()->new_version() != NULL) {
++    ik->set_unsafe_anonymous_host(InstanceKlass::cast(ik->unsafe_anonymous_host()->newest_version()));
+   }
+ 
+   // Update implementor if there is only one, in this case implementor() can reference old class
+@@ -1492,7 +1511,18 @@ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+ 
+   // If bytecode rewriting is enabled, we also need to unpatch bytecode to force resolution of zeroed entries
+   if (RewriteBytecodes) {
+-    ik->methods_do(unpatch_bytecode);
++    ik->methods_do(unpatch_bytecode, _thread);
++  }
++}
++
++u8 VM_EnhancedRedefineClasses::next_id() {
++  while (true) {
++    u8 id = _id_counter;
++    u8 next_id = id + 1;
++    u8 result = Atomic::cmpxchg(&_id_counter, id, next_id);
++    if (result == id) {
++      return next_id;
++    }
+   }
+ }
+ 
+@@ -1512,31 +1542,8 @@ void VM_EnhancedRedefineClasses::MethodDataCleaner::do_klass(Klass* k) {
+   }
+ }
+ 
+-void VM_EnhancedRedefineClasses::fix_invoke_method(Method* method) {
+-
+-  constantPoolHandle other_cp = constantPoolHandle(method->constants());
+-
+-  for (int i = 0; i < other_cp->length(); i++) {
+-    if (other_cp->tag_at(i).is_klass()) {
+-      Klass* klass = other_cp->resolved_klass_at(i);
+-      if (klass->new_version() != NULL) {
+-        // Constant pool entry points to redefined class -- update to the new version
+-        other_cp->klass_at_put(i, klass->newest_version());
+-      }
+-      assert(other_cp->resolved_klass_at(i)->new_version() == NULL, "Must be new klass!");
+-    }
+-  }
+-
+-  ConstantPoolCache* cp_cache = other_cp->cache();
+-  if (cp_cache != NULL) {
+-    cp_cache->clear_entries();
+-  }
+-
+-}
+-
+ 
+-
+-void VM_EnhancedRedefineClasses::update_jmethod_ids() {
++void VM_EnhancedRedefineClasses::update_jmethod_ids(TRAPS) {
+   for (int j = 0; j < _matching_methods_length; ++j) {
+     Method* old_method = _matching_old_methods[j];
+     jmethodID jmid = old_method->find_jmethod_id_or_null();
+@@ -1547,10 +1554,10 @@ void VM_EnhancedRedefineClasses::update_jmethod_ids() {
+ 
+     if (jmid != NULL) {
+       // There is a jmethodID, change it to point to the new method
+-      methodHandle new_method_h(_matching_new_methods[j]);
++      methodHandle new_method_h(THREAD, _matching_new_methods[j]);
+ 
+       if (old_method->new_version() == NULL) {
+-        methodHandle old_method_h(_matching_old_methods[j]);
++        methodHandle old_method_h(THREAD, _matching_old_methods[j]);
+         jmethodID new_jmethod_id = Method::make_jmethod_id(old_method_h->method_holder()->class_loader_data(), old_method_h());
+         bool result = InstanceKlass::cast(old_method_h->method_holder())->update_jmethod_id(old_method_h(), new_jmethod_id);
+       } else {
+@@ -1887,7 +1894,7 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+ 
+   // track number of methods that are EMCP for add_previous_version() call below
+   check_methods_and_mark_as_obsolete();
+-  update_jmethod_ids();
++  update_jmethod_ids(THREAD);
+ 
+   _any_class_has_resolved_methods = the_class->has_resolved_methods() || _any_class_has_resolved_methods;
+ 
+@@ -2119,12 +2126,12 @@ jvmtiError VM_EnhancedRedefineClasses::do_topological_class_sorting(TRAPS) {
+ 
+     Handle protection_domain(THREAD, klass->protection_domain());
+ 
++    ClassLoadInfo cl_info(protection_domain);
++
+     ClassFileParser parser(&st,
+                            klass->name(),
+                            klass->class_loader_data(),
+-                           protection_domain,
+-                           NULL, // host_klass
+-                           NULL, // cp_patches
++                           &cl_info,
+                            ClassFileParser::INTERNAL, // publicity level
+                            true,
+                            THREAD);
+@@ -2134,7 +2141,7 @@ jvmtiError VM_EnhancedRedefineClasses::do_topological_class_sorting(TRAPS) {
+       links.append(KlassPair(super_klass, klass));
+     }
+ 
+-    Array<Klass*>* local_interfaces = parser.local_interfaces();
++    Array<InstanceKlass*>* local_interfaces = parser.local_interfaces();
+     for (int j = 0; j < local_interfaces->length(); j++) {
+       Klass* iface = local_interfaces->at(j);
+       if (iface != NULL && _affected_klasses->contains(iface)) {
+@@ -2157,7 +2164,7 @@ jvmtiError VM_EnhancedRedefineClasses::do_topological_class_sorting(TRAPS) {
+         links.append(KlassPair(super_klass, klass));
+       }
+ 
+-      Array<Klass*>* local_interfaces = klass->local_interfaces();
++      Array<InstanceKlass*>* local_interfaces = klass->local_interfaces();
+       for (int j = 0; j < local_interfaces->length(); j++) {
+         Klass* interfaceKlass = local_interfaces->at(j);
+         if (_affected_klasses->contains(interfaceKlass)) {
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 4c0412d343d..0066088b3b0 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -32,7 +32,7 @@
+ #include "memory/resourceArea.hpp"
+ #include "oops/objArrayKlass.hpp"
+ #include "oops/objArrayOop.hpp"
+-#include "gc/shared/vmGCOperations.hpp"
++#include "gc/shared/gcVMOperations.hpp"
+ #include "../../../java.base/unix/native/include/jni_md.h"
+ 
+ //
+@@ -59,6 +59,7 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   static int             _deleted_methods_length;
+   static int             _added_methods_length;
+   static Klass*          _the_class_oop;
++  static u8              _id_counter;
+ 
+   // The instance fields are used to pass information from
+   // doit_prologue() to doit() and doit_epilogue().
+@@ -91,6 +92,9 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   elapsedTimer  _timer_heap_iterate;
+   elapsedTimer  _timer_heap_full_gc;
+ 
++  // Redefinition id used by JFR
++  u8 _id;
++
+   // These routines are roughly in call order unless otherwise noted.
+ 
+   // Load and link new classes (either redefined or affected by redefinition - subclass, ...)
+@@ -118,15 +122,14 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   static void mark_as_scavengable(nmethod* nm);
+   static void unregister_nmethod_g1(nmethod* nm);
+   static void register_nmethod_g1(nmethod* nm);
+-  static void unpatch_bytecode(Method* method);
+-  static void fix_invoke_method(Method* method);
++  static void unpatch_bytecode(Method* method, TRAPS);
+ 
+   // Figure out which new methods match old methods in name and signature,
+   // which methods have been added, and which are no longer present
+   void compute_added_deleted_matching_methods();
+ 
+   // Change jmethodIDs to point to the new methods
+-  void update_jmethod_ids();
++  void update_jmethod_ids(TRAPS);
+ 
+   // marking methods as old and/or obsolete
+   void check_methods_and_mark_as_obsolete();
+@@ -141,6 +144,8 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+ 
+   void flush_dependent_code(InstanceKlass* k_h, TRAPS);
+ 
++  u8 next_id();
++
+   static void check_class(InstanceKlass* k_oop, TRAPS);
+ 
+   static void dump_methods();
+@@ -181,6 +186,7 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+ 
+   bool allow_nested_vm_operations() const        { return true; }
+   jvmtiError check_error()                       { return _res; }
++  u8 id()                                        { return _id; }
+ 
+   // Modifiable test must be shared between IsModifiableClass query
+   // and redefine implementation
+diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
+index b6838ac034d..fba0f48abd7 100644
+--- a/src/hotspot/share/prims/jvmtiEnv.cpp
++++ b/src/hotspot/share/prims/jvmtiEnv.cpp
+@@ -456,20 +456,23 @@ JvmtiEnv::RetransformClasses(jint class_count, const jclass* classes) {
+ 
+   EventRetransformClasses event;
+   jvmtiError error;
++  u8 op_id;
+ 
+   if (AllowEnhancedClassRedefinition) {
+     MutexLocker sd_mutex(EnhancedRedefineClasses_lock);
+     VM_EnhancedRedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_retransform);
+     VMThread::execute(&op);
++    op_id = op.id();
+     error = (op.check_error());
+   } else {
+     VM_RedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_retransform);
+     VMThread::execute(&op);
++    op_id = op.id();
+     error = op.check_error();
+   }
+   if (error == JVMTI_ERROR_NONE) {
+     event.set_classCount(class_count);
+-    event.set_redefinitionId(op.id());
++    event.set_redefinitionId(op_id);
+     event.commit();
+   }
+   return error;
+@@ -484,19 +487,23 @@ JvmtiEnv::RedefineClasses(jint class_count, const jvmtiClassDefinition* class_de
+   EventRedefineClasses event;
+   jvmtiError error;
+ 
++  u8 op_id;
++
+   if (AllowEnhancedClassRedefinition) {
+     MutexLocker sd_mutex(EnhancedRedefineClasses_lock);
+     VM_EnhancedRedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_redefine);
+     VMThread::execute(&op);
++    op_id = op.id();
+     error = (op.check_error());
+   } else {
+     VM_RedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_redefine);
+     VMThread::execute(&op);
++    op_id = op.id();
+     error = op.check_error();
+   }
+   if (error == JVMTI_ERROR_NONE) {
+     event.set_classCount(class_count);
+-    event.set_redefinitionId(op.id());
++    event.set_redefinitionId(op_id);
+     event.commit();
+   }
+   return error;
+diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
+index a7840848e10..346eac7c431 100644
+--- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
+@@ -1271,6 +1271,7 @@ jvmtiError VM_RedefineClasses::load_new_class_versions(TRAPS) {
+                                                       the_class_loader,
+                                                       &st,
+                                                       cl_info,
++                                                      NULL,
+                                                       THREAD);
+     // Clear class_being_redefined just to be sure.
+     state->clear_class_being_redefined();
+diff --git a/src/hotspot/share/prims/methodHandles.hpp b/src/hotspot/share/prims/methodHandles.hpp
+index 54f36202a5f..917d31efd77 100644
+--- a/src/hotspot/share/prims/methodHandles.hpp
++++ b/src/hotspot/share/prims/methodHandles.hpp
+@@ -180,6 +180,9 @@ public:
+     assert(ref_kind_is_valid(ref_kind), "");
+     return (ref_kind & 1) != 0;
+   }
++  static bool ref_kind_is_static(int ref_kind) {
++    return !ref_kind_has_receiver(ref_kind) && (ref_kind != JVM_REF_newInvokeSpecial);
++  }
+ 
+   static int ref_kind_to_flags(int ref_kind);
+ 
+diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
+index d05a2893498..3a92b8869dc 100644
+--- a/src/hotspot/share/runtime/arguments.cpp
++++ b/src/hotspot/share/runtime/arguments.cpp
+@@ -2128,13 +2128,15 @@ bool Arguments::check_gc_consistency() {
+   // of collectors.
+   uint i = 0;
+   if (UseSerialGC)                       i++;
+-  if (UseConcMarkSweepGC)                i++;
+-  if (UseParallelGC || UseParallelOldGC) i++;
++  if (UseParallelGC)                     i++;
+   if (UseG1GC)                           i++;
++  if (UseEpsilonGC)                      i++;
++  if (UseZGC)                            i++;
++  if (UseShenandoahGC)                   i++;
+   if (AllowEnhancedClassRedefinition) {
+     // Must use serial GC. This limitation applies because the instance size changing GC modifications
+     // are only built into the mark and compact algorithm.
+-    if ((!UseSerialGC && !UseG1GC) && i >= 1) {
++    if (!UseSerialGC && !UseG1GC && i >= 1) {
+       jio_fprintf(defaultStream::error_stream(),
+                   "Must use the Serial or G1 GC with enhanced class redefinition.\n");
+       return false;
+@@ -4494,18 +4496,18 @@ void Arguments::setup_hotswap_agent() {
+ 
+   // TODO: open it only for org.hotswap.agent module
+   // Use to access java.lang.reflect.Proxy/proxyCache
+-  create_numbered_property("jdk.module.addopens", "java.base/java.lang=ALL-UNNAMED", addopens_count++);
++  create_numbered_module_property("jdk.module.addopens", "java.base/java.lang=ALL-UNNAMED", addopens_count++);
+   // Class of  field java.lang.reflect.Proxy/proxyCache
+-  create_numbered_property("jdk.module.addopens", "java.base/jdk.internal.loader=ALL-UNNAMED", addopens_count++);
++  create_numbered_module_property("jdk.module.addopens", "java.base/jdk.internal.loader=ALL-UNNAMED", addopens_count++);
+   // Use to access java.io.Reader, java.io.InputStream, java.io.FileInputStream
+-  create_numbered_property("jdk.module.addopens", "java.base/java.io=ALL-UNNAMED", addopens_count++);
++  create_numbered_module_property("jdk.module.addopens", "java.base/java.io=ALL-UNNAMED", addopens_count++);
+   // java.beans.Introspector access
+-  create_numbered_property("jdk.module.addopens", "java.desktop/java.beans=ALL-UNNAMED", addopens_count++);
++  create_numbered_module_property("jdk.module.addopens", "java.desktop/java.beans=ALL-UNNAMED", addopens_count++);
+   // java.beans.Introspector access
+-  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans=ALL-UNNAMED", addopens_count++);
++  create_numbered_module_property("jdk.module.addopens", "java.desktop/com.sun.beans=ALL-UNNAMED", addopens_count++);
+   // com.sun.beans.introspect.ClassInfo access
+-  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans.introspect=ALL-UNNAMED", addopens_count++);
++  create_numbered_module_property("jdk.module.addopens", "java.desktop/com.sun.beans.introspect=ALL-UNNAMED", addopens_count++);
+   // com.sun.beans.introspect.util.Cache access
+-  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans.util=ALL-UNNAMED", addopens_count++);
++  create_numbered_module_property("jdk.module.addopens", "java.desktop/com.sun.beans.util=ALL-UNNAMED", addopens_count++);
+ 
+ }
+diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
+index 6f982072909..14a3ed730fe 100644
+--- a/src/hotspot/share/runtime/mutexLocker.cpp
++++ b/src/hotspot/share/runtime/mutexLocker.cpp
+@@ -287,7 +287,7 @@ void mutex_init() {
+   def(InitCompleted_lock           , PaddedMonitor, leaf,        true,  _safepoint_check_never);
+   def(VtableStubs_lock             , PaddedMutex  , nonleaf,     true,  _safepoint_check_never);
+   def(Notify_lock                  , PaddedMonitor, nonleaf,     true,  _safepoint_check_always);
+-  def(EnhancedRedefineClasses_lock , PaddedMutex  , nonleaf+7,   false, Monitor::_safepoint_check_always);     // for ensuring that class redefinition is not done in parallel
++  def(EnhancedRedefineClasses_lock , PaddedMutex  , nonleaf+7,   false, _safepoint_check_always);     // for ensuring that class redefinition is not done in parallel
+   def(JNICritical_lock             , PaddedMonitor, nonleaf,     true,  _safepoint_check_always); // used for JNI critical regions
+   def(AdapterHandlerLibrary_lock   , PaddedMutex  , nonleaf,     true,  _safepoint_check_always);
+ 
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0020-dcevm15-G1-fixes.patch

@@ -0,0 +1,25 @@
+From 336cab4f72c6e642e3077ea8d1a4860de33f5a4d Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Tue, 17 Nov 2020 17:40:24 +0100
+Subject: [PATCH 20/34] dcevm15 - G1 fixes
+
+---
+ src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
+index 2f06b9617e4..476728a5d26 100644
+--- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
++++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
+@@ -240,7 +240,7 @@ void G1FullGCPrepareTask::prepare_serial_compaction_dcevm() {
+ 
+     // collect remaining, not forwarded rescued oops using serial compact point
+     while (cp->last_rescued_oop() < cp->rescued_oops()->length()) {
+-      HeapRegion* hr = G1CollectedHeap::heap()->new_region(HeapRegion::GrainBytes / HeapWordSize, false, true);
++      HeapRegion* hr = G1CollectedHeap::heap()->new_region(HeapRegion::GrainBytes / HeapWordSize, HeapRegionType::Eden, true, G1NUMA::AnyNodeIndex);
+       if (hr == NULL) {
+         vm_exit_out_of_memory(0, OOM_MMAP_ERROR, "G1 - not enough of free regions after redefinition.");
+       }
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0021-dcevm15-Fix-flush-dependent-code.patch

@@ -0,0 +1,133 @@
+From cea4e2cca3c37233c728be7235f8f9d8be136cb5 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Tue, 17 Nov 2020 18:52:57 +0100
+Subject: [PATCH 21/34] dcevm15 - Fix flush dependent code
+
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 57 +++++++------------
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |  4 +-
+ 2 files changed, 25 insertions(+), 36 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 619e3988e3a..efaf11e1666 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -508,7 +508,7 @@ void VM_EnhancedRedefineClasses::doit() {
+ 
+   // Deoptimize all compiled code that depends on this class (do only once, because it clears whole cache)
+   // if (_max_redefinition_flags > Klass::ModifyClass) {
+-    flush_dependent_code(NULL, thread);
++    flush_dependent_code(thread);
+   // }
+ 
+     // Adjust constantpool caches for all classes that reference methods of the evolved class.
+@@ -647,17 +647,8 @@ void VM_EnhancedRedefineClasses::doit() {
+   //MethodDataCleaner clean_weak_method_links;
+   //ClassLoaderDataGraph::classes_do(&clean_weak_method_links);
+ 
+-  // Disable any dependent concurrent compilations
+-  // SystemDictionary::notice_modification();
+-
+   JvmtiExport::increment_redefinition_count();
+ 
+-  // Set flag indicating that some invariants are no longer true.
+-  // See jvmtiExport.hpp for detailed explanation.
+-
+-  // dcevm15: handled by _redefinition_count
+-  // JvmtiExport::set_has_redefined_a_class();
+-
+ #ifdef PRODUCT
+   if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
+ #endif
+@@ -1746,6 +1737,18 @@ void VM_EnhancedRedefineClasses::transfer_old_native_function_registrations(Inst
+   transfer.transfer_registrations(_matching_old_methods, _matching_methods_length);
+ }
+ 
++// First step is to walk the code cache for each class redefined and mark
++// dependent methods.  Wait until all classes are processed to deoptimize everything.
++void VM_EnhancedRedefineClasses::mark_dependent_code(InstanceKlass* ik) {
++  assert_locked_or_safepoint(Compile_lock);
++
++  // All dependencies have been recorded from startup or this is a second or
++  // subsequent use of RedefineClasses
++  if (0 && JvmtiExport::all_dependencies_are_recorded()) {
++    CodeCache::mark_for_evol_deoptimization(ik);
++  }
++}
++
+ // DCEVM - it always deoptimizes everything! (because it is very difficult to find only correct dependencies)
+ // Deoptimize all compiled code that depends on this class.
+ //
+@@ -1762,33 +1765,21 @@ void VM_EnhancedRedefineClasses::transfer_old_native_function_registrations(Inst
+ // subsequent calls to RedefineClasses need only throw away code
+ // that depends on the class.
+ //
+-void VM_EnhancedRedefineClasses::flush_dependent_code(InstanceKlass* k_h, TRAPS) {
++void VM_EnhancedRedefineClasses::flush_dependent_code(TRAPS) {
+   assert_locked_or_safepoint(Compile_lock);
+ 
+   // All dependencies have been recorded from startup or this is a second or
+   // subsequent use of RedefineClasses
+   // FIXME: for now, deoptimize all!
+-  if (0 && k_h != NULL && JvmtiExport::all_dependencies_are_recorded()) {
+-    CodeCache::flush_evol_dependents_on(k_h);
+-    Klass* superCl = k_h->super();
+-    // Deoptimize super classes since redefined class can has a new method override
+-    while (superCl != NULL && !superCl->is_redefining()) {
+-      CodeCache::flush_evol_dependents_on(InstanceKlass::cast(superCl));
+-      superCl = superCl->super();
++  if (0 && JvmtiExport::all_dependencies_are_recorded()) {
++    int deopt = CodeCache::mark_dependents_for_evol_deoptimization();
++    log_debug(redefine, class, nmethod)("Marked %d dependent nmethods for deopt", deopt);
++    if (deopt != 0) {
++      CodeCache::flush_evol_dependents();
+     }
+   } else {
+-    CodeCache::mark_all_nmethods_for_deoptimization();
+-
+-    ResourceMark rm(THREAD);
+-    DeoptimizationMarker dm;
+-
+-    // Deoptimize all activations depending on marked nmethods
+-    Deoptimization::deoptimize_dependents();
+-
+-    // Make the dependent methods not entrant
+-    CodeCache::make_marked_nmethods_not_entrant();
+-
+-    // From now on we know that the dependency information is complete
++    CodeCache::mark_all_nmethods_for_evol_deoptimization();
++    CodeCache::flush_evol_dependents();
+     JvmtiExport::set_all_dependencies_are_recorded(true);
+   }
+ }
+@@ -1881,11 +1872,7 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+   JvmtiBreakpoints& jvmti_breakpoints = JvmtiCurrentBreakpoints::get_jvmti_breakpoints();
+   jvmti_breakpoints.clearall_in_class_at_safepoint(the_class);
+ 
+-  // DCEVM Deoptimization is always for whole java world, call only once after all classes are redefined
+-  // Deoptimize all compiled code that depends on this class
+-//  if (_max_redefinition_flags <= Klass::ModifyClass) {
+-//    flush_dependent_code(the_class, THREAD);
+-//  }
++  mark_dependent_code(the_class);
+ 
+   _old_methods = the_class->methods();
+   _new_methods = new_class->methods();
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 0066088b3b0..bd5e7d153be 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -142,7 +142,9 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   // and in all direct and indirect subclasses.
+   void increment_class_counter(InstanceKlass *ik, TRAPS);
+ 
+-  void flush_dependent_code(InstanceKlass* k_h, TRAPS);
++  void mark_dependent_code(InstanceKlass* ik);
++
++  void flush_dependent_code(TRAPS);
+ 
+   u8 next_id();
+ 
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0022-dcevm15-fix-ResolvedMethodTable.patch

@@ -0,0 +1,211 @@
+From 4f88dcec830d39452f69d1117729469fdb768a8f Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 22 Nov 2020 12:05:26 +0100
+Subject: [PATCH 22/34] dcevm15 - fix ResolvedMethodTable
+
+---
+ src/hotspot/share/classfile/javaClasses.cpp   |   5 -
+ src/hotspot/share/classfile/javaClasses.hpp   |   1 -
+ .../share/prims/resolvedMethodTable.cpp       | 139 +++++++++++-------
+ 3 files changed, 84 insertions(+), 61 deletions(-)
+
+diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
+index 9b086a241f7..9a627786d0f 100644
+--- a/src/hotspot/share/classfile/javaClasses.cpp
++++ b/src/hotspot/share/classfile/javaClasses.cpp
+@@ -3996,11 +3996,6 @@ void java_lang_invoke_ResolvedMethodName::set_vmholder(oop resolved_method, oop
+   resolved_method->obj_field_put(_vmholder_offset, holder);
+ }
+ 
+-void java_lang_invoke_ResolvedMethodName::set_vmholder_offset(oop resolved_method, Method* m) {
+-  assert(is_instance(resolved_method), "wrong type");
+-  resolved_method->obj_field_put(_vmholder_offset, m->method_holder()->java_mirror());
+-}
+-
+ oop java_lang_invoke_ResolvedMethodName::find_resolved_method(const methodHandle& m, TRAPS) {
+   const Method* method = m();
+ 
+diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
+index 9abf2e1d105..8f5993b7225 100644
+--- a/src/hotspot/share/classfile/javaClasses.hpp
++++ b/src/hotspot/share/classfile/javaClasses.hpp
+@@ -1107,7 +1107,6 @@ class java_lang_invoke_ResolvedMethodName : AllStatic {
+ 
+   static Method* vmtarget(oop resolved_method);
+   static void set_vmtarget(oop resolved_method, Method* method);
+-  static void set_vmholder_offset(oop resolved_method, Method* method);
+ 
+   static void set_vmholder(oop resolved_method, oop holder);
+ 
+diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
+index eb9fcda44f3..d0f1667b967 100644
+--- a/src/hotspot/share/prims/resolvedMethodTable.cpp
++++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
+@@ -375,6 +375,67 @@ public:
+   }
+ };
+ 
++class AdjustMethodEntriesDcevm : public StackObj {
++  bool* _trace_name_printed;
++  GrowableArray<oop>* _oops_to_add;
++public:
++  AdjustMethodEntriesDcevm(GrowableArray<oop>* oops_to_add, bool* trace_name_printed) : _trace_name_printed(trace_name_printed), _oops_to_add(oops_to_add) {};
++  bool operator()(WeakHandle<vm_resolved_method_table_data>* entry) {
++    oop mem_name = entry->peek();
++    if (mem_name == NULL) {
++      // Removed
++      return true;
++    }
++
++    Method* old_method = (Method*)java_lang_invoke_ResolvedMethodName::vmtarget(mem_name);
++
++    if (old_method->is_old()) {
++
++      InstanceKlass* newer_klass = InstanceKlass::cast(old_method->method_holder()->new_version());
++      Method* newer_method;
++
++      // Method* new_method;
++      if (old_method->is_deleted()) {
++        newer_method = Universe::throw_no_such_method_error();
++      } else {
++        newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
++
++        log_debug(redefine, class, update)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
++
++        assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
++        assert(newer_method != NULL, "method_with_idnum() should not be NULL");
++        assert(old_method != newer_method, "sanity check");
++
++        Thread* thread = Thread::current();
++        ResolvedMethodTableLookup lookup(thread, method_hash(newer_method), newer_method);
++        ResolvedMethodGet rmg(thread, newer_method);
++
++        if (_local_table->get(thread, lookup, rmg)) {
++          // old method was already adjusted if new method exists in _the_table
++            return true;
++        }
++      }
++
++      java_lang_invoke_ResolvedMethodName::set_vmtarget(mem_name, newer_method);
++      java_lang_invoke_ResolvedMethodName::set_vmholder(mem_name, newer_method->method_holder()->java_mirror());
++
++      newer_klass->set_has_resolved_methods();
++      _oops_to_add->append(mem_name);
++
++      ResourceMark rm;
++      if (!(*_trace_name_printed)) {
++        log_debug(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
++         *_trace_name_printed = true;
++      }
++      log_debug(redefine, class, update, constantpool)
++        ("ResolvedMethod method update: %s(%s)",
++         newer_method->name()->as_C_string(), newer_method->signature()->as_C_string());
++    }
++
++    return true;
++  }
++};
++
+ // It is called at safepoint only for RedefineClasses
+ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
+   assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
+@@ -382,73 +443,41 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
+   AdjustMethodEntries adjust(trace_name_printed);
+   _local_table->do_safepoint_scan(adjust);
+ }
+-#endif // INCLUDE_JVMTI
+ 
+-// (DCEVM) It is called at safepoint only for RedefineClasses
++// It is called at safepoint only for RedefineClasses
+ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed) {
+   assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
+   // For each entry in RMT, change to new method
+-  GrowableArray<oop>* oops_to_add = new GrowableArray<oop>();
+-
+-  for (int i = 0; i < _the_table->table_size(); ++i) {
+-    for (ResolvedMethodEntry* entry = _the_table->bucket(i);
+-         entry != NULL;
+-         entry = entry->next()) {
+-
+-      oop mem_name = entry->object_no_keepalive();
+-      // except ones removed
+-      if (mem_name == NULL) {
+-        continue;
+-      }
+-      Method* old_method = (Method*)java_lang_invoke_ResolvedMethodName::vmtarget(mem_name);
+-
+-      if (old_method->is_old()) {
+-
+-        InstanceKlass* newer_klass = InstanceKlass::cast(old_method->method_holder()->new_version());
+-        Method* newer_method;
+-
+-        // Method* new_method;
+-        if (old_method->is_deleted()) {
+-          newer_method = Universe::throw_no_such_method_error();
+-        } else {
+-          newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
+-
+-          log_debug(redefine, class, update)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
+-
+-          assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
+-          assert(newer_method != NULL, "method_with_idnum() should not be NULL");
+-          assert(old_method != newer_method, "sanity check");
+-
+-          if (_the_table->lookup(newer_method) != NULL) {
+-            // old method was already adjusted if new method exists in _the_table
+-              continue;
+-          }
+-        }
++  GrowableArray<oop> oops_to_add(0);
++  AdjustMethodEntriesDcevm adjust(&oops_to_add, trace_name_printed);
++  _local_table->do_safepoint_scan(adjust);
++  Thread* thread = Thread::current();
++  for (int i = 0; i < oops_to_add.length(); i++) {
++    oop mem_name = oops_to_add.at(i);
++    Method* method = (Method*)java_lang_invoke_ResolvedMethodName::vmtarget(mem_name);
+ 
+-        java_lang_invoke_ResolvedMethodName::set_vmtarget(mem_name, newer_method);
+-        java_lang_invoke_ResolvedMethodName::set_vmholder_offset(mem_name, newer_method);
++    // The hash table takes ownership of the WeakHandle, even if it's not inserted.
+ 
+-        newer_klass->set_has_resolved_methods();
+-        oops_to_add->append(mem_name);
++    ResolvedMethodTableLookup lookup(thread, method_hash(method), method);
++    ResolvedMethodGet rmg(thread, method);
+ 
+-        ResourceMark rm;
+-        if (!(*trace_name_printed)) {
+-          log_debug(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
+-           *trace_name_printed = true;
+-        }
+-        log_debug(redefine, class, update, constantpool)
+-          ("ResolvedMethod method update: %s(%s)",
+-           newer_method->name()->as_C_string(), newer_method->signature()->as_C_string());
++    while (true) {
++      if (_local_table->get(thread, lookup, rmg)) {
++        break;
++      }
++      WeakHandle<vm_resolved_method_table_data> wh = WeakHandle<vm_resolved_method_table_data>::create(Handle(thread, mem_name));
++      // The hash table takes ownership of the WeakHandle, even if it's not inserted.
++      if (_local_table->insert(thread, lookup, wh)) {
++        log_insert(method);
++        wh.resolve();
++        break;
+       }
+-    }
+-    for (int i = 0; i < oops_to_add->length(); i++) {
+-        oop mem_name = oops_to_add->at(i);
+-        Method* method = (Method*)java_lang_invoke_ResolvedMethodName::vmtarget(mem_name);
+-        _the_table->basic_add(method, Handle(Thread::current(), mem_name));
+     }
+   }
+ }
+ 
++#endif // INCLUDE_JVMTI
++
+ // Verification
+ class VerifyResolvedMethod : StackObj {
+  public:
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0023-dcevm15-fix-Universe-root_oops_do.patch

@@ -0,0 +1,88 @@
+From 5379e56465d3d3930ec7ea91b1c64db2cdf70170 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 22 Nov 2020 12:05:50 +0100
+Subject: [PATCH 23/34] dcevm15 - fix Universe::root_oops_do
+
+---
+ src/hotspot/share/memory/universe.cpp | 38 +++++++++------------------
+ 1 file changed, 12 insertions(+), 26 deletions(-)
+
+diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
+index f6e4253b5a5..8dad437bd51 100644
+--- a/src/hotspot/share/memory/universe.cpp
++++ b/src/hotspot/share/memory/universe.cpp
+@@ -39,6 +39,7 @@
+ #include "gc/shared/gcConfig.hpp"
+ #include "gc/shared/gcLogPrecious.hpp"
+ #include "gc/shared/gcTraceTime.inline.hpp"
++#include "gc/shared/weakProcessor.hpp"
+ #include "interpreter/interpreter.hpp"
+ #include "logging/log.hpp"
+ #include "logging/logStream.hpp"
+@@ -75,6 +76,7 @@
+ #include "runtime/thread.inline.hpp"
+ #include "runtime/timerTrace.hpp"
+ #include "runtime/vmOperations.hpp"
++#include "services/management.hpp"
+ #include "services/memoryService.hpp"
+ #include "utilities/align.hpp"
+ #include "utilities/copy.hpp"
+@@ -180,45 +182,29 @@ void Universe::basic_type_classes_do(KlassClosure *closure) {
+ 
+ // FIXME: (DCEVM) This method should iterate all pointers that are not within heap objects.
+ void Universe::root_oops_do(OopClosure *oopClosure) {
+-
+-  class AlwaysTrueClosure: public BoolObjectClosure {
+-  public:
+-    void do_object(oop p) { ShouldNotReachHere(); }
+-    bool do_object_b(oop p) { return true; }
+-  };
+-  AlwaysTrueClosure always_true;
+-
+   Universe::oops_do(oopClosure);
+ //  ReferenceProcessor::oops_do(oopClosure); (tw) check why no longer there
+   JNIHandles::oops_do(oopClosure);   // Global (strong) JNI handles
+   Threads::oops_do(oopClosure, NULL);
+   ObjectSynchronizer::oops_do(oopClosure);
+-  // TODO: review, flat profiler was removed in j10
+-  // FlatProfiler::oops_do(oopClosure);
+-  JvmtiExport::oops_do(oopClosure);
++  // (DCEVM) TODO: Check if this is correct?
++  Management::oops_do(oopClosure);
++  OopStorageSet::vm_global()->oops_do(oopClosure);
++  CLDToOopClosure cld_closure(oopClosure, ClassLoaderData::_claim_none);
++  ClassLoaderDataGraph::cld_do(&cld_closure);
+ 
+   // Now adjust pointers in remaining weak roots.  (All of which should
+   // have been cleared if they pointed to non-surviving objects.)
+   // Global (weak) JNI handles
+-  JNIHandles::weak_oops_do(&always_true, oopClosure);
++  WeakProcessor::oops_do(oopClosure);
+ 
+   CodeBlobToOopClosure blobClosure(oopClosure, CodeBlobToOopClosure::FixRelocations);
+   CodeCache::blobs_do(&blobClosure);
+-  StringTable::oops_do(oopClosure);
++  AOT_ONLY(AOTLoader::oops_do(oopClosure);)
++  // StringTable::oops_do was removed in j15
++  // StringTable::oops_do(oopClosure);
+ 
+-  // (DCEVM) TODO: Check if this is correct?
+-  //CodeCache::scavenge_root_nmethods_oops_do(oopClosure);
+-  //Management::oops_do(oopClosure);
+-  //ref_processor()->weak_oops_do(&oopClosure);
+-  //PSScavenge::reference_processor()->weak_oops_do(&oopClosure);
+-
+-#if INCLUDE_AOT
+-  if (UseAOT) {
+-    AOTLoader::oops_do(oopClosure);
+-  }
+-#endif
+-  // SO_AllClasses
+-  SystemDictionary::oops_do(oopClosure);
++  // PSScavenge::reference_processor()->weak_oops_do(oopClosure);
+ }
+ 
+ void Universe::oops_do(OopClosure* f) {
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0024-Cleanup-dcevm-comments.patch

@@ -0,0 +1,67 @@
+From c6ea68e66d37d70739f7b0ee74131322b4526a68 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 22 Nov 2020 12:03:32 +0100
+Subject: [PATCH 24/34] Cleanup dcevm comments
+
+---
+ src/hotspot/share/classfile/classLoaderDataGraph.hpp     | 2 +-
+ src/hotspot/share/classfile/systemDictionary.hpp         | 2 +-
+ src/hotspot/share/gc/shared/gcConfig.cpp                 | 2 +-
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
+index f380aa3fa34..8ce94cccb47 100644
+--- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp
++++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
+@@ -104,7 +104,7 @@ class ClassLoaderDataGraph : public AllStatic {
+ 
+   static void dictionary_classes_do(KlassClosure* klass_closure);
+ 
+-  // Enhanced class redefinition
++  // (DCEVM) Enhanced class redefinition
+   static void rollback_redefinition();
+ 
+   // VM_CounterDecay iteration support
+diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
+index 931e655d631..1019dbd0d04 100644
+--- a/src/hotspot/share/classfile/systemDictionary.hpp
++++ b/src/hotspot/share/classfile/systemDictionary.hpp
+@@ -455,7 +455,7 @@ public:
+   static bool is_well_known_klass(Symbol* class_name);
+ #endif
+ 
+-  // Enhanced class redefinition
++  // (DCEVM) Enhanced class redefinition
+   static void remove_from_hierarchy(InstanceKlass* k);
+   static void update_constraints_after_redefinition();
+ 
+diff --git a/src/hotspot/share/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
+index 5c1a09390f1..23fbf715378 100644
+--- a/src/hotspot/share/gc/shared/gcConfig.cpp
++++ b/src/hotspot/share/gc/shared/gcConfig.cpp
+@@ -99,7 +99,7 @@ void GCConfig::fail_if_non_included_gc_is_selected() {
+ 
+ void GCConfig::select_gc_ergonomically() {
+   if (AllowEnhancedClassRedefinition && !UseG1GC) {
+-    // Enhanced class redefinition only supports serial GC at the moment
++    // (DCEVM) Enhanced class redefinition only supports serial GC at the moment
+     FLAG_SET_ERGO(UseSerialGC, true);
+   } else if (os::is_server_class_machine()) {
+ #if INCLUDE_G1GC
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index bd5e7d153be..5de375fb888 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -78,7 +78,7 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   // have any entries.
+   bool _any_class_has_resolved_methods;
+ 
+-  // Enhanced class redefinition, affected klasses contain all classes which should be redefined
++  // (DCEVM) Enhanced class redefinition, affected klasses contain all classes which should be redefined
+   // either because of redefine, class hierarchy or interface change
+   GrowableArray<Klass*>*      _affected_klasses;
+ 
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0025-Fix-cpCache-in-not-AllowEnhancedClassRedefinition-mo.patch

@@ -0,0 +1,43 @@
+From 507d97966c7145d0ae2533459cc504c7b0d6d5b6 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 22 Nov 2020 18:49:05 +0100
+Subject: [PATCH 25/34] Fix cpCache in not AllowEnhancedClassRedefinition mode
+
+---
+ src/hotspot/share/oops/cpCache.hpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/hotspot/share/oops/cpCache.hpp b/src/hotspot/share/oops/cpCache.hpp
+index 121a13b1dda..64dcf6223f5 100644
+--- a/src/hotspot/share/oops/cpCache.hpp
++++ b/src/hotspot/share/oops/cpCache.hpp
+@@ -148,13 +148,13 @@ class ConstantPoolCacheEntry {
+   void set_bytecode_2(Bytecodes::Code code);
+   void set_f1(Metadata* f1) {
+     Metadata* existing_f1 = _f1; // read once
+-    //assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");
++    assert(AllowEnhancedClassRedefinition || existing_f1 == NULL || existing_f1 == f1, "illegal field change");
+     _f1 = f1;
+   }
+   void release_set_f1(Metadata* f1);
+   void set_f2(intx f2) {
+     intx existing_f2 = _f2; // read once
+-    //assert(existing_f2 == 0 || existing_f2 == f2, "illegal field change");
++    assert(AllowEnhancedClassRedefinition || existing_f2 == 0 || existing_f2 == f2, "illegal field change");
+     _f2 = f2;
+   }
+   void set_f2_as_vfinal_method(Method* f2) {
+@@ -215,7 +215,9 @@ class ConstantPoolCacheEntry {
+   void initialize_resolved_reference_index(int ref_index) {
+     assert(_f2 == 0, "set once");  // note: ref_index might be zero also
+     _f2 = ref_index;
+-    _flags = 1 << is_resolved_ref_shift;
++    if (AllowEnhancedClassRedefinition) {
++      _flags = 1 << is_resolved_ref_shift;
++    }
+   }
+ 
+   void set_field(                                // sets entry to resolved field state
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0026-dcevm15-add-ClassLoaderDataGraph_lock-on.patch

@@ -0,0 +1,32 @@
+From b516b615c20fafa2094dfb9f4cb08245b26418d0 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 22 Nov 2020 19:51:46 +0100
+Subject: [PATCH 26/34] dcevm15 - add ClassLoaderDataGraph_lock on
+ ClassLoaderDataGraph::classes_do
+
+ClassLoaderDataGraph::classes_do need safepoint or lock,
+find_sorted_affected_classes is not in safepoint therefore it must be
+locked
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index efaf11e1666..197e1c0029f 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -2063,7 +2063,10 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
+   AffectedKlassClosure closure(_affected_klasses);
+   // Updated in j10, from original SystemDictionary::classes_do
+ 
+-  ClassLoaderDataGraph::classes_do(&closure);
++  {
++    MutexLocker mcld(ClassLoaderDataGraph_lock);
++    ClassLoaderDataGraph::classes_do(&closure);
++  }
+   //ClassLoaderDataGraph::dictionary_classes_do(&closure);
+ 
+   log_trace(redefine, class, load)("%d classes affected", _affected_klasses->length());
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0027-dcevm15-check-if-has_nestmate_access_to-has-newest-h.patch

@@ -0,0 +1,29 @@
+From c6498946006879314bdc6218ee72da5d9c88f237 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sat, 28 Nov 2020 19:29:42 +0100
+Subject: [PATCH 27/34] dcevm15 - check if has_nestmate_access_to has newest
+ host class
+
+---
+ src/hotspot/share/oops/instanceKlass.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index 5e40d78a87e..1d9623f2446 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -445,6 +445,11 @@ bool InstanceKlass::has_nestmate_access_to(InstanceKlass* k, TRAPS) {
+     return false;
+   }
+ 
++  if (AllowEnhancedClassRedefinition) {
++    // TODO: (DCEVM) check if it correct. It fix problems with lambdas (hidden)
++    cur_host = InstanceKlass::cast(cur_host->newest_version());
++  }
++
+   Klass* k_nest_host = k->nest_host(CHECK_false);
+   if (k_nest_host == NULL) {
+     return false;
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0028-Remove-unused-fieldType.patch

@@ -0,0 +1,24 @@
+From 86c27155386c1c40642c99c63a242d1f5d8601a5 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sat, 28 Nov 2020 19:31:08 +0100
+Subject: [PATCH 28/34] Remove unused fieldType
+
+---
+ src/hotspot/share/classfile/vmSymbols.hpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
+index 6a3b234b222..eb06684a288 100644
+--- a/src/hotspot/share/classfile/vmSymbols.hpp
++++ b/src/hotspot/share/classfile/vmSymbols.hpp
+@@ -465,7 +465,6 @@
+   template(static_offset_name,                        "staticOffset")                             \
+   template(static_base_name,                          "staticBase")                               \
+   template(field_offset_name,                         "fieldOffset")                              \
+-  template(field_type_name,                           "fieldType")                                \
+                                                                                                   \
+    /* name symbols needed by intrinsics */                                                         \
+                                                                                                   \
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0029-mark_as_scavengable-only-alive-methods.patch

@@ -0,0 +1,54 @@
+From 025d0d2903963fb79f83cf0d90418783d3ef6813 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 29 Nov 2020 17:18:16 +0100
+Subject: [PATCH 29/34] mark_as_scavengable only alive methods
+
+---
+ .../share/prims/jvmtiEnhancedRedefineClasses.cpp   | 14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 197e1c0029f..e00fac1f693 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -223,19 +223,21 @@ class FieldCopier : public FieldClosure {
+ 
+ // TODO: review...
+ void VM_EnhancedRedefineClasses::mark_as_scavengable(nmethod* nm) {
+-  ScavengableNMethods::register_nmethod(nm);
++  if (nm->is_alive()) {
++    ScavengableNMethods::register_nmethod(nm);
++  }
+ }
+ 
+ void VM_EnhancedRedefineClasses::unregister_nmethod_g1(nmethod* nm) {
+   // It should work not only for G1 but also for another GCs, but this way is safer now
+-  if (!nm->is_zombie() && !nm->is_unloaded()) {
++  if (nm->is_alive()) {
+     Universe::heap()->unregister_nmethod(nm);
+   }
+ }
+ 
+ void VM_EnhancedRedefineClasses::register_nmethod_g1(nmethod* nm) {
+   // It should work not only for G1 but also for another GCs, but this way is safer now
+-  if (!nm->is_zombie() && !nm->is_unloaded()) {
++  if (nm->is_alive()) {
+     Universe::heap()->register_nmethod(nm);
+   }
+ }
+@@ -511,9 +513,9 @@ void VM_EnhancedRedefineClasses::doit() {
+     flush_dependent_code(thread);
+   // }
+ 
+-    // Adjust constantpool caches for all classes that reference methods of the evolved class.
+-    ClearCpoolCacheAndUnpatch clear_cpool_cache(thread);
+-    ClassLoaderDataGraph::classes_do(&clear_cpool_cache);
++  // Adjust constantpool caches for all classes that reference methods of the evolved class.
++  ClearCpoolCacheAndUnpatch clear_cpool_cache(thread);
++  ClassLoaderDataGraph::classes_do(&clear_cpool_cache);
+ 
+   // JSR-292 support
+   if (_any_class_has_resolved_methods) {
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0030-dcevm15-lock-on-ClassLoaderDataGraph-rollback_redefi.patch

@@ -0,0 +1,28 @@
+From 27aabfefe7d799545049bb81ba19d4ed2ff6379c Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 29 Nov 2020 17:20:11 +0100
+Subject: [PATCH 30/34] dcevm15 - lock on
+ ClassLoaderDataGraph::rollback_redefinition
+
+rollback is not in safepoint, therefore must be locked
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index e00fac1f693..db5fb1c472b 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -1382,7 +1382,9 @@ void VM_EnhancedRedefineClasses::calculate_instance_update_information(Klass* ne
+ // Rollback all changes - clear new classes from the system dictionary, return old classes to directory, free memory.
+ void VM_EnhancedRedefineClasses::rollback() {
+   log_info(redefine, class, load)("Rolling back redefinition, result=%d", _res);
++  ClassLoaderDataGraph_lock->lock();
+   ClassLoaderDataGraph::rollback_redefinition();
++  ClassLoaderDataGraph_lock->unlock();
+ 
+   for (int i = 0; i < _new_classes->length(); i++) {
+     SystemDictionary::remove_from_hierarchy(_new_classes->at(i));
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0031-ResourceMark-in-G1IterateObjectClosureTask-fixing-me.patch

@@ -0,0 +1,28 @@
+From 9b405cb642d5935c39c8dbd522ea2fdecfc29ef3 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 29 Nov 2020 19:59:50 +0100
+Subject: [PATCH 31/34] ResourceMark in G1IterateObjectClosureTask fixing
+ memory leaks
+
+G1IterateObjectClosureTask is used only in redefinition full GC run
+---
+ src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+index a29d2dddc2d..2af6df6c1e4 100644
+--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
++++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+@@ -2362,6 +2362,9 @@ class G1IterateObjectClosureTask : public AbstractGangTask {
+     _cl(cl), _g1h(g1h),  _hrclaimer(g1h->workers()->active_workers()) { }
+ 
+   virtual void work(uint worker_id) {
++    Thread *thread = Thread::current();
++    HandleMark hm(thread);   // make sure any handles created are deleted
++    ResourceMark rm(thread);
+     IterateObjectClosureRegionClosure blk(_cl);
+     _g1h->heap_region_par_iterate_from_worker_offset(&blk, &_hrclaimer, worker_id);
+   }
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0032-dcevm15-fix-hidded-classes.patch

@@ -0,0 +1,91 @@
+From 40fe40884d4efc50864bb3f2dd88f0a2e7122d5a Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 29 Nov 2020 20:05:03 +0100
+Subject: [PATCH 32/34] dcevm15 - fix hidded classes
+
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 41 ++++++++++++++-----
+ 1 file changed, 30 insertions(+), 11 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index db5fb1c472b..590f7fdfafe 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -722,7 +722,8 @@ bool VM_EnhancedRedefineClasses::is_modifiable_class(oop klass_mirror) {
+   }
+ 
+   // Cannot redefine or retransform an anonymous class.
+-  if (InstanceKlass::cast(k)->is_unsafe_anonymous()) {
++  // TODO: check if is correct in j15
++  if (InstanceKlass::cast(k)->is_unsafe_anonymous() || InstanceKlass::cast(k)->is_hidden()) {
+     return false;
+   }
+   return true;
+@@ -808,21 +809,27 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+ 
+     InstanceKlass* k;
+ 
+-    if (InstanceKlass::cast(the_class)->is_unsafe_anonymous()) {
+-      const InstanceKlass* host_class = the_class->unsafe_anonymous_host();
++    if (the_class->is_unsafe_anonymous() || the_class->is_hidden()) {
++      InstanceKlass* dynamic_host_class = NULL;
++      InstanceKlass* unsafe_anonymous_host = NULL;
+ 
+-      // Make sure it's the real host class, not another anonymous class.
+-      while (host_class != NULL && host_class->is_unsafe_anonymous()) {
+-        host_class = host_class->unsafe_anonymous_host();
++      if (the_class->is_hidden()) {
++        log_debug(redefine, class, load)("loading hidden class %s", the_class->name()->as_C_string());
++        dynamic_host_class = the_class->nest_host(THREAD);
++      }
++
++      if (the_class->is_unsafe_anonymous()) {
++        log_debug(redefine, class, load)("loading usafe anonymous %s", the_class->name()->as_C_string());
++        unsafe_anonymous_host = the_class->unsafe_anonymous_host();
+       }
+ 
+       ClassLoadInfo cl_info(protection_domain,
+-                            host_class,
+-                            NULL,     // dynamic_nest_host
++                            unsafe_anonymous_host,
+                             NULL,     // cp_patches
++                            dynamic_host_class,     // dynamic_nest_host
+                             Handle(), // classData
+-                            false,    // is_hidden
+-                            false,    // is_strong_hidden
++                            the_class->is_hidden(),    // is_hidden
++                            !the_class->is_non_strong_hidden(),    // is_strong_hidden
+                             true);    // FIXME: check if correct. can_access_vm_annotations
+ 
+       k = SystemDictionary::parse_stream(the_class_sym,
+@@ -833,7 +840,17 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+                                          THREAD);
+ 
+       k->class_loader_data()->exchange_holders(the_class->class_loader_data());
+-      the_class->class_loader_data()->inc_keep_alive();
++
++      if (the_class->is_hidden()) {
++      // from jvm_lookup_define_class() (jvm.cpp):
++      // The hidden class loader data has been artificially been kept alive to
++      // this point. The mirror and any instances of this class have to keep
++      // it alive afterwards.
++        the_class->class_loader_data()->dec_keep_alive();
++      } else {
++        the_class->class_loader_data()->inc_keep_alive();
++      }
++
+     } else {
+       k = SystemDictionary::resolve_from_stream(the_class_sym,
+                                                   the_class_loader,
+@@ -1475,6 +1492,8 @@ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+     ik->set_unsafe_anonymous_host(InstanceKlass::cast(ik->unsafe_anonymous_host()->newest_version()));
+   }
+ 
++  // FIXME: check new nest_host for hidden
++
+   // Update implementor if there is only one, in this case implementor() can reference old class
+   if (ik->is_interface()) {
+     Klass* implKlass = ik->implementor();
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0033-dcevm15-DON-T-clear-F2-in-CP-cache-after-indy-unevol.patch

@@ -0,0 +1,27 @@
+From 29920b076b4ad96d85adbce0a1d947e5022ba3ad Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 29 Nov 2020 20:08:57 +0100
+Subject: [PATCH 33/34] dcevm15 - DON'T clear F2 in CP cache after indy
+ unevolving
+
+It's not clear why it was cleared in dcevm7-11
+---
+ src/hotspot/share/oops/cpCache.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
+index 79a38dbeff0..650e6fab42d 100644
+--- a/src/hotspot/share/oops/cpCache.cpp
++++ b/src/hotspot/share/oops/cpCache.cpp
+@@ -650,7 +650,7 @@ void ConstantPoolCacheEntry::clear_entry() {
+ 
+   if (clearData) {
+     if (!is_resolved_reference()) {
+-      _f2 = 0;
++      // _f2 = 0;
+     }
+     // FIXME: (DCEVM) we want to clear flags, but parameter size is actually used
+     // after we return from the method, before entry is re-initialized. So let's
+-- 
+2.23.0
+

jb/project/tools/patches/dcevm/0034-dcevm15-fix-Universe-root_oops_do.patch

@@ -0,0 +1,49 @@
+From 1f13b20ab5553182680045b7d7324ff92da7e7f0 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 29 Nov 2020 21:28:06 +0100
+Subject: [PATCH 34/34] dcevm15 - fix Universe::root_oops_do
+
+Removed ClassLoaderDataGraph::cld_do was cause of crashes due multiple
+oop patching. ClassLoaderDataGraph::cld_do replaced in dcevm15
+previously used and removed SystemDictionary:oops_do
+---
+ src/hotspot/share/memory/universe.cpp | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
+index 8dad437bd51..0199962a684 100644
+--- a/src/hotspot/share/memory/universe.cpp
++++ b/src/hotspot/share/memory/universe.cpp
+@@ -190,21 +190,26 @@ void Universe::root_oops_do(OopClosure *oopClosure) {
+   // (DCEVM) TODO: Check if this is correct?
+   Management::oops_do(oopClosure);
+   OopStorageSet::vm_global()->oops_do(oopClosure);
+-  CLDToOopClosure cld_closure(oopClosure, ClassLoaderData::_claim_none);
+-  ClassLoaderDataGraph::cld_do(&cld_closure);
++  // CLDToOopClosure cld_closure(oopClosure, ClassLoaderData::_claim_none);
++  // ClassLoaderDataGraph::cld_do(&cld_closure);
+ 
+   // Now adjust pointers in remaining weak roots.  (All of which should
+   // have been cleared if they pointed to non-surviving objects.)
+   // Global (weak) JNI handles
+   WeakProcessor::oops_do(oopClosure);
+ 
++  JvmtiExport::oops_do(oopClosure);
++
+   CodeBlobToOopClosure blobClosure(oopClosure, CodeBlobToOopClosure::FixRelocations);
+   CodeCache::blobs_do(&blobClosure);
++  
+   AOT_ONLY(AOTLoader::oops_do(oopClosure);)
++  
+   // StringTable::oops_do was removed in j15
+   // StringTable::oops_do(oopClosure);
+ 
+-  // PSScavenge::reference_processor()->weak_oops_do(oopClosure);
++  // OopStorageSet::vm_global()->oops_do(oopClosure);
++
+ }
+ 
+ void Universe::oops_do(OopClosure* f) {
+-- 
+2.23.0
+

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

@@ -1,9 +0,0 @@
-#!/bin/bash -x
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-script_dir=jb/project/tools/windows/scripts
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
-${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?

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

@@ -1,12 +1,13 @@
 #!/bin/bash -x
 
 # The following parameters must be specified:
-#   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
+#   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 bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
+#   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
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -16,104 +17,103 @@
 # 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:
+#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
+#               By default JCEF binaries should be located in ./jcef_win_x64
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+WORK_DIR=$(pwd)
+JCEF_PATH=${JCEF_PATH:=$WORK_DIR/jcef_win_x64}
 
-function create_jbr {
+source jb/project/tools/common/scripts/common.sh
 
-  case "$1" in
-  "${bundle_type}_lw")
-    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
-    ;;
-  "jfx" | "jcef" | "jfx_jcef")
-    cat modules.list > modules_tmp.list
-    ;;
-  *)
-    cat modules.list > modules_tmp.list
-    ;;
-  esac
-  rm -rf ${JBR_BUNDLE}
+function create_image_bundle {
+  __bundle_name=$1
+  __modules_path=$2
+  __modules=$3
 
+  [ -d $__bundle_name ] && rm -rf $__bundle_name
+
+  echo Running jlink ...
   ${JSDK}/bin/jlink \
-    --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
-    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
-  if [[ "${bundle_type}" == *jcef* ]]
-  then
-    cp -R jcef_win_x64/* ${JBR_BUNDLE}/bin
+    --module-path $__modules_path --no-man-pages --compress=2 \
+    --add-modules $__modules --output $__bundle_name || do_exit $?
+
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__bundle_name/release
+  if [ "$__bundle_name" == "$JBRSDK_BUNDLE" ]; then
+    sed 's/JBR/JBRSDK/g' $__bundle_name/release > release
+    mv release $__bundle_name/release
   fi
-  echo Modifying release info ...
-  grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${JBR_BUNDLE}/release
 }
 
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-WORK_DIR=$(pwd)
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=windows-x86_64-server-release
 
-#git checkout -- modules.list src
 case "$bundle_type" in
-  "jfx")
-    echo "Excluding jcef modules"
-    git apply -p0 < jb/project/tools/exclude_jcef_module.patch
-    ;;
   "jcef")
-    echo "Excluding jfx modules"
-    git apply -p0 < jb/project/tools/exclude_jfx_module.patch
+    do_reset_changes=1
+    ;;
+  "dcevm")
+    HEAD_REVISION=$(git rev-parse HEAD)
+    git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
+    do_reset_dcevm=1
+    do_reset_changes=1
+    ;;
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    do_reset_changes=1
+    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+    RELEASE_NAME=windows-x86_64-server-fastdebug
     ;;
 esac
 
-PATH="/usr/local/bin:/usr/bin:${PATH}"
+sh ./configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --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 || do_exit $?
 
 if [ -z "$bundle_type" ]; then
-  bash ./configure \
-    --disable-warnings-as-errors \
-    --with-target-bits=64 \
-    --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 LOG=info CONF=$RELEASE_NAME clean images test-image || do_exit $?
 else
-  bash ./configure \
-    --disable-warnings-as-errors \
-    --with-target-bits=64 \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    --with-import-modules=${WORK_DIR}/modular-sdk \
-    --with-toolchain-version=${TOOLCHAIN_VERSION} \
-    --with-boot-jdk=${BOOT_JDK} \
-    --disable-ccache \
-    --enable-cds=yes || exit 1
+  make LOG=info CONF=$RELEASE_NAME clean images || do_exit $?
 fi
 
-if [[ "$bundle_type" == "jfx_jcef" || -z "$bundle_type" ]]; then
-  make LOG=info images CONF=windows-x86_64-server-release test-image || exit 1
-else
-  make LOG=info images CONF=windows-x86_64-server-release || exit 1
-fi
-
-JSDK=build/windows-x86_64-server-release/images/jdk
-if [[ "$bundle_type" == "*jcef*" || -z "$bundle_type" ]]; then
-  JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
-fi
-BASE_DIR=build/windows-x86_64-server-release/images
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
-rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || exit 1
-if [[ "$bundle_type" == "*jcef*" ]]; then
-  cp -R jcef_win_x64/* ${JBRSDK_BUNDLE}/bin
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$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
+
+  jbr_name_postfix="_${bundle_type}"
 fi
 
-if [ -z "$bundle_type" ]; then
-  JBR_BUNDLE=jbr
-else
-  JBR_BUNDLE=jbr_${bundle_type}
-fi
-create_jbr ${bundle_type}
+# create runtime image bundle
+modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
+create_image_bundle "jbr${jbr_name_postfix}" $JSDK_MODS_DIR "$modules" || do_exit $?
 
-#JBR_BUNDLE=jbr_${bundle_type}_lw
-#create_jbr ${bundle_type}_lw
+# 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" == "dcevm" ] || [ "$bundle_type" == "fd" ] || [ "$bundle_type" == "$JBRSDK_BUNDLE" ]; then
+  modules=${modules},$(get_mods_list "$JCEF_PATH"/jmods)
+fi
+create_image_bundle "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+
+do_exit 0

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

@@ -4,9 +4,6 @@
 #   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
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -21,30 +18,39 @@ 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)
 
+[ -z "$bundle_type" ] && (git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch || exit $?)
+
 PATH="/usr/local/bin:/usr/bin:${PATH}"
 ./configure \
   --disable-warnings-as-errors \
-  --disable-debug-symbols \
   --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=2015 \
+  --with-toolchain-version=${TOOLCHAIN_VERSION} \
   --with-boot-jdk=${BOOT_JDK} \
   --disable-ccache \
   --enable-cds=yes || exit 1
-make clean CONF=windows-x86-normal-server-release || exit 1
-make LOG=info images CONF=windows-x86-normal-server-release test-image || exit 1
+make clean CONF=windows-x86-server-release || exit 1
+make LOG=info images CONF=windows-x86-server-release test-image || exit 1
 
 JBSDK=${JBRSDK_BASE_NAME}-windows-x86-b${build_number}
-BASE_DIR=build/windows-x86-normal-server-release/images
+BASE_DIR=build/windows-x86-server-release/images
 JSDK=${BASE_DIR}/jdk
 JBRSDK_BUNDLE=jbrsdk
 
 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_BUNDLE=jbr
 rm -rf ${JBR_BUNDLE}
@@ -54,4 +60,4 @@ ${JSDK}/bin/jlink \
   --add-modules $(xargs < modules.list.x86 | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
 
 echo Modifying release info ...
-grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${JBR_BUNDLE}/release
+#grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${JBR_BUNDLE}/release

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

@@ -1,12 +1,13 @@
 #!/bin/bash -x
 
 # The following parameters must be specified:
-#   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
+#   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 bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
+#   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
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -17,6 +18,8 @@
 # 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
@@ -24,56 +27,51 @@ bundle_type=$4
 
 function pack_jbr {
 
-  case "$1" in
-  "${bundle_type}_lw")
-    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
-    ;;
-  "jfx" | "jcef")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    ;;
-  "jfx_jcef" | "")
-    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && exit 1
-    ;;
-  esac
+  if [ -z "${bundle_type}" ]; then
+    JBR_BUNDLE=jbr
+  else
+    JBR_BUNDLE=jbr_${bundle_type}
+    [ -d ${BASE_DIR}/jbr ] && rm -rf ${BASE_DIR}/jbr
+    cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
+  fi
+  JBR_BASE_NAME=${JBR_BUNDLE}-${JBSDK_VERSION}
 
   JBR=$JBR_BASE_NAME-windows-x64-b$build_number
   echo Creating $JBR.tar.gz ...
-  if [ ! -z "$bundle_type" ]; then
-    rm -rf ${BASE_DIR}/jbr
-    cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-  fi
 
-  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || exit 1
-  #rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || do_exit $?
 }
 
 JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
 JBR_BASE_NAME=jbr-$JBSDK_VERSION
+RELEASE_NAME=windows-x86_64-server-release
+JBSDK=${JBRSDK_BASE_NAME}-osx-x64-b${build_number}
+case "$bundle_type" in
+  "nomod" | "")
+    bundle_type=""
+    ;;
+  "fd")
+    RELEASE_NAME=macosx-x86_64-server-fastdebug
+    JBSDK=${JBRSDK_BASE_NAME}-osx-x64-fastdebug-b${build_number}
+    ;;
+esac
 
-IMAGES_DIR=build/windows-x86_64-server-release/images
+IMAGES_DIR=build/$RELEASE_NAME/images
 JSDK=$IMAGES_DIR/jdk
 JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
 BASE_DIR=.
 
-if [ -z "$bundle_type" ]; then
-  JBR_BUNDLE=jbr
-else
-  JBR_BUNDLE=jbr_${bundle_type}
-fi
-if [[ "$bundle_type" == "jfx_jcef" || -z "$bundle_type" ]]; then
+if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
   JBRSDK_BUNDLE=jbrsdk
   echo Creating $JBSDK.tar.gz ...
-  /usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
+  [ -f "$JBSDK.tar.gz" ] && rm "$JBSDK.tar.gz"
+  /usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || do_exit $?
 fi
 
-JBR_BUNDLE=jbr_${bundle_type}
 pack_jbr $bundle_type
 
-if [[ "$bundle_type" == "jfx_jcef" || -z "$bundle_type" ]]; then
+if [ -z "$bundle_type" ]; then
   JBRSDK_TEST=$JBRSDK_BASE_NAME-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 || exit 1
+  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
 fi

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

@@ -4,9 +4,6 @@
 #   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
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -24,7 +21,7 @@ build_number=$3
 JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
 JBR_BASE_NAME=jbr-$JBSDK_VERSION
 
-IMAGES_DIR=build/windows-x86-normal-server-release/images
+IMAGES_DIR=build/windows-x86-server-release/images
 JSDK=$IMAGES_DIR/jdk
 JBSDK=$JBRSDK_BASE_NAME-windows-x86-b$build_number
 BASE_DIR=.

make/CompileJavaModules.gmk

@@ -86,7 +86,7 @@ CreateHkTargets = \
 ################################################################################
 # Include module specific build settings
 
--include $(TOPDIR)/make/modules/$(MODULE)/Java.gmk
+-include Java.gmk
 
 ################################################################################
 # Setup the main compilation

make/Main.gmk

@@ -187,6 +187,7 @@ JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
 define DeclareCompileJavaRecipe
   $1-java:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
+	$(patsubst %,-I%/modules/$1,$(PHASE_MAKEDIRS)) \
 	    -f CompileJavaModules.gmk MODULE=$1)
 endef
 

make/MainSupport.gmk

@@ -150,9 +150,7 @@ define DeclareRecipeForModuleMakefile
   $2-$$($1_TARGET_SUFFIX):
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	    -f ModuleWrapper.gmk -I $$(TOPDIR)/make/common/modules  \
-	    $$(addprefix -I, $$(PHASE_MAKEDIRS) \
-	        $$(addsuffix /modules/$2, $$(PHASE_MAKEDIRS)) \
-	    ) \
+	    $$(patsubst %,-I%/modules/$2,$$(PHASE_MAKEDIRS)) \
 	    MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX) $$($1_EXTRA_ARGS))
 
 endef

make/autoconf/spec.gmk.in

@@ -574,8 +574,6 @@ CXXFILT:=@CXXFILT@
 
 LIPO:=@LIPO@
 INSTALL_NAME_TOOL:=@INSTALL_NAME_TOOL@
-METAL := @METAL@
-METALLIB := @METALLIB@
 
 # Options to linker to specify a mapfile.
 # (Note absence of := assignment, because we do not want to evaluate the macro body here)

make/autoconf/toolchain.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
@@ -723,32 +723,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA],
     UTIL_LOOKUP_PROGS(LIPO, lipo)
     UTIL_REQUIRE_PROGS(OTOOL, otool)
     UTIL_REQUIRE_PROGS(INSTALL_NAME_TOOL, install_name_tool)
-
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(METAL, metal)
-    if test "x$METAL" = x; then
-      AC_MSG_CHECKING([if metal can be run using xcrun])
-      METAL="xcrun -sdk macosx metal"
-      test_metal=`$METAL --version 2>&1`
-      if test $? -ne 0; then
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([XCode tool 'metal' neither found in path nor with xcrun])
-      else
-        AC_MSG_RESULT([yes, will be using '$METAL'])
-      fi
-    fi
-
-    UTIL_LOOKUP_TOOLCHAIN_PROGS(METALLIB, metallib)
-    if test "x$METALLIB" = x; then
-      AC_MSG_CHECKING([if metallib can be run using xcrun])
-      METALLIB="xcrun -sdk macosx metallib"
-      test_metallib=`$METALLIB --version 2>&1`
-      if test $? -ne 0; then
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([XCode tool 'metallib' neither found in path nor with xcrun])
-      else
-        AC_MSG_RESULT([yes, will be using '$METALLIB'])
-      fi
-    fi
   fi
 
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then

make/conf/jib-profiles.js

@@ -477,7 +477,6 @@ var getJibProfilesProfiles = function (input, common, data) {
             dependencies: ["devkit", "gtest", "build_devkit", "pandoc"],
             configure_args: [
                 "--openjdk-target=aarch64-linux-gnu",
-		"--disable-jvm-feature-jvmci",
             ],
         },
 

make/jdk/src/classes/build/tools/taglet/JSpec.java

@@ -206,7 +206,7 @@ public class JSpec implements Taglet  {
             private String escape(String s) {
                 return s.replace("&", "&")
                         .replace("<", "&lt;")
-                        .replace(">", "&gt");
+                        .replace(">", "&gt;");
             }
         }).visit(trees, new StringBuilder()).toString();
     }

make/modules/java.desktop/Lib.gmk

@@ -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
@@ -24,7 +24,6 @@
 #
 
 include LibCommon.gmk
-include Execute.gmk
 
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, modules/java.desktop/Lib.gmk))

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

@@ -160,7 +160,6 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
     LIBS_macosx := -lmlib_image \
         -framework Cocoa \
         -framework OpenGL \
-        -framework Metal \
         -framework JavaRuntimeSupport \
         -framework ApplicationServices \
         -framework AudioToolbox, \
@@ -767,8 +766,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
         -framework ApplicationServices \
         -framework Foundation \
         -framework Security \
-        -framework Cocoa \
-        -framework Metal
+        -framework Cocoa
   else ifeq ($(call isTargetOs, windows), true)
     LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
   else
@@ -829,7 +827,6 @@ ifeq ($(call isTargetOs, macosx), true)
       libawt_lwawt/awt \
       libawt_lwawt/font \
       libawt_lwawt/java2d/opengl \
-      libawt_lwawt/java2d/metal \
       include \
       common/awt/debug \
       common/java2d/opengl \
@@ -865,7 +862,6 @@ ifeq ($(call isTargetOs, macosx), true)
           -framework AudioToolbox \
           -framework Carbon \
           -framework Cocoa \
-          -framework Metal \
           -framework Security \
           -framework ExceptionHandling \
           -framework JavaRuntimeSupport \
@@ -888,28 +884,6 @@ endif
 ################################################################################
 
 ifeq ($(call isTargetOs, macosx), true)
-  SHADERS_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/shaders.metal
-  SHADERS_SUPPORT_DIR := $(SUPPORT_OUTPUTDIR)/native/java.desktop/libosxui
-  SHADERS_AIR := $(SHADERS_SUPPORT_DIR)/shaders.air
-  SHADERS_LIB := $(INSTALL_LIBRARIES_HERE)/shaders.metallib
-
-  $(eval $(call SetupExecute, metal_shaders, \
-      INFO := Running metal on $(notdir $(SHADERS_SRC)) (for libosxui.dylib), \
-      DEPS := $(SHADERS_SRC), \
-      OUTPUT_FILE := $(SHADERS_AIR), \
-      SUPPORT_DIR := $(SHADERS_SUPPORT_DIR), \
-      COMMAND := $(METAL) -c -std=osx-metal2.0 -o $(SHADERS_AIR) $(SHADERS_SRC), \
-  ))
-
-  $(eval $(call SetupExecute, metallib_shaders, \
-      INFO := Running metallib on $(notdir $(SHADERS_AIR)) (for libosxui.dylib), \
-      DEPS := $(SHADERS_AIR), \
-      OUTPUT_FILE := $(SHADERS_LIB), \
-      SUPPORT_DIR := $(SHADERS_SUPPORT_DIR), \
-      COMMAND := $(METALLIB) -o $(SHADERS_LIB) $(SHADERS_AIR), \
-  ))
-
-  TARGETS += $(SHADERS_LIB)
 
   $(eval $(call SetupJdkLibrary, BUILD_LIBOSXUI, \
       NAME := osxui, \
@@ -925,7 +899,6 @@ ifeq ($(call isTargetOs, macosx), true)
           -L$(INSTALL_LIBRARIES_HERE), \
       LIBS := -lawt -losxapp -lawt_lwawt \
           -framework Cocoa \
-          -framework Metal \
           -framework Carbon \
           -framework ApplicationServices \
           -framework JavaRuntimeSupport \
@@ -933,7 +906,6 @@ ifeq ($(call isTargetOs, macosx), true)
   ))
 
   TARGETS += $(BUILD_LIBOSXUI)
-  $(BUILD_LIBOSXUI): $(SHADERS_LIB)
 
   $(BUILD_LIBOSXUI): $(BUILD_LIBAWT)
 

modules.list

@@ -22,6 +22,7 @@ java.xml,
 java.xml.crypto,
 jdk.accessibility,
 jdk.aot,
+jdk.attach,
 jdk.charsets,
 jdk.compiler,
 jdk.crypto.cryptoki,
@@ -50,4 +51,4 @@ jdk.security.jgss,
 jdk.unsupported,
 jdk.xml.dom,
 jdk.zipfs,
-jdk.hotspot.agent
+jdk.hotspot.agent

src/hotspot/cpu/aarch64/aarch64.ad

@@ -11299,8 +11299,7 @@ instruct regI_not_reg(iRegINoSp dst,
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AndI_reg_not_reg(iRegINoSp dst,
-                         iRegIorL2I src1, iRegIorL2I src2, immI_M1 m1,
-                         rFlagsReg cr) %{
+                         iRegIorL2I src1, iRegIorL2I src2, immI_M1 m1) %{
   match(Set dst (AndI src1 (XorI src2 m1)));
   ins_cost(INSN_COST);
   format %{ "bicw  $dst, $src1, $src2" %}
@@ -11318,8 +11317,7 @@ instruct AndI_reg_not_reg(iRegINoSp dst,
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AndL_reg_not_reg(iRegLNoSp dst,
-                         iRegL src1, iRegL src2, immL_M1 m1,
-                         rFlagsReg cr) %{
+                         iRegL src1, iRegL src2, immL_M1 m1) %{
   match(Set dst (AndL src1 (XorL src2 m1)));
   ins_cost(INSN_COST);
   format %{ "bic  $dst, $src1, $src2" %}
@@ -11337,8 +11335,7 @@ instruct AndL_reg_not_reg(iRegLNoSp dst,
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct OrI_reg_not_reg(iRegINoSp dst,
-                         iRegIorL2I src1, iRegIorL2I src2, immI_M1 m1,
-                         rFlagsReg cr) %{
+                         iRegIorL2I src1, iRegIorL2I src2, immI_M1 m1) %{
   match(Set dst (OrI src1 (XorI src2 m1)));
   ins_cost(INSN_COST);
   format %{ "ornw  $dst, $src1, $src2" %}
@@ -11356,8 +11353,7 @@ instruct OrI_reg_not_reg(iRegINoSp dst,
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct OrL_reg_not_reg(iRegLNoSp dst,
-                         iRegL src1, iRegL src2, immL_M1 m1,
-                         rFlagsReg cr) %{
+                         iRegL src1, iRegL src2, immL_M1 m1) %{
   match(Set dst (OrL src1 (XorL src2 m1)));
   ins_cost(INSN_COST);
   format %{ "orn  $dst, $src1, $src2" %}
@@ -11375,8 +11371,7 @@ instruct OrL_reg_not_reg(iRegLNoSp dst,
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct XorI_reg_not_reg(iRegINoSp dst,
-                         iRegIorL2I src1, iRegIorL2I src2, immI_M1 m1,
-                         rFlagsReg cr) %{
+                         iRegIorL2I src1, iRegIorL2I src2, immI_M1 m1) %{
   match(Set dst (XorI m1 (XorI src2 src1)));
   ins_cost(INSN_COST);
   format %{ "eonw  $dst, $src1, $src2" %}
@@ -11394,8 +11389,7 @@ instruct XorI_reg_not_reg(iRegINoSp dst,
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct XorL_reg_not_reg(iRegLNoSp dst,
-                         iRegL src1, iRegL src2, immL_M1 m1,
-                         rFlagsReg cr) %{
+                         iRegL src1, iRegL src2, immL_M1 m1) %{
   match(Set dst (XorL m1 (XorL src2 src1)));
   ins_cost(INSN_COST);
   format %{ "eon  $dst, $src1, $src2" %}
@@ -11412,9 +11406,10 @@ instruct XorL_reg_not_reg(iRegLNoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val & (-1 ^ (val >>> shift)) ==> bicw
 instruct AndI_reg_URShift_not_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, immI_M1 src4, rFlagsReg cr) %{
+                         immI src3, immI_M1 src4) %{
   match(Set dst (AndI src1 (XorI(URShiftI src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "bicw  $dst, $src1, $src2, LSR $src3" %}
@@ -11432,9 +11427,10 @@ instruct AndI_reg_URShift_not_reg(iRegINoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val & (-1 ^ (val >>> shift)) ==> bic
 instruct AndL_reg_URShift_not_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, immL_M1 src4, rFlagsReg cr) %{
+                         immI src3, immL_M1 src4) %{
   match(Set dst (AndL src1 (XorL(URShiftL src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "bic  $dst, $src1, $src2, LSR $src3" %}
@@ -11452,9 +11448,10 @@ instruct AndL_reg_URShift_not_reg(iRegLNoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val & (-1 ^ (val >> shift)) ==> bicw
 instruct AndI_reg_RShift_not_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, immI_M1 src4, rFlagsReg cr) %{
+                         immI src3, immI_M1 src4) %{
   match(Set dst (AndI src1 (XorI(RShiftI src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "bicw  $dst, $src1, $src2, ASR $src3" %}
@@ -11472,9 +11469,10 @@ instruct AndI_reg_RShift_not_reg(iRegINoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val & (-1 ^ (val >> shift)) ==> bic
 instruct AndL_reg_RShift_not_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, immL_M1 src4, rFlagsReg cr) %{
+                         immI src3, immL_M1 src4) %{
   match(Set dst (AndL src1 (XorL(RShiftL src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "bic  $dst, $src1, $src2, ASR $src3" %}
@@ -11492,9 +11490,52 @@ instruct AndL_reg_RShift_not_reg(iRegLNoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val & (-1 ^ (val ror shift)) ==> bicw
+instruct AndI_reg_RotateRight_not_reg(iRegINoSp dst,
+                         iRegIorL2I src1, iRegIorL2I src2,
+                         immI src3, immI_M1 src4) %{
+  match(Set dst (AndI src1 (XorI(RotateRight src2 src3) src4)));
+  ins_cost(1.9 * INSN_COST);
+  format %{ "bicw  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ bicw(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x1f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val & (-1 ^ (val ror shift)) ==> bic
+instruct AndL_reg_RotateRight_not_reg(iRegLNoSp dst,
+                         iRegL src1, iRegL src2,
+                         immI src3, immL_M1 src4) %{
+  match(Set dst (AndL src1 (XorL(RotateRight src2 src3) src4)));
+  ins_cost(1.9 * INSN_COST);
+  format %{ "bic  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ bic(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val & (-1 ^ (val << shift)) ==> bicw
 instruct AndI_reg_LShift_not_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, immI_M1 src4, rFlagsReg cr) %{
+                         immI src3, immI_M1 src4) %{
   match(Set dst (AndI src1 (XorI(LShiftI src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "bicw  $dst, $src1, $src2, LSL $src3" %}
@@ -11512,9 +11553,10 @@ instruct AndI_reg_LShift_not_reg(iRegINoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val & (-1 ^ (val << shift)) ==> bic
 instruct AndL_reg_LShift_not_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, immL_M1 src4, rFlagsReg cr) %{
+                         immI src3, immL_M1 src4) %{
   match(Set dst (AndL src1 (XorL(LShiftL src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "bic  $dst, $src1, $src2, LSL $src3" %}
@@ -11532,9 +11574,10 @@ instruct AndL_reg_LShift_not_reg(iRegLNoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val ^ (-1 ^ (val >>> shift)) ==> eonw
 instruct XorI_reg_URShift_not_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, immI_M1 src4, rFlagsReg cr) %{
+                         immI src3, immI_M1 src4) %{
   match(Set dst (XorI src4 (XorI(URShiftI src2 src3) src1)));
   ins_cost(1.9 * INSN_COST);
   format %{ "eonw  $dst, $src1, $src2, LSR $src3" %}
@@ -11552,9 +11595,10 @@ instruct XorI_reg_URShift_not_reg(iRegINoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val ^ (-1 ^ (val >>> shift)) ==> eon
 instruct XorL_reg_URShift_not_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, immL_M1 src4, rFlagsReg cr) %{
+                         immI src3, immL_M1 src4) %{
   match(Set dst (XorL src4 (XorL(URShiftL src2 src3) src1)));
   ins_cost(1.9 * INSN_COST);
   format %{ "eon  $dst, $src1, $src2, LSR $src3" %}
@@ -11572,9 +11616,10 @@ instruct XorL_reg_URShift_not_reg(iRegLNoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val ^ (-1 ^ (val >> shift)) ==> eonw
 instruct XorI_reg_RShift_not_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, immI_M1 src4, rFlagsReg cr) %{
+                         immI src3, immI_M1 src4) %{
   match(Set dst (XorI src4 (XorI(RShiftI src2 src3) src1)));
   ins_cost(1.9 * INSN_COST);
   format %{ "eonw  $dst, $src1, $src2, ASR $src3" %}
@@ -11592,9 +11637,10 @@ instruct XorI_reg_RShift_not_reg(iRegINoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val ^ (-1 ^ (val >> shift)) ==> eon
 instruct XorL_reg_RShift_not_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, immL_M1 src4, rFlagsReg cr) %{
+                         immI src3, immL_M1 src4) %{
   match(Set dst (XorL src4 (XorL(RShiftL src2 src3) src1)));
   ins_cost(1.9 * INSN_COST);
   format %{ "eon  $dst, $src1, $src2, ASR $src3" %}
@@ -11612,9 +11658,52 @@ instruct XorL_reg_RShift_not_reg(iRegLNoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val ^ (-1 ^ (val ror shift)) ==> eonw
+instruct XorI_reg_RotateRight_not_reg(iRegINoSp dst,
+                         iRegIorL2I src1, iRegIorL2I src2,
+                         immI src3, immI_M1 src4) %{
+  match(Set dst (XorI src4 (XorI(RotateRight src2 src3) src1)));
+  ins_cost(1.9 * INSN_COST);
+  format %{ "eonw  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ eonw(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x1f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val ^ (-1 ^ (val ror shift)) ==> eon
+instruct XorL_reg_RotateRight_not_reg(iRegLNoSp dst,
+                         iRegL src1, iRegL src2,
+                         immI src3, immL_M1 src4) %{
+  match(Set dst (XorL src4 (XorL(RotateRight src2 src3) src1)));
+  ins_cost(1.9 * INSN_COST);
+  format %{ "eon  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ eon(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val ^ (-1 ^ (val << shift)) ==> eonw
 instruct XorI_reg_LShift_not_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, immI_M1 src4, rFlagsReg cr) %{
+                         immI src3, immI_M1 src4) %{
   match(Set dst (XorI src4 (XorI(LShiftI src2 src3) src1)));
   ins_cost(1.9 * INSN_COST);
   format %{ "eonw  $dst, $src1, $src2, LSL $src3" %}
@@ -11632,9 +11721,10 @@ instruct XorI_reg_LShift_not_reg(iRegINoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val ^ (-1 ^ (val << shift)) ==> eon
 instruct XorL_reg_LShift_not_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, immL_M1 src4, rFlagsReg cr) %{
+                         immI src3, immL_M1 src4) %{
   match(Set dst (XorL src4 (XorL(LShiftL src2 src3) src1)));
   ins_cost(1.9 * INSN_COST);
   format %{ "eon  $dst, $src1, $src2, LSL $src3" %}
@@ -11652,9 +11742,10 @@ instruct XorL_reg_LShift_not_reg(iRegLNoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val | (-1 ^ (val >>> shift)) ==> ornw
 instruct OrI_reg_URShift_not_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, immI_M1 src4, rFlagsReg cr) %{
+                         immI src3, immI_M1 src4) %{
   match(Set dst (OrI src1 (XorI(URShiftI src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "ornw  $dst, $src1, $src2, LSR $src3" %}
@@ -11672,9 +11763,10 @@ instruct OrI_reg_URShift_not_reg(iRegINoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val | (-1 ^ (val >>> shift)) ==> orn
 instruct OrL_reg_URShift_not_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, immL_M1 src4, rFlagsReg cr) %{
+                         immI src3, immL_M1 src4) %{
   match(Set dst (OrL src1 (XorL(URShiftL src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "orn  $dst, $src1, $src2, LSR $src3" %}
@@ -11692,9 +11784,10 @@ instruct OrL_reg_URShift_not_reg(iRegLNoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val | (-1 ^ (val >> shift)) ==> ornw
 instruct OrI_reg_RShift_not_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, immI_M1 src4, rFlagsReg cr) %{
+                         immI src3, immI_M1 src4) %{
   match(Set dst (OrI src1 (XorI(RShiftI src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "ornw  $dst, $src1, $src2, ASR $src3" %}
@@ -11712,9 +11805,10 @@ instruct OrI_reg_RShift_not_reg(iRegINoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val | (-1 ^ (val >> shift)) ==> orn
 instruct OrL_reg_RShift_not_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, immL_M1 src4, rFlagsReg cr) %{
+                         immI src3, immL_M1 src4) %{
   match(Set dst (OrL src1 (XorL(RShiftL src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "orn  $dst, $src1, $src2, ASR $src3" %}
@@ -11732,9 +11826,52 @@ instruct OrL_reg_RShift_not_reg(iRegLNoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val | (-1 ^ (val ror shift)) ==> ornw
+instruct OrI_reg_RotateRight_not_reg(iRegINoSp dst,
+                         iRegIorL2I src1, iRegIorL2I src2,
+                         immI src3, immI_M1 src4) %{
+  match(Set dst (OrI src1 (XorI(RotateRight src2 src3) src4)));
+  ins_cost(1.9 * INSN_COST);
+  format %{ "ornw  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ ornw(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x1f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val | (-1 ^ (val ror shift)) ==> orn
+instruct OrL_reg_RotateRight_not_reg(iRegLNoSp dst,
+                         iRegL src1, iRegL src2,
+                         immI src3, immL_M1 src4) %{
+  match(Set dst (OrL src1 (XorL(RotateRight src2 src3) src4)));
+  ins_cost(1.9 * INSN_COST);
+  format %{ "orn  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ orn(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val | (-1 ^ (val << shift)) ==> ornw
 instruct OrI_reg_LShift_not_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, immI_M1 src4, rFlagsReg cr) %{
+                         immI src3, immI_M1 src4) %{
   match(Set dst (OrI src1 (XorI(LShiftI src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "ornw  $dst, $src1, $src2, LSL $src3" %}
@@ -11752,9 +11889,10 @@ instruct OrI_reg_LShift_not_reg(iRegINoSp dst,
 
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val | (-1 ^ (val << shift)) ==> orn
 instruct OrL_reg_LShift_not_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, immL_M1 src4, rFlagsReg cr) %{
+                         immI src3, immL_M1 src4) %{
   match(Set dst (OrL src1 (XorL(LShiftL src2 src3) src4)));
   ins_cost(1.9 * INSN_COST);
   format %{ "orn  $dst, $src1, $src2, LSL $src3" %}
@@ -11774,7 +11912,7 @@ instruct OrL_reg_LShift_not_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AndI_reg_URShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AndI src1 (URShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -11795,7 +11933,7 @@ instruct AndI_reg_URShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AndL_reg_URShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AndL src1 (URShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -11816,7 +11954,7 @@ instruct AndL_reg_URShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AndI_reg_RShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AndI src1 (RShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -11837,7 +11975,7 @@ instruct AndI_reg_RShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AndL_reg_RShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AndL src1 (RShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -11858,7 +11996,7 @@ instruct AndL_reg_RShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AndI_reg_LShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AndI src1 (LShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -11879,7 +12017,7 @@ instruct AndI_reg_LShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AndL_reg_LShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AndL src1 (LShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -11896,11 +12034,53 @@ instruct AndL_reg_LShift_reg(iRegLNoSp dst,
   ins_pipe(ialu_reg_reg_shift);
 %}
 
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct AndI_reg_RotateRight_reg(iRegINoSp dst,
+                         iRegIorL2I src1, iRegIorL2I src2,
+                         immI src3) %{
+  match(Set dst (AndI src1 (RotateRight src2 src3)));
+
+  ins_cost(1.9 * INSN_COST);
+  format %{ "andw  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ andw(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x1f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct AndL_reg_RotateRight_reg(iRegLNoSp dst,
+                         iRegL src1, iRegL src2,
+                         immI src3) %{
+  match(Set dst (AndL src1 (RotateRight src2 src3)));
+
+  ins_cost(1.9 * INSN_COST);
+  format %{ "andr  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ andr(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct XorI_reg_URShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (XorI src1 (URShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -11921,7 +12101,7 @@ instruct XorI_reg_URShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct XorL_reg_URShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (XorL src1 (URShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -11942,7 +12122,7 @@ instruct XorL_reg_URShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct XorI_reg_RShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (XorI src1 (RShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -11963,7 +12143,7 @@ instruct XorI_reg_RShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct XorL_reg_RShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (XorL src1 (RShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -11984,7 +12164,7 @@ instruct XorL_reg_RShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct XorI_reg_LShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (XorI src1 (LShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12005,7 +12185,7 @@ instruct XorI_reg_LShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct XorL_reg_LShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (XorL src1 (LShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12022,11 +12202,53 @@ instruct XorL_reg_LShift_reg(iRegLNoSp dst,
   ins_pipe(ialu_reg_reg_shift);
 %}
 
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct XorI_reg_RotateRight_reg(iRegINoSp dst,
+                         iRegIorL2I src1, iRegIorL2I src2,
+                         immI src3) %{
+  match(Set dst (XorI src1 (RotateRight src2 src3)));
+
+  ins_cost(1.9 * INSN_COST);
+  format %{ "eorw  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ eorw(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x1f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct XorL_reg_RotateRight_reg(iRegLNoSp dst,
+                         iRegL src1, iRegL src2,
+                         immI src3) %{
+  match(Set dst (XorL src1 (RotateRight src2 src3)));
+
+  ins_cost(1.9 * INSN_COST);
+  format %{ "eor  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ eor(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct OrI_reg_URShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (OrI src1 (URShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12047,7 +12269,7 @@ instruct OrI_reg_URShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct OrL_reg_URShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (OrL src1 (URShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12068,7 +12290,7 @@ instruct OrL_reg_URShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct OrI_reg_RShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (OrI src1 (RShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12089,7 +12311,7 @@ instruct OrI_reg_RShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct OrL_reg_RShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (OrL src1 (RShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12110,7 +12332,7 @@ instruct OrL_reg_RShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct OrI_reg_LShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (OrI src1 (LShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12131,7 +12353,7 @@ instruct OrI_reg_LShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct OrL_reg_LShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (OrL src1 (LShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12148,11 +12370,53 @@ instruct OrL_reg_LShift_reg(iRegLNoSp dst,
   ins_pipe(ialu_reg_reg_shift);
 %}
 
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct OrI_reg_RotateRight_reg(iRegINoSp dst,
+                         iRegIorL2I src1, iRegIorL2I src2,
+                         immI src3) %{
+  match(Set dst (OrI src1 (RotateRight src2 src3)));
+
+  ins_cost(1.9 * INSN_COST);
+  format %{ "orrw  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ orrw(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x1f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+instruct OrL_reg_RotateRight_reg(iRegLNoSp dst,
+                         iRegL src1, iRegL src2,
+                         immI src3) %{
+  match(Set dst (OrL src1 (RotateRight src2 src3)));
+
+  ins_cost(1.9 * INSN_COST);
+  format %{ "orr  $dst, $src1, $src2, ROR $src3" %}
+
+  ins_encode %{
+    __ orr(as_Register($dst$$reg),
+              as_Register($src1$$reg),
+              as_Register($src2$$reg),
+              Assembler::ROR,
+              $src3$$constant & 0x3f);
+  %}
+
+  ins_pipe(ialu_reg_reg_shift);
+%}
+
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AddI_reg_URShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AddI src1 (URShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12173,7 +12437,7 @@ instruct AddI_reg_URShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AddL_reg_URShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AddL src1 (URShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12194,7 +12458,7 @@ instruct AddL_reg_URShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AddI_reg_RShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AddI src1 (RShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12215,7 +12479,7 @@ instruct AddI_reg_RShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AddL_reg_RShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AddL src1 (RShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12236,7 +12500,7 @@ instruct AddL_reg_RShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AddI_reg_LShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AddI src1 (LShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12257,7 +12521,7 @@ instruct AddI_reg_LShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct AddL_reg_LShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (AddL src1 (LShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12278,7 +12542,7 @@ instruct AddL_reg_LShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct SubI_reg_URShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (SubI src1 (URShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12299,7 +12563,7 @@ instruct SubI_reg_URShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct SubL_reg_URShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (SubL src1 (URShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12320,7 +12584,7 @@ instruct SubL_reg_URShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct SubI_reg_RShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (SubI src1 (RShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12341,7 +12605,7 @@ instruct SubI_reg_RShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct SubL_reg_RShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (SubL src1 (RShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12362,7 +12626,7 @@ instruct SubL_reg_RShift_reg(iRegLNoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct SubI_reg_LShift_reg(iRegINoSp dst,
                          iRegIorL2I src1, iRegIorL2I src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (SubI src1 (LShiftI src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12383,7 +12647,7 @@ instruct SubI_reg_LShift_reg(iRegINoSp dst,
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct SubL_reg_LShift_reg(iRegLNoSp dst,
                          iRegL src1, iRegL src2,
-                         immI src3, rFlagsReg cr) %{
+                         immI src3) %{
   match(Set dst (SubL src1 (LShiftL src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
@@ -12400,7 +12664,6 @@ instruct SubL_reg_LShift_reg(iRegLNoSp dst,
   ins_pipe(ialu_reg_reg_shift);
 %}
 
-
 // This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 

src/hotspot/cpu/aarch64/aarch64_ad.m4

@@ -35,8 +35,8 @@ define(`BASE_SHIFT_INSN',
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct $2$1_reg_$4_reg(iReg$1NoSp dst,
                          iReg$1`'ORL2I($1) src1, iReg$1`'ORL2I($1) src2,
-                         immI src3, rFlagsReg cr) %{
-  match(Set dst ($2$1 src1 ($4$1 src2 src3)));
+                         immI src3) %{
+  match(Set dst ($2$1 src1 (ifelse($4, RotateRight, $4, $4$1) src2 src3)));
 
   ins_cost(1.9 * INSN_COST);
   format %{ "$3  $dst, $src1, $src2, $5 $src3" %}
@@ -56,8 +56,7 @@ define(`BASE_INVERTED_INSN',
 `// This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
 instruct $2$1_reg_not_reg(iReg$1NoSp dst,
-                         iReg$1`'ORL2I($1) src1, iReg$1`'ORL2I($1) src2, imm$1_M1 m1,
-                         rFlagsReg cr) %{
+                         iReg$1`'ORL2I($1) src1, iReg$1`'ORL2I($1) src2, imm$1_M1 m1) %{
 dnl This ifelse is because hotspot reassociates (xor (xor ..)..)
 dnl into this canonical form.
   ifelse($2,Xor,
@@ -79,14 +78,15 @@ dnl into this canonical form.
 define(`INVERTED_SHIFT_INSN',
 `// This pattern is automatically generated from aarch64_ad.m4
 // DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+// val ifelse($2, Xor, ^, $2, And, &, |) (-1 ^ (val ifelse($4, RShift, >>, $4, LShift, <<, $4, URShift, >>>, ror) shift)) ==> $3
 instruct $2$1_reg_$4_not_reg(iReg$1NoSp dst,
                          iReg$1`'ORL2I($1) src1, iReg$1`'ORL2I($1) src2,
-                         immI src3, imm$1_M1 src4, rFlagsReg cr) %{
+                         immI src3, imm$1_M1 src4) %{
 dnl This ifelse is because hotspot reassociates (xor (xor ..)..)
 dnl into this canonical form.
   ifelse($2,Xor,
-    match(Set dst ($2$1 src4 (Xor$1($4$1 src2 src3) src1)));,
-    match(Set dst ($2$1 src1 (Xor$1($4$1 src2 src3) src4)));)
+    match(Set dst ($2$1 src4 (Xor$1(ifelse($4, RotateRight, $4, $4$1) src2 src3) src1)));,
+    match(Set dst ($2$1 src1 (Xor$1(ifelse($4, RotateRight, $4, $4$1) src2 src3) src4)));)
   ins_cost(1.9 * INSN_COST);
   format %{ "$3  $dst, $src1, $src2, $5 $src3" %}
 
@@ -131,17 +131,22 @@ define(`BOTH_INVERTED_INSNS',
 BASE_INVERTED_INSN(L, $1, $2, $3, $4)')dnl
 dnl
 define(`BOTH_INVERTED_SHIFT_INSNS',
-`INVERTED_SHIFT_INSN(I, $1, $2w, $3, $4, ~0, int)
-INVERTED_SHIFT_INSN(L, $1, $2, $3, $4, ~0l, jlong)')dnl
+`INVERTED_SHIFT_INSN(I, $1, $2w, $3, $4)
+INVERTED_SHIFT_INSN(L, $1, $2, $3, $4)')dnl
 dnl
-define(`ALL_SHIFT_KINDS',
+define(`ALL_SHIFT_KINDS_WITHOUT_ROR',
 `BOTH_SHIFT_INSNS($1, $2, URShift, LSR)
 BOTH_SHIFT_INSNS($1, $2, RShift, ASR)
 BOTH_SHIFT_INSNS($1, $2, LShift, LSL)')dnl
 dnl
+define(`ALL_SHIFT_KINDS',
+`ALL_SHIFT_KINDS_WITHOUT_ROR($1, $2)
+BOTH_SHIFT_INSNS($1, $2, RotateRight, ROR)')dnl
+dnl
 define(`ALL_INVERTED_SHIFT_KINDS',
 `BOTH_INVERTED_SHIFT_INSNS($1, $2, URShift, LSR)
 BOTH_INVERTED_SHIFT_INSNS($1, $2, RShift, ASR)
+BOTH_INVERTED_SHIFT_INSNS($1, $2, RotateRight, ROR)
 BOTH_INVERTED_SHIFT_INSNS($1, $2, LShift, LSL)')dnl
 dnl
 NOT_INSN(L, eon)
@@ -155,8 +160,8 @@ ALL_INVERTED_SHIFT_KINDS(Or, orn)
 ALL_SHIFT_KINDS(And, andr)
 ALL_SHIFT_KINDS(Xor, eor)
 ALL_SHIFT_KINDS(Or, orr)
-ALL_SHIFT_KINDS(Add, add)
-ALL_SHIFT_KINDS(Sub, sub)
+ALL_SHIFT_KINDS_WITHOUT_ROR(Add, add)
+ALL_SHIFT_KINDS_WITHOUT_ROR(Sub, sub)
 dnl
 dnl EXTEND mode, rshift_op, src, lshift_count, rshift_count
 define(`EXTEND', `($2$1 (LShift$1 $3 $4) $5)') dnl

src/hotspot/cpu/aarch64/atomic_aarch64.hpp

@@ -0,0 +1,49 @@
+/* Copyright (c) 2021, Red Hat Inc. 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_ATOMIC_AARCH64_HPP
+#define CPU_AARCH64_ATOMIC_AARCH64_HPP
+
+// Atomic stub implementation.
+// Default implementations are in atomic_linux_aarch64.S
+//
+// All stubs pass arguments the same way
+// x0: src/dest address
+// x1: arg1
+// x2: arg2 (optional)
+// x3, x8, x9: scratch
+typedef uint64_t (*aarch64_atomic_stub_t)(volatile void *ptr, uint64_t arg1, uint64_t arg2);
+
+// Pointers to stubs
+extern aarch64_atomic_stub_t aarch64_atomic_fetch_add_4_impl;
+extern aarch64_atomic_stub_t aarch64_atomic_fetch_add_8_impl;
+extern aarch64_atomic_stub_t aarch64_atomic_xchg_4_impl;
+extern aarch64_atomic_stub_t aarch64_atomic_xchg_8_impl;
+extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_1_impl;
+extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_4_impl;
+extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_8_impl;
+extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_1_relaxed_impl;
+extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_4_relaxed_impl;
+extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_8_relaxed_impl;
+
+#endif // CPU_AARCH64_ATOMIC_AARCH64_HPP

src/hotspot/cpu/aarch64/c1_globals_aarch64.hpp

@@ -52,7 +52,6 @@ define_pd_global(bool, ProfileInterpreter,           false);
 define_pd_global(intx, CodeCacheExpansionSize,       32*K );
 define_pd_global(uintx, CodeCacheMinBlockLength,     1);
 define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
-define_pd_global(uintx, MetaspaceSize,               12*M );
 define_pd_global(bool, NeverActAsServerClassMachine, true );
 define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
 define_pd_global(bool, CICompileOSR,                 true );

src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp

@@ -77,9 +77,6 @@ define_pd_global(intx, NonNMethodCodeHeapSize,       5*M );
 define_pd_global(uintx, CodeCacheMinBlockLength,     6);
 define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
 
-// Heap related flags
-define_pd_global(uintx,MetaspaceSize,    ScaleForWordSize(16*M));
-
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 

src/hotspot/cpu/aarch64/frame_aarch64.cpp

@@ -355,10 +355,6 @@ frame frame::sender_for_entry_frame(RegisterMap* map) const {
   vmassert(jfa->last_Java_pc() != NULL, "not walkable");
   frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc());
 
-  if (jfa->saved_fp_address()) {
-    update_map_with_saved_link(map, jfa->saved_fp_address());
-  }
-
   return fr;
 }
 

src/hotspot/cpu/aarch64/gc/shared/barrierSetAssembler_aarch64.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -23,6 +23,7 @@
  */
 
 #include "precompiled.hpp"
+#include "classfile/classLoaderData.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"

src/hotspot/cpu/aarch64/gc/shared/cardTableBarrierSetAssembler_aarch64.cpp

@@ -38,9 +38,6 @@ void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register ob
   BarrierSet* bs = BarrierSet::barrier_set();
   assert(bs->kind() == BarrierSet::CardTableBarrierSet, "Wrong barrier set kind");
 
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
-  CardTable* ct = ctbs->card_table();
-
   __ lsr(obj, obj, CardTable::card_shift);
 
   assert(CardTable::dirty_card_val() == 0, "must be");
@@ -49,25 +46,17 @@ void CardTableBarrierSetAssembler::store_check(MacroAssembler* masm, Register ob
 
   if (UseCondCardMark) {
     Label L_already_dirty;
-    __ membar(Assembler::StoreLoad);
     __ ldrb(rscratch2,  Address(obj, rscratch1));
     __ cbz(rscratch2, L_already_dirty);
     __ strb(zr, Address(obj, rscratch1));
     __ bind(L_already_dirty);
   } else {
-    if (ct->scanned_concurrently()) {
-      __ membar(Assembler::StoreStore);
-    }
     __ strb(zr, Address(obj, rscratch1));
   }
 }
 
 void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators,
                                                                     Register start, Register count, Register scratch, RegSet saved_regs) {
-  BarrierSet* bs = BarrierSet::barrier_set();
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
-  CardTable* ct = ctbs->card_table();
-
   Label L_loop, L_done;
   const Register end = count;
 
@@ -81,9 +70,6 @@ void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembl
 
   __ load_byte_map_base(scratch);
   __ add(start, start, scratch);
-  if (ct->scanned_concurrently()) {
-    __ membar(__ StoreStore);
-  }
   __ bind(L_loop);
   __ strb(zr, Address(start, count));
   __ subs(count, count, 1);

src/hotspot/cpu/aarch64/interpreterRT_aarch64.cpp

@@ -43,215 +43,103 @@ Register InterpreterRuntime::SignatureHandlerGenerator::from() { return rlocals;
 Register InterpreterRuntime::SignatureHandlerGenerator::to()   { return sp; }
 Register InterpreterRuntime::SignatureHandlerGenerator::temp() { return rscratch1; }
 
+Register InterpreterRuntime::SignatureHandlerGenerator::next_gpr() {
+  if (_num_reg_int_args < Argument::n_int_register_parameters_c-1) {
+    return as_Register(_num_reg_int_args++ + c_rarg1->encoding());
+  }
+  return noreg;
+}
+
+FloatRegister InterpreterRuntime::SignatureHandlerGenerator::next_fpr() {
+  if (_num_reg_fp_args < Argument::n_float_register_parameters_c) {
+    return as_FloatRegister(_num_reg_fp_args++);
+  }
+  return fnoreg;
+}
+
+int InterpreterRuntime::SignatureHandlerGenerator::next_stack_offset() {
+  int ret = _stack_offset;
+  _stack_offset += wordSize;
+  return ret;
+}
+
 InterpreterRuntime::SignatureHandlerGenerator::SignatureHandlerGenerator(
       const methodHandle& method, CodeBuffer* buffer) : NativeSignatureIterator(method) {
   _masm = new MacroAssembler(buffer);
-  _num_int_args = (method->is_static() ? 1 : 0);
-  _num_fp_args = 0;
+  _num_reg_int_args = (method->is_static() ? 1 : 0);
+  _num_reg_fp_args = 0;
   _stack_offset = 0;
 }
 
 void InterpreterRuntime::SignatureHandlerGenerator::pass_int() {
   const Address src(from(), Interpreter::local_offset_in_bytes(offset()));
 
-  switch (_num_int_args) {
-  case 0:
-    __ ldr(c_rarg1, src);
-    _num_int_args++;
-    break;
-  case 1:
-    __ ldr(c_rarg2, src);
-    _num_int_args++;
-    break;
-  case 2:
-    __ ldr(c_rarg3, src);
-    _num_int_args++;
-    break;
-  case 3:
-    __ ldr(c_rarg4, src);
-    _num_int_args++;
-    break;
-  case 4:
-    __ ldr(c_rarg5, src);
-    _num_int_args++;
-    break;
-  case 5:
-    __ ldr(c_rarg6, src);
-    _num_int_args++;
-    break;
-  case 6:
-    __ ldr(c_rarg7, src);
-    _num_int_args++;
-    break;
-  default:
-    __ ldr(r0, src);
-    __ str(r0, Address(to(), _stack_offset));
-    _stack_offset += wordSize;
-    _num_int_args++;
-    break;
+  Register reg = next_gpr();
+  if (reg != noreg) {
+    __ ldr(reg, src);
+  } else {
+    __ ldrw(r0, src);
+    __ strw(r0, Address(to(), next_stack_offset()));
   }
 }
 
 void InterpreterRuntime::SignatureHandlerGenerator::pass_long() {
   const Address src(from(), Interpreter::local_offset_in_bytes(offset() + 1));
 
-  switch (_num_int_args) {
-  case 0:
-    __ ldr(c_rarg1, src);
-    _num_int_args++;
-    break;
-  case 1:
-    __ ldr(c_rarg2, src);
-    _num_int_args++;
-    break;
-  case 2:
-    __ ldr(c_rarg3, src);
-    _num_int_args++;
-    break;
-  case 3:
-    __ ldr(c_rarg4, src);
-    _num_int_args++;
-    break;
-  case 4:
-    __ ldr(c_rarg5, src);
-    _num_int_args++;
-    break;
-  case 5:
-    __ ldr(c_rarg6, src);
-    _num_int_args++;
-    break;
-  case 6:
-    __ ldr(c_rarg7, src);
-    _num_int_args++;
-    break;
-  default:
+  Register reg = next_gpr();
+  if (reg != noreg) {
+    __ ldr(reg, src);
+  } else {
     __ ldr(r0, src);
-    __ str(r0, Address(to(), _stack_offset));
-    _stack_offset += wordSize;
-    _num_int_args++;
-    break;
+    __ str(r0, Address(to(), next_stack_offset()));
   }
 }
 
 void InterpreterRuntime::SignatureHandlerGenerator::pass_float() {
   const Address src(from(), Interpreter::local_offset_in_bytes(offset()));
 
-  if (_num_fp_args < Argument::n_float_register_parameters_c) {
-    __ ldrs(as_FloatRegister(_num_fp_args++), src);
+  FloatRegister reg = next_fpr();
+  if (reg != fnoreg) {
+    __ ldrs(reg, src);
   } else {
     __ ldrw(r0, src);
-    __ strw(r0, Address(to(), _stack_offset));
-    _stack_offset += wordSize;
-    _num_fp_args++;
+    __ strw(r0, Address(to(), next_stack_offset()));
   }
 }
 
 void InterpreterRuntime::SignatureHandlerGenerator::pass_double() {
   const Address src(from(), Interpreter::local_offset_in_bytes(offset() + 1));
 
-  if (_num_fp_args < Argument::n_float_register_parameters_c) {
-    __ ldrd(as_FloatRegister(_num_fp_args++), src);
+  FloatRegister reg = next_fpr();
+  if (reg != fnoreg) {
+    __ ldrd(reg, src);
   } else {
     __ ldr(r0, src);
-    __ str(r0, Address(to(), _stack_offset));
-    _stack_offset += wordSize;
-    _num_fp_args++;
+    __ str(r0, Address(to(), next_stack_offset()));
   }
 }
 
 void InterpreterRuntime::SignatureHandlerGenerator::pass_object() {
-
-  switch (_num_int_args) {
-  case 0:
+  Register reg = next_gpr();
+  if (reg == c_rarg1) {
     assert(offset() == 0, "argument register 1 can only be (non-null) receiver");
     __ add(c_rarg1, from(), Interpreter::local_offset_in_bytes(offset()));
-    _num_int_args++;
-    break;
-  case 1:
-    {
-      __ add(r0, from(), Interpreter::local_offset_in_bytes(offset()));
-      __ mov(c_rarg2, 0);
-      __ ldr(temp(), r0);
-      Label L;
-      __ cbz(temp(), L);
-      __ mov(c_rarg2, r0);
-      __ bind(L);
-      _num_int_args++;
-      break;
-    }
-  case 2:
-    {
-      __ add(r0, from(), Interpreter::local_offset_in_bytes(offset()));
-      __ mov(c_rarg3, 0);
-      __ ldr(temp(), r0);
-      Label L;
-      __ cbz(temp(), L);
-      __ mov(c_rarg3, r0);
-      __ bind(L);
-      _num_int_args++;
-      break;
-    }
-  case 3:
-    {
-      __ add(r0, from(), Interpreter::local_offset_in_bytes(offset()));
-      __ mov(c_rarg4, 0);
-      __ ldr(temp(), r0);
-      Label L;
-      __ cbz(temp(), L);
-      __ mov(c_rarg4, r0);
-      __ bind(L);
-      _num_int_args++;
-      break;
-    }
-  case 4:
-    {
-      __ add(r0, from(), Interpreter::local_offset_in_bytes(offset()));
-      __ mov(c_rarg5, 0);
-      __ ldr(temp(), r0);
-      Label L;
-      __ cbz(temp(), L);
-      __ mov(c_rarg5, r0);
-      __ bind(L);
-      _num_int_args++;
-      break;
-    }
-  case 5:
-    {
-      __ add(r0, from(), Interpreter::local_offset_in_bytes(offset()));
-      __ mov(c_rarg6, 0);
-      __ ldr(temp(), r0);
-      Label L;
-      __ cbz(temp(), L);
-      __ mov(c_rarg6, r0);
-      __ bind(L);
-      _num_int_args++;
-      break;
-    }
-  case 6:
-    {
-      __ add(r0, from(), Interpreter::local_offset_in_bytes(offset()));
-      __ mov(c_rarg7, 0);
-      __ ldr(temp(), r0);
-      Label L;
-      __ cbz(temp(), L);
-      __ mov(c_rarg7, r0);
-      __ bind(L);
-      _num_int_args++;
-      break;
-    }
- default:
-   {
-      __ add(r0, from(), Interpreter::local_offset_in_bytes(offset()));
-      __ ldr(temp(), r0);
-      Label L;
-      __ cbnz(temp(), L);
-      __ mov(r0, zr);
-      __ bind(L);
-      __ str(r0, Address(to(), _stack_offset));
-      _stack_offset += wordSize;
-      _num_int_args++;
-      break;
-   }
+  } else if (reg != noreg) {
+    __ add(r0, from(), Interpreter::local_offset_in_bytes(offset()));
+    __ mov(reg, 0);
+    __ ldr(temp(), r0);
+    Label L;
+    __ cbz(temp(), L);
+    __ mov(reg, r0);
+    __ bind(L);
+  } else {
+    __ add(r0, from(), Interpreter::local_offset_in_bytes(offset()));
+    __ ldr(temp(), r0);
+    Label L;
+    __ cbnz(temp(), L);
+    __ mov(r0, zr);
+    __ bind(L);
+    __ str(r0, Address(to(), next_stack_offset()));
   }
 }
 
@@ -280,77 +168,77 @@ class SlowSignatureHandler
   intptr_t* _int_args;
   intptr_t* _fp_args;
   intptr_t* _fp_identifiers;
-  unsigned int _num_int_args;
-  unsigned int _num_fp_args;
+  unsigned int _num_reg_int_args;
+  unsigned int _num_reg_fp_args;
 
-  virtual void pass_int()
-  {
-    jint from_obj = *(jint *)(_from+Interpreter::local_offset_in_bytes(0));
+  intptr_t* single_slot_addr() {
+    intptr_t* from_addr = (intptr_t*)(_from+Interpreter::local_offset_in_bytes(0));
     _from -= Interpreter::stackElementSize;
-
-    if (_num_int_args < Argument::n_int_register_parameters_c-1) {
-      *_int_args++ = from_obj;
-      _num_int_args++;
-    } else {
-      *_to++ = from_obj;
-      _num_int_args++;
-    }
+    return from_addr;
   }
 
-  virtual void pass_long()
-  {
-    intptr_t from_obj = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(1));
+  intptr_t* double_slot_addr() {
+    intptr_t* from_addr = (intptr_t*)(_from+Interpreter::local_offset_in_bytes(1));
     _from -= 2*Interpreter::stackElementSize;
+    return from_addr;
+  }
 
-    if (_num_int_args < Argument::n_int_register_parameters_c-1) {
-      *_int_args++ = from_obj;
-      _num_int_args++;
-    } else {
-      *_to++ = from_obj;
-      _num_int_args++;
+  int pass_gpr(intptr_t value) {
+    if (_num_reg_int_args < Argument::n_int_register_parameters_c-1) {
+      *_int_args++ = value;
+      return _num_reg_int_args++;
+    }
+    return -1;
+  }
+
+  int pass_fpr(intptr_t value) {
+    if (_num_reg_fp_args < Argument::n_float_register_parameters_c) {
+      *_fp_args++ = value;
+      return _num_reg_fp_args++;
+    }
+    return -1;
+  }
+
+  void pass_stack(intptr_t value) {
+    *_to++ = value;
+  }
+
+  virtual void pass_int() {
+    jint value = *(jint*)single_slot_addr();
+    if (pass_gpr(value) < 0) {
+      pass_stack(value);
     }
   }
 
-  virtual void pass_object()
-  {
-    intptr_t *from_addr = (intptr_t*)(_from + Interpreter::local_offset_in_bytes(0));
-    _from -= Interpreter::stackElementSize;
-
-    if (_num_int_args < Argument::n_int_register_parameters_c-1) {
-      *_int_args++ = (*from_addr == 0) ? NULL : (intptr_t)from_addr;
-      _num_int_args++;
-    } else {
-      *_to++ = (*from_addr == 0) ? NULL : (intptr_t) from_addr;
-      _num_int_args++;
+  virtual void pass_long() {
+    intptr_t value = *double_slot_addr();
+    if (pass_gpr(value) < 0) {
+      pass_stack(value);
     }
   }
 
-  virtual void pass_float()
-  {
-    jint from_obj = *(jint*)(_from+Interpreter::local_offset_in_bytes(0));
-    _from -= Interpreter::stackElementSize;
-
-    if (_num_fp_args < Argument::n_float_register_parameters_c) {
-      *_fp_args++ = from_obj;
-      _num_fp_args++;
-    } else {
-      *_to++ = from_obj;
-      _num_fp_args++;
+  virtual void pass_object() {
+    intptr_t* addr = single_slot_addr();
+    intptr_t value = *addr == 0 ? NULL : (intptr_t)addr;
+    if (pass_gpr(value) < 0) {
+      pass_stack(value);
     }
   }
 
-  virtual void pass_double()
-  {
-    intptr_t from_obj = *(intptr_t*)(_from+Interpreter::local_offset_in_bytes(1));
-    _from -= 2*Interpreter::stackElementSize;
+  virtual void pass_float() {
+    jint value = *(jint*)single_slot_addr();
+    if (pass_fpr(value) < 0) {
+      pass_stack(value);
+    }
+  }
 
-    if (_num_fp_args < Argument::n_float_register_parameters_c) {
-      *_fp_args++ = from_obj;
-      *_fp_identifiers |= (1ull << _num_fp_args); // mark as double
-      _num_fp_args++;
+  virtual void pass_double() {
+    intptr_t value = *double_slot_addr();
+    int arg = pass_fpr(value);
+    if (0 <= arg) {
+      *_fp_identifiers |= (1ull << arg); // mark as double
     } else {
-      *_to++ = from_obj;
-      _num_fp_args++;
+      pass_stack(value);
     }
   }
 
@@ -365,8 +253,8 @@ class SlowSignatureHandler
     _fp_args =  to - 8;
     _fp_identifiers = to - 9;
     *(int*) _fp_identifiers = 0;
-    _num_int_args = (method->is_static() ? 1 : 0);
-    _num_fp_args = 0;
+    _num_reg_int_args = (method->is_static() ? 1 : 0);
+    _num_reg_fp_args = 0;
   }
 
 };

src/hotspot/cpu/aarch64/interpreterRT_aarch64.hpp

@@ -34,8 +34,8 @@
 class SignatureHandlerGenerator: public NativeSignatureIterator {
  private:
   MacroAssembler* _masm;
-  unsigned int _num_fp_args;
-  unsigned int _num_int_args;
+  unsigned int _num_reg_fp_args;
+  unsigned int _num_reg_int_args;
   int _stack_offset;
 
   void pass_int();
@@ -44,6 +44,10 @@ class SignatureHandlerGenerator: public NativeSignatureIterator {
   void pass_double();
   void pass_object();
 
+  Register next_gpr();
+  FloatRegister next_fpr();
+  int next_stack_offset();
+
  public:
   // Creation
   SignatureHandlerGenerator(const methodHandle& method, CodeBuffer* buffer);

src/hotspot/cpu/aarch64/javaFrameAnchor_aarch64.hpp

@@ -31,9 +31,6 @@ private:
   // FP value associated with _last_Java_sp:
   intptr_t* volatile        _last_Java_fp;           // pointer is volatile not what it points to
 
-  // (Optional) location of saved FP register, which GCs want to inspect
-  intptr_t** volatile _saved_fp_address;
-
 public:
   // Each arch must define reset, save, restore
   // These are used by objects that only care about:
@@ -47,7 +44,6 @@ public:
     OrderAccess::release();
     _last_Java_fp = NULL;
     _last_Java_pc = NULL;
-    _saved_fp_address = NULL;
   }
 
   void copy(JavaFrameAnchor* src) {
@@ -66,8 +62,6 @@ public:
     _last_Java_pc = src->_last_Java_pc;
     // Must be last so profiler will always see valid frame if has_last_frame() is true
     _last_Java_sp = src->_last_Java_sp;
-
-    _saved_fp_address = src->_saved_fp_address;
   }
 
   bool walkable(void)                            { return _last_Java_sp != NULL && _last_Java_pc != NULL; }
@@ -78,12 +72,9 @@ public:
 
   address last_Java_pc(void)                     { return _last_Java_pc; }
 
-  intptr_t** saved_fp_address(void) const        { return _saved_fp_address; }
-
 private:
 
   static ByteSize last_Java_fp_offset()          { return byte_offset_of(JavaFrameAnchor, _last_Java_fp); }
-  static ByteSize saved_fp_address_offset()      { return byte_offset_of(JavaFrameAnchor, _saved_fp_address); }
 
 public:
 

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -320,8 +320,6 @@ void MacroAssembler::reset_last_Java_frame(bool clear_fp) {
 
   // Always clear the pc because it could have been set by make_walkable()
   str(zr, Address(rthread, JavaThread::last_Java_pc_offset()));
-
-  str(zr, Address(rthread, JavaThread::saved_fp_address_offset()));
 }
 
 // Calls to C land
@@ -2567,6 +2565,8 @@ void MacroAssembler::atomic_##OP(Register prev, Register newv, Register addr) {
 
 ATOMIC_XCHG(xchg, swp, ldxr, stxr, Assembler::xword)
 ATOMIC_XCHG(xchgw, swp, ldxrw, stxrw, Assembler::word)
+ATOMIC_XCHG(xchgl, swpl, ldxr, stlxr, Assembler::xword)
+ATOMIC_XCHG(xchglw, swpl, ldxrw, stlxrw, Assembler::word)
 ATOMIC_XCHG(xchgal, swpal, ldaxr, stlxr, Assembler::xword)
 ATOMIC_XCHG(xchgalw, swpal, ldaxrw, stlxrw, Assembler::word)
 
@@ -5266,10 +5266,14 @@ void MacroAssembler::char_array_compress(Register src, Register dst, Register le
 // by the call to JavaThread::aarch64_get_thread_helper() or, indeed,
 // the call setup code.
 //
-// aarch64_get_thread_helper() clobbers only r0, r1, and flags.
+// On Linux, aarch64_get_thread_helper() clobbers only r0, r1, and flags.
+// On other systems, the helper is a usual C function.
 //
 void MacroAssembler::get_thread(Register dst) {
-  RegSet saved_regs = RegSet::range(r0, r1) + lr - dst;
+  RegSet saved_regs =
+    LINUX_ONLY(RegSet::range(r0, r1)  + lr - dst)
+    NOT_LINUX (RegSet::range(r0, r17) + lr - dst);
+
   push(saved_regs, sp);
 
   mov(lr, CAST_FROM_FN_PTR(address, JavaThread::aarch64_get_thread_helper));

src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp

@@ -1039,6 +1039,8 @@ public:
 
   void atomic_xchg(Register prev, Register newv, Register addr);
   void atomic_xchgw(Register prev, Register newv, Register addr);
+  void atomic_xchgl(Register prev, Register newv, Register addr);
+  void atomic_xchglw(Register prev, Register newv, Register addr);
   void atomic_xchgal(Register prev, Register newv, Register addr);
   void atomic_xchgalw(Register prev, Register newv, Register addr);
 

src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp

@@ -3072,7 +3072,6 @@ void OptoRuntime::generate_exception_blob() {
   // Set exception blob
   _exception_blob =  ExceptionBlob::create(&buffer, oop_maps, SimpleRuntimeFrame::framesize >> 1);
 }
-#endif // COMPILER2
 
 // ---------------------------------------------------------------
 
@@ -3082,6 +3081,10 @@ class NativeInvokerGenerator : public StubCodeGenerator {
 
   const GrowableArray<VMReg>& _input_registers;
   const GrowableArray<VMReg>& _output_registers;
+
+  int _frame_complete;
+  int _framesize;
+  OopMapSet* _oop_maps;
 public:
   NativeInvokerGenerator(CodeBuffer* buffer,
                          address call_target,
@@ -3092,9 +3095,90 @@ public:
      _call_target(call_target),
      _shadow_space_bytes(shadow_space_bytes),
      _input_registers(input_registers),
-     _output_registers(output_registers) {}
+     _output_registers(output_registers),
+     _frame_complete(0),
+     _framesize(0),
+     _oop_maps(NULL) {
+    assert(_output_registers.length() <= 1
+           || (_output_registers.length() == 2 && !_output_registers.at(1)->is_valid()), "no multi-reg returns");
+  }
+
   void generate();
 
+  int spill_size_in_bytes() const {
+    if (_output_registers.length() == 0) {
+      return 0;
+    }
+    VMReg reg = _output_registers.at(0);
+    assert(reg->is_reg(), "must be a register");
+    if (reg->is_Register()) {
+      return 8;
+    } else if (reg->is_FloatRegister()) {
+      bool use_sve = Matcher::supports_scalable_vector();
+      if (use_sve) {
+        return Matcher::scalable_vector_reg_size(T_BYTE);
+      }
+      return 16;
+    } else {
+      ShouldNotReachHere();
+    }
+    return 0;
+  }
+
+  void spill_output_registers() {
+    if (_output_registers.length() == 0) {
+      return;
+    }
+    VMReg reg = _output_registers.at(0);
+    assert(reg->is_reg(), "must be a register");
+    MacroAssembler* masm = _masm;
+    if (reg->is_Register()) {
+      __ spill(reg->as_Register(), true, 0);
+    } else if (reg->is_FloatRegister()) {
+      bool use_sve = Matcher::supports_scalable_vector();
+      if (use_sve) {
+        __ spill_sve_vector(reg->as_FloatRegister(), 0, Matcher::scalable_vector_reg_size(T_BYTE));
+      } else {
+        __ spill(reg->as_FloatRegister(), __ Q, 0);
+      }
+    } else {
+      ShouldNotReachHere();
+    }
+  }
+
+  void fill_output_registers() {
+    if (_output_registers.length() == 0) {
+      return;
+    }
+    VMReg reg = _output_registers.at(0);
+    assert(reg->is_reg(), "must be a register");
+    MacroAssembler* masm = _masm;
+    if (reg->is_Register()) {
+      __ unspill(reg->as_Register(), true, 0);
+    } else if (reg->is_FloatRegister()) {
+      bool use_sve = Matcher::supports_scalable_vector();
+      if (use_sve) {
+        __ unspill_sve_vector(reg->as_FloatRegister(), 0, Matcher::scalable_vector_reg_size(T_BYTE));
+      } else {
+        __ unspill(reg->as_FloatRegister(), __ Q, 0);
+      }
+    } else {
+      ShouldNotReachHere();
+    }
+  }
+
+  int frame_complete() const {
+    return _frame_complete;
+  }
+
+  int framesize() const {
+    return (_framesize >> (LogBytesPerWord - LogBytesPerInt));
+  }
+
+  OopMapSet* oop_maps() const {
+    return _oop_maps;
+  }
+
 private:
 #ifdef ASSERT
   bool target_uses_register(VMReg reg) {
@@ -3105,21 +3189,23 @@ private:
 
 static const int native_invoker_code_size = 1024;
 
-BufferBlob* SharedRuntime::make_native_invoker(address call_target,
-                                               int shadow_space_bytes,
-                                               const GrowableArray<VMReg>& input_registers,
-                                               const GrowableArray<VMReg>& output_registers) {
-  BufferBlob* _invoke_native_blob =
-    BufferBlob::create("nep_invoker_blob", native_invoker_code_size);
-  if (_invoke_native_blob == NULL)
-    return NULL; // allocation failure
-
-  CodeBuffer code(_invoke_native_blob);
+RuntimeStub* SharedRuntime::make_native_invoker(address call_target,
+                                                int shadow_space_bytes,
+                                                const GrowableArray<VMReg>& input_registers,
+                                                const GrowableArray<VMReg>& output_registers) {
+  int locs_size  = 64;
+  CodeBuffer code("nep_invoker_blob", native_invoker_code_size, locs_size);
   NativeInvokerGenerator g(&code, call_target, shadow_space_bytes, input_registers, output_registers);
   g.generate();
   code.log_section_sizes("nep_invoker_blob");
 
-  return _invoke_native_blob;
+  RuntimeStub* stub =
+    RuntimeStub::new_runtime_stub("nep_invoker_blob",
+                                  &code,
+                                  g.frame_complete(),
+                                  g.framesize(),
+                                  g.oop_maps(), false);
+  return stub;
 }
 
 void NativeInvokerGenerator::generate() {
@@ -3128,26 +3214,40 @@ void NativeInvokerGenerator::generate() {
            || target_uses_register(rthread->as_VMReg())),
          "Register conflict");
 
+  enum layout {
+    rbp_off,
+    rbp_off2,
+    return_off,
+    return_off2,
+    framesize // inclusive of return address
+  };
+
+  assert(_shadow_space_bytes == 0, "not expecting shadow space on AArch64");
+  _framesize = align_up(framesize + (spill_size_in_bytes() >> LogBytesPerInt), 4);
+  assert(is_even(_framesize/2), "sp not 16-byte aligned");
+
+  _oop_maps  = new OopMapSet();
   MacroAssembler* masm = _masm;
 
-  __ set_last_Java_frame(sp, noreg, lr, rscratch1);
+  address start = __ pc();
 
   __ enter();
 
-  // Store a pointer to the previous R29 (RFP) saved on the stack as it
-  // may contain an oop if PreserveFramePointer is off. This value is
-  // retrieved later by frame::sender_for_entry_frame() when the stack
-  // is walked.
-  __ mov(rscratch1, sp);
-  __ str(rscratch1, Address(rthread, JavaThread::saved_fp_address_offset()));
+  // lr and fp are already in place
+  __ sub(sp, rfp, ((unsigned)_framesize-4) << LogBytesPerInt); // prolog
+
+  _frame_complete = __ pc() - start;
+
+  address the_pc = __ pc();
+  __ set_last_Java_frame(sp, rfp, the_pc, rscratch1);
+  OopMap* map = new OopMap(_framesize, 0);
+  _oop_maps->add_gc_map(the_pc - start, map);
 
   // State transition
   __ mov(rscratch1, _thread_in_native);
   __ lea(rscratch2, Address(rthread, JavaThread::thread_state_offset()));
   __ stlrw(rscratch1, rscratch2);
 
-  assert(_shadow_space_bytes == 0, "not expecting shadow space on AArch64");
-
   rt_call(masm, _call_target);
 
   __ mov(rscratch1, _thread_in_native_trans);
@@ -3193,27 +3293,14 @@ void NativeInvokerGenerator::generate() {
   __ bind(L_safepoint_poll_slow_path);
 
   // Need to save the native result registers around any runtime calls.
-  RegSet spills;
-  FloatRegSet fp_spills;
-  for (int i = 0; i < _output_registers.length(); i++) {
-    VMReg output = _output_registers.at(i);
-    if (output->is_Register()) {
-      spills += RegSet::of(output->as_Register());
-    } else if (output->is_FloatRegister()) {
-      fp_spills += FloatRegSet::of(output->as_FloatRegister());
-    }
-  }
-
-  __ push(spills, sp);
-  __ push_fp(fp_spills, sp);
+  spill_output_registers();
 
   __ mov(c_rarg0, rthread);
   assert(frame::arg_reg_save_area_bytes == 0, "not expecting frame reg save area");
   __ lea(rscratch1, RuntimeAddress(CAST_FROM_FN_PTR(address, JavaThread::check_special_condition_for_native_trans)));
   __ blr(rscratch1);
 
-  __ pop_fp(fp_spills, sp);
-  __ pop(spills, sp);
+  fill_output_registers();
 
   __ b(L_after_safepoint_poll);
   __ block_comment("} L_safepoint_poll_slow_path");
@@ -3223,13 +3310,11 @@ void NativeInvokerGenerator::generate() {
   __ block_comment("{ L_reguard");
   __ bind(L_reguard);
 
-  __ push(spills, sp);
-  __ push_fp(fp_spills, sp);
+  spill_output_registers();
 
   rt_call(masm, CAST_FROM_FN_PTR(address, SharedRuntime::reguard_yellow_pages));
 
-  __ pop_fp(fp_spills, sp);
-  __ pop(spills, sp);
+  fill_output_registers();
 
   __ b(L_after_reguard);
 
@@ -3239,3 +3324,4 @@ void NativeInvokerGenerator::generate() {
 
   __ flush();
 }
+#endif // COMPILER2

src/hotspot/cpu/aarch64/stubGenerator_aarch64.cpp

@@ -26,6 +26,7 @@
 #include "precompiled.hpp"
 #include "asm/macroAssembler.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "atomic_aarch64.hpp"
 #include "gc/shared/barrierSet.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/gc_globals.hpp"
@@ -38,6 +39,7 @@
 #include "oops/objArrayKlass.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/methodHandles.hpp"
+#include "runtime/atomic.hpp"
 #include "runtime/frame.inline.hpp"
 #include "runtime/handles.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
@@ -1361,7 +1363,7 @@ class StubGenerator: public StubCodeGenerator {
   //
   // If 'from' and/or 'to' are aligned on 4-byte boundaries, we let
   // the hardware handle it.  The two dwords within qwords that span
-  // cache line boundaries will still be loaded and stored atomicly.
+  // cache line boundaries will still be loaded and stored atomically.
   //
   // Side Effects:
   //   disjoint_int_copy_entry is set to the no-overlap entry point
@@ -1431,7 +1433,7 @@ class StubGenerator: public StubCodeGenerator {
   //
   // If 'from' and/or 'to' are aligned on 4-byte boundaries, we let
   // the hardware handle it.  The two dwords within qwords that span
-  // cache line boundaries will still be loaded and stored atomicly.
+  // cache line boundaries will still be loaded and stored atomically.
   //
   address generate_conjoint_copy(int size, bool aligned, bool is_oop, address nooverlap_target,
                                  address *entry, const char *name,
@@ -1596,7 +1598,7 @@ class StubGenerator: public StubCodeGenerator {
   //
   // If 'from' and/or 'to' are aligned on 4-byte boundaries, we let
   // the hardware handle it.  The two dwords within qwords that span
-  // cache line boundaries will still be loaded and stored atomicly.
+  // cache line boundaries will still be loaded and stored atomically.
   //
   // Side Effects:
   //   disjoint_int_copy_entry is set to the no-overlap entry point
@@ -1620,7 +1622,7 @@ class StubGenerator: public StubCodeGenerator {
   //
   // If 'from' and/or 'to' are aligned on 4-byte boundaries, we let
   // the hardware handle it.  The two dwords within qwords that span
-  // cache line boundaries will still be loaded and stored atomicly.
+  // cache line boundaries will still be loaded and stored atomically.
   //
   address generate_conjoint_int_copy(bool aligned, address nooverlap_target,
                                      address *entry, const char *name,
@@ -5571,6 +5573,171 @@ class StubGenerator: public StubCodeGenerator {
     return start;
   }
 
+#ifdef LINUX
+
+  // ARMv8.1 LSE versions of the atomic stubs used by Atomic::PlatformXX.
+  //
+  // If LSE is in use, generate LSE versions of all the stubs. The
+  // non-LSE versions are in atomic_aarch64.S.
+
+  // class AtomicStubMark records the entry point of a stub and the
+  // stub pointer which will point to it. The stub pointer is set to
+  // the entry point when ~AtomicStubMark() is called, which must be
+  // after ICache::invalidate_range. This ensures safe publication of
+  // the generated code.
+  class AtomicStubMark {
+    address _entry_point;
+    aarch64_atomic_stub_t *_stub;
+    MacroAssembler *_masm;
+  public:
+    AtomicStubMark(MacroAssembler *masm, aarch64_atomic_stub_t *stub) {
+      _masm = masm;
+      __ align(32);
+      _entry_point = __ pc();
+      _stub = stub;
+    }
+    ~AtomicStubMark() {
+      *_stub = (aarch64_atomic_stub_t)_entry_point;
+    }
+  };
+
+  // NB: For memory_order_conservative we need a trailing membar after
+  // LSE atomic operations but not a leading membar.
+  //
+  // We don't need a leading membar because a clause in the Arm ARM
+  // says:
+  //
+  //   Barrier-ordered-before
+  //
+  //   Barrier instructions order prior Memory effects before subsequent
+  //   Memory effects generated by the same Observer. A read or a write
+  //   RW1 is Barrier-ordered-before a read or a write RW 2 from the same
+  //   Observer if and only if RW1 appears in program order before RW 2
+  //   and [ ... ] at least one of RW 1 and RW 2 is generated by an atomic
+  //   instruction with both Acquire and Release semantics.
+  //
+  // All the atomic instructions {ldaddal, swapal, casal} have Acquire
+  // and Release semantics, therefore we don't need a leading
+  // barrier. However, there is no corresponding Barrier-ordered-after
+  // relationship, therefore we need a trailing membar to prevent a
+  // later store or load from being reordered with the store in an
+  // atomic instruction.
+  //
+  // This was checked by using the herd7 consistency model simulator
+  // (http://diy.inria.fr/) with this test case:
+  //
+  // AArch64 LseCas
+  // { 0:X1=x; 0:X2=y; 1:X1=x; 1:X2=y; }
+  // P0 | P1;
+  // LDR W4, [X2] | MOV W3, #0;
+  // DMB LD       | MOV W4, #1;
+  // LDR W3, [X1] | CASAL W3, W4, [X1];
+  //              | DMB ISH;
+  //              | STR W4, [X2];
+  // exists
+  // (0:X3=0 /\ 0:X4=1)
+  //
+  // If X3 == 0 && X4 == 1, the store to y in P1 has been reordered
+  // with the store to x in P1. Without the DMB in P1 this may happen.
+  //
+  // At the time of writing we don't know of any AArch64 hardware that
+  // reorders stores in this way, but the Reference Manual permits it.
+
+  void gen_cas_entry(Assembler::operand_size size,
+                     atomic_memory_order order) {
+    Register prev = r3, ptr = c_rarg0, compare_val = c_rarg1,
+      exchange_val = c_rarg2;
+    bool acquire, release;
+    switch (order) {
+      case memory_order_relaxed:
+        acquire = false;
+        release = false;
+        break;
+      default:
+        acquire = true;
+        release = true;
+        break;
+    }
+    __ mov(prev, compare_val);
+    __ lse_cas(prev, exchange_val, ptr, size, acquire, release, /*not_pair*/true);
+    if (order == memory_order_conservative) {
+      __ membar(Assembler::StoreStore|Assembler::StoreLoad);
+    }
+    if (size == Assembler::xword) {
+      __ mov(r0, prev);
+    } else {
+      __ movw(r0, prev);
+    }
+    __ ret(lr);
+  }
+
+  void gen_ldaddal_entry(Assembler::operand_size size) {
+    Register prev = r2, addr = c_rarg0, incr = c_rarg1;
+    __ ldaddal(size, incr, prev, addr);
+    __ membar(Assembler::StoreStore|Assembler::StoreLoad);
+    if (size == Assembler::xword) {
+      __ mov(r0, prev);
+    } else {
+      __ movw(r0, prev);
+    }
+    __ ret(lr);
+  }
+
+  void gen_swpal_entry(Assembler::operand_size size) {
+    Register prev = r2, addr = c_rarg0, incr = c_rarg1;
+    __ swpal(size, incr, prev, addr);
+    __ membar(Assembler::StoreStore|Assembler::StoreLoad);
+    if (size == Assembler::xword) {
+      __ mov(r0, prev);
+    } else {
+      __ movw(r0, prev);
+    }
+    __ ret(lr);
+  }
+
+  void generate_atomic_entry_points() {
+    if (! UseLSE) {
+      return;
+    }
+
+    __ align(CodeEntryAlignment);
+    StubCodeMark mark(this, "StubRoutines", "atomic entry points");
+    address first_entry = __ pc();
+
+    // All memory_order_conservative
+    AtomicStubMark mark_fetch_add_4(_masm, &aarch64_atomic_fetch_add_4_impl);
+    gen_ldaddal_entry(Assembler::word);
+    AtomicStubMark mark_fetch_add_8(_masm, &aarch64_atomic_fetch_add_8_impl);
+    gen_ldaddal_entry(Assembler::xword);
+
+    AtomicStubMark mark_xchg_4(_masm, &aarch64_atomic_xchg_4_impl);
+    gen_swpal_entry(Assembler::word);
+    AtomicStubMark mark_xchg_8_impl(_masm, &aarch64_atomic_xchg_8_impl);
+    gen_swpal_entry(Assembler::xword);
+
+    // CAS, memory_order_conservative
+    AtomicStubMark mark_cmpxchg_1(_masm, &aarch64_atomic_cmpxchg_1_impl);
+    gen_cas_entry(MacroAssembler::byte, memory_order_conservative);
+    AtomicStubMark mark_cmpxchg_4(_masm, &aarch64_atomic_cmpxchg_4_impl);
+    gen_cas_entry(MacroAssembler::word, memory_order_conservative);
+    AtomicStubMark mark_cmpxchg_8(_masm, &aarch64_atomic_cmpxchg_8_impl);
+    gen_cas_entry(MacroAssembler::xword, memory_order_conservative);
+
+    // CAS, memory_order_relaxed
+    AtomicStubMark mark_cmpxchg_1_relaxed
+      (_masm, &aarch64_atomic_cmpxchg_1_relaxed_impl);
+    gen_cas_entry(MacroAssembler::byte, memory_order_relaxed);
+    AtomicStubMark mark_cmpxchg_4_relaxed
+      (_masm, &aarch64_atomic_cmpxchg_4_relaxed_impl);
+    gen_cas_entry(MacroAssembler::word, memory_order_relaxed);
+    AtomicStubMark mark_cmpxchg_8_relaxed
+      (_masm, &aarch64_atomic_cmpxchg_8_relaxed_impl);
+    gen_cas_entry(MacroAssembler::xword, memory_order_relaxed);
+
+    ICache::invalidate_range(first_entry, __ pc() - first_entry);
+  }
+#endif // LINUX
+
   // Continuation point for throwing of implicit exceptions that are
   // not handled in the current activation. Fabricates an exception
   // oop and initiates normal exception dispatching in this
@@ -6683,6 +6850,12 @@ class StubGenerator: public StubCodeGenerator {
       StubRoutines::_updateBytesAdler32 = generate_updateBytesAdler32();
     }
 
+#ifdef LINUX
+
+    generate_atomic_entry_points();
+
+#endif // LINUX
+
     StubRoutines::aarch64::set_completed();
   }
 
@@ -6703,3 +6876,30 @@ void StubGenerator_generate(CodeBuffer* code, bool all) {
   }
   StubGenerator g(code, all);
 }
+
+
+#ifdef LINUX
+
+// Define pointers to atomic stubs and initialize them to point to the
+// code in atomic_aarch64.S.
+
+#define DEFAULT_ATOMIC_OP(OPNAME, SIZE, RELAXED)                                \
+  extern "C" uint64_t aarch64_atomic_ ## OPNAME ## _ ## SIZE ## RELAXED ## _default_impl \
+    (volatile void *ptr, uint64_t arg1, uint64_t arg2);                 \
+  aarch64_atomic_stub_t aarch64_atomic_ ## OPNAME ## _ ## SIZE ## RELAXED ## _impl \
+    = aarch64_atomic_ ## OPNAME ## _ ## SIZE ## RELAXED ## _default_impl;
+
+DEFAULT_ATOMIC_OP(fetch_add, 4, )
+DEFAULT_ATOMIC_OP(fetch_add, 8, )
+DEFAULT_ATOMIC_OP(xchg, 4, )
+DEFAULT_ATOMIC_OP(xchg, 8, )
+DEFAULT_ATOMIC_OP(cmpxchg, 1, )
+DEFAULT_ATOMIC_OP(cmpxchg, 4, )
+DEFAULT_ATOMIC_OP(cmpxchg, 8, )
+DEFAULT_ATOMIC_OP(cmpxchg, 1, _relaxed)
+DEFAULT_ATOMIC_OP(cmpxchg, 4, _relaxed)
+DEFAULT_ATOMIC_OP(cmpxchg, 8, _relaxed)
+
+#undef DEFAULT_ATOMIC_OP
+
+#endif // LINUX

src/hotspot/cpu/arm/c1_LIRGenerator_arm.cpp

@@ -366,9 +366,6 @@ void LIRGenerator::set_card(LIR_Opr value, LIR_Address* card_addr) {
 void LIRGenerator::CardTableBarrierSet_post_barrier_helper(LIR_OprDesc* addr, LIR_Const* card_table_base) {
   assert(addr->is_register(), "must be a register at this point");
 
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
-  CardTable* ct = ctbs->card_table();
-
   LIR_Opr tmp = FrameMap::LR_ptr_opr;
 
   bool load_card_table_base_const = VM_Version::supports_movw();
@@ -382,9 +379,6 @@ void LIRGenerator::CardTableBarrierSet_post_barrier_helper(LIR_OprDesc* addr, LI
   // byte instruction does not support the addressing mode we need.
   LIR_Address* card_addr = new LIR_Address(tmp, addr, (LIR_Address::Scale) -CardTable::card_shift, 0, T_BOOLEAN);
   if (UseCondCardMark) {
-    if (ct->scanned_concurrently()) {
-      __ membar_storeload();
-    }
     LIR_Opr cur_value = new_register(T_INT);
     __ move(card_addr, cur_value);
 
@@ -394,9 +388,6 @@ void LIRGenerator::CardTableBarrierSet_post_barrier_helper(LIR_OprDesc* addr, LI
     set_card(tmp, card_addr);
     __ branch_destination(L_already_dirty->label());
   } else {
-    if (ct->scanned_concurrently()) {
-      __ membar_storestore();
-    }
     set_card(tmp, card_addr);
   }
 }

src/hotspot/cpu/arm/c1_globals_arm.hpp

@@ -53,7 +53,6 @@ define_pd_global(bool, ProfileInterpreter,           false);
 define_pd_global(size_t, CodeCacheExpansionSize,     32*K );
 define_pd_global(uintx, CodeCacheMinBlockLength,     1);
 define_pd_global(size_t, CodeCacheMinimumUseSpace,   400*K);
-define_pd_global(size_t, MetaspaceSize,              12*M );
 define_pd_global(bool, NeverActAsServerClassMachine, true);
 define_pd_global(uint64_t, MaxRAM,                   1ULL*G);
 define_pd_global(bool, CICompileOSR,                 true );

src/hotspot/cpu/arm/c2_globals_arm.hpp

@@ -100,9 +100,6 @@ define_pd_global(size_t, CodeCacheMinimumUseSpace,   400*K);
 
 define_pd_global(bool,  TrapBasedRangeChecks,        false); // Not needed
 
-// Heap related flags
-define_pd_global(size_t, MetaspaceSize,              ScaleForWordSize(16*M));
-
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 

src/hotspot/cpu/arm/gc/shared/cardTableBarrierSetAssembler_arm.cpp

@@ -128,16 +128,10 @@ void CardTableBarrierSetAssembler::store_check_part2(MacroAssembler* masm, Regis
   assert(bs->kind() == BarrierSet::CardTableBarrierSet,
          "Wrong barrier set kind");
 
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(bs);
-  CardTable* ct = ctbs->card_table();
-
   assert(CardTable::dirty_card_val() == 0, "Dirty card value must be 0 due to optimizations.");
   Address card_table_addr(card_table_base, obj, lsr, CardTable::card_shift);
 
   if (UseCondCardMark) {
-    if (ct->scanned_concurrently()) {
-      __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreLoad), noreg);
-    }
     Label already_dirty;
 
     __ ldrb(tmp, card_table_addr);
@@ -147,9 +141,6 @@ void CardTableBarrierSetAssembler::store_check_part2(MacroAssembler* masm, Regis
     __ bind(already_dirty);
 
   } else {
-    if (ct->scanned_concurrently()) {
-      __ membar(MacroAssembler::Membar_mask_bits(MacroAssembler::StoreStore), noreg);
-    }
     set_card(masm, card_table_base, card_table_addr, tmp);
   }
 }

src/hotspot/cpu/arm/sharedRuntime_arm.cpp

@@ -1898,10 +1898,12 @@ RuntimeStub* SharedRuntime::generate_resolve_blob(address destination, const cha
   return RuntimeStub::new_runtime_stub(name, &buffer, frame_complete, frame_size_words, oop_maps, true);
 }
 
-BufferBlob* SharedRuntime::make_native_invoker(address call_target,
-                                               int shadow_space_bytes,
-                                               const GrowableArray<VMReg>& input_registers,
-                                               const GrowableArray<VMReg>& output_registers) {
+#ifdef COMPILER2
+RuntimeStub* SharedRuntime::make_native_invoker(address call_target,
+                                                int shadow_space_bytes,
+                                                const GrowableArray<VMReg>& input_registers,
+                                                const GrowableArray<VMReg>& output_registers) {
   Unimplemented();
   return nullptr;
 }
+#endif

src/hotspot/cpu/ppc/c1_globals_ppc.hpp

@@ -51,7 +51,6 @@ define_pd_global(uintx,    NonNMethodCodeHeapSize,       5*M );
 define_pd_global(uintx,    CodeCacheExpansionSize,       32*K);
 define_pd_global(uintx,    CodeCacheMinBlockLength,      1);
 define_pd_global(uintx,    CodeCacheMinimumUseSpace,     400*K);
-define_pd_global(size_t,   MetaspaceSize,                12*M);
 define_pd_global(bool,     NeverActAsServerClassMachine, true);
 define_pd_global(size_t,   NewSizeThreadIncrease,        16*K);
 define_pd_global(uint64_t, MaxRAM,                       1ULL*G);

src/hotspot/cpu/ppc/c2_globals_ppc.hpp

@@ -93,9 +93,6 @@ define_pd_global(uintx,    CodeCacheMinimumUseSpace,     400*K);
 
 define_pd_global(bool,     TrapBasedRangeChecks,          true);
 
-// Heap related flags
-define_pd_global(size_t,   MetaspaceSize,                ScaleForWordSize(16*M));
-
 // Ergonomics related flags
 define_pd_global(bool,     NeverActAsServerClassMachine, false);
 

src/hotspot/cpu/ppc/gc/shared/barrierSetAssembler_ppc.cpp

@@ -26,6 +26,7 @@
 #include "nativeInst_ppc.hpp"
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
+#include "classfile/classLoaderData.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 #include "gc/shared/barrierSetNMethod.hpp"
 #include "interpreter/interp_masm.hpp"

src/hotspot/cpu/ppc/gc/shared/cardTableBarrierSetAssembler_ppc.cpp

@@ -49,8 +49,6 @@ void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembl
 
   Label Lskip_loop, Lstore_loop;
 
-  if (ct->scanned_concurrently()) { __ membar(Assembler::StoreStore); }
-
   __ sldi_(count, count, LogBytesPerHeapOop);
   __ beq(CCR0, Lskip_loop); // zero length
   __ addi(count, count, -BytesPerHeapOop);
@@ -74,13 +72,10 @@ void CardTableBarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembl
 void CardTableBarrierSetAssembler::card_table_write(MacroAssembler* masm,
                                                     CardTable::CardValue* byte_map_base,
                                                     Register tmp, Register obj) {
-  CardTableBarrierSet* ctbs = barrier_set_cast<CardTableBarrierSet>(BarrierSet::barrier_set());
-  CardTable* ct = ctbs->card_table();
   assert_different_registers(obj, tmp, R0);
   __ load_const_optimized(tmp, (address)byte_map_base, R0);
   __ srdi(obj, obj, CardTable::card_shift);
   __ li(R0, CardTable::dirty_card_val());
-  if (ct->scanned_concurrently()) { __ membar(Assembler::StoreStore); }
   __ stbx(R0, tmp, obj);
 }
 

src/hotspot/cpu/ppc/ppc.ad

@@ -3035,36 +3035,6 @@ encode %{
     __ stfd($src$$FloatRegister, Idisp, $mem$$base$$Register);
   %}
 
-  // Use release_store for card-marking to ensure that previous
-  // oop-stores are visible before the card-mark change.
-  enc_class enc_cms_card_mark(memory mem, iRegLdst releaseFieldAddr, flagsReg crx) %{
-    // FIXME: Implement this as a cmove and use a fixed condition code
-    // register which is written on every transition to compiled code,
-    // e.g. in call-stub and when returning from runtime stubs.
-    //
-    // Proposed code sequence for the cmove implementation:
-    //
-    // Label skip_release;
-    // __ beq(CCRfixed, skip_release);
-    // __ release();
-    // __ bind(skip_release);
-    // __ stb(card mark);
-
-    C2_MacroAssembler _masm(&cbuf);
-    Label skip_storestore;
-
-    __ li(R0, 0);
-    __ membar(Assembler::StoreStore);
-
-    // Do the store.
-    if ($mem$$index == 0) {
-      __ stb(R0, $mem$$disp, $mem$$base$$Register);
-    } else {
-      assert(0 == $mem$$disp, "no displacement possible with indexed load/stores on ppc");
-      __ stbx(R0, $mem$$base$$Register, $mem$$index$$Register);
-    }
-  %}
-
   enc_class postalloc_expand_encode_oop(iRegNdst dst, iRegPdst src, flagsReg crx) %{
 
     if (VM_Version::has_isel()) {
@@ -6601,37 +6571,15 @@ instruct storeD(memory mem, regD src) %{
 
 //----------Store Instructions With Zeros--------------------------------------
 
-// Card-mark for CMS garbage collection.
-// This cardmark does an optimization so that it must not always
-// do a releasing store. For this, it gets the address of
-// CMSCollectorCardTableBarrierSetBSExt::_requires_release as input.
-// (Using releaseFieldAddr in the match rule is a hack.)
-instruct storeCM_CMS(memory mem, iRegLdst releaseFieldAddr, flagsReg crx) %{
-  match(Set mem (StoreCM mem releaseFieldAddr));
-  effect(TEMP crx);
-  predicate(false);
-  ins_cost(MEMORY_REF_COST);
-
-  // See loadConP.
-  ins_cannot_rematerialize(true);
-
-  format %{ "STB     #0, $mem \t// CMS card-mark byte (must be 0!), checking requires_release in [$releaseFieldAddr]" %}
-  ins_encode( enc_cms_card_mark(mem, releaseFieldAddr, crx) );
-  ins_pipe(pipe_class_memory);
-%}
-
-instruct storeCM_G1(memory mem, immI_0 zero) %{
+instruct storeCM(memory mem, immI_0 zero) %{
   match(Set mem (StoreCM mem zero));
-  predicate(UseG1GC);
   ins_cost(MEMORY_REF_COST);
 
-  ins_cannot_rematerialize(true);
-
-  format %{ "STB     #0, $mem \t// CMS card-mark byte store (G1)" %}
+  format %{ "STB     #0, $mem \t// CMS card-mark byte store" %}
   size(8);
   ins_encode %{
     __ li(R0, 0);
-    //__ release(); // G1: oops are allowed to get visible after dirty marking
+    // No release barrier: Oops are allowed to get visible after marking.
     guarantee($mem$$base$$Register != R1_SP, "use frame_slots_bias");
     __ stb(R0, $mem$$disp, $mem$$base$$Register);
   %}

src/hotspot/cpu/ppc/sharedRuntime_ppc.cpp

@@ -3442,10 +3442,12 @@ void SharedRuntime::montgomery_square(jint *a_ints, jint *n_ints,
   reverse_words(m, (unsigned long *)m_ints, longwords);
 }
 
-BufferBlob* SharedRuntime::make_native_invoker(address call_target,
-                                               int shadow_space_bytes,
-                                               const GrowableArray<VMReg>& input_registers,
-                                               const GrowableArray<VMReg>& output_registers) {
+#ifdef COMPILER2
+RuntimeStub* SharedRuntime::make_native_invoker(address call_target,
+                                                int shadow_space_bytes,
+                                                const GrowableArray<VMReg>& input_registers,
+                                                const GrowableArray<VMReg>& output_registers) {
   Unimplemented();
   return nullptr;
 }
+#endif

src/hotspot/cpu/ppc/stubGenerator_ppc.cpp

@@ -2598,7 +2598,7 @@ class StubGenerator: public StubCodeGenerator {
 
     address start = __ function_entry();
 
-    Label L_doLast;
+    Label L_doLast, L_error;
 
     Register from           = R3_ARG1;  // source array address
     Register to             = R4_ARG2;  // destination array address
@@ -2628,7 +2628,7 @@ class StubGenerator: public StubCodeGenerator {
 
     __ li              (fifteen, 15);
 
-    // load unaligned from[0-15] to vsRet
+    // load unaligned from[0-15] to vRet
     __ lvx             (vRet, from);
     __ lvx             (vTmp1, fifteen, from);
     __ lvsl            (fromPerm, from);
@@ -2743,6 +2743,11 @@ class StubGenerator: public StubCodeGenerator {
     __ cmpwi           (CCR0, keylen, 52);
     __ beq             (CCR0, L_doLast);
 
+#ifdef ASSERT
+    __ cmpwi           (CCR0, keylen, 60);
+    __ bne             (CCR0, L_error);
+#endif
+
     // 12th - 13th rounds
     __ vcipher         (vRet, vRet, vKey1);
     __ vcipher         (vRet, vRet, vKey2);
@@ -2763,29 +2768,30 @@ class StubGenerator: public StubCodeGenerator {
     __ vcipher         (vRet, vRet, vKey1);
     __ vcipherlast     (vRet, vRet, vKey2);
 
+#ifdef VM_LITTLE_ENDIAN
+    // toPerm = 0x0F0E0D0C0B0A09080706050403020100
+    __ lvsl            (toPerm, keypos); // keypos is a multiple of 16
+    __ vxor            (toPerm, toPerm, fSplt);
+
+    // Swap Bytes
+    __ vperm           (vRet, vRet, vRet, toPerm);
+#endif
+
     // store result (unaligned)
-#ifdef VM_LITTLE_ENDIAN
-    __ lvsl            (toPerm, to);
-#else
-    __ lvsr            (toPerm, to);
-#endif
-    __ vspltisb        (vTmp3, -1);
-    __ vspltisb        (vTmp4, 0);
-    __ lvx             (vTmp1, to);
-    __ lvx             (vTmp2, fifteen, to);
-#ifdef VM_LITTLE_ENDIAN
-    __ vperm           (vTmp3, vTmp3, vTmp4, toPerm); // generate select mask
-    __ vxor            (toPerm, toPerm, fSplt);       // swap bytes
-#else
-    __ vperm           (vTmp3, vTmp4, vTmp3, toPerm); // generate select mask
-#endif
-    __ vperm           (vTmp4, vRet, vRet, toPerm);   // rotate data
-    __ vsel            (vTmp2, vTmp4, vTmp2, vTmp3);
-    __ vsel            (vTmp1, vTmp1, vTmp4, vTmp3);
-    __ stvx            (vTmp2, fifteen, to);          // store this one first (may alias)
-    __ stvx            (vTmp1, to);
+    // Note: We can't use a read-modify-write sequence which touches additional Bytes.
+    Register lo = temp, hi = fifteen; // Reuse
+    __ vsldoi          (vTmp1, vRet, vRet, 8);
+    __ mfvrd           (hi, vRet);
+    __ mfvrd           (lo, vTmp1);
+    __ std             (hi, 0 LITTLE_ENDIAN_ONLY(+ 8), to);
+    __ std             (lo, 0 BIG_ENDIAN_ONLY(+ 8), to);
 
     __ blr();
+
+#ifdef ASSERT
+    __ bind(L_error);
+    __ stop("aescrypt_encryptBlock: invalid key length");
+#endif
      return start;
   }
 
@@ -2799,9 +2805,7 @@ class StubGenerator: public StubCodeGenerator {
 
     address start = __ function_entry();
 
-    Label L_doLast;
-    Label L_do44;
-    Label L_do52;
+    Label L_doLast, L_do44, L_do52, L_error;
 
     Register from           = R3_ARG1;  // source array address
     Register to             = R4_ARG2;  // destination array address
@@ -2832,7 +2836,7 @@ class StubGenerator: public StubCodeGenerator {
 
     __ li              (fifteen, 15);
 
-    // load unaligned from[0-15] to vsRet
+    // load unaligned from[0-15] to vRet
     __ lvx             (vRet, from);
     __ lvx             (vTmp1, fifteen, from);
     __ lvsl            (fromPerm, from);
@@ -2861,6 +2865,11 @@ class StubGenerator: public StubCodeGenerator {
     __ cmpwi           (CCR0, keylen, 52);
     __ beq             (CCR0, L_do52);
 
+#ifdef ASSERT
+    __ cmpwi           (CCR0, keylen, 60);
+    __ bne             (CCR0, L_error);
+#endif
+
     // load the 15th round key to vKey1
     __ li              (keypos, 240);
     __ lvx             (vKey1, keypos, key);
@@ -2897,6 +2906,7 @@ class StubGenerator: public StubCodeGenerator {
 
     __ b               (L_doLast);
 
+    __ align(32);
     __ bind            (L_do52);
 
     // load the 13th round key to vKey1
@@ -2923,6 +2933,7 @@ class StubGenerator: public StubCodeGenerator {
 
     __ b               (L_doLast);
 
+    __ align(32);
     __ bind            (L_do44);
 
     // load the 11th round key to vKey1
@@ -3000,29 +3011,30 @@ class StubGenerator: public StubCodeGenerator {
     __ vncipher        (vRet, vRet, vKey4);
     __ vncipherlast    (vRet, vRet, vKey5);
 
+#ifdef VM_LITTLE_ENDIAN
+    // toPerm = 0x0F0E0D0C0B0A09080706050403020100
+    __ lvsl            (toPerm, keypos); // keypos is a multiple of 16
+    __ vxor            (toPerm, toPerm, fSplt);
+
+    // Swap Bytes
+    __ vperm           (vRet, vRet, vRet, toPerm);
+#endif
+
     // store result (unaligned)
-#ifdef VM_LITTLE_ENDIAN
-    __ lvsl            (toPerm, to);
-#else
-    __ lvsr            (toPerm, to);
-#endif
-    __ vspltisb        (vTmp3, -1);
-    __ vspltisb        (vTmp4, 0);
-    __ lvx             (vTmp1, to);
-    __ lvx             (vTmp2, fifteen, to);
-#ifdef VM_LITTLE_ENDIAN
-    __ vperm           (vTmp3, vTmp3, vTmp4, toPerm); // generate select mask
-    __ vxor            (toPerm, toPerm, fSplt);       // swap bytes
-#else
-    __ vperm           (vTmp3, vTmp4, vTmp3, toPerm); // generate select mask
-#endif
-    __ vperm           (vTmp4, vRet, vRet, toPerm);   // rotate data
-    __ vsel            (vTmp2, vTmp4, vTmp2, vTmp3);
-    __ vsel            (vTmp1, vTmp1, vTmp4, vTmp3);
-    __ stvx            (vTmp2, fifteen, to);          // store this one first (may alias)
-    __ stvx            (vTmp1, to);
+    // Note: We can't use a read-modify-write sequence which touches additional Bytes.
+    Register lo = temp, hi = fifteen; // Reuse
+    __ vsldoi          (vTmp1, vRet, vRet, 8);
+    __ mfvrd           (hi, vRet);
+    __ mfvrd           (lo, vTmp1);
+    __ std             (hi, 0 LITTLE_ENDIAN_ONLY(+ 8), to);
+    __ std             (lo, 0 BIG_ENDIAN_ONLY(+ 8), to);
 
     __ blr();
+
+#ifdef ASSERT
+    __ bind(L_error);
+    __ stop("aescrypt_decryptBlock: invalid key length");
+#endif
      return start;
   }
 

src/hotspot/cpu/s390/c1_globals_s390.hpp

@@ -51,7 +51,6 @@ define_pd_global(uintx,    NonNMethodCodeHeapSize,       5*M);
 define_pd_global(uintx,    CodeCacheExpansionSize,       32*K);
 define_pd_global(uintx,    CodeCacheMinBlockLength,      1);
 define_pd_global(uintx,    CodeCacheMinimumUseSpace,     400*K);
-define_pd_global(size_t,   MetaspaceSize,                12*M);
 define_pd_global(bool,     NeverActAsServerClassMachine, true);
 define_pd_global(size_t,   NewSizeThreadIncrease,        16*K);
 define_pd_global(uint64_t, MaxRAM,                       1ULL*G);

src/hotspot/cpu/s390/c2_globals_s390.hpp

@@ -82,9 +82,6 @@ define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
 
 define_pd_global(bool,  TrapBasedRangeChecks,        false); // Not needed on z/Architecture.
 
-// Heap related flags
-define_pd_global(size_t, MetaspaceSize,              ScaleForWordSize(16*M));
-
 // Ergonomics related flags
 define_pd_global(bool, NeverActAsServerClassMachine, false);
 

src/hotspot/cpu/s390/sharedRuntime_s390.cpp

@@ -3468,10 +3468,12 @@ int SpinPause() {
   return 0;
 }
 
-BufferBlob* SharedRuntime::make_native_invoker(address call_target,
-                                               int shadow_space_bytes,
-                                               const GrowableArray<VMReg>& input_registers,
-                                               const GrowableArray<VMReg>& output_registers) {
+#ifdef COMPILER2
+RuntimeStub* SharedRuntime::make_native_invoker(address call_target,
+                                                int shadow_space_bytes,
+                                                const GrowableArray<VMReg>& input_registers,
+                                                const GrowableArray<VMReg>& output_registers) {
   Unimplemented();
   return nullptr;
 }
+#endif