JBR-4148 - removed meaningless copying of data to itself

dcevm instance transformation expects increasing field's offset when
fields of class are iterated. This ordering is no more valid if
UseEmptySlotsInSupers=true.

.github/workflows/submit.yml

@@ -10,7 +10,7 @@ on:
       platforms:
         description: "Platform(s) to execute on"
         required: true
-        default: "Linux additional (hotspot only), Linux x64, Linux x86, Windows x64, macOS x64"
+        default: "Linux additional (hotspot only), Linux x64, Linux x86, Windows aarch64, Windows x64, macOS x64"
 
 jobs:
   prerequisites:
@@ -22,6 +22,7 @@ jobs:
       platform_linux_additional: ${{ steps.check_platforms.outputs.platform_linux_additional }}
       platform_linux_x64: ${{ steps.check_platforms.outputs.platform_linux_x64 }}
       platform_linux_x86: ${{ steps.check_platforms.outputs.platform_linux_x86 }}
+      platform_windows_aarch64: ${{ steps.check_platforms.outputs.platform_windows_aarch64 }}
       platform_windows_x64: ${{ steps.check_platforms.outputs.platform_windows_x64 }}
       platform_macos_x64: ${{ steps.check_platforms.outputs.platform_macos_x64 }}
       platform_macos_aarch64: ${{ steps.check_platforms.outputs.platform_macos_aarch64 }}
@@ -38,6 +39,7 @@ jobs:
           echo "::set-output name=platform_linux_additional::${{ contains(github.event.inputs.platforms, 'linux additional (hotspot only)') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'linux additional (hotspot only)'))) }}"
           echo "::set-output name=platform_linux_x64::${{ contains(github.event.inputs.platforms, 'linux x64') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'linux x64'))) }}"
           echo "::set-output name=platform_linux_x86::${{ contains(github.event.inputs.platforms, 'linux x86') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'linux x86'))) }}"
+          echo "::set-output name=platform_windows_aarch64::${{ contains(github.event.inputs.platforms, 'windows aarch64') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'windows aarch64'))) }}"
           echo "::set-output name=platform_windows_x64::${{ contains(github.event.inputs.platforms, 'windows x64') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'windows x64'))) }}"
           echo "::set-output name=platform_macos_x64::${{ contains(github.event.inputs.platforms, 'macos x64') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'macos x64'))) }}"
           echo "::set-output name=platform_macos_aarch64::${{ contains(github.event.inputs.platforms, 'macos aarch64') || (github.event.inputs.platforms == '' && (secrets.JDK_SUBMIT_PLATFORMS == '' || contains(secrets.JDK_SUBMIT_PLATFORMS, 'macos aarch64'))) }}"
@@ -172,7 +174,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install gcc-10=10.3.0-1ubuntu1~20.04 g++-10=10.3.0-1ubuntu1~20.04 libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
+          sudo apt-get install gcc-10=10.2.0-5ubuntu1~20.04 g++-10=10.2.0-5ubuntu1~20.04 libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
 
       - name: Configure
@@ -487,12 +489,12 @@ jobs:
 
       - name: Install native host dependencies
         run: |
-          sudo apt-get install gcc-10=10.3.0-1ubuntu1~20.04 g++-10=10.3.0-1ubuntu1~20.04 libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
+          sudo apt-get install gcc-10=10.2.0-5ubuntu1~20.04 g++-10=10.2.0-5ubuntu1~20.04 libxrandr-dev libxtst-dev libcups2-dev libasound2-dev
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 --slave /usr/bin/g++ g++ /usr/bin/g++-10
         if: matrix.debian-arch == ''
 
       - name: Install cross-compilation host dependencies
-        run: sudo apt-get install gcc-10-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-flavor}}=10.3.0-1ubuntu1~20.04cross1 g++-10-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-flavor}}=10.3.0-1ubuntu1~20.04cross1
+        run: sudo apt-get install gcc-10-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-flavor}}=10.2.0-5ubuntu1~20.04cross1 g++-10-${{ matrix.gnu-arch }}-linux-gnu${{ matrix.gnu-flavor}}=10.2.0-5ubuntu1~20.04cross1
         if: matrix.debian-arch != ''
 
       - name: Cache sysroot
@@ -847,6 +849,94 @@ jobs:
           path: ~/linux-x86${{ matrix.artifact }}_testsupport_${{ env.logsuffix }}.zip
         continue-on-error: true
 
+  windows_aarch64_build:
+    name: Windows aarch64
+    runs-on: "windows-2019"
+    needs: prerequisites
+    if: needs.prerequisites.outputs.should_run != 'false' && needs.prerequisites.outputs.platform_windows_aarch64 != 'false'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        flavor:
+          - build debug
+        include:
+          - flavor: build debug
+            flags: --enable-debug
+            artifact: -debug
+
+    env:
+      JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).DEFAULT_VERSION_FEATURE }}"
+      BOOT_JDK_VERSION: "${{ fromJson(needs.prerequisites.outputs.dependencies).BOOT_JDK_VERSION }}"
+      BOOT_JDK_FILENAME: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_FILENAME }}"
+      BOOT_JDK_URL: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_URL }}"
+      BOOT_JDK_SHA256: "${{ fromJson(needs.prerequisites.outputs.dependencies).WINDOWS_X64_BOOT_JDK_SHA256 }}"
+
+    steps:
+      - name: Restore cygwin packages from cache
+        id: cygwin
+        uses: actions/cache@v2
+        with:
+          path: ~/cygwin/packages
+          key: cygwin-packages-${{ runner.os }}-v1
+
+      - name: Install cygwin
+        run: |
+          New-Item -Force -ItemType directory -Path "$HOME\cygwin"
+          & curl -L "https://www.cygwin.com/setup-x86_64.exe" -o "$HOME/cygwin/setup-x86_64.exe"
+          Start-Process -FilePath "$HOME\cygwin\setup-x86_64.exe" -ArgumentList "--quiet-mode --packages autoconf,make,zip,unzip --root $HOME\cygwin\cygwin64 --local-package-dir $HOME\cygwin\packages --site http://mirrors.kernel.org/sourceware/cygwin --no-desktop --no-shortcuts --no-startmenu --no-admin" -Wait -NoNewWindow
+
+      - name: Checkout the source
+        uses: actions/checkout@v2
+        with:
+          path: jdk
+
+      - name: Restore boot JDK from cache
+        id: bootjdk
+        uses: actions/cache@v2
+        with:
+          path: ~/bootjdk/${{ env.BOOT_JDK_VERSION }}
+          key: bootjdk-${{ runner.os }}-${{ env.BOOT_JDK_VERSION }}-${{ env.BOOT_JDK_SHA256 }}-v1
+
+      - name: Download boot JDK
+        run: |
+          mkdir -p "$HOME\bootjdk\$env:BOOT_JDK_VERSION"
+          & curl -L "$env:BOOT_JDK_URL" -o "$HOME/bootjdk/$env:BOOT_JDK_FILENAME"
+          $FileHash = Get-FileHash -Algorithm SHA256 "$HOME/bootjdk/$env:BOOT_JDK_FILENAME"
+          $FileHash.Hash -eq $env:BOOT_JDK_SHA256
+          & tar -xf "$HOME/bootjdk/$env:BOOT_JDK_FILENAME" -C "$HOME/bootjdk/$env:BOOT_JDK_VERSION"
+          Get-ChildItem "$HOME\bootjdk\$env:BOOT_JDK_VERSION\*\*" | Move-Item -Destination "$HOME\bootjdk\$env:BOOT_JDK_VERSION"
+        if: steps.bootjdk.outputs.cache-hit != 'true'
+
+      - name: Ensure a specific version of MSVC is installed
+        run: >
+          Start-Process -FilePath 'C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe' -Wait -NoNewWindow -ArgumentList
+          'modify --installPath "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise" --quiet
+          --add Microsoft.VisualStudio.Component.VC.14.28.arm64'
+
+      - name: Configure
+        run: >
+          $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ;
+          $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ;
+          $env:BOOT_JDK = cygpath "$HOME/bootjdk/$env:BOOT_JDK_VERSION" ;
+          & bash configure
+          --with-conf-name=windows-aarch64
+          --with-msvc-toolset-version=14.28
+          --openjdk-target=aarch64-unknown-cygwin
+          ${{ matrix.flags }}
+          --with-version-opt="$env:GITHUB_ACTOR-$env:GITHUB_SHA"
+          --with-version-build=0
+          --with-boot-jdk="$env:BOOT_JDK"
+          --with-default-make-target="hotspot"
+        working-directory: jdk
+
+      - name: Build
+        run: |
+          $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ;
+          $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ;
+          & make CONF_NAME=windows-aarch64
+        working-directory: jdk
+
   windows_x64_build:
     name: Windows x64
     runs-on: "windows-2019"
@@ -1571,6 +1661,7 @@ jobs:
     needs:
       - prerequisites
       - linux_additional_build
+      - windows_aarch64_build
       - linux_x64_test
       - linux_x86_test
       - windows_x64_test

.gitignore

@@ -16,7 +16,5 @@ NashornProfile.txt
 **/JTreport/**
 **/JTwork/**
 /src/utils/LogCompilation/target/
-/.project/
-/.settings/
 *.class
 .idea/workspace.xml

README.md

@@ -1,141 +1,13 @@
 [![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 
-# Welcome to JetBrains Runtime!
+# Welcome to the JDK!
 
-JetBrains Runtime is a fork of [OpenJDK](https://github.com/openjdk/jdk) available for Windows, Mac OS X, and Linux.
-It includes a number enhancements in font rendering, HiDPI support, ligatures, performance improvements, and bugfixes.
+For build instructions please see the
+[online documentation](https://openjdk.java.net/groups/build/doc/building.html),
+or either of these files:
 
-## Contents
-- [Welcome to JetBrains Runtime](#jetbrains-runtime)
-  - [Products Built on JetBrains Runtime](#products-built-on-jetbrains-runtime)
-  - [Getting Sources](#getting-sources)
-    - [macOS, Linux](#macos-linux)
-    - [Windows](#sources-windows)
-  - [Configuring the Build Environment](#configuring-the-build-environment)
-    - [Linux (Docker)](#linux-docker)
-    - [Ubuntu Linux](#ubuntu-linux)
-    - [Windows](#build-windows)
-    - [macOS](#macos)
-  - [Contributing](#contributing)
-  - [Resources](#resources)
+- [doc/building.html](doc/building.html) (html version)
+- [doc/building.md](doc/building.md) (markdown version)
 
-## Products Built on JetBrains Runtime
-* [Android Studio](https://developer.android.com/studio). The official IDE for Google's Android operating system.
-* [CLion](https://www.jetbrains.com/clion/). A cross-platform IDE for C and C++ from JetBrains.
-* [DataGrip](https://www.jetbrains.com/datagrip/). The IDE for Databases and SQL from JetBrains.
-* [GoLand](https://www.jetbrains.com/go/). The cross-platform Go IDE from JetBrains.
-* [IntelliJ IDEA](https://www.jetbrains.com/idea/). The IDE for JVM from JetBrains.
-* [JProfiler](https://www.ej-technologies.com/products/jprofiler/overview.html). The Java profiler.
-* [PhpStorm](https://www.jetbrains.com/phpstorm/). The PHP IDE from JetBrains.
-* [PyCharm](https://www.jetbrains.com/pycharm/). The Python IDE from JetBrains.
-* [Rider](https://www.jetbrains.com/rider/). The cross-platform .NET IDE from JetBrains.
-* [RubyMine](https://www.jetbrains.com/ruby/). The Ruby and Rails IDE from JetBrains.
-* [WebStorm](https://www.jetbrains.com/webstorm/). The JavaScript IDE from JetBrains.
-* [YourKit](https://www.yourkit.com/). Java and .NET profilers.
-
-## Getting Sources
-### macOS, Linux
-```
-git config --global core.autocrlf input
-git clone git@github.com:JetBrains/JetBrainsRuntime.git
-```
-
-### Windows
-<a name="sources-windows"></a>
-```
-git config --global core.autocrlf false
-git clone git@github.com:JetBrains/JetBrainsRuntime.git
-```
-
-## Configuring the Build Environment
-Here are quick per-platform instructions for those who can't wait to get started. 
-Please refer to [OpenJDK build docs](https://openjdk.java.net/groups/build/doc/building.html) for in-depth
-coverage of all the details.
-
-> **_TIP:_**  To get a preliminary report of what's missing, run `./configure` and check its output. 
-> It would usually have a meaningful advice on how to solve the problem.
-
-### Linux (Docker)
-Create a container:
-```
-$ cd jb/project/docker
-$ docker build .
-...
-Successfully built 942ea9900054
-```
-Run these commands in the new container:
-```
-$ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
-# cd /JetBrainsRuntime
-# git checkout master17
-# sh ./configure
-# make images CONF=linux-x86_64-normal-server-release
-```
-
-### Ubuntu Linux
-Install the necessary tools, libraries, and headers with:
-```
-$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev \
-       libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev \
-       java-16-amazon-corretto-jdk
-```
-Then run the following:
-```
-$ cd JetBrainsRuntime
-$ git checkout master17
-$ sh ./configure
-$ make images
-```
-This will build the release configuration under `./build/linux-x86_64-server-release/`.
-
-### Windows
-<a name="build-windows"></a>
-Install the following:
-* [Cygwin x64](http://www.cygwin.com/).
-  Required packages: `autoconf`, `binutils`, `cpio`, `diffutils`, `file`, `gawk`, `gcc-core`, `make`, `m4`, `unzip`, `zip`.  
-  Install those together with Cygwin.
-* [Visual Studio compiler toolset](https://visualstudio.microsoft.com/downloads/).
-  Install with the desktop development kit, which includes Windows SDK and compilers.
-  Visual Studio 2019 is supported by default.
-* Java 16 (for instance, from [AdoptOpenJDK](https://adoptopenjdk.net/installation.html?variant=openjdk16&jvmVariant=hotspot#)).
-  If you have problems while configuring, read [Java tips on Cygwin](http://horstmann.com/articles/cygwin-tips.html).
-
-From the command line: 
-```
-"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
-"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
-```
-The first command sets up environment variables, the second starts a Cygwin shell with the proper environment.  
-
-In the Cygwin shell: 
-```
-$ cd JetBrainsRuntime
-$ git checkout master17
-$ bash configure --with-toolchain-version=2019
-$ make images
-```
-This will build the release configuration under `./build/windows-x86_64-server-release/`.
-
-### macOS
-Install the following:
-* Xcode command line developer tools and `autoconf` via [Homebrew](getDpiInfo).
-* Java 16 (for instance, from [AdoptOpenJDK](https://adoptopenjdk.net/installation.html?variant=openjdk16&jvmVariant=hotspot#)).
-
-From the command line:
-```
-$ cd JetBrainsRuntime
-$ git checkout master17
-$ sh ./configure
-$ make images
-```
-This will build the release configuration under `./build/macosx-x86_64-server-release/`.
-
-## Contributing
-We are happy to receive your pull requests! 
-Before you submit one, please sign our [Contributor License Agreement (CLA)](https://www.jetbrains.com/agreements/cla/).
-
-## Resources
-* [JetBrains Runtime on github](https://github.com/JetBrains/JetBrainsRuntime).
-* [OpenJDK build instructions](https://openjdk.java.net/groups/build/doc/building.html).
-* [OpenJDK test instructions](https://htmlpreview.github.io/?https://raw.githubusercontent.com/openjdk/jdk/master/doc/building.html#running-tests).
-* [How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).
+See <https://openjdk.java.net/> for more information about
+the OpenJDK Community and the JDK.

bin/idea.sh

@@ -25,22 +25,17 @@
 # Shell script for generating an IDEA project from a given list of modules
 
 usage() {
-      echo "Usage: $0 [-h|--help] [-q|--quiet] [-a|--absolute-paths] [-r|--root <path>] [-o|--output <path>] [-c|--conf <conf_name>] [modules...]"
+      echo "Usage: $0 [-h|--help] [-q|--quiet] [-a|--absolute-paths] [-o|--output <path>] [modules...]"
       echo "    -h | --help"
       echo "    -q | --quiet
         No stdout output"
       echo "    -a | --absolute-paths
         Use absolute paths to this jdk, so that generated .idea
         project files can be moved independently of jdk sources"
-      echo "    -r | --root <path>
-        Project content root
-        Default: $TOPLEVEL_DIR"
       echo "    -o | --output <path>
         Where .idea directory with project files will be generated
         (e.g. using '-o .' will place project files in './.idea')
-        Default: same as --root"
-      echo "    -c | --conf <conf_name>
-        make configuration (release, slowdebug etc)"
+        Default: $TOPLEVEL_DIR"
       echo "    [modules...]
         Generate project modules for specific java modules
         (e.g. 'java.base java.desktop')
@@ -52,14 +47,12 @@ SCRIPT_DIR=`dirname $0`
 #assume TOP is the dir from which the script has been called
 TOP=`pwd`
 cd $SCRIPT_DIR; SCRIPT_DIR=`pwd`
-if [ "x$TOPLEVEL_DIR" = "x" ] ; then
-  cd .. ; TOPLEVEL_DIR=`pwd`
-fi
+cd .. ; TOPLEVEL_DIR=`pwd`
 cd $TOP;
 
+IDEA_OUTPUT=$TOPLEVEL_DIR/.idea
 VERBOSE=true
 ABSOLUTE_PATHS=false
-CONF_ARG=
 while [ $# -gt 0 ]
 do
   case $1 in
@@ -75,18 +68,8 @@ do
       ABSOLUTE_PATHS=true
       ;;
 
-    -r | --root )
-      TOPLEVEL_DIR="$2"
-      shift
-      ;;
-
     -o | --output )
-      IDEA_OUTPUT="$2/.idea"
-      shift
-      ;;
-
-    -c | --conf )
-      CONF_ARG="CONF_NAME=$2"
+      IDEA_OUTPUT=$2/.idea
       shift
       ;;
 
@@ -101,17 +84,12 @@ do
   shift
 done
 
-if [ "x$IDEA_OUTPUT" = "x" ] ; then
-  IDEA_OUTPUT="$TOPLEVEL_DIR/.idea"
-fi
-
 mkdir -p $IDEA_OUTPUT || exit 1
-cd "$TOP" ; cd $TOPLEVEL_DIR; TOPLEVEL_DIR=`pwd`
-cd "$TOP" ; cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
+cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
 cd ..; IDEA_OUTPUT_PARENT=`pwd`
-cd "$SCRIPT_DIR/.." ; OPENJDK_DIR=`pwd`
 
-IDEA_MAKE="$OPENJDK_DIR/make/ide/idea/jdk"
+MAKE_DIR="$TOPLEVEL_DIR/make"
+IDEA_MAKE="$MAKE_DIR/ide/idea/jdk"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 
 cp -rn "$TOPLEVEL_DIR/jb/project/idea-project-files"/* "$IDEA_OUTPUT"
@@ -128,8 +106,8 @@ if [ "$VERBOSE" = true ] ; then
   echo "Will generate IDEA project files in \"$IDEA_OUTPUT\" for project \"$TOPLEVEL_DIR\""
 fi
 
-cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I "$OPENJDK_DIR" idea TOPLEVEL_DIR="$TOPLEVEL_DIR" \
-    MAKEOVERRIDES= IDEA_OUTPUT_PARENT="$IDEA_OUTPUT_PARENT" OUT="$IDEA_OUTPUT/env.cfg" MODULES="$*" $CONF_ARG || exit 1
+cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I "$TOPLEVEL_DIR" idea \
+    MAKEOVERRIDES= IDEA_OUTPUT_PARENT="$IDEA_OUTPUT_PARENT" OUT="$IDEA_OUTPUT/env.cfg" MODULES="$*" || exit 1
 cd $SCRIPT_DIR
 
 . $IDEA_OUTPUT/env.cfg
@@ -161,16 +139,13 @@ fi
 
 if [ "$ABSOLUTE_PATHS" = true ] ; then
   if [ "x$PATHTOOL" != "x" ]; then
-    PROJECT_DIR="`$PATHTOOL -am $OPENJDK_DIR`"
-    TOPLEVEL_PROJECT_DIR="`$PATHTOOL -am $TOPLEVEL_DIR`"
+    PROJECT_DIR="`$PATHTOOL -am $TOPLEVEL_DIR`"
   else
-    PROJECT_DIR="$OPENJDK_DIR"
-    TOPLEVEL_PROJECT_DIR="$TOPLEVEL_DIR"
+    PROJECT_DIR="$TOPLEVEL_DIR"
   fi
   MODULE_DIR="$PROJECT_DIR"
-  TOPLEVEL_MODULE_DIR="$TOPLEVEL_PROJECT_DIR"
-  cd "$IDEA_OUTPUT_PARENT" && cd "$RELATIVE_BUILD_DIR" && BUILD_DIR="`pwd`"
-  CLION_SCRIPT_TOPDIR="$OPENJDK_DIR"
+  cd "$TOPLEVEL_DIR" && cd "$RELATIVE_BUILD_DIR" && BUILD_DIR="`pwd`"
+  CLION_SCRIPT_TOPDIR="$TOPLEVEL_DIR"
   CLION_PROJECT_DIR="$PROJECT_DIR"
 else
   if [ "$RELATIVE_PROJECT_DIR" = "." ] ; then
@@ -178,15 +153,8 @@ else
   else
     PROJECT_DIR="/$RELATIVE_PROJECT_DIR"
   fi
-  if [ "$RELATIVE_TOPLEVEL_PROJECT_DIR" = "." ] ; then
-    TOPLEVEL_PROJECT_DIR=""
-  else
-    TOPLEVEL_PROJECT_DIR="/$RELATIVE_TOPLEVEL_PROJECT_DIR"
-  fi
   MODULE_DIR="\$MODULE_DIR\$$PROJECT_DIR"
   PROJECT_DIR="\$PROJECT_DIR\$$PROJECT_DIR"
-  TOPLEVEL_MODULE_DIR="\$MODULE_DIR\$$TOPLEVEL_PROJECT_DIR"
-  TOPLEVEL_PROJECT_DIR="\$PROJECT_DIR\$$TOPLEVEL_PROJECT_DIR"
   BUILD_DIR="\$PROJECT_DIR\$/$RELATIVE_BUILD_DIR"
   CLION_SCRIPT_TOPDIR="$CLION_RELATIVE_PROJECT_DIR"
   CLION_PROJECT_DIR="\$PROJECT_DIR\$/$CLION_SCRIPT_TOPDIR"
@@ -224,12 +192,9 @@ add_replacement "###CLION_SCRIPT_TOPDIR###" "$CLION_SCRIPT_TOPDIR"
 add_replacement "###CLION_PROJECT_DIR###" "$CLION_PROJECT_DIR"
 add_replacement "###PROJECT_DIR###" "$PROJECT_DIR"
 add_replacement "###MODULE_DIR###" "$MODULE_DIR"
-add_replacement "###TOPLEVEL_PROJECT_DIR###" "$TOPLEVEL_PROJECT_DIR"
-add_replacement "###TOPLEVEL_MODULE_DIR###" "$TOPLEVEL_MODULE_DIR"
 add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
 add_replacement "###VCS_TYPE###" "$VCS_TYPE"
 add_replacement "###BUILD_DIR###" "$BUILD_DIR"
-add_replacement "###RELATIVE_BUILD_DIR###" "$RELATIVE_BUILD_DIR"
 if [ "x$PATHTOOL" != "x" ]; then
   add_replacement "###BASH_RUNNER_PREFIX###" "\$PROJECT_DIR\$/.idea/bash.bat"
 else
@@ -270,21 +235,15 @@ for value in $MODULES; do
   if [ "$VERBOSE" = true ] ; then
     echo "    $module"
   fi
-  MAIN_SOURCE_DIRS=""
-  CONTENT_ROOTS=""
+  add_replacement "###MODULE_CONTENT###" "src/$module"
+  SOURCE_DIRS=""
   IFS=' '
   for dir in $moduleSrcDirs; do
-    case $dir in
-      "src/"*) MAIN_SOURCE_DIRS="$MAIN_SOURCE_DIRS <sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" />" ;;
-      *"/support/gensrc/$module") ;; # Exclude generated sources to avoid module-info conflicts, see https://youtrack.jetbrains.com/issue/IDEA-185108
-      *) CONTENT_ROOTS="$CONTENT_ROOTS <content url=\"file://$MODULE_DIR/$dir\">\
-      <sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" generated=\"true\" /></content>" ;;
+    case $dir in # Exclude generated sources to avoid module-info conflicts, see https://youtrack.jetbrains.com/issue/IDEA-185108
+      "src/"*) SOURCE_DIRS="$SOURCE_DIRS<sourceFolder url=\"file://$MODULE_DIR/$dir\" isTestSource=\"false\" /> "
     esac
   done
-  if [ "x$MAIN_SOURCE_DIRS" != "x" ] ; then
-    CONTENT_ROOTS="<content url=\"file://$MODULE_DIR/src/$module\">$MAIN_SOURCE_DIRS</content>$CONTENT_ROOTS"
-  fi
-  add_replacement "###MODULE_CONTENT_ROOTS###" "$CONTENT_ROOTS"
+  add_replacement "###SOURCE_DIRS###" "$SOURCE_DIRS"
   DEPENDENCIES=""
   for dep in $moduleDependencies; do
     case $MODULE_NAMES in # Exclude skipped modules from dependencies

jb/project/docker/Dockerfile

@@ -9,5 +9,5 @@ RUN wget https://cdn.azul.com/zulu/bin/zulu16.28.11-ca-jdk16.0.0-linux_x64.tar.g
 RUN mv /zulu16.28.11-ca-jdk16.0.0-linux_x64 /jdk16.0.0
 ENV PATH /opt/rh/devtoolset-8/root/usr/bin:$PATH
 RUN mkdir .git
-RUN git config user.email "teamcity@jetbrains.com"
+RUN git config user.email "builduser@jetbrains.com"
 RUN git config user.name "builduser"

jb/project/docker/Dockerfile.x86

@@ -1,7 +0,0 @@
-FROM i386/ubuntu:xenial
-
-RUN linux32 apt-get update && apt-get install -y --no-install-recommends apt-utils
-COPY jbrsdk-11.0.5-b1 /jbrsdk-11.0.5-b1
-RUN linux32 apt-get -y install file build-essential zip unzip curl libx11-dev libxext-dev \
-  libxrender-dev libxrandr-dev libxtst-dev libxt-dev libcups2-dev libasound2-data \
-  libpng12-0 libasound2 libfreetype6 libfontconfig1-dev libasound2-dev autoconf

jb/project/idea-project-files/copyright/JetBrains.xml

@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="notice" value="Copyright &amp;#36;originalComment.match(&quot;Copyright (\d+)&quot;, 1, &quot;-&quot;)&amp;#36;today.year JetBrains s.r.o.&#10;DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.&#10;&#10;This code is free software; you can redistribute it and/or modify it&#10;under the terms of the GNU General Public License version 2 only, as&#10;published by the Free Software Foundation.&#10;&#10;This code is distributed in the hope that it will be useful, but WITHOUT&#10;ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or&#10;FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License&#10;version 2 for more details (a copy is included in the LICENSE file that&#10;accompanied this code).&#10;&#10;You should have received a copy of the GNU General Public License version&#10;2 along with this work; if not, write to the Free Software Foundation,&#10;Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.&#10;&#10;Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA&#10;or visit www.oracle.com if you need additional information or have any&#10;questions." />
+    <option name="notice" value="Copyright 2000-&amp;#36;today.year JetBrains s.r.o.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
     <option name="keyword" value="Copyright" />
     <option name="allowReplaceKeyword" value="JetBrains" />
     <option name="myName" value="JetBrains" />

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

@@ -52,13 +52,3 @@ function get_mods_list() {
   __mods=$1
   echo $(ls $__mods) | sed s/\.jmod/,/g | sed s/,$//g | sed s/' '//g
 }
-
-function copy_jmods() {
-  __mods_list=$1
-  __jmods_from=$2
-  __jmods_to=$3
-
-  mkdir -p $__jmods_to
-
-  echo "${__mods_list}," | while read -d, mod; do cp $__jmods_from/$mod.jmod $__jmods_to/; done
-}

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

@@ -30,9 +30,8 @@ sh configure \
   --with-debug-level=release \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-  --with-jvm-features=shenandoahgc \
   --with-version-pre= \
-  --with-version-build="${JDK_BUILD_NUMBER}" \
+  --with-version-build=${JDK_BUILD_NUMBER} \
   --with-version-opt=b${build_number} \
   --with-boot-jdk=${BOOT_JDK} \
   --enable-cds=yes || exit $?
@@ -68,7 +67,7 @@ grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules
 echo Running jlink....
 ${JSDK}/bin/jlink \
   --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
-  --add-modules $(xargs < modules.list.aarch64 | sed s/" "//g | sed s/',$'//g) \
+  --add-modules $(xargs < modules.list.aarch64 | sed s/" "//g | sed s/,$//g) \
   --output ${BASE_DIR}/${JBR_BUNDLE} || exit $?
 
 echo Modifying release info ...

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

@@ -36,7 +36,7 @@ function create_image_bundle {
   __modules_path=$3
   __modules=$4
 
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  [ "$bundle_type" == "fd" ] && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-linux-x64-${fastdebug_infix}b${build_number}
 
   echo Running jlink....
@@ -46,10 +46,9 @@ function create_image_bundle {
     --add-modules "$__modules" --output "$IMAGES_DIR"/"$__arch_name"
 
   grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$IMAGES_DIR"/"$__arch_name"/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+  if [ "$__bundle_name" == "$JBRSDK_BUNDLE" ]; then
     sed 's/JBR/JBRSDK/g' "$IMAGES_DIR"/"$__arch_name"/release > release
     mv release "$IMAGES_DIR"/"$__arch_name"/release
-    copy_jmods "$__modules" "$__modules_path" "$IMAGES_DIR"/"$__arch_name"/jmods
   fi
 
   # jmod does not preserve file permissions (JDK-8173610)
@@ -89,7 +88,6 @@ sh configure \
   $WITH_DEBUG_LEVEL \
   --with-vendor-name="$VENDOR_NAME" \
   --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-  --with-jvm-features=shenandoahgc \
   --with-version-pre= \
   --with-version-build="$JDK_BUILD_NUMBER" \
   --with-version-opt=b"$build_number" \
@@ -120,11 +118,11 @@ modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
 create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
 
 # create sdk image bundle
-modules=$(cat $JSDK/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
+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${jbr_name_postfix}" $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
+create_image_bundle $JBRSDK_BUNDLE $JBRSDK_BUNDLE $JSDK_MODS_DIR "$modules" || do_exit $?
 
 if [ -z "$bundle_type" ]; then
     JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-linux-test-x64-b${build_number}

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

@@ -51,7 +51,7 @@ function create_image_bundle {
   tmp=.bundle.$$.tmp
   mkdir "$tmp" || do_exit $?
 
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  [ "$bundle_type" == "fd" ] && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-osx-${architecture}-${fastdebug_infix}b${build_number}
 
   JRE_CONTENTS=$tmp/$__arch_name/Contents
@@ -63,10 +63,9 @@ function create_image_bundle {
     --add-modules "$__modules" --output "$JRE_CONTENTS/Home" || do_exit $?
 
   grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> "$JRE_CONTENTS/Home/release"
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
+  if [ "$__bundle_name" == "$JBRSDK_BUNDLE" ]; then
     sed 's/JBR/JBRSDK/g' $JRE_CONTENTS/Home/release > release
     mv release $JRE_CONTENTS/Home/release
-    copy_jmods "$__modules" "$__modules_path" "$JRE_CONTENTS"/Home/jmods
   fi
 
   cp -R "$JSDK"/../MacOS "$JRE_CONTENTS"
@@ -118,7 +117,6 @@ if [[ "${architecture}" == *aarch64* ]]; then
     $WITH_DEBUG_LEVEL \
     --with-vendor-name="${VENDOR_NAME}" \
     --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-    --with-jvm-features=shenandoahgc \
     --with-version-pre= \
     --with-version-build="${JDK_BUILD_NUMBER}" \
     --with-version-opt=b"${build_number}" \
@@ -133,7 +131,6 @@ else
     $WITH_DEBUG_LEVEL \
     --with-vendor-name="$VENDOR_NAME" \
     --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-    --with-jvm-features=shenandoahgc \
     --with-version-pre= \
     --with-version-build="$JDK_BUILD_NUMBER" \
     --with-version-opt=b"$build_number" \
@@ -161,11 +158,11 @@ modules=$(xargs < modules.list | sed s/" "//g) || do_exit $?
 create_image_bundle "jbr${jbr_name_postfix}" "jbr" $JSDK_MODS_DIR "$modules" || do_exit $?
 
 # create sdk image bundle
-modules=$(cat "$JSDK"/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\n//g) || do_exit $?
+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${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+create_image_bundle "$JBRSDK_BUNDLE" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
 
 if [ -z "$bundle_type" ]; then
     JBRSDK_TEST=${JBRSDK_BUNDLE}-${JBSDK_VERSION}-osx-test-${architecture}-b${build_number}

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

@@ -58,7 +58,7 @@ file="$APP_NAME.zip"
 
 log "Zipping $file..."
 rm -rf "$file"
-ditto -c -k --sequesterRsrc --keepParent "$APP_DIRECTORY" "$file"
+ditto -c -k --sequesterRsrc --keepParent "$APP_DIRECTORY/Contents" "$file"
 
 log "Notarizing $file..."
 rm -rf "altool.init.out" "altool.check.out"

jb/project/tools/mkjbrapi.sh

@@ -1,56 +0,0 @@
-#!/bin/bash -x
-
-# How to call this script:
-# eval $(jb/project/tools/mkjbrapi.sh)
-
-# It is used to build jetbrains.api module
-# After properly calling this script, you can use following variables:
-# JBR_API_JAR - absolute path to resulting JAR
-# JBR_API_SOURCES_JAR - absolute path to JAR with sources
-# JBR_API_VERSION - JBR API version in form <major>.<minor>
-# JBR_API_VERSION_MAJOR, JBR_API_VERSION_MINOR - JBR API version components
-# JBR_BUILD_DIR - absolute path to JBR build directory
-# JBR_BOOT_JDK - absolute path to used boot JDK
-
-ROOT=$(pwd)
-
-sh configure --with-debug-level=release --disable-warnings-as-errors 1>&2 || exit $?
-
-# Get boot JDK & build directory using make script
-make -f $ROOT/make/JBRApi.gmk -I $ROOT jbr-api MAKEOVERRIDES= CONF=release OUT="$ROOT/build/jbr-api.cfg" 1>&2 || exit $?
-source "$ROOT/build/jbr-api.cfg" || exit $?
-
-# Build module
-make jetbrains.api 1>&2 || exit $?
-
-# Get JBR API version from compiled class
-JSHELL_COMMAND='
-System.out.println("\nVERSION_MAJOR=" + com.jetbrains.JBRApi.getMajorVersion());
-System.out.println("\nVERSION_MINOR=" + com.jetbrains.JBRApi.getMinorVersion());
-/exit'
-VERSION_VARIABLES=$("$BOOT_JDK/bin/jshell" -s --module-path "$BUILD_DIR/jdk/modules/jetbrains.api" \
---add-modules jetbrains.api <<< "$JSHELL_COMMAND" | grep "^VERSION\|^|") || exit $?
-eval "$VERSION_VARIABLES" || exit $?
-
-# Create JAR
-(
-  cd "$BUILD_DIR/jdk/modules/jetbrains.api"
-  "$BOOT_JDK/bin/jar" -cf "$BUILD_DIR/jbr-api.jar" * 1>&2
-) || exit $?
-
-# Create source JAR
-(
-  cd "src/jetbrains.api/share/classes"
-  "$BOOT_JDK/bin/jar" -cf "$BUILD_DIR/jbr-api-sources.jar" * 1>&2
-) || exit $?
-
-# Print output values
-echo "JBR_API_JAR=$BUILD_DIR/jbr-api.jar"
-echo "JBR_API_SOURCES_JAR=$BUILD_DIR/jbr-api-sources.jar"
-echo "JBR_API_VERSION=$VERSION_MAJOR.$VERSION_MINOR"
-echo "JBR_API_VERSION_MAJOR=$VERSION_MAJOR"
-echo "JBR_API_VERSION_MINOR=$VERSION_MINOR"
-echo "JBR_BUILD_DIR=$BUILD_DIR"
-echo "JBR_BOOT_JDK=$BOOT_JDK"
-
-echo "Success!" 1>&2

jb/project/tools/patches/add_jcef_module.patch

@@ -1,21 +1,21 @@
 diff --git modules.list modules.list
-index dcf610a6a56..f8797505c23 100644
+index 7c4b3e9cb6d..5ed60349ca7 100644
 --- modules.list
 +++ modules.list
-@@ -51,4 +51,7 @@ jdk.zipfs,
- jdk.hotspot.agent,
- jetbrains.api,
- jetbrains.api.impl,
--jdk.jcmd
-+jdk.jcmd,
+@@ -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 897647ee368..781d1809493 100644
+index b663b382f52..3e9acdc0c27 100644
 --- src/java.desktop/share/classes/module-info.java
 +++ src/java.desktop/share/classes/module-info.java
-@@ -116,7 +116,11 @@ module java.desktop {
+@@ -109,7 +109,11 @@ module java.desktop {
      // see make/GensrcModuleInfo.gmk
      exports sun.awt to
          jdk.accessibility,

jb/project/tools/patches/dcevm/0003-Fix-class-cast-exception-on-redefinition-of-class-A-.patch

@@ -1,7 +1,7 @@
-From d937dae078891013a644c6a53eb17f8f5deb8ec8 Mon Sep 17 00:00:00 2001
+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/39] Fix class cast exception on redefinition of class A,
+Subject: [PATCH 03/34] Fix class cast exception on redefinition of class A,
  that is superclass of B that has anonymous class C
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 03/39] Fix class cast exception on redefinition of class A,
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index 9327652d8fe..c18a5822939 100644
+index 994fc8a3bc8..3be3a09ef8f 100644
 --- a/src/hotspot/share/oops/instanceKlass.cpp
 +++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -908,7 +908,10 @@ bool InstanceKlass::link_class_impl(TRAPS) {
+@@ -953,7 +953,10 @@ bool InstanceKlass::link_class_impl(TRAPS) {
  
      if (!is_linked()) {
        if (!is_rewritten()) {

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

@@ -1,22 +1,24 @@
-From 53d50b53f83aa5135ff5092d0d566424024b8b4b Mon Sep 17 00:00:00 2001
+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 04/39] Support for Lambda class redefinition
+Subject: [PATCH 05/34] Support for Lambda class redefinition
 
 ---
  .../share/classfile/classLoaderData.cpp       |  9 +++
  .../share/classfile/classLoaderData.hpp       |  2 +-
- .../share/classfile/systemDictionary.cpp      | 10 ++-
+ .../share/classfile/systemDictionary.cpp      | 12 +++-
+ .../share/classfile/systemDictionary.hpp      |  1 +
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 65 +++++++++++++++++--
  .../prims/jvmtiEnhancedRedefineClasses.hpp    |  1 +
  .../share/prims/resolvedMethodTable.cpp       |  2 +
- 6 files changed, 80 insertions(+), 9 deletions(-)
+ 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 340ffadf837..db50b3edee8 100644
+index 0cd90bb8c27..4d64c6b454a 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -599,6 +599,15 @@ Dictionary* ClassLoaderData::create_dictionary() {
+@@ -593,6 +593,15 @@ Dictionary* ClassLoaderData::create_dictionary() {
    return new Dictionary(this, size, resizable);
  }
  
@@ -33,11 +35,11 @@ index 340ffadf837..db50b3edee8 100644
  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 5a81ab90ca3..bda39f3e353 100644
+index ba2393f8dd0..e2ae0a77351 100644
 --- a/src/hotspot/share/classfile/classLoaderData.hpp
 +++ b/src/hotspot/share/classfile/classLoaderData.hpp
-@@ -175,7 +175,7 @@ class ClassLoaderData : public CHeapObj<mtClass> {
- 
+@@ -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;
 -
@@ -46,153 +48,173 @@ index 5a81ab90ca3..bda39f3e353 100644
    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 2bfd9cb802f..cea614a574f 100644
+index bd0cae7cb9b..8f2b46add4d 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -825,10 +825,14 @@ InstanceKlass* SystemDictionary::resolve_hidden_class_from_stream(
-                                                      Symbol* class_name,
-                                                      Handle class_loader,
-                                                      const ClassLoadInfo& cl_info,
-+                                                     InstanceKlass* old_klass,
-                                                      TRAPS) {
+@@ -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 hidden classes that are not strong: create a new CLD that has a class holder and
-   //                                           whose loader is the Lookup class's loader.
-@@ -845,9 +849,13 @@ InstanceKlass* SystemDictionary::resolve_hidden_class_from_stream(
+   // - 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);
-   assert(k != NULL, "no klass created");
 +  if (is_redefining && k != NULL) {
 +    k->set_redefining(true);
 +    k->set_old_version(old_klass);
 +  }
  
-   // Hidden classes that are not strong must update ClassLoaderData holder
-   // so that they can be unloaded when the mirror is no longer referenced.
+   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 5551d3ca123..bf31819479d 100644
+index 92ce6c27b8a..8b765623dcd 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -492,6 +492,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;
-@@ -754,12 +756,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();
- 
-@@ -1440,6 +1464,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];
-@@ -1977,7 +2025,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.
+@@ -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
+   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 6a8128e844f..8644937dbbb 100644
+index 122bb8c186b..81b3aa96564 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -409,6 +409,8 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -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());
  
@@ -201,6 +223,18 @@ index 6a8128e844f..8644937dbbb 100644
          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

@@ -1,7 +1,7 @@
-From 7bb6ea77608cd43cb7ca8c1ea8d492ae07789a0f Mon Sep 17 00:00:00 2001
+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 05/39] Fix "no original bytecode found" error if method with
+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
@@ -15,7 +15,7 @@ n bytecode, but breakpoint position can still exist.
  5 files changed, 18 insertions(+), 16 deletions(-)
 
 diff --git a/src/hotspot/share/interpreter/bytecodes.cpp b/src/hotspot/share/interpreter/bytecodes.cpp
-index 6711ba735db..4f0b655265a 100644
+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) {
@@ -28,20 +28,20 @@ index 6711ba735db..4f0b655265a 100644
  
  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 d66ed24d862..9bfcd9eb479 100644
+index ed3cc3eb6a2..504e59caf51 100644
 --- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
 +++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
-@@ -788,7 +788,7 @@ JRT_END
+@@ -814,7 +814,7 @@ JRT_END
  // Invokes
  
- JRT_ENTRY(Bytecodes::Code, InterpreterRuntime::get_original_bytecode_at(JavaThread* current, Method* method, address bcp))
+ 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* current, Method* method, address bcp, Bytecodes::Code new_code))
+ 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 613c10a9d8c..a5a12599997 100644
+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() {
@@ -61,7 +61,7 @@ index 613c10a9d8c..a5a12599997 100644
      ResourceMark rm;
      fatal("no original bytecode found in %s at bci %d", name_and_sig_as_C_string(), bci);
    }
-@@ -1998,7 +1998,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int 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)
@@ -70,7 +70,7 @@ index 613c10a9d8c..a5a12599997 100644
    _next = NULL;
  }
  
-@@ -2007,7 +2007,7 @@ void BreakpointInfo::set(Method* method) {
+@@ -2015,7 +2015,7 @@ void BreakpointInfo::set(Method* method) {
    {
      Bytecodes::Code code = (Bytecodes::Code) *method->bcp_from(_bci);
      if (code == Bytecodes::_breakpoint)
@@ -80,10 +80,10 @@ index 613c10a9d8c..a5a12599997 100644
    }
  #endif
 diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
-index 030ddd1f675..a8d6507ff6c 100644
+index 83ed2d9c3c1..4d4cc6dc012 100644
 --- a/src/hotspot/share/oops/method.hpp
 +++ b/src/hotspot/share/oops/method.hpp
-@@ -226,7 +226,7 @@ class Method : public Metadata {
+@@ -230,7 +230,7 @@ class Method : public Metadata {
  
    // JVMTI breakpoints
  #if !INCLUDE_JVMTI
@@ -92,7 +92,7 @@ index 030ddd1f675..a8d6507ff6c 100644
      ShouldNotReachHere();
      return Bytecodes::_shouldnotreachhere;
    }
-@@ -235,7 +235,7 @@ class Method : public Metadata {
+@@ -239,7 +239,7 @@ class Method : public Metadata {
    };
    u2   number_of_breakpoints() const {return 0;}
  #else // !INCLUDE_JVMTI
@@ -102,34 +102,34 @@ index 030ddd1f675..a8d6507ff6c 100644
    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 bf31819479d..07935bd0ada 100644
+index 8b765623dcd..a859b8e1162 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -1360,14 +1360,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);
+@@ -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

@@ -1,35 +1,18 @@
-From c40cd307310822e6e60c61931c14f97a8501f975 Mon Sep 17 00:00:00 2001
+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 06/39] Replace deleted method with
+Subject: [PATCH 07/34] Replace deleted method with
  Universe::throw_no_such_method_error
 
-+ 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
 ---
- .../prims/jvmtiEnhancedRedefineClasses.cpp    |  2 +-
- .../share/prims/resolvedMethodTable.cpp       | 30 +++++++++----------
- 2 files changed, 16 insertions(+), 16 deletions(-)
+ .../share/prims/resolvedMethodTable.cpp       | 28 +++++++++----------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
 
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 07935bd0ada..3c86e8c68ac 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -881,7 +881,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 8644937dbbb..b8d039adff6 100644
+index 81b3aa96564..caf03ffe56d 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -399,25 +399,25 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -404,25 +404,25 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
  
        if (old_method->is_old()) {
  
@@ -50,7 +33,7 @@ index 8644937dbbb..b8d039adff6 100644
 +          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());
++          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");
@@ -69,15 +52,6 @@ index 8644937dbbb..b8d039adff6 100644
          }
  
          java_lang_invoke_ResolvedMethodName::set_vmtarget(mem_name, newer_method);
-@@ -428,7 +428,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/0008-Support-for-G1-gc.patch

@@ -1,13 +1,13 @@
-From a3775e77a2b4c5ec15051d5cfbf150fc67719d90 Mon Sep 17 00:00:00 2001
+From a597c7248c92aad292e681564300dc98eb72e216 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Fri, 12 Jun 2020 17:43:52 +0200
-Subject: [PATCH 07/39] Support for G1 gc
+Subject: [PATCH 08/34] Support for G1 gc
 
 ---
- src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  23 +++
- src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |   2 +
+ src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  20 +++
+ src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |   3 +
  src/hotspot/share/gc/g1/g1FullCollector.cpp   |  16 +-
- .../share/gc/g1/g1FullGCCompactTask.cpp       |  91 +++++++++-
+ .../share/gc/g1/g1FullGCCompactTask.cpp       |  92 +++++++++-
  .../share/gc/g1/g1FullGCCompactTask.hpp       |  19 +++
  .../share/gc/g1/g1FullGCCompactionPoint.cpp   |  85 +++++++++-
  .../share/gc/g1/g1FullGCCompactionPoint.hpp   |  11 ++
@@ -22,19 +22,19 @@ Subject: [PATCH 07/39] Support for G1 gc
  src/hotspot/share/gc/shared/gcConfig.cpp      |   2 +-
  src/hotspot/share/gc/shared/space.inline.hpp  |   3 +-
  src/hotspot/share/memory/universe.cpp         |   5 +
- .../prims/jvmtiEnhancedRedefineClasses.cpp    |  93 +++++++---
- .../prims/jvmtiEnhancedRedefineClasses.hpp    |   7 +-
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    |  80 ++++++---
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |   6 +-
  src/hotspot/share/runtime/arguments.cpp       |   4 +-
  src/hotspot/share/utilities/growableArray.hpp |   4 +
- 22 files changed, 643 insertions(+), 147 deletions(-)
+ 22 files changed, 628 insertions(+), 147 deletions(-)
  create mode 100644 src/hotspot/share/gc/shared/dcevmSharedGC.cpp
  create mode 100644 src/hotspot/share/gc/shared/dcevmSharedGC.hpp
 
 diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-index 07edbe49817..87eecf74c72 100644
+index e8cdd861cbb..a29d2dddc2d 100644
 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-@@ -2262,6 +2262,24 @@ public:
+@@ -2352,6 +2352,21 @@ public:
    }
  };
  
@@ -48,9 +48,6 @@ index 07edbe49817..87eecf74c72 100644
 +    _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);
 +  }
@@ -59,8 +56,8 @@ index 07edbe49817..87eecf74c72 100644
  void G1CollectedHeap::object_iterate(ObjectClosure* cl) {
    IterateObjectClosureRegionClosure blk(cl);
    heap_region_iterate(&blk);
-@@ -2299,6 +2317,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
-   _hrm.iterate(cl);
+@@ -2365,6 +2380,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
+   _hrm->iterate(cl);
  }
  
 +void G1CollectedHeap::object_par_iterate(ObjectClosure* cl) {
@@ -72,10 +69,10 @@ index 07edbe49817..87eecf74c72 100644
                                                                   HeapRegionClaimer *hrclaimer,
                                                                   uint worker_id) const {
 diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
-index 2068236265e..d7140b0aaee 100644
+index 71f89d09184..adb97ee260a 100644
 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
-@@ -147,6 +147,7 @@ class G1CollectedHeap : public CollectedHeap {
+@@ -146,6 +146,7 @@ class G1CollectedHeap : public CollectedHeap {
    friend class G1ParScanThreadStateSet;
    friend class G1EvacuateRegionsTask;
    friend class G1PLABAllocator;
@@ -83,19 +80,20 @@ index 2068236265e..d7140b0aaee 100644
  
    // Other related classes.
    friend class HeapRegionClaimer;
-@@ -1201,6 +1202,7 @@ public:
+@@ -1168,6 +1169,8 @@ public:
+ 
    // Iteration functions.
  
-   void object_iterate_parallel(ObjectClosure* cl, uint worker_id, HeapRegionClaimer* claimer);
 +  void object_par_iterate(ObjectClosure* cl);
- 
++
    // Iterate over all objects, calling "cl.do_object" on each.
    virtual void object_iterate(ObjectClosure* cl);
+ 
 diff --git a/src/hotspot/share/gc/g1/g1FullCollector.cpp b/src/hotspot/share/gc/g1/g1FullCollector.cpp
-index a48c043e850..7b5a984dead 100644
+index 0242e45eef5..707fe8844d0 100644
 --- a/src/hotspot/share/gc/g1/g1FullCollector.cpp
 +++ b/src/hotspot/share/gc/g1/g1FullCollector.cpp
-@@ -312,8 +312,12 @@ void G1FullCollector::phase2_prepare_compaction() {
+@@ -237,8 +237,12 @@ void G1FullCollector::phase2_prepare_compaction() {
    run_task(&task);
  
    // To avoid OOM when there is memory left.
@@ -110,7 +108,7 @@ index a48c043e850..7b5a984dead 100644
    }
  }
  
-@@ -332,8 +336,12 @@ void G1FullCollector::phase4_do_compaction() {
+@@ -257,8 +261,12 @@ void G1FullCollector::phase4_do_compaction() {
    run_task(&task);
  
    // Serial compact to avoid OOM when very few free regions.
@@ -126,10 +124,10 @@ index a48c043e850..7b5a984dead 100644
  }
  
 diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
-index a7aec46d2ee..fbc6c7f0e3e 100644
+index 97742d26ee9..f70f4606dc8 100644
 --- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
 +++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
-@@ -31,6 +31,7 @@
+@@ -30,6 +30,7 @@
  #include "gc/g1/g1FullGCCompactTask.hpp"
  #include "gc/g1/heapRegion.inline.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
@@ -137,7 +135,7 @@ index a7aec46d2ee..fbc6c7f0e3e 100644
  #include "logging/log.hpp"
  #include "oops/oop.inline.hpp"
  #include "utilities/ticks.hpp"
-@@ -92,10 +93,27 @@ void G1FullGCCompactTask::compact_region(HeapRegion* hr) {
+@@ -90,12 +91,30 @@ void G1FullGCCompactTask::compact_region(HeapRegion* hr) {
  void G1FullGCCompactTask::work(uint worker_id) {
    Ticks start = Ticks::now();
    GrowableArray<HeapRegion*>* compaction_queue = collector()->compaction_point(worker_id)->regions();
@@ -168,8 +166,11 @@ index a7aec46d2ee..fbc6c7f0e3e 100644
 +    }
    }
  
-   G1ResetSkipCompactingClosure hc(collector());
-@@ -112,3 +130,68 @@ void G1FullGCCompactTask::serial_compaction() {
++  // TODO: (DCEV) check it
+   G1ResetHumongousClosure hc(collector()->mark_bitmap());
+   G1CollectedHeap::heap()->heap_region_par_iterate_from_worker_offset(&hc, &_claimer, worker_id);
+   log_task("Compaction task", worker_id, start);
+@@ -110,3 +129,68 @@ void G1FullGCCompactTask::serial_compaction() {
      compact_region(*it);
    }
  }
@@ -239,10 +240,10 @@ index a7aec46d2ee..fbc6c7f0e3e 100644
 +  return size;
 +}
 diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp
-index 5f96796acca..8d66b0d80e6 100644
+index 6c8eaf5967e..ea52a2db8cc 100644
 --- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp
 +++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.hpp
-@@ -40,6 +40,8 @@ protected:
+@@ -41,6 +41,8 @@ protected:
  
  private:
    void compact_region(HeapRegion* hr);
@@ -251,7 +252,7 @@ index 5f96796acca..8d66b0d80e6 100644
  
  public:
    G1FullGCCompactTask(G1FullCollector* collector) :
-@@ -47,6 +49,7 @@ public:
+@@ -48,6 +50,7 @@ public:
      _claimer(collector->workers()) { }
    void work(uint worker_id);
    void serial_compaction();
@@ -259,7 +260,7 @@ index 5f96796acca..8d66b0d80e6 100644
  
    class G1CompactRegionClosure : public StackObj {
      G1CMBitMap* _bitmap;
-@@ -55,6 +58,22 @@ public:
+@@ -56,6 +59,22 @@ public:
      G1CompactRegionClosure(G1CMBitMap* bitmap) : _bitmap(bitmap) { }
      size_t apply(oop object);
    };
@@ -283,7 +284,7 @@ index 5f96796acca..8d66b0d80e6 100644
  
  #endif // SHARE_GC_G1_G1FULLGCCOMPACTTASK_HPP
 diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
-index 499ae94c12b..14d4cd2e78a 100644
+index 269d14d8b73..1e49571c999 100644
 --- a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
 +++ b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
 @@ -31,13 +31,19 @@
@@ -294,7 +295,7 @@ index 499ae94c12b..14d4cd2e78a 100644
 +    _compaction_top(NULL),
 +    _last_rescued_oop(0)
 +{
-   _compaction_regions = new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapRegion*>(32, mtGC);
+   _compaction_regions = new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapRegion*>(32, true, mtGC);
    _compaction_region_iterator = _compaction_regions->begin();
 +  _rescued_oops = new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(128, true, mtGC);
 +  _rescued_oops_values = new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(128, true, mtGC);
@@ -322,7 +323,7 @@ index 499ae94c12b..14d4cd2e78a 100644
  bool G1FullGCCompactionPoint::object_will_fit(size_t size) {
    size_t space_left = pointer_delta(_current_region->end(), _compaction_top);
    return size <= space_left;
-@@ -139,3 +153,72 @@ void G1FullGCCompactionPoint::add(HeapRegion* hr) {
+@@ -143,3 +157,72 @@ void G1FullGCCompactionPoint::merge(G1FullGCCompactionPoint* other) {
  HeapRegion* G1FullGCCompactionPoint::remove_last() {
    return _compaction_regions->pop();
  }
@@ -396,7 +397,7 @@ index 499ae94c12b..14d4cd2e78a 100644
 +  _last_rescued_oop = i;
 +}
 diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp
-index 5f732dcad89..0689af537db 100644
+index 0ec0b324aab..a55a37f96c0 100644
 --- a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp
 +++ b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.hpp
 @@ -37,6 +37,9 @@ class G1FullGCCompactionPoint : public CHeapObj<mtGC> {
@@ -409,15 +410,16 @@ index 5f732dcad89..0689af537db 100644
  
    bool object_will_fit(size_t size);
    void initialize_values(bool init_threshold);
-@@ -52,12 +55,20 @@ public:
+@@ -52,6 +55,8 @@ public:
    void initialize(HeapRegion* hr, bool init_threshold);
    void update();
    void forward(oop object, size_t size);
 +  HeapWord* forward_compact_top(size_t size);
 +  void forward_dcevm(oop object, size_t size, bool force_forward);
    void add(HeapRegion* hr);
+   void merge(G1FullGCCompactionPoint* other);
  
-   HeapRegion* remove_last();
+@@ -59,6 +64,12 @@ public:
    HeapRegion* current_region();
  
    GrowableArray<HeapRegion*>* regions();
@@ -431,41 +433,48 @@ index 5f732dcad89..0689af537db 100644
  
  #endif // SHARE_GC_G1_G1FULLGCCOMPACTIONPOINT_HPP
 diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
-index cc486aa8e7a..eedf3b0f576 100644
+index 3658ae200d9..a45681b60cf 100644
 --- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
 +++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
-@@ -53,7 +53,8 @@ void G1FullGCPrepareTask::G1CalculatePointersClosure::free_pinned_region(HeapReg
+@@ -40,6 +40,7 @@
+ #include "utilities/ticks.hpp"
  
  bool G1FullGCPrepareTask::G1CalculatePointersClosure::do_heap_region(HeapRegion* hr) {
-   bool force_not_compacted = false;
--  if (should_compact(hr)) {
 +  hr->set_processing_order(_region_processing_order++);
-+  if (should_compact(hr)) {  // TODO: (DCEVM) review pinned
-     assert(!hr->is_humongous(), "moving humongous objects not supported.");
+   if (hr->is_humongous()) {
+     oop obj = oop(hr->humongous_start_region()->bottom());
+     if (_bitmap->is_marked(obj)) {
+@@ -49,7 +50,7 @@ bool G1FullGCPrepareTask::G1CalculatePointersClosure::do_heap_region(HeapRegion*
+     } else {
+       free_humongous_region(hr);
+     }
+-  } else if (!hr->is_pinned()) {
++  } else if (!hr->is_pinned()) { // TODO: (DCEVM) review pinned
      prepare_for_compaction(hr);
-   } else {
-@@ -119,6 +120,10 @@ void G1FullGCPrepareTask::work(uint worker_id) {
-   G1CalculatePointersClosure closure(collector(), compaction_point);
+   }
+ 
+@@ -81,6 +82,10 @@ void G1FullGCPrepareTask::work(uint worker_id) {
+   G1CalculatePointersClosure closure(collector()->mark_bitmap(), compaction_point);
    G1CollectedHeap::heap()->heap_region_par_iterate_from_start(&closure, &_hrclaimer);
  
 +  if (Universe::is_redefining_gc_run()) {
 +    compaction_point->forward_rescued();
 +  }
 +
+   // Update humongous region sets
+   closure.update_sets();
    compaction_point->update();
- 
-   // Check if any regions was freed by this worker and store in task.
-@@ -134,7 +139,8 @@ G1FullGCPrepareTask::G1CalculatePointersClosure::G1CalculatePointersClosure(G1Fu
-     _collector(collector),
-     _bitmap(collector->mark_bitmap()),
+@@ -97,7 +102,8 @@ G1FullGCPrepareTask::G1CalculatePointersClosure::G1CalculatePointersClosure(G1CM
+     _g1h(G1CollectedHeap::heap()),
+     _bitmap(bitmap),
      _cp(cp),
--    _regions_freed(false) { }
-+    _regions_freed(false),
+-    _humongous_regions_removed(0) { }
++    _humongous_regions_removed(0),
 +    _region_processing_order(0) { }
  
- bool G1FullGCPrepareTask::G1CalculatePointersClosure::should_compact(HeapRegion* hr) {
-   if (hr->is_pinned()) {
-@@ -182,9 +188,15 @@ size_t G1FullGCPrepareTask::G1RePrepareClosure::apply(oop obj) {
+ void G1FullGCPrepareTask::G1CalculatePointersClosure::free_humongous_region(HeapRegion* hr) {
+   FreeRegionList dummy_free_list("Dummy Free List for G1MarkSweep");
+@@ -146,9 +152,15 @@ size_t G1FullGCPrepareTask::G1RePrepareClosure::apply(oop obj) {
  
  void G1FullGCPrepareTask::G1CalculatePointersClosure::prepare_for_compaction_work(G1FullGCCompactionPoint* cp,
                                                                                    HeapRegion* hr) {
@@ -484,7 +493,7 @@ index cc486aa8e7a..eedf3b0f576 100644
  }
  
  void G1FullGCPrepareTask::G1CalculatePointersClosure::prepare_for_compaction(HeapRegion* hr) {
-@@ -248,3 +260,71 @@ bool G1FullGCPrepareTask::G1CalculatePointersClosure::freed_regions() {
+@@ -219,3 +231,71 @@ bool G1FullGCPrepareTask::G1CalculatePointersClosure::freed_regions() {
    // No free regions in the queue.
    return false;
  }
@@ -497,7 +506,7 @@ index cc486aa8e7a..eedf3b0f576 100644
 +
 +    // 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, HeapRegionType::Eden, true, G1NUMA::AnyNodeIndex);
++      HeapRegion* hr = G1CollectedHeap::heap()->new_region(HeapRegion::GrainBytes / HeapWordSize, false, true);
 +      if (hr == NULL) {
 +        vm_exit_out_of_memory(0, OOM_MMAP_ERROR, "G1 - not enough of free regions after redefinition.");
 +      }
@@ -557,7 +566,7 @@ index cc486aa8e7a..eedf3b0f576 100644
 +  return overlap;
 +}
 diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp
-index d694fc6ffca..97e91893583 100644
+index fcaf797a12f..98a8fa58bbc 100644
 --- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp
 +++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.hpp
 @@ -46,6 +46,7 @@ public:
@@ -568,15 +577,15 @@ index d694fc6ffca..97e91893583 100644
    bool has_freed_regions();
  
  protected:
-@@ -59,6 +60,7 @@ protected:
+@@ -55,6 +56,7 @@ protected:
      G1CMBitMap* _bitmap;
      G1FullGCCompactionPoint* _cp;
-     bool _regions_freed;
+     uint _humongous_regions_removed;
 +    uint _region_processing_order;
  
-     bool should_compact(HeapRegion* hr);
-     void prepare_for_compaction(HeapRegion* hr);
-@@ -82,6 +84,16 @@ protected:
+     virtual void prepare_for_compaction(HeapRegion* hr);
+     void prepare_for_compaction_work(G1FullGCCompactionPoint* cp, HeapRegion* hr);
+@@ -78,6 +80,16 @@ protected:
      size_t apply(oop object);
    };
  
@@ -593,7 +602,7 @@ index d694fc6ffca..97e91893583 100644
    class G1RePrepareClosure : public StackObj {
      G1FullGCCompactionPoint* _cp;
      HeapRegion* _current;
-@@ -94,6 +106,7 @@ protected:
+@@ -90,6 +102,7 @@ protected:
  
      size_t apply(oop object);
    };
@@ -602,10 +611,10 @@ index d694fc6ffca..97e91893583 100644
  
  #endif // SHARE_GC_G1_G1FULLGCPREPARETASK_HPP
 diff --git a/src/hotspot/share/gc/g1/heapRegion.hpp b/src/hotspot/share/gc/g1/heapRegion.hpp
-index ea63f65a8e6..da25f86ba3f 100644
+index 5bf94460540..ec6c5cf8751 100644
 --- a/src/hotspot/share/gc/g1/heapRegion.hpp
 +++ b/src/hotspot/share/gc/g1/heapRegion.hpp
-@@ -202,6 +202,8 @@ private:
+@@ -199,6 +199,8 @@ private:
    // The remembered set for this region.
    HeapRegionRemSet* _rem_set;
  
@@ -614,7 +623,7 @@ index ea63f65a8e6..da25f86ba3f 100644
    // Cached index of this region in the heap region sequence.
    const uint _hrm_index;
  
-@@ -450,6 +452,14 @@ public:
+@@ -452,6 +454,14 @@ public:
      return _rem_set;
    }
  
@@ -630,10 +639,10 @@ index ea63f65a8e6..da25f86ba3f 100644
  
    // Methods used by the HeapRegionSetBase class and subclasses.
 diff --git a/src/hotspot/share/gc/serial/genMarkSweep.cpp b/src/hotspot/share/gc/serial/genMarkSweep.cpp
-index 2776e7d89fe..bbb2c02f2b2 100644
+index 72f571645a5..1d13c647452 100644
 --- a/src/hotspot/share/gc/serial/genMarkSweep.cpp
 +++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp
-@@ -316,5 +316,7 @@ void GenMarkSweep::mark_sweep_phase4() {
+@@ -334,5 +334,7 @@ void GenMarkSweep::mark_sweep_phase4() {
  
    GenCompactClosure blk;
    gch->generation_iterate(&blk, true);
@@ -643,10 +652,10 @@ index 2776e7d89fe..bbb2c02f2b2 100644
 +  MarkSweep::_rescued_oops = NULL;
  }
 diff --git a/src/hotspot/share/gc/serial/markSweep.cpp b/src/hotspot/share/gc/serial/markSweep.cpp
-index b1c1e64316a..345e8cf9f91 100644
+index c7befd2f63d..c0108bad092 100644
 --- a/src/hotspot/share/gc/serial/markSweep.cpp
 +++ b/src/hotspot/share/gc/serial/markSweep.cpp
-@@ -225,100 +225,3 @@ void MarkSweep::initialize() {
+@@ -224,100 +224,3 @@ void MarkSweep::initialize() {
    MarkSweep::_gc_timer = new (ResourceObj::C_HEAP, mtGC) STWGCTimer();
    MarkSweep::_gc_tracer = new (ResourceObj::C_HEAP, mtGC) SerialOldTracer();
  }
@@ -748,7 +757,7 @@ index b1c1e64316a..345e8cf9f91 100644
 -  }
 -}
 diff --git a/src/hotspot/share/gc/serial/markSweep.hpp b/src/hotspot/share/gc/serial/markSweep.hpp
-index b95e2151b72..2a90528db93 100644
+index e12ac327d90..92af0e36a1c 100644
 --- a/src/hotspot/share/gc/serial/markSweep.hpp
 +++ b/src/hotspot/share/gc/serial/markSweep.hpp
 @@ -148,9 +148,6 @@ class MarkSweep : AllStatic {
@@ -982,10 +991,10 @@ index 00000000000..e2ef0171fb2
 +
 +#endif
 diff --git a/src/hotspot/share/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
-index 71b4e46111f..891a75ace08 100644
+index fdb1c806559..f01d64d1434 100644
 --- a/src/hotspot/share/gc/shared/gcConfig.cpp
 +++ b/src/hotspot/share/gc/shared/gcConfig.cpp
-@@ -96,7 +96,7 @@ void GCConfig::fail_if_non_included_gc_is_selected() {
+@@ -98,7 +98,7 @@ void GCConfig::fail_if_non_included_gc_is_selected() {
  }
  
  void GCConfig::select_gc_ergonomically() {
@@ -995,10 +1004,10 @@ index 71b4e46111f..891a75ace08 100644
      FLAG_SET_ERGO(bool, UseSerialGC, true);
    } else if (os::is_server_class_machine()) {
 diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp
-index cd201d03cf2..e3a37280268 100644
+index 875c3fdf319..5a93e93471b 100644
 --- a/src/hotspot/share/gc/shared/space.inline.hpp
 +++ b/src/hotspot/share/gc/shared/space.inline.hpp
-@@ -38,6 +38,7 @@
+@@ -37,6 +37,7 @@
  #if INCLUDE_SERIALGC
  #include "gc/serial/markSweep.inline.hpp"
  #endif
@@ -1006,7 +1015,7 @@ index cd201d03cf2..e3a37280268 100644
  
  inline HeapWord* Space::block_start(const void* p) {
    return block_start_const(p);
-@@ -368,7 +369,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
+@@ -369,7 +370,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
            Copy::aligned_conjoint_words(cur_obj, compaction_top, size);
            oop(compaction_top)->set_klass(new_version);
          } else {
@@ -1016,10 +1025,10 @@ index cd201d03cf2..e3a37280268 100644
          oop(compaction_top)->init_mark_raw();
          assert(oop(compaction_top)->klass() != NULL, "should have a class");
 diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
-index 8091ab2808d..9fcbb6c41b3 100644
+index d38cd348e1b..f6e4253b5a5 100644
 --- a/src/hotspot/share/memory/universe.cpp
 +++ b/src/hotspot/share/memory/universe.cpp
-@@ -241,6 +241,11 @@ void Universe::root_oops_do(OopClosure *oopClosure) {
+@@ -212,6 +212,11 @@ void Universe::root_oops_do(OopClosure *oopClosure) {
    //ref_processor()->weak_oops_do(&oopClosure);
    //PSScavenge::reference_processor()->weak_oops_do(&oopClosure);
  
@@ -1032,258 +1041,244 @@ index 8091ab2808d..9fcbb6c41b3 100644
    SystemDictionary::oops_do(oopClosure);
  }
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 3c86e8c68ac..1da6661dd3e 100644
+index a859b8e1162..6c9eb40ecf5 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -36,7 +36,6 @@
- #include "memory/metaspaceShared.hpp"
- #include "memory/resourceArea.hpp"
- #include "memory/iterator.inline.hpp"
--#include "gc/serial/markSweep.hpp"
- #include "oops/fieldStreams.hpp"
- #include "oops/klassVtable.hpp"
- #include "oops/oop.inline.hpp"
+ #include "memory/metaspaceShared.hpp"
+ #include "memory/resourceArea.hpp"
+ #include "memory/iterator.inline.hpp"
+-#include "gc/serial/markSweep.hpp"
+ #include "oops/fieldStreams.hpp"
+ #include "oops/klassVtable.hpp"
+ #include "oops/oop.inline.hpp"
 @@ -54,6 +53,8 @@
- #include "prims/jvmtiThreadState.inline.hpp"
- #include "utilities/events.hpp"
- #include "oops/constantPool.inline.hpp"
-+#include "gc/g1/g1CollectedHeap.hpp"
-+#include "gc/shared/dcevmSharedGC.hpp"
- 
- Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
- Array<Method*>* VM_EnhancedRedefineClasses::_new_methods = NULL;
+ #include "prims/jvmtiThreadState.inline.hpp"
+ #include "utilities/events.hpp"
+ #include "oops/constantPool.inline.hpp"
++#include "gc/g1/g1CollectedHeap.hpp"
++#include "gc/shared/dcevmSharedGC.hpp"
+ 
+ Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
+ Array<Method*>* VM_EnhancedRedefineClasses::_new_methods = NULL;
 @@ -77,7 +78,7 @@ Klass*      VM_EnhancedRedefineClasses::_the_class_oop = NULL;
- //  - class_defs class definition - either new class or redefined class
- //               note that this is not the final array of classes to be redefined
- //               we need to scan for all affected classes (e.g. subclasses) and
--//               caculcate redefinition for them as well.
-+//               calculate redefinition for them as well.
- // @param class_load_kind always jvmti_class_load_kind_redefine
- VM_EnhancedRedefineClasses::VM_EnhancedRedefineClasses(jint class_count, const jvmtiClassDefinition *class_defs, JvmtiClassLoadKind class_load_kind) :
-         VM_GC_Operation(Universe::heap()->total_collections(), GCCause::_heap_inspection, Universe::heap()->total_full_collections(), true) {
-@@ -215,6 +216,20 @@ void VM_EnhancedRedefineClasses::mark_as_scavengable(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);
-+  }
-+}
-+
- // TODO comment
- struct StoreBarrier {
-   // TODO: j10 review change ::oop_store -> HeapAccess<>::oop_store
-@@ -429,12 +444,7 @@ public:
-           src->set_klass(obj->klass()->new_version());
-           //  FIXME: instance updates...
-           //guarantee(false, "instance updates!");
--          MarkSweep::update_fields(obj, src, new_klass->update_information());
--
--          if (size_diff > 0) {
--            HeapWord* dead_space = ((HeapWord *)obj) + obj->size();
--            CollectedHeap::fill_with_object(dead_space, size_diff);
--          }
-+          DcevmSharedGC::update_fields(obj, src, new_klass->update_information());
-         }
-       } else {
-         obj->set_klass(obj->klass()->new_version());
-@@ -456,6 +466,10 @@ public:
- void VM_EnhancedRedefineClasses::doit() {
-   Thread *thread = Thread::current();
- 
-+  if (log_is_enabled(Info, redefine, class, timer)) {
-+    _timer_vm_op_doit.start();
-+  }
-+
- #if INCLUDE_CDS
-   if (UseSharedSpaces) {
-     // Sharing is enabled so we remap the shared readonly space to
-@@ -511,12 +525,37 @@ void VM_EnhancedRedefineClasses::doit() {
-     // mark such nmethod's as "scavengable".
-     // For now, mark all nmethod's as scavengable that are not scavengable already
-     if (ScavengeRootsInCode) {
--      CodeCache::nmethods_do(mark_as_scavengable);
-+      if (UseG1GC) {
-+        // 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);
-+      }
-     }
- 
-     Universe::heap()->ensure_parsability(false);
--    Universe::heap()->object_iterate(&objectClosure);
-+    if (UseG1GC) {
-+      if (log_is_enabled(Info, redefine, class, timer)) {
-+        _timer_heap_iterate.start();
-+      }
-+      G1CollectedHeap::heap()->object_par_iterate(&objectClosure);
-+      _timer_heap_iterate.stop();
-+    } else {
-+      if (log_is_enabled(Info, redefine, class, timer)) {
-+        _timer_heap_iterate.start();
-+      }
-+      Universe::heap()->object_iterate(&objectClosure);
-+      _timer_heap_iterate.stop();
-+    }
-+
-     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");
- 
-@@ -569,11 +608,19 @@ void VM_EnhancedRedefineClasses::doit() {
- 
-   if (objectClosure.needs_instance_update()) {
-     // Do a full garbage collection to update the instance sizes accordingly
-+
-+    if (log_is_enabled(Info, redefine, class, timer)) {
-+      _timer_heap_full_gc.start();
-+    }
-+
-     Universe::set_redefining_gc_run(true);
-     notify_gc_begin(true);
-+    // TODO: check _metadata_GC_clear_soft_refs with ScavengeRootsInCode
-     Universe::heap()->collect_as_vm_thread(GCCause::_heap_inspection);
-     notify_gc_end();
-     Universe::set_redefining_gc_run(false);
-+
-+    _timer_heap_full_gc.stop();
-   }
- 
-   // Unmark Klass*s as "redefining"
-@@ -621,6 +668,7 @@ void VM_EnhancedRedefineClasses::doit() {
-   }
- #endif
- 
-+  _timer_vm_op_doit.stop();
- }
- 
- // Cleanup - runs in JVM thread
-@@ -644,16 +692,14 @@ void VM_EnhancedRedefineClasses::doit_epilogue() {
-   if (log_is_enabled(Info, redefine, class, timer)) {
-     // Used to have separate timers for "doit" and "all", but the timer
-     // overhead skewed the measurements.
--    jlong doit_time = _timer_rsc_phase1.milliseconds() +
--                      _timer_rsc_phase2.milliseconds();
--    jlong all_time = _timer_vm_op_prologue.milliseconds() + doit_time;
-+    jlong all_time = _timer_vm_op_prologue.milliseconds() + _timer_vm_op_doit.milliseconds();
- 
-     log_info(redefine, class, timer)
-       ("vm_op: all=" JLONG_FORMAT "  prologue=" JLONG_FORMAT "  doit=" JLONG_FORMAT,
--       all_time, _timer_vm_op_prologue.milliseconds(), doit_time);
-+       all_time, _timer_vm_op_prologue.milliseconds(), _timer_vm_op_doit.milliseconds());
-     log_info(redefine, class, timer)
--      ("redefine_single_class: phase1=" JLONG_FORMAT "  phase2=" JLONG_FORMAT,
--       _timer_rsc_phase1.milliseconds(), _timer_rsc_phase2.milliseconds());
-+      ("doit: heap iterate=" JLONG_FORMAT "  fullgc=" JLONG_FORMAT,
-+       _timer_heap_iterate.milliseconds(), _timer_heap_full_gc.milliseconds());
-   }
- }
- 
-@@ -1402,7 +1448,7 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
- // arrayKlassOops. See Open Issues in jvmtiRedefineClasses.hpp.
- void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
-   if (!k->is_instance_klass()) {
--	return;
-+    return;
-   }
- 
-   HandleMark hm(_thread);
-@@ -1588,7 +1634,7 @@ class TransferNativeFunctionRegistration {
- 
-   // Recursively search the binary tree of possibly prefixed method names.
-   // Iteration could be used if all agents were well behaved. Full tree walk is
--  // more resilent to agents not cleaning up intermediate methods.
-+  // more resilient to agents not cleaning up intermediate methods.
-   // Branch at each depth in the binary tree is:
-   //    (1) without the prefix.
-   //    (2) with the prefix.
-@@ -1693,7 +1739,7 @@ void VM_EnhancedRedefineClasses::transfer_old_native_function_registrations(Inst
-   transfer.transfer_registrations(_matching_old_methods, _matching_methods_length);
- }
- 
--// DCEVM - it always deoptimases everything! (because it is very difficult to find only correct dependencies)
-+// DCEVM - it always deoptimizes everything! (because it is very difficult to find only correct dependencies)
- // Deoptimize all compiled code that depends on this class.
- //
- // If the can_redefine_classes capability is obtained in the onload
-@@ -1820,10 +1866,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
- 
-   HandleMark hm(THREAD);   // make sure handles from this call are freed
- 
--  if (log_is_enabled(Info, redefine, class, timer)) {
--    _timer_rsc_phase1.start();
--  }
--
-   InstanceKlass* new_class = new_class_oop;
-   InstanceKlass* the_class = InstanceKlass::cast(new_class_oop->old_version());
-   assert(the_class != NULL, "must have old version");
-@@ -1878,7 +1920,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
-                              new_class->external_name(),
-                              java_lang_Class::classRedefinedCount(new_class->java_mirror()));
-   }
--  _timer_rsc_phase2.stop();
- } // end redefine_single_class()
- 
- 
-@@ -2061,8 +2102,8 @@ static bool match_second(void* value, KlassPair elem) {
- // For each class to be redefined parse the bytecode and figure out the superclass and all interfaces.
- // First newly introduced classes (_class_defs) are scanned and then affected classed (_affected_klasses).
- // Affected flag is cleared (clear_redefinition_flag(Klass::MarkedAsAffected))
--// For each dependency create a KlassPair instance. Finnaly, affected classes (_affected_klasses) are sorted according to pairs.
--// TODO - the class file is potentionally parsed multiple times - introduce a cache?
-+// For each dependency create a KlassPair instance. Finally, affected classes (_affected_klasses) are sorted according to pairs.
-+// TODO - the class file is potentially parsed multiple times - introduce a cache?
- jvmtiError VM_EnhancedRedefineClasses::do_topological_class_sorting(TRAPS) {
-   ResourceMark mark(THREAD);
- 
+ //  - class_defs class definition - either new class or redefined class
+ //               note that this is not the final array of classes to be redefined
+ //               we need to scan for all affected classes (e.g. subclasses) and
+-//               caculcate redefinition for them as well.
++//               calculate redefinition for them as well.
+ // @param class_load_kind always jvmti_class_load_kind_redefine
+ VM_EnhancedRedefineClasses::VM_EnhancedRedefineClasses(jint class_count, const jvmtiClassDefinition *class_defs, JvmtiClassLoadKind class_load_kind) :
+         VM_GC_Operation(Universe::heap()->total_collections(), GCCause::_heap_inspection, Universe::heap()->total_full_collections(), true) {
+@@ -215,6 +216,13 @@ void VM_EnhancedRedefineClasses::mark_as_scavengable(nmethod* nm) {
+   }
+ }
+ 
++void VM_EnhancedRedefineClasses::mark_as_scavengable_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);
++  }
++}
++
+ // TODO comment
+ struct StoreBarrier {
+   // TODO: j10 review change ::oop_store -> HeapAccess<>::oop_store
+@@ -431,12 +439,7 @@ public:
+           src->set_klass(obj->klass()->new_version());
+           //  FIXME: instance updates...
+           //guarantee(false, "instance updates!");
+-          MarkSweep::update_fields(obj, src, new_klass->update_information());
+-
+-          if (size_diff > 0) {
+-            HeapWord* dead_space = ((HeapWord *)obj) + obj->size();
+-            CollectedHeap::fill_with_object(dead_space, size_diff);
+-          }
++          DcevmSharedGC::update_fields(obj, src, new_klass->update_information());
+         }
+       } else {
+         obj->set_klass(obj->klass()->new_version());
+@@ -458,6 +461,10 @@ public:
+ void VM_EnhancedRedefineClasses::doit() {
+   Thread *thread = Thread::current();
+ 
++  if (log_is_enabled(Info, redefine, class, timer)) {
++    _timer_vm_op_doit.start();
++  }
++
+ #if INCLUDE_CDS
+   if (UseSharedSpaces) {
+     // Sharing is enabled so we remap the shared readonly space to
+@@ -513,12 +520,31 @@ void VM_EnhancedRedefineClasses::doit() {
+     // mark such nmethod's as "scavengable".
+     // For now, mark all nmethod's as scavengable that are not scavengable already
+     if (ScavengeRootsInCode) {
+-      CodeCache::nmethods_do(mark_as_scavengable);
++      if (UseG1GC) {
++        // this should work also for other GCs
++        CodeCache::nmethods_do(mark_as_scavengable_g1);
++      } else {
++        CodeCache::nmethods_do(mark_as_scavengable);
++      }
+     }
+ 
+     Universe::heap()->ensure_parsability(false);
+-    Universe::heap()->object_iterate(&objectClosure);
++    if (UseG1GC) {
++      if (log_is_enabled(Info, redefine, class, timer)) {
++        _timer_heap_iterate.start();
++      }
++      G1CollectedHeap::heap()->object_par_iterate(&objectClosure);
++      _timer_heap_iterate.stop();
++    } else {
++      if (log_is_enabled(Info, redefine, class, timer)) {
++        _timer_heap_iterate.start();
++      }
++      Universe::heap()->object_iterate(&objectClosure);
++      _timer_heap_iterate.stop();
++    }
++
+     Universe::root_oops_do(&oopClosureNoBarrier);
++
+   }
+   log_trace(redefine, class, obsolete, metadata)("After updating instances");
+ 
+@@ -571,11 +597,19 @@ void VM_EnhancedRedefineClasses::doit() {
+ 
+   if (objectClosure.needs_instance_update()) {
+     // Do a full garbage collection to update the instance sizes accordingly
++
++    if (log_is_enabled(Info, redefine, class, timer)) {
++      _timer_heap_full_gc.start();
++    }
++
+     Universe::set_redefining_gc_run(true);
+     notify_gc_begin(true);
++    // TODO: check _metadata_GC_clear_soft_refs with ScavengeRootsInCode
+     Universe::heap()->collect_as_vm_thread(GCCause::_heap_inspection);
+     notify_gc_end();
+     Universe::set_redefining_gc_run(false);
++
++    _timer_heap_full_gc.stop();
+   }
+ 
+   // Unmark Klass*s as "redefining"
+@@ -623,6 +657,7 @@ void VM_EnhancedRedefineClasses::doit() {
+   }
+ #endif
+ 
++  _timer_vm_op_doit.stop();
+ }
+ 
+ // Cleanup - runs in JVM thread
+@@ -646,16 +681,14 @@ void VM_EnhancedRedefineClasses::doit_epilogue() {
+   if (log_is_enabled(Info, redefine, class, timer)) {
+     // Used to have separate timers for "doit" and "all", but the timer
+     // overhead skewed the measurements.
+-    jlong doit_time = _timer_rsc_phase1.milliseconds() +
+-                      _timer_rsc_phase2.milliseconds();
+-    jlong all_time = _timer_vm_op_prologue.milliseconds() + doit_time;
++    jlong all_time = _timer_vm_op_prologue.milliseconds() + _timer_vm_op_doit.milliseconds();
+ 
+     log_info(redefine, class, timer)
+       ("vm_op: all=" JLONG_FORMAT "  prologue=" JLONG_FORMAT "  doit=" JLONG_FORMAT,
+-       all_time, _timer_vm_op_prologue.milliseconds(), doit_time);
++       all_time, _timer_vm_op_prologue.milliseconds(), _timer_vm_op_doit.milliseconds());
+     log_info(redefine, class, timer)
+-      ("redefine_single_class: phase1=" JLONG_FORMAT "  phase2=" JLONG_FORMAT,
+-       _timer_rsc_phase1.milliseconds(), _timer_rsc_phase2.milliseconds());
++      ("doit: heap iterate=" JLONG_FORMAT "  fullgc=" JLONG_FORMAT,
++       _timer_heap_iterate.milliseconds(), _timer_heap_full_gc.milliseconds());
+   }
+ }
+ 
+@@ -1404,7 +1437,7 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
+ // arrayKlassOops. See Open Issues in jvmtiRedefineClasses.hpp.
+ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+   if (!k->is_instance_klass()) {
+-	return;
++    return;
+   }
+ 
+   HandleMark hm(_thread);
+@@ -1590,7 +1623,7 @@ class TransferNativeFunctionRegistration {
+ 
+   // Recursively search the binary tree of possibly prefixed method names.
+   // Iteration could be used if all agents were well behaved. Full tree walk is
+-  // more resilent to agents not cleaning up intermediate methods.
++  // more resilient to agents not cleaning up intermediate methods.
+   // Branch at each depth in the binary tree is:
+   //    (1) without the prefix.
+   //    (2) with the prefix.
+@@ -1695,7 +1728,7 @@ void VM_EnhancedRedefineClasses::transfer_old_native_function_registrations(Inst
+   transfer.transfer_registrations(_matching_old_methods, _matching_methods_length);
+ }
+ 
+-// DCEVM - it always deoptimases everything! (because it is very difficult to find only correct dependencies)
++// DCEVM - it always deoptimizes everything! (because it is very difficult to find only correct dependencies)
+ // Deoptimize all compiled code that depends on this class.
+ //
+ // If the can_redefine_classes capability is obtained in the onload
+@@ -1822,10 +1855,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+ 
+   HandleMark hm(THREAD);   // make sure handles from this call are freed
+ 
+-  if (log_is_enabled(Info, redefine, class, timer)) {
+-    _timer_rsc_phase1.start();
+-  }
+-
+   InstanceKlass* new_class = new_class_oop;
+   InstanceKlass* the_class = InstanceKlass::cast(new_class_oop->old_version());
+   assert(the_class != NULL, "must have old version");
+@@ -1880,7 +1909,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+                              new_class->external_name(),
+                              java_lang_Class::classRedefinedCount(new_class->java_mirror()));
+   }
+-  _timer_rsc_phase2.stop();
+ } // end redefine_single_class()
+ 
+ 
+@@ -2063,8 +2091,8 @@ static bool match_second(void* value, KlassPair elem) {
+ // For each class to be redefined parse the bytecode and figure out the superclass and all interfaces.
+ // First newly introduced classes (_class_defs) are scanned and then affected classed (_affected_klasses).
+ // Affected flag is cleared (clear_redefinition_flag(Klass::MarkedAsAffected))
+-// For each dependency create a KlassPair instance. Finnaly, affected classes (_affected_klasses) are sorted according to pairs.
+-// TODO - the class file is potentionally parsed multiple times - introduce a cache?
++// For each dependency create a KlassPair instance. Finally, affected classes (_affected_klasses) are sorted according to pairs.
++// TODO - the class file is potentially parsed multiple times - introduce a cache?
+ jvmtiError VM_EnhancedRedefineClasses::do_topological_class_sorting(TRAPS) {
+   ResourceMark mark(THREAD);
+ 
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index d8a11b51fe9..4c0412d343d 100644
+index d8a11b51fe9..9755944d70b 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 @@ -86,9 +86,10 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
-   // Performance measurement support. These timers do not cover all
-   // the work done for JVM/TI RedefineClasses() but they do cover
-   // the heavy lifting.
--  elapsedTimer  _timer_rsc_phase1;
--  elapsedTimer  _timer_rsc_phase2;
-+  elapsedTimer  _timer_vm_op_doit;
-   elapsedTimer  _timer_vm_op_prologue;
-+  elapsedTimer  _timer_heap_iterate;
-+  elapsedTimer  _timer_heap_full_gc;
- 
-   // These routines are roughly in call order unless otherwise noted.
- 
-@@ -115,6 +116,8 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
- 
-   void rollback();
-   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);
- 
+   // Performance measurement support. These timers do not cover all
+   // the work done for JVM/TI RedefineClasses() but they do cover
+   // the heavy lifting.
+-  elapsedTimer  _timer_rsc_phase1;
+-  elapsedTimer  _timer_rsc_phase2;
++  elapsedTimer  _timer_vm_op_doit;
+   elapsedTimer  _timer_vm_op_prologue;
++  elapsedTimer  _timer_heap_iterate;
++  elapsedTimer  _timer_heap_full_gc;
+ 
+   // These routines are roughly in call order unless otherwise noted.
+ 
+@@ -115,6 +116,7 @@ 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 unpatch_bytecode(Method* method);
+   static void fix_invoke_method(Method* method);
+ 
 diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index 1373408f18d..b7bb88e2a46 100644
+index 2803a3c46eb..d05a2893498 100644
 --- a/src/hotspot/share/runtime/arguments.cpp
 +++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -1981,9 +1981,9 @@ bool Arguments::check_gc_consistency() {
+@@ -2134,9 +2134,9 @@ bool Arguments::check_gc_consistency() {
    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.
@@ -1296,10 +1291,10 @@ index 1373408f18d..b7bb88e2a46 100644
      }
    }
 diff --git a/src/hotspot/share/utilities/growableArray.hpp b/src/hotspot/share/utilities/growableArray.hpp
-index b75283843eb..33ab3bd4676 100644
+index 972b702b4cb..548440e06b6 100644
 --- a/src/hotspot/share/utilities/growableArray.hpp
 +++ b/src/hotspot/share/utilities/growableArray.hpp
-@@ -778,6 +778,10 @@ class GrowableArrayIterator : public StackObj {
+@@ -560,6 +560,10 @@ template<class E> class GrowableArrayIterator : public StackObj {
      assert(_array == rhs._array, "iterator belongs to different array");
      return _position != rhs._position;
    }

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/0009-Set-HOTSPOT_VM_DISTRO-Dynamic-Code-Evolution.patch

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

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

@@ -1,7 +1,7 @@
-From e062743b148a099a8593a3110d5f1d9156f4ca23 Mon Sep 17 00:00:00 2001
+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 08/39] AllowEnhancedClassRedefinition is false (disabled) by
+Subject: [PATCH 10/34] AllowEnhancedClassRedefinition is false (disabled) by
  default
 
 ---
@@ -9,18 +9,18 @@ Subject: [PATCH 08/39] AllowEnhancedClassRedefinition is false (disabled) by
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 2fcb02fcf49..7051b634a9b 100644
+index 5b367704800..2710c6ea0e5 100644
 --- a/src/hotspot/share/runtime/globals.hpp
 +++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2088,7 +2088,7 @@ const intx ObjectAlignmentInBytes = 8;
-   develop(bool, TraceOptimizedUpcallStubs, false,                              \
-                 "Trace optimized upcall stub generation")                      \
+@@ -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")
- 
+              "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/0013-dcevm15-add-ClassLoaderDataGraph_lock-on.patch

@@ -1,43 +0,0 @@
-From 9815ee603b27484953651bdc6d5705994a4d38aa 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 13/39] dcevm15 - add ClassLoaderDataGraph_lock on
- ClassLoaderDataGraph::classes_do
-
-ClassLoaderDataGraph::classes_do and need safepoint or lock,
-find_sorted_affected_classes is not in safepoint therefore it must be
-locked
-ClassLoaderDataGraph::rollback_redefinition need safepoint too
----
- src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index efaf11e1666..9f42d14ce98 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -1380,7 +1380,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));
-@@ -2063,7 +2065,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/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

@@ -1,40 +1,46 @@
-From 3b4788c779cb9ffe2751e996bba3b445b474eba7 Mon Sep 17 00:00:00 2001
+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 10/39] Clear dcevm code separation
+Subject: [PATCH 15/34] Clear dcevm code separation
 
 ---
- src/hotspot/share/classfile/systemDictionary.cpp   |  3 +--
- src/hotspot/share/gc/serial/genMarkSweep.cpp       |  8 +++++---
- src/hotspot/share/interpreter/linkResolver.cpp     | 14 ++++++++++----
- .../instrumentation/jfrEventClassTransformer.cpp   |  2 +-
- src/hotspot/share/oops/cpCache.hpp                 |  8 +++++---
- src/hotspot/share/oops/instanceKlass.cpp           |  6 +++---
- src/hotspot/share/oops/method.cpp                  |  2 +-
- src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp  |  2 +-
- src/hotspot/share/runtime/reflection.cpp           |  2 +-
- 9 files changed, 28 insertions(+), 19 deletions(-)
+ 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 cea614a574f..98e2541c79b 100644
+index 8f2b46add4d..9ac6ec96cb5 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -830,9 +830,8 @@ InstanceKlass* SystemDictionary::resolve_hidden_class_from_stream(
+@@ -1241,7 +1241,7 @@ InstanceKlass* SystemDictionary::resolve_from_stream(Symbol* class_name,
+     MutexLocker mu(THREAD, SystemDictionary_lock);
  
-   EventClassLoad class_load_start_event;
-   ClassLoaderData* loader_data;
-- 
-+
-   bool is_redefining = (old_klass != NULL);
--  
+     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");
+   } );
  
-   // - for hidden classes that are not strong: create a new CLD that has a class holder and
-   //                                           whose loader is the Lookup class's loader.
+   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 bbb2c02f2b2..00b8e44078e 100644
+index 1d13c647452..548df01e557 100644
 --- a/src/hotspot/share/gc/serial/genMarkSweep.cpp
 +++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp
-@@ -316,7 +316,9 @@ void GenMarkSweep::mark_sweep_phase4() {
+@@ -334,7 +334,9 @@ void GenMarkSweep::mark_sweep_phase4() {
  
    GenCompactClosure blk;
    gch->generation_iterate(&blk, true);
@@ -48,37 +54,38 @@ index bbb2c02f2b2..00b8e44078e 100644
 +  }
  }
 diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
-index 8fb336762df..74a6af13ea4 100644
+index b6e9e0a308d..b2f24ddbeda 100644
 --- a/src/hotspot/share/interpreter/linkResolver.cpp
 +++ b/src/hotspot/share/interpreter/linkResolver.cpp
-@@ -287,9 +287,14 @@ void LinkResolver::check_klass_accessibility(Klass* ref_klass, Klass* sel_klass,
+@@ -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(ref_klass->newest_version(), InstanceKlass::cast(base_klass->newest_version()), true);
++  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,
-@@ -551,7 +556,8 @@ void LinkResolver::check_method_accessability(Klass* 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() == vmClasses::Object_klass()->newest_version() &&
-+      ( !AllowEnhancedClassRedefinition && sel_klass == vmClasses::Object_klass() ||
-+      AllowEnhancedClassRedefinition && sel_klass->newest_version() == vmClasses::Object_klass()->newest_version()) &&
+-      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?");
-@@ -997,7 +1003,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
+@@ -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()) {
  
@@ -88,10 +95,10 @@ index 8fb336762df..74a6af13ea4 100644
          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 88e520ec475..73832251f3f 100644
+index 96fc139bea3..f7284197c5a 100644
 --- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
 +++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
-@@ -1475,7 +1475,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
+@@ -1471,7 +1471,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
                               cld,
                               &cl_info,
                               ClassFileParser::INTERNAL, // internal visibility
@@ -100,60 +107,40 @@ index 88e520ec475..73832251f3f 100644
                               THREAD);
    if (HAS_PENDING_EXCEPTION) {
      log_pending_exception(PENDING_EXCEPTION);
-diff --git a/src/hotspot/share/oops/cpCache.hpp b/src/hotspot/share/oops/cpCache.hpp
-index b934302f422..d7ae5edc7b3 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
 diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index c18a5822939..994f6bf266f 100644
+index 3be3a09ef8f..f8e60941046 100644
 --- a/src/hotspot/share/oops/instanceKlass.cpp
 +++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -968,7 +968,7 @@ bool InstanceKlass::link_class_impl(TRAPS) {
-         set_init_state(linked);
-       }
+@@ -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 */) {
-         JvmtiExport::post_class_prepare(THREAD, this);
-       }
-     }
-@@ -1046,7 +1046,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
++      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))
+     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);
-@@ -3796,7 +3796,7 @@ void InstanceKlass::verify_on(outputStream* st) {
+@@ -3782,7 +3784,7 @@ void InstanceKlass::verify_on(outputStream* st) {
  
      guarantee(sib->is_klass(), "should be klass");
      // TODO: (DCEVM) explain
@@ -163,10 +150,10 @@ index c18a5822939..994f6bf266f 100644
  
    // Verify local interfaces
 diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index a5a12599997..4426f03fd40 100644
+index ce940cf10a9..2d8e5b0256b 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
-@@ -2199,7 +2199,7 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
+@@ -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) ???
@@ -176,10 +163,10 @@ index a5a12599997..4426f03fd40 100644
    }
    ClassLoaderData* cld = loader_data;
 diff --git a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-index 42e72c67879..c860ee24f80 100644
+index 1c7677f270f..6c12ee64a6e 100644
 --- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-@@ -76,7 +76,7 @@ public:
+@@ -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.
@@ -189,10 +176,10 @@ index 42e72c67879..c860ee24f80 100644
        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 cc58f913ed5..21104c18423 100644
+index 0e7722dba7d..d67457f02ac 100644
 --- a/src/hotspot/share/runtime/reflection.cpp
 +++ b/src/hotspot/share/runtime/reflection.cpp
-@@ -608,7 +608,7 @@ bool Reflection::verify_member_access(const Klass* current_class,
+@@ -628,7 +628,7 @@ bool Reflection::verify_member_access(const Klass* current_class,
                                        TRAPS) {
  
    // (DCEVM) Decide accessibility based on active version

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

@@ -1,7 +1,7 @@
-From bb8f91da24b2649507f2e200f1ff2bae2d2658bf Mon Sep 17 00:00:00 2001
+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 11/39] Fix LoadedClassesClosure - fixes problems with remote
+Subject: [PATCH 16/34] Fix LoadedClassesClosure - fixes problems with remote
  debugging
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 11/39] Fix LoadedClassesClosure - fixes problems with remote
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-index c860ee24f80..dfe0bb8d96a 100644
+index 6c12ee64a6e..2a469555dbd 100644
 --- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-@@ -76,7 +76,7 @@ public:
+@@ -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.

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/0020-Disable-AllowEnhancedClassRedefinition-in-flight-rec.patch

@@ -1,31 +0,0 @@
-From 5c41ecc9f48d22b81b3ac610e5655f1a74d25614 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Fri, 12 Feb 2021 10:11:10 +0100
-Subject: [PATCH 20/39] Disable AllowEnhancedClassRedefinition in flight
- recorder
-
----
- src/hotspot/share/runtime/arguments.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index 567803b70b7..cbcd8f91c66 100644
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -3994,6 +3994,13 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
-   // Set object alignment values.
-   set_object_alignment();
- 
-+  if (FlightRecorder) {
-+    if (AllowEnhancedClassRedefinition) {
-+      warning("EnhancedClassRedefinition was disabled, it is not allowed in FlightRecorder.");
-+      AllowEnhancedClassRedefinition = false;
-+    }
-+  }
-+
- #if !INCLUDE_CDS
-   if (DumpSharedSpaces || RequireSharedSpaces) {
-     jio_fprintf(defaultStream::error_stream(),
--- 
-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/0021-dcevm17-fix-compilation-issues.patch

@@ -1,695 +0,0 @@
-From e560b33cdec3ef0e4ce91714663d3befa87ff4e5 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Fri, 12 Feb 2021 09:44:28 +0100
-Subject: [PATCH 21/39] dcevm17 - fix compilation issues
-
----
- .../share/classfile/classLoaderData.cpp       |   2 +-
- src/hotspot/share/classfile/javaClasses.cpp   |   4 +-
- src/hotspot/share/classfile/javaClasses.hpp   |   4 +-
- .../share/classfile/lambdaFormInvokers.cpp    | 152 ++++++++++++++++++
- .../share/classfile/systemDictionary.cpp      |   5 +-
- .../share/classfile/systemDictionary.hpp      |   6 +
- src/hotspot/share/classfile/vmClassMacros.hpp |   2 +
- .../share/gc/g1/g1FullGCCompactTask.cpp       |   9 +-
- .../share/gc/g1/g1FullGCCompactionPoint.cpp   |  12 +-
- src/hotspot/share/gc/shared/dcevmSharedGC.cpp |   2 +-
- src/hotspot/share/gc/shared/space.inline.hpp  |   2 +-
- src/hotspot/share/memory/universe.cpp         |  71 --------
- src/hotspot/share/memory/universe.hpp         |   7 -
- src/hotspot/share/oops/instanceKlass.cpp      |   4 +-
- .../prims/jvmtiEnhancedRedefineClasses.cpp    |  47 ++++--
- .../prims/jvmtiEnhancedRedefineClasses.hpp    |   2 +
- .../share/prims/resolvedMethodTable.cpp       |   5 +-
- src/hotspot/share/runtime/arguments.hpp       |   2 +
- 18 files changed, 221 insertions(+), 117 deletions(-)
- create mode 100644 src/hotspot/share/classfile/lambdaFormInvokers.cpp
-
-diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 2a826ff50a7..65ce4c4af8c 100644
---- a/src/hotspot/share/classfile/classLoaderData.cpp
-+++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -603,7 +603,7 @@ void ClassLoaderData::exchange_holders(ClassLoaderData* cld) {
-   oop holder_oop = _holder.peek();
-   _holder.replace(cld->_holder.peek());
-   cld->_holder.replace(holder_oop);
--  WeakHandle<vm_weak_data> exchange = _holder;
-+  WeakHandle exchange = _holder;
-   _holder = cld->_holder;
-   cld->_holder = exchange;
- }
-diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
-index dc800debea4..66ff72b2f02 100644
---- a/src/hotspot/share/classfile/javaClasses.cpp
-+++ b/src/hotspot/share/classfile/javaClasses.cpp
-@@ -3827,7 +3827,7 @@ void java_lang_invoke_DirectMethodHandle_StaticAccessor::set_static_offset(oop d
-   macro(_static_offset_offset, k, vmSymbols::static_offset_name(), long_signature, false)
- 
- void java_lang_invoke_DirectMethodHandle_StaticAccessor::compute_offsets() {
--  InstanceKlass* k = SystemDictionary::DirectMethodHandle_StaticAccessor_klass();
-+  InstanceKlass* k = vmClasses::DirectMethodHandle_StaticAccessor_klass();
-   DIRECTMETHODHANDLE_STATIC_ACCESSOR_FIELDS_DO(FIELD_COMPUTE_OFFSET);
- }
- 
-@@ -3855,7 +3855,7 @@ void java_lang_invoke_DirectMethodHandle_Accessor::set_field_offset(oop dmh, int
-   macro(_field_offset_offset, k, vmSymbols::field_offset_name(), int_signature, false)
- 
- void java_lang_invoke_DirectMethodHandle_Accessor::compute_offsets() {
--  InstanceKlass* k = SystemDictionary::DirectMethodHandle_Accessor_klass();
-+  InstanceKlass* k = vmClasses::DirectMethodHandle_Accessor_klass();
-   DIRECTMETHODHANDLE_ACCESSOR_FIELDS_DO(FIELD_COMPUTE_OFFSET);
- }
- 
-diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
-index 32348c90ef9..f7dc5ccbd8c 100644
---- a/src/hotspot/share/classfile/javaClasses.hpp
-+++ b/src/hotspot/share/classfile/javaClasses.hpp
-@@ -1029,7 +1029,7 @@ class java_lang_invoke_DirectMethodHandle_StaticAccessor: AllStatic {
- 
-   // Testers
-   static bool is_subclass(Klass* klass) {
--    return klass->is_subclass_of(SystemDictionary::DirectMethodHandle_StaticAccessor_klass());
-+    return klass->is_subclass_of(vmClasses::DirectMethodHandle_StaticAccessor_klass());
-   }
-   static bool is_instance(oop obj);
- 
-@@ -1053,7 +1053,7 @@ class java_lang_invoke_DirectMethodHandle_Accessor: AllStatic {
- 
-   // Testers
-   static bool is_subclass(Klass* klass) {
--    return klass->is_subclass_of(SystemDictionary::DirectMethodHandle_Accessor_klass());
-+    return klass->is_subclass_of(vmClasses::DirectMethodHandle_Accessor_klass());
-   }
-   static bool is_instance(oop obj);
- 
-diff --git a/src/hotspot/share/classfile/lambdaFormInvokers.cpp b/src/hotspot/share/classfile/lambdaFormInvokers.cpp
-new file mode 100644
-index 00000000000..281de58b482
---- /dev/null
-+++ b/src/hotspot/share/classfile/lambdaFormInvokers.cpp
-@@ -0,0 +1,152 @@
-+/*
-+ * Copyright (c) 2020, 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
-+ * 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.
-+ *
-+ */
-+
-+#include "precompiled.hpp"
-+#include "classfile/classLoadInfo.hpp"
-+#include "classfile/classFileStream.hpp"
-+#include "classfile/javaClasses.inline.hpp"
-+#include "classfile/klassFactory.hpp"
-+#include "classfile/lambdaFormInvokers.hpp"
-+#include "classfile/symbolTable.hpp"
-+#include "classfile/systemDictionary.hpp"
-+#include "classfile/systemDictionaryShared.hpp"
-+#include "classfile/vmClasses.hpp"
-+#include "classfile/vmSymbols.hpp"
-+#include "logging/log.hpp"
-+#include "memory/oopFactory.hpp"
-+#include "memory/metaspaceShared.hpp"
-+#include "memory/resourceArea.hpp"
-+#include "oops/instanceKlass.hpp"
-+#include "oops/klass.hpp"
-+#include "oops/objArrayKlass.hpp"
-+#include "oops/objArrayOop.hpp"
-+#include "oops/oop.inline.hpp"
-+#include "oops/typeArrayOop.inline.hpp"
-+#include "runtime/handles.inline.hpp"
-+#include "runtime/javaCalls.hpp"
-+
-+GrowableArray<char*>* LambdaFormInvokers::_lambdaform_lines = NULL;
-+
-+void LambdaFormInvokers::append(char* line) {
-+  if (_lambdaform_lines == NULL) {
-+    _lambdaform_lines = new GrowableArray<char*>(100);
-+  }
-+  _lambdaform_lines->append(line);
-+}
-+
-+void LambdaFormInvokers::regenerate_holder_classes(TRAPS) {
-+  assert(_lambdaform_lines != NULL, "Bad List");
-+  ResourceMark rm(THREAD);
-+
-+  Symbol* cds_name  = vmSymbols::jdk_internal_misc_CDS();
-+  Klass*  cds_klass = SystemDictionary::resolve_or_null(cds_name, THREAD);
-+  guarantee(cds_klass != NULL, "jdk/internal/misc/CDS must exist!");
-+
-+  int len = _lambdaform_lines->length();
-+  objArrayHandle list_lines = oopFactory::new_objArray_handle(vmClasses::String_klass(), len, CHECK);
-+  for (int i = 0; i < len; i++) {
-+    Handle h_line = java_lang_String::create_from_str(_lambdaform_lines->at(i), CHECK);
-+    list_lines->obj_at_put(i, h_line());
-+  }
-+
-+  //
-+  // Object[] CDS.generateLambdaFormHolderClasses(String[] lines)
-+  // the returned Object[] layout:
-+  //   name, byte[], name, byte[] ....
-+  Symbol* method = vmSymbols::generateLambdaFormHolderClasses();
-+  Symbol* signrs = vmSymbols::generateLambdaFormHolderClasses_signature();
-+
-+  JavaValue result(T_OBJECT);
-+  JavaCalls::call_static(&result, cds_klass, method, signrs, list_lines, THREAD);
-+
-+  if (HAS_PENDING_EXCEPTION) {
-+    log_info(cds)("%s: %s", THREAD->pending_exception()->klass()->external_name(),
-+                            java_lang_String::as_utf8_string(java_lang_Throwable::message(THREAD->pending_exception())));
-+    CLEAR_PENDING_EXCEPTION;
-+    return;
-+  }
-+
-+  objArrayHandle h_array(THREAD, (objArrayOop)result.get_oop());
-+  int sz = h_array->length();
-+  assert(sz % 2 == 0 && sz >= 2, "Must be even size of length");
-+  for (int i = 0; i < sz; i+= 2) {
-+    Handle h_name(THREAD, h_array->obj_at(i));
-+    typeArrayHandle h_bytes(THREAD, (typeArrayOop)h_array->obj_at(i+1));
-+    assert(h_name != NULL, "Class name is NULL");
-+    assert(h_bytes != NULL, "Class bytes is NULL");
-+
-+    char *class_name = java_lang_String::as_utf8_string(h_name());
-+    int len = h_bytes->length();
-+    // make a copy of class bytes so GC will not affect us.
-+    char *buf = resource_allocate_bytes(THREAD, len);
-+    memcpy(buf, (char*)h_bytes->byte_at_addr(0), len);
-+    ClassFileStream st((u1*)buf, len, NULL, ClassFileStream::verify);
-+
-+    reload_class(class_name, st, THREAD);
-+    // free buf
-+    resource_free_bytes(buf, len);
-+
-+    if (HAS_PENDING_EXCEPTION) {
-+      log_info(cds)("Exception happened: %s", PENDING_EXCEPTION->klass()->name()->as_C_string());
-+      log_info(cds)("Could not create InstanceKlass for class %s", class_name);
-+      CLEAR_PENDING_EXCEPTION;
-+      return;
-+    }
-+  }
-+}
-+
-+// class_handle - the class name, bytes_handle - the class bytes
-+void LambdaFormInvokers::reload_class(char* name, ClassFileStream& st, TRAPS) {
-+  Symbol* class_name = SymbolTable::new_symbol((const char*)name);
-+  // the class must exist
-+  Klass* klass = SystemDictionary::resolve_or_null(class_name, THREAD);
-+  if (klass == NULL) {
-+    log_info(cds)("Class %s not present, skip", name);
-+    return;
-+  }
-+  assert(klass->is_instance_klass(), "Should be");
-+
-+  ClassLoaderData* cld = ClassLoaderData::the_null_class_loader_data();
-+  Handle protection_domain;
-+  ClassLoadInfo cl_info(protection_domain);
-+
-+  InstanceKlass* result = KlassFactory::create_from_stream(&st,
-+                                                   class_name,
-+                                                   cld,
-+                                                   cl_info,
-+                                                   false,
-+                                                   CHECK);
-+
-+  {
-+    MutexLocker mu_r(THREAD, Compile_lock); // add_to_hierarchy asserts this.
-+    SystemDictionary::add_to_hierarchy(result);
-+  }
-+  // new class not linked yet.
-+  MetaspaceShared::try_link_class(THREAD, result);
-+  assert(!HAS_PENDING_EXCEPTION, "Invariant");
-+
-+  // exclude the existing class from dump
-+  SystemDictionaryShared::set_excluded(InstanceKlass::cast(klass));
-+  log_info(cds, lambda)("Replaced class %s, old: %p  new: %p", name, klass, result);
-+}
-diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 98e2541c79b..63de2e2f099 100644
---- a/src/hotspot/share/classfile/systemDictionary.cpp
-+++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -963,11 +963,12 @@ InstanceKlass* SystemDictionary::resolve_from_stream(ClassFileStream* st,
-                                                      Symbol* class_name,
-                                                      Handle class_loader,
-                                                      const ClassLoadInfo& cl_info,
-+                                                     InstanceKlass* old_klass,
-                                                      TRAPS) {
-   if (cl_info.is_hidden()) {
--    return resolve_hidden_class_from_stream(st, class_name, class_loader, cl_info, CHECK_NULL);
-+    return resolve_hidden_class_from_stream(st, class_name, class_loader, cl_info, old_klass, CHECK_NULL);
-   } else {
--    return resolve_class_from_stream(st, class_name, class_loader, cl_info, CHECK_NULL);
-+    return resolve_class_from_stream(st, class_name, class_loader, cl_info, old_klass, CHECK_NULL);
-   }
- }
- 
-diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
-index 0c774dfeb51..65185a29b10 100644
---- a/src/hotspot/share/classfile/systemDictionary.hpp
-+++ b/src/hotspot/share/classfile/systemDictionary.hpp
-@@ -124,6 +124,7 @@ class SystemDictionary : AllStatic {
-                                                          Symbol* class_name,
-                                                          Handle class_loader,
-                                                          const ClassLoadInfo& cl_info,
-+                                                         InstanceKlass* old_klass,
-                                                          TRAPS);
- 
-   // Resolve a class from stream (called by jni_DefineClass and JVM_DefineClass)
-@@ -132,6 +133,7 @@ class SystemDictionary : AllStatic {
-                                                   Symbol* class_name,
-                                                   Handle class_loader,
-                                                   const ClassLoadInfo& cl_info,
-+                                                  InstanceKlass* old_klass,
-                                                   TRAPS);
- 
-  public:
-@@ -203,6 +205,10 @@ class SystemDictionary : AllStatic {
-   // Initialization
-   static void initialize(TRAPS);
- 
-+  // (DCEVM) Enhanced class redefinition
-+  static void remove_from_hierarchy(InstanceKlass* k);
-+  static void update_constraints_after_redefinition();
-+
- protected:
-   // Returns the class loader data to be used when looking up/updating the
-   // system dictionary.
-diff --git a/src/hotspot/share/classfile/vmClassMacros.hpp b/src/hotspot/share/classfile/vmClassMacros.hpp
-index a4f55641b51..fb205721a39 100644
---- a/src/hotspot/share/classfile/vmClassMacros.hpp
-+++ b/src/hotspot/share/classfile/vmClassMacros.hpp
-@@ -109,6 +109,8 @@
-                                                                                                                 \
-   /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */                                   \
-   do_klass(DirectMethodHandle_klass,                    java_lang_invoke_DirectMethodHandle                   ) \
-+  do_klass(DirectMethodHandle_StaticAccessor_klass,     java_lang_invoke_DirectMethodHandle_StaticAccessor    ) \
-+  do_klass(DirectMethodHandle_Accessor_klass,           java_lang_invoke_DirectMethodHandle_Accessor          ) \
-   do_klass(MethodHandle_klass,                          java_lang_invoke_MethodHandle                         ) \
-   do_klass(VarHandle_klass,                             java_lang_invoke_VarHandle                            ) \
-   do_klass(MemberName_klass,                            java_lang_invoke_MemberName                           ) \
-diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
-index 54edc9dffb5..058dea90828 100644
---- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
-+++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
-@@ -141,7 +141,10 @@ void G1FullGCCompactTask::compact_region_dcevm(HeapRegion* hr, GrowableArray<Hea
-   // Once all objects have been moved the liveness information
-   // needs be cleared.
-   collector()->mark_bitmap()->clear_region(hr);
--  hr->complete_compaction();
-+  if (G1VerifyBitmaps) {
-+    collector()->mark_bitmap()->clear_region(hr);
-+  }
-+  hr->reset_compacted_after_full_gc();
- }
- 
- void G1FullGCCompactTask::serial_compaction_dcevm() {
-@@ -184,13 +187,13 @@ size_t G1FullGCCompactTask::G1CompactRegionClosureDcevm::apply(oop obj) {
-     } else {
-       DcevmSharedGC::update_fields(obj, oop(destination));
-     }
--    oop(destination)->init_mark_raw();
-+    oop(destination)->init_mark();
-     assert(oop(destination)->klass() != NULL, "should have a class");
-     return size;
-   }
- 
-   Copy::aligned_conjoint_words(obj_addr, destination, size);
--  oop(destination)->init_mark_raw();
-+  oop(destination)->init_mark();
-   assert(oop(destination)->klass() != NULL, "should have a class");
- 
-   return size;
-diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
-index 71a46b88f9e..87b1977128a 100644
---- a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
-+++ b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
-@@ -36,8 +36,8 @@ G1FullGCCompactionPoint::G1FullGCCompactionPoint() :
- {
-   _compaction_regions = new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapRegion*>(32, mtGC);
-   _compaction_region_iterator = _compaction_regions->begin();
--  _rescued_oops = new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(128, true, mtGC);
--  _rescued_oops_values = new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(128, true, mtGC);
-+  _rescued_oops = new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(128, mtGC);
-+  _rescued_oops_values = new (ResourceObj::C_HEAP, mtGC) GrowableArray<HeapWord*>(128, mtGC);
- }
- 
- G1FullGCCompactionPoint::~G1FullGCCompactionPoint() {
-@@ -180,15 +180,15 @@ void G1FullGCCompactionPoint::forward_dcevm(oop object, size_t size, bool force_
-       // with BiasedLocking, in this case forwardee() will return NULL
-       // even if the mark-word is used. This is no problem since
-       // forwardee() will return NULL in the compaction phase as well.
--      object->init_mark_raw();
-+      object->init_mark();
-     } 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() == markWord::prototype_for_klass(object->klass()) || // Correct mark
-+      assert(object->mark() == 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
-+             (UseBiasedLocking && object->has_bias_pattern()), // Will be restored by BiasedLocking
-              "should have correct prototype obj: " PTR_FORMAT " mark: " PTR_FORMAT " prototype: " PTR_FORMAT,
--             p2i(object), object->mark_raw().value(), markWord::prototype_for_klass(object->klass()).value());
-+             p2i(object), object->mark().value(), markWord::prototype_for_klass(object->klass()).value());
-     }
-     assert(object->forwardee() == NULL, "should be forwarded to NULL");
-   }
-diff --git a/src/hotspot/share/gc/shared/dcevmSharedGC.cpp b/src/hotspot/share/gc/shared/dcevmSharedGC.cpp
-index 3dee097f1d3..edc19a3077d 100644
---- a/src/hotspot/share/gc/shared/dcevmSharedGC.cpp
-+++ b/src/hotspot/share/gc/shared/dcevmSharedGC.cpp
-@@ -64,7 +64,7 @@ void DcevmSharedGC::copy_rescued_objects_back(GrowableArray<HeapWord*>* rescued_
-         Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(rescued_obj), cast_from_oop<HeapWord*>(new_obj), size);
-       }
- 
--      new_obj->init_mark_raw();
-+      new_obj->init_mark();
-       assert(oopDesc::is_oop(new_obj), "must be a valid oop");
-     }
-   }
-diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp
-index e3a37280268..cafa2503ef4 100644
---- a/src/hotspot/share/gc/shared/space.inline.hpp
-+++ b/src/hotspot/share/gc/shared/space.inline.hpp
-@@ -371,7 +371,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
-         } else {
-           DcevmSharedGC::update_fields(oop(cur_obj), oop(compaction_top));
-         }
--        oop(compaction_top)->init_mark_raw();
-+        oop(compaction_top)->init_mark();
-         assert(oop(compaction_top)->klass() != NULL, "should have a class");
- 
-         debug_only(prev_obj = cur_obj);
-diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
-index 247f2b3e8c0..4ae3b382b67 100644
---- a/src/hotspot/share/memory/universe.cpp
-+++ b/src/hotspot/share/memory/universe.cpp
-@@ -44,8 +44,6 @@
- #include "gc/shared/oopStorageSet.hpp"
- #include "gc/shared/stringdedup/stringDedup.hpp"
- #include "gc/shared/tlab_globals.hpp"
--#include "gc/shared/weakProcessor.hpp"
--#include "interpreter/interpreter.hpp"
- #include "logging/log.hpp"
- #include "logging/logStream.hpp"
- #include "memory/metadataFactory.hpp"
-@@ -73,8 +71,6 @@
- #include "runtime/jniHandles.hpp"
- #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/autoRestore.hpp"
-@@ -208,73 +204,6 @@ void Universe::basic_type_classes_do(KlassClosure *closure) {
-   }
- }
- 
--#define DO_PRIMITIVE_MIRROR(m) \
--  f->do_oop((oop*) &m);
--
--// FIXME: (DCEVM) This method should iterate all pointers that are not within heap objects.
--void Universe::root_oops_do(OopClosure *oopClosure) {
--  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);
--  // (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
--  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);
--
--  // OopStorageSet::vm_global()->oops_do(oopClosure);
--
--}
--
--void Universe::oops_do(OopClosure* f) {
--  PRIMITIVE_MIRRORS_DO(DO_PRIMITIVE_MIRROR);
--
--  for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
--    f->do_oop((oop*) &_mirrors[i]);
--  }
--  assert(_mirrors[0] == NULL && _mirrors[T_BOOLEAN - 1] == NULL, "checking");
--
--  f->do_oop((oop*)&_the_empty_class_array);
--  f->do_oop((oop*)&_the_null_sentinel);
--  f->do_oop((oop*)&_the_null_string);
--  f->do_oop((oop*)&_the_min_jint_string);
--  f->do_oop((oop*)&out_of_memory_errors()->obj_at(_oom_java_heap));
--  f->do_oop((oop*)&out_of_memory_errors()->obj_at(_oom_c_heap));
--  f->do_oop((oop*)&out_of_memory_errors()->obj_at(_oom_metaspace));
--  f->do_oop((oop*)&out_of_memory_errors()->obj_at(_oom_class_metaspace));
--  f->do_oop((oop*)&out_of_memory_errors()->obj_at(_oom_array_size));
--  f->do_oop((oop*)&out_of_memory_errors()->obj_at(_oom_gc_overhead_limit));
--  f->do_oop((oop*)&out_of_memory_errors()->obj_at(_oom_realloc_objects));
--  f->do_oop((oop*)&out_of_memory_errors()->obj_at(_oom_retry));
--  f->do_oop((oop*)&_delayed_stack_overflow_error_message);
--  f->do_oop((oop*)&_preallocated_out_of_memory_error_array);
--  f->do_oop((oop*)&_null_ptr_exception_instance);
--  f->do_oop((oop*)&_arithmetic_exception_instance);
--  f->do_oop((oop*)&_virtual_machine_error_instance);
--  f->do_oop((oop*)&_main_thread_group);
--  f->do_oop((oop*)&_system_thread_group);
--  f->do_oop((oop*)&_reference_pending_list);
--  debug_only(f->do_oop((oop*)&_fullgc_alot_dummy_array);)
--  ThreadsSMRSupport::exiting_threads_oops_do(f);
--}
--
- void LatestMethodCache::metaspace_pointers_do(MetaspaceClosure* it) {
-   it->push(&_klass);
- }
-diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
-index cb320076a55..4b2211c415e 100644
---- a/src/hotspot/share/memory/universe.hpp
-+++ b/src/hotspot/share/memory/universe.hpp
-@@ -326,13 +326,6 @@ class Universe: AllStatic {
-   static bool        should_fill_in_stack_trace(Handle throwable);
-   static void check_alignment(uintx size, uintx alignment, const char* name);
- 
--  // Iteration
--
--  static void root_oops_do(OopClosure *oopClosure); // FIXME: kill...
--  // Apply "f" to the addresses of all the direct heap pointers maintained
--  // as static fields of "Universe".
--  static void oops_do(OopClosure* f);
--
-   // CDS support
-   static void serialize(SerializeClosure* f);
- 
-diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index b4d09e92830..c2de2bec7d4 100644
---- a/src/hotspot/share/oops/instanceKlass.cpp
-+++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -1286,7 +1286,7 @@ void InstanceKlass::init_implementor() {
- // (DCEVM) - init_implementor() for dcevm
- void InstanceKlass::init_implementor_from_redefine() {
-   assert(is_interface(), "not interface");
--  Klass* volatile* addr = adr_implementor();
-+  InstanceKlass* volatile* addr = adr_implementor();
-   assert(addr != NULL, "null addr");
-   if (addr != NULL) {
-     *addr = NULL;
-@@ -3816,7 +3816,7 @@ void InstanceKlass::verify_on(outputStream* st) {
- 
-     guarantee(sib->is_klass(), "should be klass");
-     // TODO: (DCEVM) explain
--    guarantee(sib->super() == super || AllowEnhancedClassRedefinition && super->newest_version() == SystemDictionary::Object_klass(), "siblings should have same superklass");
-+    guarantee(sib->super() == super || AllowEnhancedClassRedefinition && super->newest_version() == vmClasses::Object_klass(), "siblings should have same superklass");
-   }
- 
-   // Verify local interfaces
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 2a7dd35bdd1..071dbc6d6ad 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -26,8 +26,10 @@
- #include "aot/aotLoader.hpp"
- #include "classfile/classFileParser.hpp"
- #include "classfile/classFileStream.hpp"
-+#include "classfile/classLoadInfo.hpp"
- #include "classfile/metadataOnStackMark.hpp"
- #include "classfile/systemDictionary.hpp"
-+#include "classfile/symbolTable.hpp"
- #include "classfile/verifier.hpp"
- #include "classfile/dictionary.hpp"
- #include "classfile/classLoaderDataGraph.hpp"
-@@ -198,8 +200,8 @@ class FieldCopier : public FieldClosure {
-     if (found && result.is_static()) {
-       log_trace(redefine, class, obsolete, metadata)("Copying static field value for field %s old_offset=%d new_offset=%d",
-                                                fd->name()->as_C_string(), result.offset(), fd->offset());
--      memcpy(cur_oop->obj_field_addr_raw<HeapWord>(fd->offset()),
--             old_oop->obj_field_addr_raw<HeapWord>(result.offset()),
-+      memcpy(cur_oop->obj_field_addr<HeapWord>(fd->offset()),
-+             old_oop->obj_field_addr<HeapWord>(result.offset()),
-              type2aelembytes(fd->field_type()));
- 
-       // Static fields may have references to java.lang.Class
-@@ -242,6 +244,17 @@ void VM_EnhancedRedefineClasses::register_nmethod_g1(nmethod* nm) {
-   }
- }
- 
-+void VM_EnhancedRedefineClasses::root_oops_do(OopClosure *oopClosure) {
-+  Universe::vm_global()->oops_do(oopClosure);
-+
-+  Threads::oops_do(oopClosure, NULL);
-+  AOT_ONLY(AOTLoader::oops_do(oopClosure);)
-+  OopStorageSet::strong_oops_do(oopClosure);
-+
-+  CodeBlobToOopClosure blobClosure(oopClosure, CodeBlobToOopClosure::FixRelocations);
-+  CodeCache::blobs_do(&blobClosure);
-+}
-+
- // TODO comment
- struct StoreBarrier {
-   // TODO: j10 review change ::oop_store -> HeapAccess<>::oop_store
-@@ -558,7 +571,7 @@ void VM_EnhancedRedefineClasses::doit() {
-       _timer_heap_iterate.stop();
-     }
- 
--    Universe::root_oops_do(&oopClosureNoBarrier);
-+    root_oops_do(&oopClosureNoBarrier);
- 
-     if (UseG1GC) {
-       // this should work also for other GCs
-@@ -737,8 +750,8 @@ bool VM_EnhancedRedefineClasses::is_modifiable_class(oop klass_mirror) {
- //  - link new classes
- jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
- 
--  _affected_klasses = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<Klass*>(_class_count, true);
--  _new_classes = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<InstanceKlass*>(_class_count, true);
-+  _affected_klasses = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<Klass*>(_class_count);
-+  _new_classes = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<InstanceKlass*>(_class_count);
- 
-   ResourceMark rm(THREAD);
- 
-@@ -832,12 +845,12 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
-                             !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,
--                                         the_class_loader,
--                                         &st,
--                                         cl_info,
--                                         the_class,
--                                         THREAD);
-+      k = SystemDictionary::resolve_from_stream(&st,
-+                                                the_class_sym,
-+                                                the_class_loader,
-+                                                cl_info,
-+                                                the_class,
-+                                                THREAD);
- 
-       k->class_loader_data()->exchange_holders(the_class->class_loader_data());
- 
-@@ -853,12 +866,12 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
-       }
- 
-     } else {
--      k = SystemDictionary::resolve_from_stream(the_class_sym,
--                                                  the_class_loader,
--                                                  protection_domain,
--                                                  &st,
--                                                  the_class,
--                                                  THREAD);
-+      k = SystemDictionary::resolve_from_stream(&st,
-+                                                the_class_sym,
-+                                                the_class_loader,
-+                                                protection_domain,
-+                                                the_class,
-+                                                THREAD);
-     }
-     // Clear class_being_redefined just to be sure.
-     state->clear_class_being_redefined();
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index 5de375fb888..9be70039e32 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -124,6 +124,8 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
-   static void register_nmethod_g1(nmethod* nm);
-   static void unpatch_bytecode(Method* method, TRAPS);
- 
-+  void root_oops_do(OopClosure *oopClosure);
-+
-   // 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();
-diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index 3c29eda4da0..a1eadc2958a 100644
---- a/src/hotspot/share/prims/resolvedMethodTable.cpp
-+++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -34,6 +34,7 @@
- #include "oops/access.inline.hpp"
- #include "oops/method.hpp"
- #include "oops/oop.inline.hpp"
-+#include "oops/klass.inline.hpp"
- #include "oops/weakHandle.inline.hpp"
- #include "prims/resolvedMethodTable.hpp"
- #include "runtime/atomic.hpp"
-@@ -375,7 +376,7 @@ class AdjustMethodEntriesDcevm : public StackObj {
-   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) {
-+  bool operator()(WeakHandle* entry) {
-     oop mem_name = entry->peek();
-     if (mem_name == NULL) {
-       // Removed
-@@ -460,7 +461,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
-       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));
-+      WeakHandle wh(_oop_storage, 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);
-diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
-index 1b7f8fe9f47..6a8ceb7fa8a 100644
---- a/src/hotspot/share/runtime/arguments.hpp
-+++ b/src/hotspot/share/runtime/arguments.hpp
-@@ -482,6 +482,8 @@ class Arguments : AllStatic {
-   // Adjusts the arguments after the OS have adjusted the arguments
-   static jint adjust_after_os();
- 
-+  // Check for consistency in the selection of the garbage collector.
-+  static bool check_gc_consistency();        // Check user-selected gc
-   // Check consistency or otherwise of VM argument settings
-   static bool check_vm_args_consistency();
-   // Used by os_solaris
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0022-Fix-crash-on-GrowableArray-allocation-in-C_HEAP.patch

@@ -1,27 +0,0 @@
-From 6e18ad67981ab5a1bbdac46e1e0c7cc80beb4a5b Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Fri, 12 Feb 2021 11:38:48 +0100
-Subject: [PATCH 22/39] Fix crash on GrowableArray allocation in C_HEAP
-
----
- src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 071dbc6d6ad..a5264077bfe 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -750,8 +750,8 @@ bool VM_EnhancedRedefineClasses::is_modifiable_class(oop klass_mirror) {
- //  - link new classes
- jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
- 
--  _affected_klasses = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<Klass*>(_class_count);
--  _new_classes = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<InstanceKlass*>(_class_count);
-+  _affected_klasses = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<Klass*>(_class_count, mtInternal);
-+  _new_classes = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<InstanceKlass*>(_class_count, mtInternal);
- 
-   ResourceMark rm(THREAD);
- 
--- 
-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-Rename-confusing-method-name-old_if_redefined-to-old.patch

@@ -1,49 +0,0 @@
-From 96680710816d9cd6e9cd8d5ce6dcbe054a7e53bd Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Fri, 12 Feb 2021 11:39:05 +0100
-Subject: [PATCH 23/39] Rename confusing method name old_if_redefined to
- old_if_redefining
-
----
- src/hotspot/share/classfile/dictionary.cpp | 4 ++--
- src/hotspot/share/classfile/dictionary.hpp | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index 223b9e1e7a9..2b236a7724e 100644
---- a/src/hotspot/share/classfile/dictionary.cpp
-+++ b/src/hotspot/share/classfile/dictionary.cpp
-@@ -359,7 +359,7 @@ InstanceKlass* Dictionary::find(unsigned int hash, Symbol* name,
-   int index = hash_to_index(hash);
-   DictionaryEntry* entry = get_entry(index, hash, name);
-   if (entry != NULL && entry->is_valid_protection_domain(protection_domain)) {
--    return old_if_redefined(entry->instance_klass());
-+    return old_if_redefining(entry->instance_klass());
-   } else {
-     return NULL;
-   }
-@@ -373,7 +373,7 @@ InstanceKlass* Dictionary::find_class(unsigned int hash,
-   assert (index == index_for(name), "incorrect index?");
- 
-   DictionaryEntry* entry = get_entry(index, hash, name);
--  return old_if_redefined((entry != NULL) ? entry->instance_klass() : NULL);
-+  return old_if_redefining((entry != NULL) ? entry->instance_klass() : NULL);
- }
- 
- void Dictionary::add_protection_domain(int index, unsigned int hash,
-diff --git a/src/hotspot/share/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp
-index bdfef5c8663..e997cfdcabd 100644
---- a/src/hotspot/share/classfile/dictionary.hpp
-+++ b/src/hotspot/share/classfile/dictionary.hpp
-@@ -109,7 +109,7 @@ public:
-                              Handle protection_domain);
- 
-   // (DCEVM) return old class if redefining in AllowEnhancedClassRedefinition, otherwise return "k"
--  static InstanceKlass* old_if_redefined(InstanceKlass* k) {
-+  static InstanceKlass* old_if_redefining(InstanceKlass* k) {
-     return (k != NULL && k->is_redefining()) ? ((InstanceKlass* )k->old_version()) : k;
-   }
- };
--- 
-2.23.0
-

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

@@ -1,38 +1,33 @@
-From d3e5f8acd389021128bb8a899bb538294de353f6 Mon Sep 17 00:00:00 2001
+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 14/39] dcevm15 - fix Universe::root_oops_do
+Subject: [PATCH 23/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 | 45 +++++++++++----------------
- 1 file changed, 19 insertions(+), 26 deletions(-)
+ 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 9fcbb6c41b3..247f2b3e8c0 100644
+index f6e4253b5a5..8dad437bd51 100644
 --- a/src/hotspot/share/memory/universe.cpp
 +++ b/src/hotspot/share/memory/universe.cpp
-@@ -44,6 +44,8 @@
- #include "gc/shared/oopStorageSet.hpp"
- #include "gc/shared/stringdedup/stringDedup.hpp"
- #include "gc/shared/tlab_globals.hpp"
+@@ -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 "interpreter/interpreter.hpp"
  #include "logging/log.hpp"
  #include "logging/logStream.hpp"
- #include "memory/metadataFactory.hpp"
-@@ -71,6 +73,8 @@
- #include "runtime/jniHandles.hpp"
+@@ -75,6 +76,7 @@
  #include "runtime/thread.inline.hpp"
  #include "runtime/timerTrace.hpp"
-+#include "runtime/vmOperations.hpp"
+ #include "runtime/vmOperations.hpp"
 +#include "services/management.hpp"
  #include "services/memoryService.hpp"
  #include "utilities/align.hpp"
- #include "utilities/autoRestore.hpp"
-@@ -209,45 +213,34 @@ void Universe::basic_type_classes_do(KlassClosure *closure) {
+ #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) {
@@ -55,27 +50,21 @@ index 9fcbb6c41b3..247f2b3e8c0 100644
 +  // (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
 -  JNIHandles::weak_oops_do(&always_true, oopClosure);
 +  WeakProcessor::oops_do(oopClosure);
-+
-+  JvmtiExport::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);
-+
-+  // OopStorageSet::vm_global()->oops_do(oopClosure);
  
 -  // (DCEVM) TODO: Check if this is correct?
 -  //CodeCache::scavenge_root_nmethods_oops_do(oopClosure);
@@ -90,6 +79,7 @@ index 9fcbb6c41b3..247f2b3e8c0 100644
 -#endif
 -  // SO_AllClasses
 -  SystemDictionary::oops_do(oopClosure);
++  // PSScavenge::reference_processor()->weak_oops_do(oopClosure);
  }
  
  void Universe::oops_do(OopClosure* f) {

jb/project/tools/patches/dcevm/0024-Check-InstanceKlass-has_nestmate_access_to-with-acti.patch

@@ -1,43 +0,0 @@
-From 5d10d789150dfa6f8366dceb7fce3251d725ab8a Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Fri, 12 Feb 2021 12:33:47 +0100
-Subject: [PATCH 24/39] Check InstanceKlass::has_nestmate_access_to with active
- classes
-
-Dcevm can leave old host in nested class if nested class is not
-redefined together with host class
----
- src/hotspot/share/oops/instanceKlass.cpp | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index c2de2bec7d4..3cc96f98f41 100644
---- a/src/hotspot/share/oops/instanceKlass.cpp
-+++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -398,9 +398,9 @@ bool InstanceKlass::has_nestmate_access_to(InstanceKlass* k, TRAPS) {
-     return false;
-   }
- 
-+  // (DCEVM) cur_host can be old, decide accessibility based on active version
-   if (AllowEnhancedClassRedefinition) {
--    // TODO: (DCEVM) check if it correct. It fix problems with lambdas (hidden)
--    cur_host = InstanceKlass::cast(cur_host->newest_version());
-+    cur_host = InstanceKlass::cast(cur_host->active_version());
-   }
- 
-   Klass* k_nest_host = k->nest_host(CHECK_false);
-@@ -408,6 +408,11 @@ bool InstanceKlass::has_nestmate_access_to(InstanceKlass* k, TRAPS) {
-     return false;
-   }
- 
-+  // (DCEVM) k_nest_host can be old, decide accessibility based on active version
-+  if (AllowEnhancedClassRedefinition) {
-+    k_nest_host = InstanceKlass::cast(k_nest_host->active_version());
-+  }
-+
-   bool access = (cur_host == k_nest_host);
- 
-   ResourceMark rm(THREAD);
--- 
-2.23.0
-

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

@@ -1,20 +1,20 @@
-From 3b09df69c007285ea6c258388532a8e5f9fe3d45 Mon Sep 17 00:00:00 2001
+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 19/39] Cleanup and review comments
+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.cpp | 1 +
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp | 2 +-
- 4 files changed, 4 insertions(+), 3 deletions(-)
+ 4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-index 5f8913001b0..c3bcc7271e6 100644
+index f380aa3fa34..8ce94cccb47 100644
 --- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp
 +++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-@@ -105,7 +105,7 @@ class ClassLoaderDataGraph : public AllStatic {
+@@ -104,7 +104,7 @@ class ClassLoaderDataGraph : public AllStatic {
  
    static void dictionary_classes_do(KlassClosure* klass_closure);
  
@@ -23,11 +23,24 @@ index 5f8913001b0..c3bcc7271e6 100644
    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 26a2b67b8e9..8e78696bef5 100644
+index 5c1a09390f1..23fbf715378 100644
 --- a/src/hotspot/share/gc/shared/gcConfig.cpp
 +++ b/src/hotspot/share/gc/shared/gcConfig.cpp
-@@ -97,7 +97,7 @@ void GCConfig::fail_if_non_included_gc_is_selected() {
+@@ -99,7 +99,7 @@ void GCConfig::fail_if_non_included_gc_is_selected() {
  
  void GCConfig::select_gc_ergonomically() {
    if (AllowEnhancedClassRedefinition && !UseG1GC) {
@@ -36,31 +49,19 @@ index 26a2b67b8e9..8e78696bef5 100644
      FLAG_SET_ERGO(UseSerialGC, true);
    } else if (os::is_server_class_machine()) {
  #if INCLUDE_G1GC
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 590f7fdfafe..2a7dd35bdd1 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -842,6 +842,7 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
-       k->class_loader_data()->exchange_holders(the_class->class_loader_data());
- 
-       if (the_class->is_hidden()) {
-+      // TODO: (DCEVM) review if is correct
-       // 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
 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;
- 
+   // 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/0025-JBR-3111-Update-class-in-all-dictionaries-where-it-w.patch

@@ -1,95 +0,0 @@
-From dac9d7a7d87de680a50be7c2857646323c4c8ffa Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Sat, 13 Feb 2021 20:47:52 +0100
-Subject: [PATCH 25/39] JBR-3111 Update class in all dictionaries where it was
- already defined
-
-This patch keeps compatibility with std redefinition, that does not
-create a new Klass, but modifies it, then it is modified in all
-dictionaries containing this class.
----
- src/hotspot/share/classfile/classLoaderDataGraph.cpp | 9 +++++++++
- src/hotspot/share/classfile/classLoaderDataGraph.hpp | 3 +++
- src/hotspot/share/classfile/dictionary.cpp           | 2 +-
- src/hotspot/share/classfile/dictionary.hpp           | 2 +-
- src/hotspot/share/classfile/systemDictionary.cpp     | 4 +++-
- 5 files changed, 17 insertions(+), 3 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.cpp b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
-index fda5d2eb1ba..67ade5709f6 100644
---- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp
-+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
-@@ -455,6 +455,15 @@ void ClassLoaderDataGraph::rollback_redefinition() {
-   }
- }
- 
-+// (DCEVM) - iterate over all classes in all dictionaries
-+bool ClassLoaderDataGraph::dictionary_classes_do_update_klass(Symbol* name, InstanceKlass* k, InstanceKlass* old_klass) {
-+  bool ok = false;
-+  FOR_ALL_DICTIONARY(cld) {
-+    ok = cld->dictionary()->update_klass(name, k, old_klass) || ok;
-+  }
-+  return ok;
-+}
-+
- void ClassLoaderDataGraph::verify_dictionary() {
-   FOR_ALL_DICTIONARY(cld) {
-     cld->dictionary()->verify();
-diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-index c3bcc7271e6..ebdb0bc2c8c 100644
---- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-+++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-@@ -108,6 +108,9 @@ class ClassLoaderDataGraph : public AllStatic {
-   // (DCEVM) Enhanced class redefinition
-   static void rollback_redefinition();
- 
-+  // Enhanced class redefinition
-+  static bool dictionary_classes_do_update_klass(Symbol* name, InstanceKlass* k, InstanceKlass* old_klass);
-+
-   // VM_CounterDecay iteration support
-   static InstanceKlass* try_get_next_class();
-   static void adjust_saved_class(ClassLoaderData* cld);
-diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index 2b236a7724e..bb1d09fa7a2 100644
---- a/src/hotspot/share/classfile/dictionary.cpp
-+++ b/src/hotspot/share/classfile/dictionary.cpp
-@@ -322,7 +322,7 @@ DictionaryEntry* Dictionary::get_entry(int index, unsigned int hash,
- }
- 
- // (DCEVM) replace old_class by new class in dictionary
--bool Dictionary::update_klass(unsigned int hash, Symbol* name, ClassLoaderData* loader_data, InstanceKlass* k, InstanceKlass* old_klass) {
-+bool Dictionary::update_klass(Symbol* name, InstanceKlass* k, InstanceKlass* old_klass) {
-   // There are several entries for the same class in the dictionary: One extra entry for each parent classloader of the classloader of the class.
-   bool found = false;
-   for (int index = 0; index < table_size(); index++) {
-diff --git a/src/hotspot/share/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp
-index e997cfdcabd..7f8d8e35fc3 100644
---- a/src/hotspot/share/classfile/dictionary.hpp
-+++ b/src/hotspot/share/classfile/dictionary.hpp
-@@ -83,7 +83,7 @@ public:
-   void verify();
- 
-   // (DCEVM) Enhanced class redefinition
--  bool update_klass(unsigned int hash, Symbol* name, ClassLoaderData* loader_data, InstanceKlass* k, InstanceKlass* old_klass);
-+  bool update_klass(Symbol* name, InstanceKlass* k, InstanceKlass* old_klass);
- 
-   void rollback_redefinition();
- 
-diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 63de2e2f099..35e2f376870 100644
---- a/src/hotspot/share/classfile/systemDictionary.cpp
-+++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -1441,7 +1441,9 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, InstanceKlass* ol
- 
-   unsigned int name_hash = dictionary->compute_hash(name_h);
-   if (is_redefining) {
--    bool ok = dictionary->update_klass(name_hash, name_h, loader_data, k, old_klass);
-+    // Update all dictionaries containing old_class to new_class
-+    // outcome must be same as result of standard redefinition, that does not create a new Klass
-+    bool ok = ClassLoaderDataGraph::dictionary_classes_do_update_klass(name_h, k, old_klass);
-     assert (ok, "must have found old class and updated!");
-   }
-   check_constraints(name_hash, k, class_loader, !is_redefining, CHECK);
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0026-Add-ClassLoaderDataGraph_lock-to-define-new-class-in.patch

@@ -1,29 +0,0 @@
-From f42115a3d488c93a2d163aebd030530f060dcef8 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Sat, 20 Feb 2021 15:47:47 +0100
-Subject: [PATCH 26/39] Add ClassLoaderDataGraph_lock to define new class in
- enhanced redefiniton
-
-ClassLoaderDataGraph locking for introduced in redefinition in
-java.version>11
----
- src/hotspot/share/classfile/systemDictionary.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 35e2f376870..c628cb9da83 100644
---- a/src/hotspot/share/classfile/systemDictionary.cpp
-+++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -1443,7 +1443,9 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, InstanceKlass* ol
-   if (is_redefining) {
-     // Update all dictionaries containing old_class to new_class
-     // outcome must be same as result of standard redefinition, that does not create a new Klass
-+    ClassLoaderDataGraph_lock->lock();
-     bool ok = ClassLoaderDataGraph::dictionary_classes_do_update_klass(name_h, k, old_klass);
-+    ClassLoaderDataGraph_lock->unlock();
-     assert (ok, "must have found old class and updated!");
-   }
-   check_constraints(name_hash, k, class_loader, !is_redefining, CHECK);
--- 
-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-JBR-3140-support-for-modularized-HotswapAgent.patch

@@ -1,180 +0,0 @@
-From 30308e893e43425da166175f5f18f84abf2c6110 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Thu, 18 Jun 2020 18:40:11 +0200
-Subject: [PATCH 27/39] JBR-3140 - support for modularized HotswapAgent
-
-Add -XX:HotswapAgent=[disabled,fatjar.core]
----
- src/hotspot/share/runtime/arguments.cpp       | 77 +++++++++++++++++++
- src/hotspot/share/runtime/arguments.hpp       |  4 +
- .../flags/jvmFlagConstraintsRuntime.cpp       |  9 +++
- .../flags/jvmFlagConstraintsRuntime.hpp       |  3 +-
- src/hotspot/share/runtime/globals.hpp         | 11 ++-
- 5 files changed, 102 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index cbcd8f91c66..4f9cfde9323 100644
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -4001,6 +4001,8 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
-     }
-   }
- 
-+  setup_hotswap_agent();
-+
- #if !INCLUDE_CDS
-   if (DumpSharedSpaces || RequireSharedSpaces) {
-     jio_fprintf(defaultStream::error_stream(),
-@@ -4357,3 +4359,78 @@ bool Arguments::copy_expand_pid(const char* src, size_t srclen,
-   *b = '\0';
-   return (p == src_end); // return false if not all of the source was copied
- }
-+
-+void Arguments::setup_hotswap_agent() {
-+
-+  if (DumpSharedSpaces)
-+    return;
-+
-+  if (HotswapAgent == NULL || strcmp(HotswapAgent, "disabled") == 0)
-+    return;
-+
-+  // Force AllowEnhancedClassRedefinition if HA is enabled
-+  AllowEnhancedClassRedefinition = true;
-+
-+  bool ha_fatjar = strcmp(HotswapAgent, "fatjar") == 0;
-+  bool ha_core = strcmp(HotswapAgent, "core") == 0;
-+
-+  // Set HotswapAgent
-+  if (ha_fatjar || ha_core) {
-+
-+    char ext_path_str[JVM_MAXPATHLEN];
-+
-+    os::jvm_path(ext_path_str, sizeof(ext_path_str));
-+    for (int i = 0; i < 3; i++) {
-+      char *end = strrchr(ext_path_str, *os::file_separator());
-+      if (end != NULL) *end = '\0';
-+    }
-+    size_t ext_path_length = strlen(ext_path_str);
-+    if (ext_path_length >= 3) {
-+      if (strcmp(ext_path_str + ext_path_length - 3, "lib") != 0) {
-+        if (ext_path_length < JVM_MAXPATHLEN - 4) {
-+          jio_snprintf(ext_path_str + ext_path_length, sizeof(ext_path_str) - ext_path_length, "%slib", os::file_separator());
-+          ext_path_length += 4;
-+        }
-+      }
-+    }
-+    if (ext_path_length < JVM_MAXPATHLEN - 10) {
-+      if (ha_fatjar) {
-+        jio_snprintf(ext_path_str + ext_path_length, sizeof(ext_path_str) - ext_path_length,
-+                     "%shotswap%shotswap-agent.jar", os::file_separator(), os::file_separator());
-+      } else {
-+        jio_snprintf(ext_path_str + ext_path_length, sizeof(ext_path_str) - ext_path_length,
-+                     "%shotswap%shotswap-agent-core.jar", os::file_separator(), os::file_separator());
-+      }
-+      int fd = ::open(ext_path_str, O_RDONLY);
-+      if (fd >= 0) {
-+        os::close(fd);
-+        size_t length = strlen(ext_path_str) + 1;
-+        char *options = NEW_C_HEAP_ARRAY(char,  length, mtArguments);
-+        jio_snprintf(options, length, "%s", ext_path_str);
-+        add_init_agent("instrument", ext_path_str, false);
-+        jio_fprintf(defaultStream::output_stream(), "Starting HotswapAgent '%s'\n", ext_path_str);
-+      }
-+      else
-+      {
-+        jio_fprintf(defaultStream::error_stream(), "HotswapAgent not found on path:'%s'!\n", ext_path_str);
-+      }
-+    }
-+  }
-+
-+  // TODO: open it only for org.hotswap.agent module
-+  // Use to access java.lang.reflect.Proxy/proxyCache
-+  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_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_module_property("jdk.module.addopens", "java.base/java.io=ALL-UNNAMED", addopens_count++);
-+  // java.beans.Introspector access
-+  create_numbered_module_property("jdk.module.addopens", "java.desktop/java.beans=ALL-UNNAMED", addopens_count++);
-+  // java.beans.Introspector access
-+  create_numbered_module_property("jdk.module.addopens", "java.desktop/com.sun.beans=ALL-UNNAMED", addopens_count++);
-+  // com.sun.beans.introspect.ClassInfo access
-+  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_module_property("jdk.module.addopens", "java.desktop/com.sun.beans.util=ALL-UNNAMED", addopens_count++);
-+
-+}
-diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
-index 6a8ceb7fa8a..7669a283375 100644
---- a/src/hotspot/share/runtime/arguments.hpp
-+++ b/src/hotspot/share/runtime/arguments.hpp
-@@ -491,6 +491,10 @@ class Arguments : AllStatic {
- 
-   static size_t conservative_max_heap_alignment() { return _conservative_max_heap_alignment; }
- 
-+
-+  // Initialize HotswapAgent
-+  static void setup_hotswap_agent();
-+
-   // Return the maximum size a heap with compressed oops can take
-   static size_t max_heap_for_compressed_oops();
- 
-diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
-index 5b09758e089..e55b68e63a6 100644
---- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
-+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
-@@ -158,6 +158,15 @@ JVMFlag::Error NUMAInterleaveGranularityConstraintFunc(size_t value, bool verbos
-                         " ... " UINTX_FORMAT " ]\n", value, min, max);
-     return JVMFlag::VIOLATES_CONSTRAINT;
-   }
-+  return JVMFlag::SUCCESS;
-+}
- 
-+JVMFlag::Error HotswapAgentConstraintFunc(ccstr value, bool verbose) {
-+  if (value != NULL) {
-+    if (strcmp("disabled", value) != 0 && strcmp("fatjar", value) != 0 && strcmp("core", value) != 0 && strcmp("external", value) != 0) {
-+      JVMFlag::printError(verbose, "HotswapAgent(%s) must be one of disabled,fatjar,core or external.\n", value);
-+      return JVMFlag::VIOLATES_CONSTRAINT;
-+    }
-+  }
-   return JVMFlag::SUCCESS;
- }
-diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
-index 8bc3a9a1548..c5f58fd16ee 100644
---- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
-+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
-@@ -42,7 +42,8 @@
-   f(intx,   BiasedLockingDecayTimeFunc)               \
-   f(intx,   PerfDataSamplingIntervalFunc)             \
-   f(uintx,  VMPageSizeConstraintFunc)                 \
--  f(size_t, NUMAInterleaveGranularityConstraintFunc)
-+  f(size_t, NUMAInterleaveGranularityConstraintFunc)  \
-+  f(ccstr, HotswapAgentConstraintFunc)
- 
- RUNTIME_CONSTRAINTS(DECLARE_CONSTRAINT)
- 
-diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 7051b634a9b..d23e43407e1 100644
---- a/src/hotspot/share/runtime/globals.hpp
-+++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2090,7 +2090,16 @@ const intx ObjectAlignmentInBytes = 8;
-                                                                             \
-   product(bool, AllowEnhancedClassRedefinition, false,                      \
-              "Allow enhanced class redefinition beyond swapping method "    \
--             "bodies")
-+             "bodies")                                                      \
-+                                                                            \
-+  product(ccstr, HotswapAgent, "disabled",                                  \
-+          "Specify HotswapAgent image to be used."                          \
-+          "disabled: hotswap agent is disabled (default)"                   \
-+          "fatjar: full HA. Use integrated hotswap-agent.jar"               \
-+          "core: core HA. Use integrated hotswap-agent-core.jar"            \
-+          "external: external HA. use external HA, open required JDK "      \
-+          "modules.")                                                       \
-+          constraint(HotswapAgentConstraintFunc, AfterErgo)
- 
- 
- // end of RUNTIME_FLAGS
--- 
-2.23.0
-

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

@@ -1,7 +1,7 @@
-From 574cddeb00c3d93bddbaf1845a7d9d3ffdced324 Mon Sep 17 00:00:00 2001
+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 15/39] dcevm15 - check if has_nestmate_access_to has newest
+Subject: [PATCH 27/34] dcevm15 - check if has_nestmate_access_to has newest
  host class
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 15/39] dcevm15 - check if has_nestmate_access_to has newest
  1 file changed, 5 insertions(+)
 
 diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index ef0091fe288..b4d09e92830 100644
+index 5e40d78a87e..1d9623f2446 100644
 --- a/src/hotspot/share/oops/instanceKlass.cpp
 +++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -398,6 +398,11 @@ bool InstanceKlass::has_nestmate_access_to(InstanceKlass* k, TRAPS) {
+@@ -445,6 +445,11 @@ bool InstanceKlass::has_nestmate_access_to(InstanceKlass* k, TRAPS) {
      return false;
    }
  

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/0028-Support-for-redefinition-of-Well-Known-classses-java.patch

@@ -1,347 +0,0 @@
-From 51f0036ff15d39330b787512af9e38d15c748e4b Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Sun, 7 Mar 2021 20:22:54 +0100
-Subject: [PATCH 28/39] Support for redefinition of Well Known classses
- (java.*,jdk.*, sun.*)
-
----
- src/hotspot/share/ci/ciKlass.hpp              |  1 +
- src/hotspot/share/ci/ciObjectFactory.cpp      | 34 ++++++++++
- src/hotspot/share/ci/ciObjectFactory.hpp      |  6 ++
- src/hotspot/share/classfile/vmClasses.cpp     | 10 +++
- src/hotspot/share/classfile/vmClasses.hpp     |  4 ++
- src/hotspot/share/classfile/vmSymbols.hpp     |  2 +
- src/hotspot/share/compiler/compileBroker.cpp  | 11 ++++
- src/hotspot/share/memory/universe.cpp         |  8 +++
- src/hotspot/share/memory/universe.hpp         |  2 +
- .../prims/jvmtiEnhancedRedefineClasses.cpp    | 63 ++++++++++++++++++-
- .../prims/jvmtiEnhancedRedefineClasses.hpp    |  2 +
- 11 files changed, 142 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/ci/ciKlass.hpp b/src/hotspot/share/ci/ciKlass.hpp
-index 467284b7cde..644993a7513 100644
---- a/src/hotspot/share/ci/ciKlass.hpp
-+++ b/src/hotspot/share/ci/ciKlass.hpp
-@@ -129,6 +129,7 @@ public:
-   void print_name_on(outputStream* st);
- 
-   const char* external_name() const;
-+  Klass* new_version() { return get_Klass()->new_version(); }
- };
- 
- #endif // SHARE_CI_CIKLASS_HPP
-diff --git a/src/hotspot/share/ci/ciObjectFactory.cpp b/src/hotspot/share/ci/ciObjectFactory.cpp
-index 664062a0f74..e9cb49be3ff 100644
---- a/src/hotspot/share/ci/ciObjectFactory.cpp
-+++ b/src/hotspot/share/ci/ciObjectFactory.cpp
-@@ -74,7 +74,10 @@ GrowableArray<ciMetadata*>* ciObjectFactory::_shared_ci_metadata = NULL;
- ciSymbol*                 ciObjectFactory::_shared_ci_symbols[vmSymbols::number_of_symbols()];
- int                       ciObjectFactory::_shared_ident_limit = 0;
- volatile bool             ciObjectFactory::_initialized = false;
-+volatile bool             ciObjectFactory::_reinitialize_vm_klasses = false;
- 
-+// TODO: review...
-+Arena* ciObjectFactory::_initial_arena = NULL;
- 
- // ------------------------------------------------------------------
- // ciObjectFactory::ciObjectFactory
-@@ -110,6 +113,7 @@ void ciObjectFactory::initialize() {
-   // compiler thread that initializes the initial ciObjectFactory which
-   // creates the shared ciObjects that all later ciObjectFactories use.
-   Arena* arena = new (mtCompiler) Arena(mtCompiler);
-+  ciObjectFactory::_initial_arena = arena;
-   ciEnv initial(arena);
-   ciEnv* env = ciEnv::current();
-   env->_factory->init_shared_objects();
-@@ -118,6 +122,36 @@ void ciObjectFactory::initialize() {
- 
- }
- 
-+// (DCEVM) vm classes could be modified
-+void ciObjectFactory::reinitialize_vm_classes() {
-+  ASSERT_IN_VM;
-+  JavaThread* thread = JavaThread::current();
-+  HandleMark  handle_mark(thread);
-+
-+  // This Arena is long lived and exists in the resource mark of the
-+  // compiler thread that initializes the initial ciObjectFactory which
-+  // creates the shared ciObjects that all later ciObjectFactories use.
-+  // Arena* arena = new (mtCompiler) Arena(mtCompiler);
-+  ciEnv initial(ciObjectFactory::_initial_arena);
-+  ciEnv* env = ciEnv::current();
-+  env->_factory->do_reinitialize_vm_classes();
-+  _reinitialize_vm_klasses = false;
-+}
-+
-+// (DCEVM) vm classes could be modified
-+void ciObjectFactory::do_reinitialize_vm_classes() {
-+#define VM_CLASS_DEFN(name, ignore_s)   \
-+  if (ciEnv::_##name != NULL && ciEnv::_##name->new_version() != NULL) { \
-+    int old_ident = ciEnv::_##name->ident(); \
-+    ciEnv::_##name = get_metadata(vmClasses::name())->as_instance_klass(); \
-+    ciEnv::_##name->compute_nonstatic_fields(); \
-+    ciEnv::_##name->set_ident(old_ident); \
-+  }
-+
-+  VM_CLASSES_DO(VM_CLASS_DEFN)
-+#undef VM_CLASS_DEFN
-+}
-+
- void ciObjectFactory::init_shared_objects() {
- 
-   _next_ident = 1;  // start numbering CI objects at 1
-diff --git a/src/hotspot/share/ci/ciObjectFactory.hpp b/src/hotspot/share/ci/ciObjectFactory.hpp
-index fdefc8e3b92..1ed8732cb40 100644
---- a/src/hotspot/share/ci/ciObjectFactory.hpp
-+++ b/src/hotspot/share/ci/ciObjectFactory.hpp
-@@ -42,9 +42,11 @@ class ciObjectFactory : public ResourceObj {
- 
- private:
-   static volatile bool _initialized;
-+  static volatile bool _reinitialize_vm_klasses;
-   static GrowableArray<ciMetadata*>* _shared_ci_metadata;
-   static ciSymbol*                 _shared_ci_symbols[];
-   static int                       _shared_ident_limit;
-+  static Arena*                    _initial_arena;
- 
-   Arena*                           _arena;
-   GrowableArray<ciMetadata*>       _ci_metadata;
-@@ -90,10 +92,14 @@ private:
-   ciInstance* get_unloaded_instance(ciInstanceKlass* klass);
- 
-   static int compare_cimetadata(ciMetadata** a, ciMetadata** b);
-+  void do_reinitialize_vm_classes();
- public:
-   static bool is_initialized() { return _initialized; }
-+  static bool is_reinitialize_vm_klasses() { return _reinitialize_vm_klasses; }
-+  static void set_reinitialize_vm_klasses() { _reinitialize_vm_klasses = true; }
- 
-   static void initialize();
-+  static void reinitialize_vm_classes();
-   void init_shared_objects();
-   void remove_symbols();
- 
-diff --git a/src/hotspot/share/classfile/vmClasses.cpp b/src/hotspot/share/classfile/vmClasses.cpp
-index 2bd1ca65cc0..3ec13d952d8 100644
---- a/src/hotspot/share/classfile/vmClasses.cpp
-+++ b/src/hotspot/share/classfile/vmClasses.cpp
-@@ -259,3 +259,13 @@ BasicType vmClasses::box_klass_type(Klass* k) {
-   }
-   return T_OBJECT;
- }
-+
-+bool vmClasses::update_vm_klass(InstanceKlass* old_klass, InstanceKlass* new_klass) {
-+  for (int id = static_cast<int>(vmClassID::FIRST); id < static_cast<int>(vmClassID::LIMIT); id++) {
-+    if (_klasses[id] == old_klass) {
-+      _klasses[id] = new_klass;
-+      return true;
-+    }
-+  }
-+  return false;
-+}
-diff --git a/src/hotspot/share/classfile/vmClasses.hpp b/src/hotspot/share/classfile/vmClasses.hpp
-index 364014a2514..b637ff0ae3d 100644
---- a/src/hotspot/share/classfile/vmClasses.hpp
-+++ b/src/hotspot/share/classfile/vmClasses.hpp
-@@ -110,6 +110,10 @@ public:
-   static bool Cloneable_klass_loaded()      { return is_loaded(VM_CLASS_AT(Cloneable_klass));          }
-   static bool Parameter_klass_loaded()      { return is_loaded(VM_CLASS_AT(reflect_Parameter_klass));  }
-   static bool ClassLoader_klass_loaded()    { return is_loaded(VM_CLASS_AT(ClassLoader_klass));        }
-+
-+  // (DCEVM) vmClasses could be modified
-+  static bool update_vm_klass(InstanceKlass* new_klass, InstanceKlass* old_klass);
-+
- };
- 
- #endif // SHARE_CLASSFILE_VMCLASSES_HPP
-diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
-index dad94005f5c..82fd593224a 100644
---- a/src/hotspot/share/classfile/vmSymbols.hpp
-+++ b/src/hotspot/share/classfile/vmSymbols.hpp
-@@ -380,6 +380,8 @@
-   template(exit_method_name,                          "exit")                                     \
-   template(add_method_name,                           "add")                                      \
-   template(remove_method_name,                        "remove")                                   \
-+  template(registerNatives_method_name,               "registerNatives")                          \
-+  template(initIDs_method_name,                       "initIDs")                                  \
-   template(parent_name,                               "parent")                                   \
-   template(threads_name,                              "threads")                                  \
-   template(groups_name,                               "groups")                                   \
-diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
-index cc1dff089e8..aaf8e4b1f1e 100644
---- a/src/hotspot/share/compiler/compileBroker.cpp
-+++ b/src/hotspot/share/compiler/compileBroker.cpp
-@@ -1982,6 +1982,17 @@ void CompileBroker::compiler_thread_loop() {
-       if (method()->number_of_breakpoints() == 0) {
-         // Compile the method.
-         if ((UseCompiler || AlwaysCompileLoopMethods) && CompileBroker::should_compile_new_jobs()) {
-+
-+          // TODO: review usage of CompileThread_lock (DCEVM)
-+          if (ciObjectFactory::is_reinitialize_vm_klasses())
-+          {
-+            ASSERT_IN_VM;
-+            MutexLocker only_one(CompileThread_lock);
-+            if (ciObjectFactory::is_reinitialize_vm_klasses()) {
-+              ciObjectFactory::reinitialize_vm_classes();
-+            }
-+          }
-+
-           invoke_compiler_on_method(task);
-           thread->start_idle_timer();
-         } else {
-diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
-index 4ae3b382b67..92da9bbe5f9 100644
---- a/src/hotspot/share/memory/universe.cpp
-+++ b/src/hotspot/share/memory/universe.cpp
-@@ -924,6 +924,14 @@ void Universe::initialize_known_methods(TRAPS) {
-                           vmSymbols::doStackWalk_signature(), false, CHECK);
- }
- 
-+void Universe::reinitialize_loader_addClass_method(TRAPS) {
-+  // Set up method for registering loaded classes in class loader vector
-+  initialize_known_method(_loader_addClass_cache,
-+                          vmClasses::ClassLoader_klass(),
-+                          "addClass",
-+                          vmSymbols::class_void_signature(), false, CHECK);
-+}
-+
- void universe2_init() {
-   EXCEPTION_MARK;
-   Universe::genesis(CATCH);
-diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
-index 4b2211c415e..4d4c444220e 100644
---- a/src/hotspot/share/memory/universe.hpp
-+++ b/src/hotspot/share/memory/universe.hpp
-@@ -268,6 +268,8 @@ class Universe: AllStatic {
-   // Function to initialize these
-   static void initialize_known_methods(TRAPS);
- 
-+  static void reinitialize_loader_addClass_method(TRAPS);
-+
-   static void create_preallocated_out_of_memory_errors(TRAPS);
- 
-   // Reference pending list manipulation.  Access is protected by
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index a5264077bfe..e00f0e19e20 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -55,6 +55,7 @@
- #include "prims/resolvedMethodTable.hpp"
- #include "prims/methodHandles.hpp"
- #include "runtime/deoptimization.hpp"
-+#include "runtime/javaCalls.hpp"
- #include "runtime/jniHandles.inline.hpp"
- #include "runtime/relocator.hpp"
- #include "runtime/fieldDescriptor.hpp"
-@@ -66,6 +67,7 @@
- #include "gc/g1/g1CollectedHeap.hpp"
- #include "gc/shared/dcevmSharedGC.hpp"
- #include "gc/shared/scavengableNMethods.hpp"
-+#include "gc/shared/oopStorageSet.inline.hpp"
- #include "ci/ciObjectFactory.hpp"
- 
- Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
-@@ -521,6 +523,16 @@ void VM_EnhancedRedefineClasses::doit() {
-     redefine_single_class(_new_classes->at(i), thread);
-   }
- 
-+  // Update possible redefinition of vm classes (like ClassLoader)
-+  for (int i = 0; i < _new_classes->length(); i++) {
-+    InstanceKlass* cur = _new_classes->at(i);
-+    if (cur->old_version() != NULL && vmClasses::update_vm_klass(InstanceKlass::cast(cur->old_version()), cur))
-+    {
-+      log_trace(redefine, class, obsolete, metadata)("Well known class updated %s", cur->external_name());
-+      ciObjectFactory::set_reinitialize_vm_klasses();
-+    }
-+  }
-+
-   // 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(thread);
-@@ -688,12 +700,56 @@ void VM_EnhancedRedefineClasses::doit() {
-   _timer_vm_op_doit.stop();
- }
- 
-+void VM_EnhancedRedefineClasses::reinitializeJDKClasses() {
-+  if (!_new_classes->is_empty()) {
-+    ResourceMark rm(Thread::current());
-+
-+    for (int i = 0; i < _new_classes->length(); i++) {
-+      InstanceKlass* cur = _new_classes->at(i);
-+
-+      if (cur->name()->starts_with("java/") || cur->name()->starts_with("jdk/") || cur->name()->starts_with("sun/")) {
-+
-+        if (cur == vmClasses::ClassLoader_klass()) {
-+          // ClassLoader.addClass method is cached in Universe, we must redefine
-+          Universe::reinitialize_loader_addClass_method(Thread::current());
-+          log_trace(redefine, class, obsolete, metadata)("Reinitialize ClassLoade addClass method cache.");
-+        }
-+
-+        // naive assumptions that only JDK classes has native static "registerNative" and "initIDs" methods
-+        int end;
-+        Symbol* signature = vmSymbols::registerNatives_method_name();
-+        int midx = cur->find_method_by_name(signature, &end);
-+        if (midx == -1) {
-+          signature = vmSymbols::initIDs_method_name();
-+          midx = cur->find_method_by_name(signature, &end);
-+        }
-+        Method* m = NULL;
-+        if (midx != -1) {
-+          m = cur->methods()->at(midx);
-+        }
-+        if (m != NULL && m->is_static() && m->is_native()) {
-+          // call static registerNative if present
-+          JavaValue result(T_VOID);
-+          JavaCalls::call_static(&result,
-+                                  cur,
-+                                  signature,
-+                                  vmSymbols::void_method_signature(),
-+                                  Thread::current());
-+          log_trace(redefine, class, obsolete, metadata)("Reregister natives of JDK class %s", cur->external_name());
-+        }
-+      }
-+    }
-+  }
-+}
-+
- // Cleanup - runs in JVM thread
- //  - free used memory
- //  - end GC
- void VM_EnhancedRedefineClasses::doit_epilogue() {
-   VM_GC_Operation::doit_epilogue();
- 
-+  reinitializeJDKClasses();
-+
-   if (_new_classes != NULL) {
-     delete _new_classes;
-   }
-@@ -1623,7 +1679,12 @@ void VM_EnhancedRedefineClasses::check_methods_and_mark_as_obsolete() {
- 
-       // obsolete methods need a unique idnum so they become new entries in
-       // the jmethodID cache in InstanceKlass
--      assert(old_method->method_idnum() == new_method->method_idnum(), "must match");
-+      if (old_method->method_idnum() != new_method->method_idnum()) {
-+        log_error(redefine, class, normalize)
-+          ("Method not matched: %d != %d  old: %s = new: %s",  old_method->method_idnum(), new_method->method_idnum(),
-+              old_method->name_and_sig_as_C_string(), new_method->name_and_sig_as_C_string());
-+        // assert(old_method->method_idnum() == new_method->method_idnum(), "must match");
-+      }
- //      u2 num = InstanceKlass::cast(_the_class_oop)->next_method_idnum();
- //      if (num != ConstMethod::UNSET_IDNUM) {
- //        old_method->set_method_idnum(num);
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index 9be70039e32..673688dff84 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -150,6 +150,8 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
- 
-   u8 next_id();
- 
-+  void reinitializeJDKClasses();
-+
-   static void check_class(InstanceKlass* k_oop, TRAPS);
- 
-   static void dump_methods();
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0029-Fix-fastdebug-compilation-issues-cast_to_oop.patch

@@ -1,260 +0,0 @@
-From 6cde71e353f823f2df2d0875cd03b656fe060d5c Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Sat, 15 May 2021 10:31:28 +0200
-Subject: [PATCH 29/39] Fix fastdebug compilation issues - cast_to_oop
-
----
- .../share/gc/g1/g1FullGCCompactTask.cpp       | 12 +++++-----
- .../share/gc/g1/g1FullGCCompactionPoint.cpp   | 10 ++++-----
- .../share/gc/g1/g1FullGCPrepareTask.cpp       |  4 ++--
- src/hotspot/share/gc/shared/dcevmSharedGC.cpp |  6 ++---
- src/hotspot/share/gc/shared/space.cpp         | 22 +++++++++----------
- src/hotspot/share/gc/shared/space.inline.hpp  | 14 ++++++------
- .../prims/jvmtiEnhancedRedefineClasses.cpp    |  2 +-
- 7 files changed, 35 insertions(+), 35 deletions(-)
-
-diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
-index 058dea90828..765630a9826 100644
---- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
-+++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
-@@ -183,18 +183,18 @@ size_t G1FullGCCompactTask::G1CompactRegionClosureDcevm::apply(oop obj) {
-     Klass* new_version = obj->klass()->new_version();
-     if (new_version->update_information() == NULL) {
-       Copy::aligned_conjoint_words(obj_addr, destination, size);
--      oop(destination)->set_klass(new_version);
-+      cast_to_oop(destination)->set_klass(new_version);
-     } else {
--      DcevmSharedGC::update_fields(obj, oop(destination));
-+      DcevmSharedGC::update_fields(obj, cast_to_oop(destination));
-     }
--    oop(destination)->init_mark();
--    assert(oop(destination)->klass() != NULL, "should have a class");
-+    cast_to_oop(destination)->init_mark();
-+    assert(cast_to_oop(destination)->klass() != NULL, "should have a class");
-     return size;
-   }
- 
-   Copy::aligned_conjoint_words(obj_addr, destination, size);
--  oop(destination)->init_mark();
--  assert(oop(destination)->klass() != NULL, "should have a class");
-+  cast_to_oop(destination)->init_mark();
-+  assert(cast_to_oop(destination)->klass() != NULL, "should have a class");
- 
-   return size;
- }
-diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
-index 87b1977128a..028c182e68f 100644
---- a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
-+++ b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
-@@ -171,7 +171,7 @@ void G1FullGCCompactionPoint::forward_dcevm(oop object, size_t size, bool force_
- 
-   // Store a forwarding pointer if the object should be moved.
-   if (cast_from_oop<HeapWord*>(object) != _compaction_top || force_forward) {
--    object->forward_to(oop(_compaction_top));
-+    object->forward_to(cast_to_oop(_compaction_top));
-   } else {
-     if (object->forwardee() != NULL) {
-       // Object should not move but mark-word is used so it looks like the
-@@ -208,17 +208,17 @@ void G1FullGCCompactionPoint::forward_rescued() {
-   for (;i<rescued_oops()->length(); i++) {
-     HeapWord* q = rescued_oops()->at(i);
- 
--    size_t size = oop(q)->size();
-+    size_t size = cast_to_oop(q)->size();
- 
-     // (DCEVM) There is a new version of the class of q => different size
--    if (oop(q)->klass()->new_version() != NULL) {
-+    if (cast_to_oop(q)->klass()->new_version() != NULL) {
-       // assert(size != new_size, "instances without changed size have to be updated prior to GC run");
--      size = oop(q)->size_given_klass(oop(q)->klass()->new_version());
-+      size = cast_to_oop(q)->size_given_klass(cast_to_oop(q)->klass()->new_version());
-     }
-     if (forward_compact_top(size) == NULL) {
-       break;
-     }
--    forward_dcevm(oop(q), size, true);
-+    forward_dcevm(cast_to_oop(q), size, true);
-   }
-   _last_rescued_oop = i;
- }
-diff --git a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
-index 05f0444cc7a..93c066383a1 100644
---- a/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
-+++ b/src/hotspot/share/gc/g1/g1FullGCPrepareTask.cpp
-@@ -297,7 +297,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))) {
-+  if (compact_top == NULL || must_rescue(object, cast_to_oop(compact_top))) {
-     _cp->rescued_oops()->append(cast_from_oop<HeapWord*>(object));
-   } else {
-     _cp->forward_dcevm(object, forward_size, (size != forward_size));
-@@ -308,7 +308,7 @@ size_t G1FullGCPrepareTask::G1PrepareCompactLiveClosureDcevm::apply(oop object)
- 
- bool G1FullGCPrepareTask::G1PrepareCompactLiveClosureDcevm::must_rescue(oop old_obj, oop new_obj) {
-   // Only redefined objects can have the need to be rescued.
--  if (oop(old_obj)->klass()->new_version() == NULL) {
-+  if (old_obj->klass()->new_version() == NULL) {
-     return false;
-   }
- 
-diff --git a/src/hotspot/share/gc/shared/dcevmSharedGC.cpp b/src/hotspot/share/gc/shared/dcevmSharedGC.cpp
-index edc19a3077d..de3d518b696 100644
---- a/src/hotspot/share/gc/shared/dcevmSharedGC.cpp
-+++ b/src/hotspot/share/gc/shared/dcevmSharedGC.cpp
-@@ -46,7 +46,7 @@ void DcevmSharedGC::copy_rescued_objects_back(GrowableArray<HeapWord*>* rescued_
-   if (rescued_oops != NULL) {
-     for (int i=from; i < to; i++) {
-       HeapWord* rescued_ptr = rescued_oops->at(i);
--      oop rescued_obj = (oop) rescued_ptr;
-+      oop rescued_obj = cast_to_oop(rescued_ptr);
- 
-       int size = rescued_obj->size();
-       oop new_obj = rescued_obj->forwardee();
-@@ -75,7 +75,7 @@ void DcevmSharedGC::clear_rescued_objects_resource(GrowableArray<HeapWord*>* res
-   if (rescued_oops != NULL) {
-     for (int i=0; i < rescued_oops->length(); i++) {
-       HeapWord* rescued_ptr = rescued_oops->at(i);
--      int size = ((oop) rescued_ptr)->size();
-+      int size = cast_to_oop(rescued_ptr)->size();
-       FREE_RESOURCE_ARRAY(HeapWord, rescued_ptr, size);
-     }
-     rescued_oops->clear();
-@@ -114,7 +114,7 @@ void DcevmSharedGC::update_fields(oop q, oop new_location) {
-     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;
-+       q = cast_to_oop(tmp);
-        Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(tmp_obj), cast_from_oop<HeapWord*>(q), size);
-     }
-   }
-diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
-index 29a81348d2d..000760744f7 100644
---- a/src/hotspot/share/gc/shared/space.cpp
-+++ b/src/hotspot/share/gc/shared/space.cpp
-@@ -475,7 +475,7 @@ bool CompactibleSpace::must_rescue(oop old_obj, oop new_obj) {
- 
-   int new_size = old_obj->size_given_klass(oop(old_obj)->klass()->new_version());
-   int original_size = old_obj->size();
--  
-+
-   Generation* tenured_gen = GenCollectedHeap::heap()->old_gen();
-   bool old_in_tenured = tenured_gen->is_in_reserved(old_obj);
-   bool new_in_tenured = tenured_gen->is_in_reserved(new_obj);
-@@ -513,9 +513,9 @@ bool CompactibleSpace::must_rescue(oop old_obj, oop new_obj) {
- }
- 
- HeapWord* CompactibleSpace::rescue(HeapWord* old_obj) {
--  assert(must_rescue(oop(old_obj), oop(old_obj)->forwardee()), "do not call otherwise");
-+  assert(must_rescue(cast_to_oop(old_obj), cast_to_oop(old_obj)->forwardee()), "do not call otherwise");
- 
--  int size = oop(old_obj)->size();
-+  int size = cast_to_oop(old_obj)->size();
-   HeapWord* rescued_obj = NEW_RESOURCE_ARRAY(HeapWord, size);
-   Copy::aligned_disjoint_words(old_obj, rescued_obj, size);
- 
-@@ -803,16 +803,16 @@ HeapWord* CompactibleSpace::forward_with_rescue(HeapWord* q, size_t size,
-   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) {
-+  if (cast_to_oop(q)->klass()->new_version() != NULL) {
- 
--    size_t new_size = oop(q)->size_given_klass(oop(q)->klass()->new_version());
-+    size_t new_size = cast_to_oop(q)->size_given_klass(cast_to_oop(q)->klass()->new_version());
-     // assert(size != new_size, "instances without changed size have to be updated prior to GC run");
-     forward_size = new_size;
-   }
- 
-   compact_top = forward_compact_top(forward_size, cp, compact_top);
- 
--  if (must_rescue(oop(q), oop(compact_top))) {
-+  if (must_rescue(cast_to_oop(q), cast_to_oop(compact_top))) {
-     if (MarkSweep::_rescued_oops == NULL) {
-       MarkSweep::_rescued_oops = new GrowableArray<HeapWord*>(128);
-     }
-@@ -820,7 +820,7 @@ HeapWord* CompactibleSpace::forward_with_rescue(HeapWord* q, size_t size,
-     return compact_top;
-   }
- 
--  return forward(oop(q), forward_size, cp, compact_top, force_forward);
-+  return forward(cast_to_oop(q), forward_size, cp, compact_top, force_forward);
- }
- 
- // Compute the forwarding addresses for the objects that need to be rescued.
-@@ -830,17 +830,17 @@ HeapWord* CompactibleSpace::forward_rescued(CompactPoint* cp, HeapWord* compact_
-     for (int i=0; i<MarkSweep::_rescued_oops->length(); i++) {
-       HeapWord* q = MarkSweep::_rescued_oops->at(i);
- 
--      /* size_t size = oop(q)->size();  changing this for cms for perm gen */
-+      /* size_t size = cast_to_oop(q)->size();  changing this for cms for perm gen */
-       size_t size = block_size(q);
- 
-       // (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());
-+      if (cast_to_oop(q)->klass()->new_version() != NULL) {
-+        size_t new_size = cast_to_oop(q)->size_given_klass(cast_to_oop(q)->klass()->new_version());
-         // 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, true);
-+      compact_top = cp->space->forward(cast_to_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.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp
-index cafa2503ef4..076ce6b0cce 100644
---- a/src/hotspot/share/gc/shared/space.inline.hpp
-+++ b/src/hotspot/share/gc/shared/space.inline.hpp
-@@ -351,7 +351,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
-       size_t size = space->obj_size(cur_obj);
-       HeapWord* compaction_top = cast_from_oop<HeapWord*>(cast_to_oop(cur_obj)->forwardee());
- 
--      if (redefinition_run &&  space->must_rescue(oop(cur_obj), oop(cur_obj)->forwardee())) {
-+      if (redefinition_run &&  space->must_rescue(cast_to_oop(cur_obj), cast_to_oop(cur_obj)->forwardee())) {
-          space->rescue(cur_obj);
-         debug_only(Copy::fill_to_words(cur_obj, size, 0));
-         cur_obj += size;
-@@ -363,16 +363,16 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
- 
-       // copy object and reinit its mark
-       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 (redefinition_run && cast_to_oop(cur_obj)->klass()->new_version() != NULL) {
-+        Klass* new_version = cast_to_oop(cur_obj)->klass()->new_version();
-         if (new_version->update_information() == NULL) {
-           Copy::aligned_conjoint_words(cur_obj, compaction_top, size);
--          oop(compaction_top)->set_klass(new_version);
-+          cast_to_oop(compaction_top)->set_klass(new_version);
-         } else {
--          DcevmSharedGC::update_fields(oop(cur_obj), oop(compaction_top));
-+          DcevmSharedGC::update_fields(cast_to_oop(cur_obj), cast_to_oop(compaction_top));
-         }
--        oop(compaction_top)->init_mark();
--        assert(oop(compaction_top)->klass() != NULL, "should have a class");
-+        cast_to_oop(compaction_top)->init_mark();
-+        assert(cast_to_oop(compaction_top)->klass() != NULL, "should have a class");
- 
-         debug_only(prev_obj = cur_obj);
-         cur_obj += size;
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index e00f0e19e20..62477b5ce10 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -439,7 +439,7 @@ public:
-     int size = o->size();
-     if (_tmp_obj_size < size) {
-       _tmp_obj_size = size;
--      _tmp_obj = (oop)resource_allocate_bytes(size * HeapWordSize);
-+      _tmp_obj = cast_to_oop(resource_allocate_bytes(size * HeapWordSize));
-     }
-     Copy::aligned_disjoint_words(cast_from_oop<HeapWord*>(o), cast_from_oop<HeapWord*>(_tmp_obj), size);
-   }
--- 
-2.23.0
-

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

@@ -1,54 +1,54 @@
-From 983b4aaed2c56a74287b9400ddae4b7d7f3fd715 Mon Sep 17 00:00:00 2001
+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 16/39] dcevm15 - mark_as_scavengable only alive methods
+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 9f42d14ce98..db5fb1c472b 100644
+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);
-   }
- }
+ 
+ // 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) {
+     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-JBR-3458-Skip-dynamic-proxy-classes-based-on-com.sun.patch

@@ -1,27 +0,0 @@
-From 585e2f11d293081db5dc919fa8c13fb5bc7cbc53 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Fri, 19 Mar 2021 19:13:38 +0100
-Subject: [PATCH 30/39] JBR-3458: Skip dynamic proxy classes based on
- com.sun.proxy
-
----
- src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 62477b5ce10..7bdbc861c1f 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -707,7 +707,8 @@ void VM_EnhancedRedefineClasses::reinitializeJDKClasses() {
-     for (int i = 0; i < _new_classes->length(); i++) {
-       InstanceKlass* cur = _new_classes->at(i);
- 
--      if (cur->name()->starts_with("java/") || cur->name()->starts_with("jdk/") || cur->name()->starts_with("sun/")) {
-+      if ((cur->name()->starts_with("java/") || cur->name()->starts_with("jdk/") || cur->name()->starts_with("sun/"))
-+          && cur->name()->index_of_at(0, "$$") == -1) { // skip dynamic proxies
- 
-         if (cur == vmClasses::ClassLoader_klass()) {
-           // ClassLoader.addClass method is cached in Universe, we must redefine
--- 
-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-JBR-3459-Fix-race-condition-in-ClassLoaderDataGraph-.patch

@@ -1,81 +0,0 @@
-From d4d56b7ad6cd8f73f7485cdc608655c014c55f3c Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sat, 20 Mar 2021 20:51:08 +0100
-Subject: [PATCH 31/39] JBR-3459: Fix race condition in
- ClassLoaderDataGraph::classes_do
-
-InstanceKlass in ClassLoaderData can be uninitialized when
-ClassLoaderDataGraph::classes_do is called. Using
-ClassLoaderDataGraph::dictionary_classes_do is safe but problem is still
-persisting with anonymous classes.
----
- .../share/classfile/classLoaderDataGraph.cpp       | 10 ++++++++++
- .../share/classfile/classLoaderDataGraph.hpp       |  4 ++++
- .../share/prims/jvmtiEnhancedRedefineClasses.cpp   | 14 ++++++++++++--
- 3 files changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.cpp b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
-index 67ade5709f6..aa2a6bcec6b 100644
---- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp
-+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
-@@ -361,6 +361,16 @@ void ClassLoaderDataGraph::classes_do(KlassClosure* klass_closure) {
-   }
- }
- 
-+void ClassLoaderDataGraph::anonymous_or_hidden_classes_do(KlassClosure* klass_closure) {
-+  Thread* thread = Thread::current();
-+  for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
-+    if (cld->has_class_mirror_holder()) {
-+      Handle holder(thread, cld->holder_phantom());
-+      cld->classes_do(klass_closure);
-+    }
-+  }
-+}
-+
- void ClassLoaderDataGraph::classes_do(void f(Klass* const)) {
-   ClassLoaderDataGraphIterator iter;
-   while (ClassLoaderData* cld = iter.get_next()) {
-diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-index ebdb0bc2c8c..da712eaf55f 100644
---- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-+++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-@@ -78,6 +78,10 @@ class ClassLoaderDataGraph : public AllStatic {
-   // for redefinition.  These classes are removed during the next class unloading.
-   // Walking the ClassLoaderDataGraph also includes hidden classes.
-   static void classes_do(KlassClosure* klass_closure);
-+
-+  // Enhanced class redefinition
-+  static void anonymous_or_hidden_classes_do(KlassClosure* klass_closure);
-+
-   static void classes_do(void f(Klass* const));
-   static void methods_do(void f(Method*));
-   static void modules_do(void f(ModuleEntry*));
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 7bdbc861c1f..4e8e7141e61 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -2164,9 +2164,19 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
- 
-   {
-     MutexLocker mcld(ClassLoaderDataGraph_lock);
--    ClassLoaderDataGraph::classes_do(&closure);
-+
-+    // 0. we can't use ClassLoaderDataGraph::classes_do since classes can be uninitialized in cld,
-+    // fully initialized class is in system dictionary
-+    // ClassLoaderDataGraph::classes_do(&closure);
-+
-+    // 1. Scan over dictionaries
-+    ClassLoaderDataGraph::dictionary_classes_do(&closure);
-+
-+    // 2. Anonymous or hidden class is not in dictionary, we have to iterate anonymous cld directly, but there is race cond...
-+    // TODO: review ... anonymous class is added to cld before InstanceKlass initialization,
-+    //                  find out how to check if the InstanceKlass is initialized
-+    ClassLoaderDataGraph::anonymous_or_hidden_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/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-Fix-compilation-problems.patch

@@ -1,39 +0,0 @@
-From 5356c4dbbcc2564e401fc92b7680b870ee7070ec Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Sat, 15 May 2021 13:01:25 +0200
-Subject: [PATCH 32/39] Fix compilation problems
-
----
- src/hotspot/share/oops/instanceKlass.cpp                 | 2 +-
- src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index 3cc96f98f41..c54b6b1bf46 100644
---- a/src/hotspot/share/oops/instanceKlass.cpp
-+++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -978,7 +978,7 @@ bool InstanceKlass::link_class_impl(TRAPS) {
-         set_init_state(linked);
-       }
-       // (DCEVM) Must check for old version in order to prevent infinite loops.
--      if (JvmtiExport::should_post_class_prepare()  && (!AllowEnhancedClassRedefinition || old_version() == NULL /* JVMTI deadlock otherwise */) {
-+      if (JvmtiExport::should_post_class_prepare()  && (!AllowEnhancedClassRedefinition || old_version() == NULL /* JVMTI deadlock otherwise */)) {
-         JvmtiExport::post_class_prepare(THREAD, this);
-       }
-     }
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 4e8e7141e61..f6bef8262d3 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -708,7 +708,7 @@ void VM_EnhancedRedefineClasses::reinitializeJDKClasses() {
-       InstanceKlass* cur = _new_classes->at(i);
- 
-       if ((cur->name()->starts_with("java/") || cur->name()->starts_with("jdk/") || cur->name()->starts_with("sun/"))
--          && cur->name()->index_of_at(0, "$$") == -1) { // skip dynamic proxies
-+          && cur->name()->index_of_at(0, "$$", (int) strlen("$$")) == -1) { // skip dynamic proxies
- 
-         if (cur == vmClasses::ClassLoader_klass()) {
-           // ClassLoader.addClass method is cached in Universe, we must redefine
--- 
-2.23.0
-

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

@@ -1,7 +1,7 @@
-From ed546016ead6064d8b95a9c1e4cdc6bc192f8d67 Mon Sep 17 00:00:00 2001
+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 17/39] dcevm15 - fix hidded classes
+Subject: [PATCH 32/34] dcevm15 - fix hidded classes
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 41 ++++++++++++++-----
@@ -12,80 +12,80 @@ 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;
+   }
+ 
+   // 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,
+ 
+     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,
+                                          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();
+     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-Fix-dcevm-issues-related-to-refactorization-of-Threa.patch

@@ -1,350 +0,0 @@
-From 3eb64e8ed65ae214091b55e497d24dff0eb1e353 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Sun, 20 Jun 2021 19:11:16 +0200
-Subject: [PATCH 33/39] Fix dcevm issues related to refactorization of Thread
- to JavaThread
-
----
- src/hotspot/share/cds/lambdaFormInvokers.cpp  |  1 +
- .../prims/jvmtiEnhancedRedefineClasses.cpp    | 72 +++++++++----------
- .../prims/jvmtiEnhancedRedefineClasses.hpp    | 12 ++--
- 3 files changed, 39 insertions(+), 46 deletions(-)
-
-diff --git a/src/hotspot/share/cds/lambdaFormInvokers.cpp b/src/hotspot/share/cds/lambdaFormInvokers.cpp
-index 5c058dc43ac..9de28f740ac 100644
---- a/src/hotspot/share/cds/lambdaFormInvokers.cpp
-+++ b/src/hotspot/share/cds/lambdaFormInvokers.cpp
-@@ -178,6 +178,7 @@ void LambdaFormInvokers::reload_class(char* name, ClassFileStream& st, TRAPS) {
-                                                    class_name,
-                                                    cld,
-                                                    cl_info,
-+                                                   false, // pick_newest
-                                                    CHECK);
- 
-   {
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index f6bef8262d3..b662976afcb 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -23,7 +23,6 @@
-  */
- 
- #include "precompiled.hpp"
--#include "aot/aotLoader.hpp"
- #include "classfile/classFileParser.hpp"
- #include "classfile/classFileStream.hpp"
- #include "classfile/classLoadInfo.hpp"
-@@ -38,7 +37,7 @@
- #include "interpreter/rewriter.hpp"
- #include "logging/logStream.hpp"
- #include "memory/metadataFactory.hpp"
--#include "memory/metaspaceShared.hpp"
-+#include "cds/metaspaceShared.hpp"
- #include "memory/resourceArea.hpp"
- #include "memory/iterator.inline.hpp"
- #include "oops/fieldStreams.hpp"
-@@ -156,7 +155,7 @@ bool VM_EnhancedRedefineClasses::doit_prologue() {
- 
-   // We first load new class versions in the prologue, because somewhere down the
-   // call chain it is required that the current thread is a Java thread.
--  _res = load_new_class_versions(Thread::current());
-+  _res = load_new_class_versions(JavaThread::current());
- 
-   // prepare GC, lock heap
-   if (_res == JVMTI_ERROR_NONE && !VM_GC_Operation::doit_prologue()) {
-@@ -250,7 +249,6 @@ void VM_EnhancedRedefineClasses::root_oops_do(OopClosure *oopClosure) {
-   Universe::vm_global()->oops_do(oopClosure);
- 
-   Threads::oops_do(oopClosure, NULL);
--  AOT_ONLY(AOTLoader::oops_do(oopClosure);)
-   OopStorageSet::strong_oops_do(oopClosure);
- 
-   CodeBlobToOopClosure blobClosure(oopClosure, CodeBlobToOopClosure::FixRelocations);
-@@ -520,7 +518,7 @@ void VM_EnhancedRedefineClasses::doit() {
-                            // before the stack walk again.
- 
-   for (int i = 0; i < _new_classes->length(); i++) {
--    redefine_single_class(_new_classes->at(i), thread);
-+    redefine_single_class(thread, _new_classes->at(i));
-   }
- 
-   // Update possible redefinition of vm classes (like ClassLoader)
-@@ -535,7 +533,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(thread);
-+    flush_dependent_code();
-   // }
- 
-   // Adjust constantpool caches for all classes that reference methods of the evolved class.
-@@ -692,7 +690,7 @@ void VM_EnhancedRedefineClasses::doit() {
-     assert(new_version->super() == NULL || new_version->super()->new_version() == NULL, "Super class must be newest version");
-   }
-   log_trace(redefine, class, obsolete, metadata)("calling check_class");
--  ClassLoaderData::the_null_class_loader_data()->dictionary()->classes_do(check_class, thread);
-+  ClassLoaderData::the_null_class_loader_data()->dictionary()->classes_do(check_class);
- #ifdef PRODUCT
-   }
- #endif
-@@ -702,7 +700,7 @@ void VM_EnhancedRedefineClasses::doit() {
- 
- void VM_EnhancedRedefineClasses::reinitializeJDKClasses() {
-   if (!_new_classes->is_empty()) {
--    ResourceMark rm(Thread::current());
-+    ResourceMark rm(JavaThread::current());
- 
-     for (int i = 0; i < _new_classes->length(); i++) {
-       InstanceKlass* cur = _new_classes->at(i);
-@@ -712,7 +710,7 @@ void VM_EnhancedRedefineClasses::reinitializeJDKClasses() {
- 
-         if (cur == vmClasses::ClassLoader_klass()) {
-           // ClassLoader.addClass method is cached in Universe, we must redefine
--          Universe::reinitialize_loader_addClass_method(Thread::current());
-+          Universe::reinitialize_loader_addClass_method(JavaThread::current());
-           log_trace(redefine, class, obsolete, metadata)("Reinitialize ClassLoade addClass method cache.");
-         }
- 
-@@ -735,7 +733,7 @@ void VM_EnhancedRedefineClasses::reinitializeJDKClasses() {
-                                   cur,
-                                   signature,
-                                   vmSymbols::void_method_signature(),
--                                  Thread::current());
-+                                  JavaThread::current());
-           log_trace(redefine, class, obsolete, metadata)("Reregister natives of JDK class %s", cur->external_name());
-         }
-       }
-@@ -793,7 +791,7 @@ bool VM_EnhancedRedefineClasses::is_modifiable_class(oop klass_mirror) {
- 
-   // Cannot redefine or retransform an anonymous class.
-   // TODO: check if is correct in j15
--  if (InstanceKlass::cast(k)->is_unsafe_anonymous() || InstanceKlass::cast(k)->is_hidden()) {
-+  if (InstanceKlass::cast(k)->is_hidden()) {
-     return false;
-   }
-   return true;
-@@ -879,23 +877,15 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
- 
-     InstanceKlass* k;
- 
--    if (the_class->is_unsafe_anonymous() || the_class->is_hidden()) {
-+    if (the_class->is_hidden()) {
-       InstanceKlass* dynamic_host_class = NULL;
--      InstanceKlass* unsafe_anonymous_host = NULL;
- 
-       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,
--                            unsafe_anonymous_host,
--                            NULL,     // cp_patches
-                             dynamic_host_class,     // dynamic_nest_host
-                             Handle(), // classData
-                             the_class->is_hidden(),    // is_hidden
-@@ -1143,7 +1133,7 @@ int VM_EnhancedRedefineClasses::calculate_redefinition_flags(InstanceKlass* new_
-   Array<Method*>* k_new_methods(new_class->methods());
-   int n_old_methods = k_old_methods->length();
-   int n_new_methods = k_new_methods->length();
--  Thread* thread = Thread::current();
-+  JavaThread* thread = JavaThread::current();
- 
-   int ni = 0;
-   int oi = 0;
-@@ -1491,8 +1481,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, TRAPS) {
--  RawBytecodeStream bcs(methodHandle(THREAD, method));
-+void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
-+  RawBytecodeStream bcs(methodHandle(Thread::current(), method));
-   Bytecodes::Code code;
-   Bytecodes::Code java_code;
-   while (!bcs.is_last_bytecode()) {
-@@ -1535,10 +1525,10 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method, TRAPS) {
-       assert(code2 == Bytecodes::_fast_igetfield ||
-              code2 == Bytecodes::_fast_agetfield ||
-              code2 == Bytecodes::_fast_fgetfield, "");
--        *(bcp + 1) = Bytecodes::java_code(code2);
--      }
-+      *(bcp + 1) = Bytecodes::java_code(code2);
-     }
-   }
-+}
- 
- // Unevolving classes may point to old methods directly
- // from their constant pool caches, itables, and/or vtables. We
-@@ -1559,9 +1549,11 @@ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
-   constantPoolHandle other_cp = constantPoolHandle(_thread, ik->constants());
- 
-   // Update host klass of anonymous classes (for example, produced by lambdas) to 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()));
-   }
-+  */
- 
-   // FIXME: check new nest_host for hidden
- 
-@@ -1596,7 +1588,7 @@ 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, _thread);
-+    ik->methods_do(unpatch_bytecode);
-   }
- }
- 
-@@ -1628,7 +1620,7 @@ void VM_EnhancedRedefineClasses::MethodDataCleaner::do_klass(Klass* k) {
- }
- 
- 
--void VM_EnhancedRedefineClasses::update_jmethod_ids(TRAPS) {
-+void VM_EnhancedRedefineClasses::update_jmethod_ids(Thread* current) {
-   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();
-@@ -1639,10 +1631,10 @@ void VM_EnhancedRedefineClasses::update_jmethod_ids(TRAPS) {
- 
-     if (jmid != NULL) {
-       // There is a jmethodID, change it to point to the new method
--      methodHandle new_method_h(THREAD, _matching_new_methods[j]);
-+      methodHandle new_method_h(current, _matching_new_methods[j]);
- 
-       if (old_method->new_version() == NULL) {
--        methodHandle old_method_h(THREAD, _matching_old_methods[j]);
-+        methodHandle old_method_h(current, _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 {
-@@ -1864,7 +1856,7 @@ void VM_EnhancedRedefineClasses::mark_dependent_code(InstanceKlass* ik) {
- // subsequent calls to RedefineClasses need only throw away code
- // that depends on the class.
- //
--void VM_EnhancedRedefineClasses::flush_dependent_code(TRAPS) {
-+void VM_EnhancedRedefineClasses::flush_dependent_code() {
-   assert_locked_or_safepoint(Compile_lock);
- 
-   // All dependencies have been recorded from startup or this is a second or
-@@ -1959,9 +1951,9 @@ void VM_EnhancedRedefineClasses::compute_added_deleted_matching_methods() {
- //      a helper method to be specified. The interesting parameters
- //      that we would like to pass to the helper method are saved in
- //      static global fields in the VM operation.
--void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_oop, TRAPS) {
-+void VM_EnhancedRedefineClasses::redefine_single_class(Thread* current, InstanceKlass* new_class_oop) {
- 
--  HandleMark hm(THREAD);   // make sure handles from this call are freed
-+  HandleMark hm(current);   // make sure handles from this call are freed
- 
-   InstanceKlass* new_class = new_class_oop;
-   InstanceKlass* the_class = InstanceKlass::cast(new_class_oop->old_version());
-@@ -1980,7 +1972,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(THREAD);
-+  update_jmethod_ids(current);
- 
-   _any_class_has_resolved_methods = the_class->has_resolved_methods() || _any_class_has_resolved_methods;
- 
-@@ -2002,14 +1994,14 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
-   */
- 
-   {
--    ResourceMark rm(THREAD);
-+    ResourceMark rm(current);
-     // increment the classRedefinedCount field in the_class and in any
-     // direct and indirect subclasses of the_class
--    increment_class_counter(new_class, THREAD);
-+    increment_class_counter(current, new_class);
-     log_info(redefine, class, load)
-       ("redefined name=%s, count=%d (avail_mem=" UINT64_FORMAT "K)",
-        new_class->external_name(), java_lang_Class::classRedefinedCount(new_class->java_mirror()), os::available_memory() >> 10);
--    Events::log_redefinition(THREAD, "redefined class name=%s, count=%d",
-+    Events::log_redefinition(current, "redefined class name=%s, count=%d",
-                              new_class->external_name(),
-                              java_lang_Class::classRedefinedCount(new_class->java_mirror()));
-   }
-@@ -2018,21 +2010,21 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
- 
- // Increment the classRedefinedCount field in the specific InstanceKlass
- // and in all direct and indirect subclasses.
--void VM_EnhancedRedefineClasses::increment_class_counter(InstanceKlass *ik, TRAPS) {
-+void VM_EnhancedRedefineClasses::increment_class_counter(Thread* current, InstanceKlass *ik) {
-   oop class_mirror = ik->old_version()->java_mirror();
-   Klass* class_oop = java_lang_Class::as_Klass(class_mirror);
-   int new_count = java_lang_Class::classRedefinedCount(class_mirror) + 1;
-   java_lang_Class::set_classRedefinedCount(ik->java_mirror(), new_count);
- }
- 
--void VM_EnhancedRedefineClasses::check_class(InstanceKlass* ik, TRAPS) {
-+void VM_EnhancedRedefineClasses::check_class(InstanceKlass* ik) {
-   if (ik->is_instance_klass() && ik->old_version() != NULL) {
--    HandleMark hm(THREAD);
-+    HandleMark hm(Thread::current());
- 
-     assert(ik->new_version() == NULL, "must be latest version in system dictionary");
- 
-     if (ik->vtable_length() > 0) {
--      ResourceMark rm(THREAD);
-+      ResourceMark rm(Thread::current());
-       assert(ik->vtable().check_no_old_or_obsolete_entries(), "old method found");
-       ik->vtable().verify(tty, true);
-     }
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index 673688dff84..378e6f78582 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -122,7 +122,7 @@ 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, TRAPS);
-+  static void unpatch_bytecode(Method* method);
- 
-   void root_oops_do(OopClosure *oopClosure);
- 
-@@ -131,28 +131,28 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
-   void compute_added_deleted_matching_methods();
- 
-   // Change jmethodIDs to point to the new methods
--  void update_jmethod_ids(TRAPS);
-+  void update_jmethod_ids(Thread* current);
- 
-   // marking methods as old and/or obsolete
-   void check_methods_and_mark_as_obsolete();
-   void transfer_old_native_function_registrations(InstanceKlass* the_class);
- 
-   // Install the redefinition of a class
--  void redefine_single_class(InstanceKlass* new_class_oop, TRAPS);
-+  void redefine_single_class(Thread* current, InstanceKlass* new_class_oop);
- 
-   // Increment the classRedefinedCount field in the specific InstanceKlass
-   // and in all direct and indirect subclasses.
--  void increment_class_counter(InstanceKlass *ik, TRAPS);
-+  void increment_class_counter(Thread* current, InstanceKlass *ik);
- 
-   void mark_dependent_code(InstanceKlass* ik);
- 
--  void flush_dependent_code(TRAPS);
-+  void flush_dependent_code();
- 
-   u8 next_id();
- 
-   void reinitializeJDKClasses();
- 
--  static void check_class(InstanceKlass* k_oop, TRAPS);
-+  static void check_class(InstanceKlass* k_oop);
- 
-   static void dump_methods();
- 
--- 
-2.23.0
-

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

@@ -1,7 +1,7 @@
-From 9983c44fe6903daba758ed0c43b8c86e738e0741 Mon Sep 17 00:00:00 2001
+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 18/39] dcevm15 - DON'T clear F2 in CP cache after indy
+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
@@ -10,10 +10,10 @@ It's not clear why it was cleared in dcevm7-11
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
-index 167cb274661..7e72641ec5a 100644
+index 79a38dbeff0..650e6fab42d 100644
 --- a/src/hotspot/share/oops/cpCache.cpp
 +++ b/src/hotspot/share/oops/cpCache.cpp
-@@ -654,7 +654,7 @@ void ConstantPoolCacheEntry::clear_entry() {
+@@ -650,7 +650,7 @@ void ConstantPoolCacheEntry::clear_entry() {
  
    if (clearData) {
      if (!is_resolved_reference()) {

jb/project/tools/patches/dcevm/0034-Fix-init_method_MemberName-after-Thread-to-JavaThrea.patch

@@ -1,142 +0,0 @@
-From db2d7cd0cd956f297c58baa7500c1440092648bf Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Sun, 20 Jun 2021 19:42:51 +0200
-Subject: [PATCH 34/39] Fix init_method_MemberName after Thread to JavaThread
- refactorization
-
----
- src/hotspot/share/interpreter/linkResolver.cpp    | 14 ++++++++++----
- src/hotspot/share/interpreter/linkResolver.hpp    |  3 ++-
- src/hotspot/share/oops/instanceKlass.cpp          | 15 ---------------
- src/hotspot/share/oops/instanceKlass.hpp          |  1 -
- .../share/prims/jvmtiEnhancedRedefineClasses.cpp  | 11 +++++++++--
- 5 files changed, 21 insertions(+), 23 deletions(-)
-
-diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
-index 74a6af13ea4..78c9624a18b 100644
---- a/src/hotspot/share/interpreter/linkResolver.cpp
-+++ b/src/hotspot/share/interpreter/linkResolver.cpp
-@@ -131,14 +131,14 @@ void CallInfo::set_common(Klass* resolved_klass,
- }
- 
- // utility query for unreflecting a method
--CallInfo::CallInfo(Method* resolved_method, Klass* resolved_klass, TRAPS) {
-+CallInfo::CallInfo(Method* resolved_method, Klass* resolved_klass, Thread* thread) {
-   Klass* resolved_method_holder = resolved_method->method_holder();
-   if (resolved_klass == NULL) { // 2nd argument defaults to holder of 1st
-     resolved_klass = resolved_method_holder;
-   }
-   _resolved_klass  = resolved_klass;
--  _resolved_method = methodHandle(THREAD, resolved_method);
--  _selected_method = methodHandle(THREAD, resolved_method);
-+  _resolved_method = methodHandle(thread, resolved_method);
-+  _selected_method = methodHandle(thread, resolved_method);
-   // classify:
-   CallKind kind = CallInfo::unknown_kind;
-   int index = resolved_method->vtable_index();
-@@ -179,7 +179,9 @@ CallInfo::CallInfo(Method* resolved_method, Klass* resolved_klass, TRAPS) {
-   _call_index = index;
-   _resolved_appendix = Handle();
-   // Find or create a ResolvedMethod instance for this Method*
--  set_resolved_method_name(CHECK);
-+  if (thread->is_Java_thread()) { // exclude DCEVM VM thread
-+    set_resolved_method_name(thread->as_Java_thread());
-+  }
- 
-   DEBUG_ONLY(verify());
- }
-@@ -190,6 +192,10 @@ void CallInfo::set_resolved_method_name(TRAPS) {
-   _resolved_method_name = Handle(THREAD, rmethod_name);
- }
- 
-+void CallInfo::set_resolved_method_name_dcevm(oop rmethod_name, Thread* thread) {
-+  _resolved_method_name = Handle(thread, rmethod_name);
-+}
-+
- #ifdef ASSERT
- void CallInfo::verify() {
-   switch (call_kind()) {  // the meaning and allowed value of index depends on kind
-diff --git a/src/hotspot/share/interpreter/linkResolver.hpp b/src/hotspot/share/interpreter/linkResolver.hpp
-index 9eeb10cc6fd..871eaab7464 100644
---- a/src/hotspot/share/interpreter/linkResolver.hpp
-+++ b/src/hotspot/share/interpreter/linkResolver.hpp
-@@ -91,7 +91,7 @@ class CallInfo : public StackObj {
-   // utility to extract an effective CallInfo from a method and an optional receiver limit
-   // does not queue the method for compilation.  This also creates a ResolvedMethodName
-   // object for the resolved_method.
--  CallInfo(Method* resolved_method, Klass* resolved_klass, TRAPS);
-+  CallInfo(Method* resolved_method, Klass* resolved_klass, Thread* thread);
- 
-   Klass*  resolved_klass() const                 { return _resolved_klass; }
-   Method* resolved_method() const                { return _resolved_method(); }
-@@ -100,6 +100,7 @@ class CallInfo : public StackObj {
-   Handle       resolved_method_name() const      { return _resolved_method_name; }
-   // Materialize a java.lang.invoke.ResolvedMethodName for this resolved_method
-   void     set_resolved_method_name(TRAPS);
-+  void     set_resolved_method_name_dcevm(oop rmethod_name, Thread* thread);
- 
-   BasicType    result_type() const               { return selected_method()->result_type(); }
-   CallKind     call_kind() const                 { return _call_kind; }
-diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index c54b6b1bf46..8d259451032 100644
---- a/src/hotspot/share/oops/instanceKlass.cpp
-+++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -1643,21 +1643,6 @@ 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 317a006a4ec..36587031fec 100644
---- a/src/hotspot/share/oops/instanceKlass.hpp
-+++ b/src/hotspot/share/oops/instanceKlass.hpp
-@@ -1017,7 +1017,6 @@ 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/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index b662976afcb..ff012383872 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -292,8 +292,15 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
-           // Note: we might set NULL at this point, which should force AbstractMethodError at runtime
-           Thread *thread = Thread::current();
-           CallInfo info(new_method, newest, thread);
--          Handle objHandle(thread, obj);
--          MethodHandles::init_method_MemberName(objHandle, info);
-+          oop resolved_method = ResolvedMethodTable::find_method(info.resolved_method());
-+          if (resolved_method != NULL) {
-+            info.set_resolved_method_name_dcevm(resolved_method, thread);
-+            Handle objHandle(thread, obj);
-+            MethodHandles::init_method_MemberName(objHandle, info);
-+          } else {
-+            assert(0, "Must be resolved");
-+            java_lang_invoke_MemberName::set_method(obj, NULL);
-+          }
-         } else {
-           java_lang_invoke_MemberName::set_method(obj, NULL);
-         }
--- 
-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/patches/dcevm/0035-Fix-implicit-conversion-of-NULL-constant-to-bool.patch

@@ -1,25 +0,0 @@
-From bfbbae66340a223328542722b299f67c21166c52 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Mon, 21 Jun 2021 20:44:17 +0200
-Subject: [PATCH 35/39] Fix "implicit conversion of NULL constant to 'bool'"
-
----
- src/hotspot/share/prims/jvmtiRedefineClasses.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
-index 87b3b5f47ce..6915a09cf85 100644
---- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
-@@ -1390,7 +1390,7 @@ jvmtiError VM_RedefineClasses::load_new_class_versions() {
-                                                       the_class->name(),
-                                                       the_class->class_loader_data(),
-                                                       cl_info,
--                                                      NULL,
-+                                                      false,
-                                                       THREAD);
- 
-     // Clear class_being_redefined just to be sure.
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0036-Fix-pass-SystemDictionary-resolve_from_stream-cl_inf.patch

@@ -1,35 +0,0 @@
-From 5bb6ef0fc266a748232c7c51191deab47d4f3857 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Wed, 30 Jun 2021 18:30:00 +0200
-Subject: [PATCH 36/39] Fix, pass SystemDictionary::resolve_from_stream cl_info
- param
-
----
- src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index ff012383872..cbcb484a290 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -920,10 +920,16 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
-       }
- 
-     } else {
-+      ClassLoadInfo cl_info(protection_domain,
-+                            NULL,     // dynamic_nest_host
-+                            Handle(), // classData
-+                            false,    // is_hidden
-+                            !the_class->is_non_strong_hidden(),    // is_strong_hidden
-+                            true);    // FIXME: check if correct. can_access_vm_annotations
-       k = SystemDictionary::resolve_from_stream(&st,
-                                                 the_class_sym,
-                                                 the_class_loader,
--                                                protection_domain,
-+                                                cl_info,
-                                                 the_class,
-                                                 THREAD);
-     }
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0037-Search-for-affected-classes-in-all-initialized-class.patch

@@ -1,113 +0,0 @@
-From 563e06d1c56cfc3f4e93e3975cd6c2dab8183c98 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Wed, 30 Jun 2021 18:50:38 +0200
-Subject: [PATCH 37/39] Search for affected classes in all initialized classes
- in cld
-
-Fix also case when lambda interface is redefined. Lambda class is
-missing in cld dictionary since it is hidden since j17
----
- src/hotspot/share/classfile/classLoaderData.cpp     | 10 ++++++++++
- src/hotspot/share/classfile/classLoaderData.hpp     |  1 +
- .../share/classfile/classLoaderDataGraph.cpp        | 11 ++++-------
- .../share/classfile/classLoaderDataGraph.hpp        |  2 +-
- .../share/prims/jvmtiEnhancedRedefineClasses.cpp    | 13 ++++---------
- 5 files changed, 20 insertions(+), 17 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 65ce4c4af8c..1c51e83e86e 100644
---- a/src/hotspot/share/classfile/classLoaderData.cpp
-+++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -337,6 +337,16 @@ void ClassLoaderData::classes_do(KlassClosure* klass_closure) {
-   }
- }
- 
-+void ClassLoaderData::initialized_classes_do(KlassClosure* klass_closure) {
-+  // Lock-free access requires load_acquire
-+  for (Klass* k = Atomic::load_acquire(&_klasses); k != NULL; k = k->next_link()) {
-+    if (k->is_instance_klass() && InstanceKlass::cast(k)->is_initialized()) {
-+      klass_closure->do_klass(k);
-+    }
-+    assert(k != k->next_link(), "no loops!");
-+  }
-+}
-+
- void ClassLoaderData::classes_do(void f(Klass * const)) {
-   // Lock-free access requires load_acquire
-   for (Klass* k = Atomic::load_acquire(&_klasses); k != NULL; k = k->next_link()) {
-diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp
-index bda39f3e353..28fc9060e03 100644
---- a/src/hotspot/share/classfile/classLoaderData.hpp
-+++ b/src/hotspot/share/classfile/classLoaderData.hpp
-@@ -272,6 +272,7 @@ class ClassLoaderData : public CHeapObj<mtClass> {
-   void oops_do(OopClosure* f, int claim_value, bool clear_modified_oops = false);
- 
-   void classes_do(KlassClosure* klass_closure);
-+  void initialized_classes_do(KlassClosure* klass_closure);
-   Klass* klasses() { return _klasses; }
- 
-   JNIMethodBlock* jmethod_ids() const              { return _jmethod_ids; }
-diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.cpp b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
-index aa2a6bcec6b..f2394f72dbd 100644
---- a/src/hotspot/share/classfile/classLoaderDataGraph.cpp
-+++ b/src/hotspot/share/classfile/classLoaderDataGraph.cpp
-@@ -361,13 +361,10 @@ void ClassLoaderDataGraph::classes_do(KlassClosure* klass_closure) {
-   }
- }
- 
--void ClassLoaderDataGraph::anonymous_or_hidden_classes_do(KlassClosure* klass_closure) {
--  Thread* thread = Thread::current();
--  for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
--    if (cld->has_class_mirror_holder()) {
--      Handle holder(thread, cld->holder_phantom());
--      cld->classes_do(klass_closure);
--    }
-+void ClassLoaderDataGraph::initialized_classes_do(KlassClosure* klass_closure) {
-+  ClassLoaderDataGraphIterator iter;
-+  while (ClassLoaderData* cld = iter.get_next()) {
-+    cld->initialized_classes_do(klass_closure);
-   }
- }
- 
-diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-index da712eaf55f..ff391ec74fc 100644
---- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-+++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-@@ -80,7 +80,7 @@ class ClassLoaderDataGraph : public AllStatic {
-   static void classes_do(KlassClosure* klass_closure);
- 
-   // Enhanced class redefinition
--  static void anonymous_or_hidden_classes_do(KlassClosure* klass_closure);
-+  static void initialized_classes_do(KlassClosure* klass_closure);
- 
-   static void classes_do(void f(Klass* const));
-   static void methods_do(void f(Method*));
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index cbcb484a290..43899ea3d48 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -2170,17 +2170,12 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
-   {
-     MutexLocker mcld(ClassLoaderDataGraph_lock);
- 
--    // 0. we can't use ClassLoaderDataGraph::classes_do since classes can be uninitialized in cld,
--    // fully initialized class is in system dictionary
-+    // We can't use ClassLoaderDataGraph::classes_do since classes can be uninitialized in cld,
-+    // fully initialized class is in system dictionary, but hidden classes are excluded. Therefore
-+    // we use special method iterating over initialized classes only
-     // ClassLoaderDataGraph::classes_do(&closure);
- 
--    // 1. Scan over dictionaries
--    ClassLoaderDataGraph::dictionary_classes_do(&closure);
--
--    // 2. Anonymous or hidden class is not in dictionary, we have to iterate anonymous cld directly, but there is race cond...
--    // TODO: review ... anonymous class is added to cld before InstanceKlass initialization,
--    //                  find out how to check if the InstanceKlass is initialized
--    ClassLoaderDataGraph::anonymous_or_hidden_classes_do(&closure);
-+    ClassLoaderDataGraph::initialized_classes_do(&closure);
-   }
- 
-   log_trace(redefine, class, load)("%d classes affected", _affected_klasses->length());
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0038-Fix-compilation-issue.patch

@@ -1,27 +0,0 @@
-From acad06204bc4f7e7a89e9a44ded6b9d27082327b Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Wed, 30 Jun 2021 18:58:47 +0200
-Subject: [PATCH 38/39] Fix compilation issue
-
----
- src/hotspot/share/interpreter/linkResolver.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
-index 78c9624a18b..28dccd0face 100644
---- a/src/hotspot/share/interpreter/linkResolver.cpp
-+++ b/src/hotspot/share/interpreter/linkResolver.cpp
-@@ -562,8 +562,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() &&
--      ( !AllowEnhancedClassRedefinition && sel_klass == vmClasses::Object_klass() ||
--      AllowEnhancedClassRedefinition && sel_klass->newest_version() == vmClasses::Object_klass()->newest_version()) &&
-+      ( (!AllowEnhancedClassRedefinition && sel_klass == vmClasses::Object_klass()) ||
-+        (AllowEnhancedClassRedefinition && sel_klass->newest_version() == vmClasses::Object_klass()->newest_version()) ) &&
-       resolved_klass->is_array_klass()) {
-     // We need to change "protected" to "public".
-     assert(flags.is_protected(), "clone not protected?");
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0039-Remove-duplicated-lambdaFormInvokers.cpp.patch

@@ -1,171 +0,0 @@
-From 563465b112da14e8b81ef32eefc06c79015a809b Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Tue, 27 Jul 2021 21:32:51 +0200
-Subject: [PATCH 39/39] Remove duplicated lambdaFormInvokers.cpp
-
----
- .../share/classfile/lambdaFormInvokers.cpp    | 152 ------------------
- 1 file changed, 152 deletions(-)
- delete mode 100644 src/hotspot/share/classfile/lambdaFormInvokers.cpp
-
-diff --git a/src/hotspot/share/classfile/lambdaFormInvokers.cpp b/src/hotspot/share/classfile/lambdaFormInvokers.cpp
-deleted file mode 100644
-index 281de58b482..00000000000
---- a/src/hotspot/share/classfile/lambdaFormInvokers.cpp
-+++ /dev/null
-@@ -1,152 +0,0 @@
--/*
-- * Copyright (c) 2020, 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
-- * 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.
-- *
-- */
--
--#include "precompiled.hpp"
--#include "classfile/classLoadInfo.hpp"
--#include "classfile/classFileStream.hpp"
--#include "classfile/javaClasses.inline.hpp"
--#include "classfile/klassFactory.hpp"
--#include "classfile/lambdaFormInvokers.hpp"
--#include "classfile/symbolTable.hpp"
--#include "classfile/systemDictionary.hpp"
--#include "classfile/systemDictionaryShared.hpp"
--#include "classfile/vmClasses.hpp"
--#include "classfile/vmSymbols.hpp"
--#include "logging/log.hpp"
--#include "memory/oopFactory.hpp"
--#include "memory/metaspaceShared.hpp"
--#include "memory/resourceArea.hpp"
--#include "oops/instanceKlass.hpp"
--#include "oops/klass.hpp"
--#include "oops/objArrayKlass.hpp"
--#include "oops/objArrayOop.hpp"
--#include "oops/oop.inline.hpp"
--#include "oops/typeArrayOop.inline.hpp"
--#include "runtime/handles.inline.hpp"
--#include "runtime/javaCalls.hpp"
--
--GrowableArray<char*>* LambdaFormInvokers::_lambdaform_lines = NULL;
--
--void LambdaFormInvokers::append(char* line) {
--  if (_lambdaform_lines == NULL) {
--    _lambdaform_lines = new GrowableArray<char*>(100);
--  }
--  _lambdaform_lines->append(line);
--}
--
--void LambdaFormInvokers::regenerate_holder_classes(TRAPS) {
--  assert(_lambdaform_lines != NULL, "Bad List");
--  ResourceMark rm(THREAD);
--
--  Symbol* cds_name  = vmSymbols::jdk_internal_misc_CDS();
--  Klass*  cds_klass = SystemDictionary::resolve_or_null(cds_name, THREAD);
--  guarantee(cds_klass != NULL, "jdk/internal/misc/CDS must exist!");
--
--  int len = _lambdaform_lines->length();
--  objArrayHandle list_lines = oopFactory::new_objArray_handle(vmClasses::String_klass(), len, CHECK);
--  for (int i = 0; i < len; i++) {
--    Handle h_line = java_lang_String::create_from_str(_lambdaform_lines->at(i), CHECK);
--    list_lines->obj_at_put(i, h_line());
--  }
--
--  //
--  // Object[] CDS.generateLambdaFormHolderClasses(String[] lines)
--  // the returned Object[] layout:
--  //   name, byte[], name, byte[] ....
--  Symbol* method = vmSymbols::generateLambdaFormHolderClasses();
--  Symbol* signrs = vmSymbols::generateLambdaFormHolderClasses_signature();
--
--  JavaValue result(T_OBJECT);
--  JavaCalls::call_static(&result, cds_klass, method, signrs, list_lines, THREAD);
--
--  if (HAS_PENDING_EXCEPTION) {
--    log_info(cds)("%s: %s", THREAD->pending_exception()->klass()->external_name(),
--                            java_lang_String::as_utf8_string(java_lang_Throwable::message(THREAD->pending_exception())));
--    CLEAR_PENDING_EXCEPTION;
--    return;
--  }
--
--  objArrayHandle h_array(THREAD, (objArrayOop)result.get_oop());
--  int sz = h_array->length();
--  assert(sz % 2 == 0 && sz >= 2, "Must be even size of length");
--  for (int i = 0; i < sz; i+= 2) {
--    Handle h_name(THREAD, h_array->obj_at(i));
--    typeArrayHandle h_bytes(THREAD, (typeArrayOop)h_array->obj_at(i+1));
--    assert(h_name != NULL, "Class name is NULL");
--    assert(h_bytes != NULL, "Class bytes is NULL");
--
--    char *class_name = java_lang_String::as_utf8_string(h_name());
--    int len = h_bytes->length();
--    // make a copy of class bytes so GC will not affect us.
--    char *buf = resource_allocate_bytes(THREAD, len);
--    memcpy(buf, (char*)h_bytes->byte_at_addr(0), len);
--    ClassFileStream st((u1*)buf, len, NULL, ClassFileStream::verify);
--
--    reload_class(class_name, st, THREAD);
--    // free buf
--    resource_free_bytes(buf, len);
--
--    if (HAS_PENDING_EXCEPTION) {
--      log_info(cds)("Exception happened: %s", PENDING_EXCEPTION->klass()->name()->as_C_string());
--      log_info(cds)("Could not create InstanceKlass for class %s", class_name);
--      CLEAR_PENDING_EXCEPTION;
--      return;
--    }
--  }
--}
--
--// class_handle - the class name, bytes_handle - the class bytes
--void LambdaFormInvokers::reload_class(char* name, ClassFileStream& st, TRAPS) {
--  Symbol* class_name = SymbolTable::new_symbol((const char*)name);
--  // the class must exist
--  Klass* klass = SystemDictionary::resolve_or_null(class_name, THREAD);
--  if (klass == NULL) {
--    log_info(cds)("Class %s not present, skip", name);
--    return;
--  }
--  assert(klass->is_instance_klass(), "Should be");
--
--  ClassLoaderData* cld = ClassLoaderData::the_null_class_loader_data();
--  Handle protection_domain;
--  ClassLoadInfo cl_info(protection_domain);
--
--  InstanceKlass* result = KlassFactory::create_from_stream(&st,
--                                                   class_name,
--                                                   cld,
--                                                   cl_info,
--                                                   false,
--                                                   CHECK);
--
--  {
--    MutexLocker mu_r(THREAD, Compile_lock); // add_to_hierarchy asserts this.
--    SystemDictionary::add_to_hierarchy(result);
--  }
--  // new class not linked yet.
--  MetaspaceShared::try_link_class(THREAD, result);
--  assert(!HAS_PENDING_EXCEPTION, "Invariant");
--
--  // exclude the existing class from dump
--  SystemDictionaryShared::set_excluded(InstanceKlass::cast(klass));
--  log_info(cds, lambda)("Replaced class %s, old: %p  new: %p", name, klass, result);
--}
--- 
-2.23.0
-

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

@@ -33,22 +33,20 @@ source jb/project/tools/common/scripts/common.sh
 
 function create_image_bundle {
   __bundle_name=$1
-  __arch_name=$2
-  __modules_path=$3
-  __modules=$4
+  __modules_path=$2
+  __modules=$3
 
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
+  [ -d $__bundle_name ] && rm -rf $__bundle_name
 
   echo Running jlink ...
   ${JSDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
-    --add-modules $__modules --output $__arch_name || do_exit $?
+    --add-modules $__modules --output $__bundle_name || do_exit $?
 
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__arch_name/release
-  if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' $__arch_name/release > release
-    mv release $__arch_name/release
-    copy_jmods "$__modules" "$__modules_path" "$__arch_name"/jmods
+  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
 }
 
@@ -57,19 +55,19 @@ RELEASE_NAME=windows-x86_64-server-release
 
 case "$bundle_type" in
   "jcef")
-    do_reset_changes=0
+    do_reset_changes=1
     ;;
   "dcevm")
     HEAD_REVISION=$(git rev-parse HEAD)
     git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
-    do_reset_dcevm=0
-    do_reset_changes=0
+    do_reset_dcevm=1
+    do_reset_changes=1
     ;;
   "nomod" | "")
     bundle_type=""
     ;;
   "fd")
-    do_reset_changes=0
+    do_reset_changes=1
     WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
     RELEASE_NAME=windows-x86_64-server-fastdebug
     ;;
@@ -79,7 +77,6 @@ sh ./configure \
   $WITH_DEBUG_LEVEL \
   --with-vendor-name="$VENDOR_NAME" \
   --with-vendor-version-string="$VENDOR_VERSION_STRING" \
-  --with-jvm-features=shenandoahgc \
   --with-version-pre= \
   --with-version-build=$JDK_BUILD_NUMBER \
   --with-version-opt=b${build_number} \
@@ -109,13 +106,13 @@ fi
 
 # 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 $?
+create_image_bundle "jbr${jbr_name_postfix}" $JSDK_MODS_DIR "$modules" || do_exit $?
 
 # create sdk image bundle
-modules=$(cat ${JSDK}/release | grep MODULES | sed s/MODULES=//g | sed s/' '/','/g | sed s/\"//g | sed s/\\r//g | sed s/\\n//g)
+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${jbr_name_postfix}" "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
+create_image_bundle "$JBRSDK_BUNDLE" "$JSDK_MODS_DIR" "$modules" || do_exit $?
 
 do_exit 0

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

@@ -26,31 +26,49 @@ build_number=$3
 bundle_type=$4
 
 function pack_jbr {
-  __bundle_name=$1
-  __arch_name=$2
 
-  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
-  JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
+  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 ...
 
-  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__arch_name || do_exit $?
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || do_exit $?
 }
 
-[ "$bundle_type" == "nomod" ] && bundle_type=""
-
-JBRSDK_BUNDLE=jbrsdk
+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/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
 JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
 BASE_DIR=.
 
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
-  jbr_name_postfix="_${bundle_type}"
+  JBRSDK_BUNDLE=jbrsdk
+  echo Creating $JBSDK.tar.gz ...
+  [ -f "$JBSDK.tar.gz" ] && rm "$JBSDK.tar.gz"
+  /usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || do_exit $?
 fi
 
-pack_jbr jbr${jbr_name_postfix} jbr
-pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
+pack_jbr $bundle_type
 
 if [ -z "$bundle_type" ]; then
   JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x64-b$build_number

make/CreateJmods.gmk

@@ -213,12 +213,12 @@ endif
 
 ifeq ($(call isTargetOs, windows), true)
   ifeq ($(SHIP_DEBUG_SYMBOLS), )
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.pdb,*.map}'
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.pdb,*.map}'
   else
-    JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.map}'
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.map}'
   endif
 else
-  JMOD_FLAGS += --exclude '**{_the.*,_*.marker*,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
+  JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
 endif
 
 # Create jmods in the support dir and then move them into place to keep the

make/JBRApi.gmk

@@ -1,20 +0,0 @@
-include Makefile
-include make/MainSupport.gmk
-
-.PHONY: jbr-api
-
-ifeq ($(SPEC),)
-  ifneq ($(words $(SPECS)),1)
-	@echo "Error: Multiple build specification files found. Please select one explicitly."
-	@exit 2
-  endif
-  jbr-api:
-	@cd $(topdir)
-	@$(MAKE) $(MFLAGS) $(MAKE_LOG_FLAGS) -r -R -j 1 -f $(topdir)/make/JBRApi.gmk SPEC=$(SPECS) HAS_SPEC=true ACTUAL_TOPDIR=$(topdir) MODULES="$(MODULES)" jbr-api
-else #with SPEC
-
-  jbr-api:
-	$(ECHO) "BUILD_DIR=$(OUTPUTDIR)" > $(OUT)
-	$(ECHO) "BOOT_JDK=\"$(BOOT_JDK)\"" >> $(OUT)
-
-endif

make/Main.gmk

@@ -857,9 +857,6 @@ else
   # virtual target.
   jdk.jdwp.agent-libs: jdk.jdwp.agent-gensrc
 
-  # jdk.jfr-gendata uses TOOL_JFR_GEN from buildtools-hotspot
-  jdk.jfr-gendata: buildtools-hotspot
-
   # The swing beans need to have java base properly generated to avoid errors
   # in javadoc. The X11 wrappers need the java.base include files to have been
   # copied and processed.

make/autoconf/version-numbers

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

make/conf/module-loader-map.conf

@@ -55,8 +55,6 @@ BOOT_MODULES= \
     jdk.sctp \
     jdk.unsupported \
     jdk.naming.rmi \
-    jetbrains.api \
-    jetbrains.api.impl \
     #
 
 # Modules that directly or indirectly requiring upgradeable modules

make/conf/version-numbers.conf

@@ -39,4 +39,4 @@ DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="16 17"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=17
-DEFAULT_PROMOTED_VERSION_PRE=
+DEFAULT_PROMOTED_VERSION_PRE=ea

make/data/x11wrappergen/sizes-32.txt

@@ -272,14 +272,12 @@ XEvent.xclient	0
 XEvent.xcolormap	0
 XEvent.xconfigure	0
 XEvent.xconfigurerequest	0
-XEvent.xcookie	0
 XEvent.xcreatewindow	0
 XEvent.xcrossing	0
 XEvent.xdestroywindow	0
 XEvent.xerror	0
 XEvent.xexpose	0
 XEvent.xfocus	0
-XEvent.xgeneric	0
 XEvent.xgraphicsexpose	0
 XEvent.xgravity	0
 XEvent.xkey	0
@@ -372,22 +370,6 @@ XGCValues.subwindow_mode	64
 XGCValues.tile	44
 XGCValues.ts_x_origin	52
 XGCValues.ts_y_origin	56
-XGenericEvent	24
-XGenericEventCookie	32
-XGenericEventCookie.cookie	24
-XGenericEventCookie.data	28
-XGenericEventCookie.display	12
-XGenericEventCookie.evtype	20
-XGenericEventCookie.extension	16
-XGenericEventCookie.send_event	8
-XGenericEventCookie.serial	4
-XGenericEventCookie.type	0
-XGenericEvent.display	12
-XGenericEvent.evtype	20
-XGenericEvent.extension	16
-XGenericEvent.send_event	8
-XGenericEvent.serial	4
-XGenericEvent.type	0
 XGraphicsExposeEvent	48
 XGraphicsExposeEvent.count	36
 XGraphicsExposeEvent.display	12
@@ -414,9 +396,6 @@ XHostAddress	12
 XHostAddress.address	8
 XHostAddress.family	0
 XHostAddress.length	4
-XIButtonState	8
-XIButtonState.mask	4
-XIButtonState.mask_len	0
 XIconSize	24
 XIconSize.height_inc	20
 XIconSize.max_height	12
@@ -424,29 +403,6 @@ XIconSize.max_width	8
 XIconSize.min_height	4
 XIconSize.min_width	0
 XIconSize.width_inc	16
-XIDeviceEvent	140
-XIDeviceEvent.buttons	88
-XIDeviceEvent.child	48
-XIDeviceEvent.detail	36
-XIDeviceEvent.deviceid	28
-XIDeviceEvent.display	12
-XIDeviceEvent.event	44
-XIDeviceEvent.event_x	68
-XIDeviceEvent.event_y	76
-XIDeviceEvent.evtype	20
-XIDeviceEvent.extension	16
-XIDeviceEvent.flags	84
-XIDeviceEvent.group	124
-XIDeviceEvent.mods	108
-XIDeviceEvent.root	40
-XIDeviceEvent.root_x	52
-XIDeviceEvent.root_y	60
-XIDeviceEvent.send_event	8
-XIDeviceEvent.serial	4
-XIDeviceEvent.sourceid	32
-XIDeviceEvent.time	24
-XIDeviceEvent.type	0
-XIDeviceEvent.valuators	96
 XImage	88
 XImage.bitmap_bit_order	28
 XImage.bitmap_pad	32
@@ -480,11 +436,6 @@ XIMHotKeyTrigger.modifier_mask	8
 XIMHotKeyTriggers	8
 XIMHotKeyTriggers.key	4
 XIMHotKeyTriggers.num_hot_key	0
-XIModifierState	16
-XIModifierState.base	0
-XIModifierState.effective	12
-XIModifierState.latched	4
-XIModifierState.locked	8
 XIMPreeditCaretCallbackStruct	12
 XIMPreeditCaretCallbackStruct.direction	4
 XIMPreeditCaretCallbackStruct.position	0
@@ -521,10 +472,6 @@ XIMText.string	12
 XIMValuesList	8
 XIMValuesList.count_values	0
 XIMValuesList.supported_values	4
-XIValuatorState	12
-XIValuatorState.mask	4
-XIValuatorState.mask_len	0
-XIValuatorState.values	8
 XkbAccessXNotifyEvent	44
 XkbAccessXNotifyEvent.debounce_delay	40
 XkbAccessXNotifyEvent.detail	28

make/ide/idea/jdk/idea.gmk

@@ -52,7 +52,6 @@ else #with SPEC
 	          moduleDependencies='$(call FindTransitiveDepsForModule,$(mod))' \
 	        #)\"" > $(OUT)
 	$(ECHO) "MODULE_NAMES=\"$(strip $(foreach mod, $(SEL_MODULES), $(mod)))\"" >> $(OUT)
-	$(ECHO) "RELATIVE_TOPLEVEL_PROJECT_DIR=\"$(call RelativePath,$(TOPLEVEL_DIR),$(IDEA_OUTPUT_PARENT))\"" >> $(OUT)
 	$(ECHO) "RELATIVE_PROJECT_DIR=\"$(call RelativePath,$(topdir),$(IDEA_OUTPUT_PARENT))\"" >> $(OUT)
 	$(ECHO) "RELATIVE_BUILD_DIR=\"$(call RelativePath,$(OUTPUTDIR),$(IDEA_OUTPUT_PARENT))\"" >> $(OUT)
 	$(ECHO) "CLION_RELATIVE_PROJECT_DIR=\"$(call RelativePath,$(topdir),$(IDEA_OUTPUT_PARENT)/.idea/jdk-clion)\"" >> $(OUT)

make/ide/idea/jdk/template/jdk-clion/update-project.sh

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/bin/sh
 
 TOPDIR="###CLION_SCRIPT_TOPDIR###"
-BUILD_DIR="###RELATIVE_BUILD_DIR###"
+BUILD_DIR="###BUILD_DIR###"
 PATHTOOL="###PATHTOOL###"
 
 
@@ -12,8 +12,7 @@ cd "$TOPDIR"
 
 echo "Updating Clion project files in \"$SCRIPT_DIR\" for project \"`pwd`\""
 
-set -o pipefail
-make compile-commands SPEC="$BUILD_DIR/spec.gmk" | sed 's/^/  /' || exit 1
+(make compile-commands SPEC="$BUILD_DIR/spec.gmk" || exit 1) | sed 's/^/  /'
 
 if [ "x$PATHTOOL" != "x" ]; then
   CLION_PROJECT_DIR="`$PATHTOOL -am $SCRIPT_DIR`"

make/ide/idea/jdk/template/jdk.iml

@@ -2,7 +2,7 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://###TOPLEVEL_MODULE_DIR###">
+    <content url="file://###MODULE_DIR###">
       <excludeFolder url="file://###MODULE_DIR###/build" />
       <excludeFolder url="file://###MODULE_DIR###/make" />
     </content>

make/ide/idea/jdk/template/module.iml

@@ -2,7 +2,9 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    ###MODULE_CONTENT_ROOTS###
+    <content url="file://###MODULE_DIR###/###MODULE_CONTENT###">
+      ###SOURCE_DIRS###
+    </content>
     <orderEntry type="sourceFolder" forTests="false" />
     ###DEPENDENCIES###
     <orderEntry type="inheritedJdk" />

make/ide/idea/jdk/template/test.iml

@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://###MODULE_DIR###/test/jdk"></content>
-    <orderEntry type="sourceFolder" forTests="true" />
-    ###TEST_MODULE_DEPENDENCIES###
-    <orderEntry type="inheritedJdk" />
-  </component>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://###MODULE_DIR###/test/jdk"></content>
+    <orderEntry type="sourceFolder" forTests="true" />
+    ###TEST_MODULE_DEPENDENCIES###
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>

make/ide/idea/jdk/template/vcs.xml

@@ -11,6 +11,6 @@
     </option>
   </component>
   <component name="VcsDirectoryMappings">
-    <mapping directory="###TOPLEVEL_PROJECT_DIR###" vcs="###VCS_TYPE###" />
+    <mapping directory="###PROJECT_DIR###" vcs="###VCS_TYPE###" />
   </component>
 </project>

make/langtools/src/classes/build/tools/symbolgenerator/CreateSymbols.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2018, 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
@@ -229,7 +229,6 @@ public class CreateSymbols {
                                                                     : null,
                                      Paths.get(ctDescriptionFile));
 
-        stripNonExistentAnnotations(data);
         splitHeaders(data.classes);
 
         Map<String, Map<Character, String>> package2Version2Module = new HashMap<>();
@@ -302,50 +301,6 @@ public class CreateSymbols {
         }
     }
 
-    private static final String PREVIEW_FEATURE_ANNOTATION_OLD =
-            "Ljdk/internal/PreviewFeature;";
-    private static final String PREVIEW_FEATURE_ANNOTATION_NEW =
-            "Ljdk/internal/javac/PreviewFeature;";
-    private static final String PREVIEW_FEATURE_ANNOTATION_INTERNAL =
-            "Ljdk/internal/PreviewFeature+Annotation;";
-    private static final String VALUE_BASED_ANNOTATION =
-            "Ljdk/internal/ValueBased;";
-    private static final String VALUE_BASED_ANNOTATION_INTERNAL =
-            "Ljdk/internal/ValueBased+Annotation;";
-    public static final Set<String> HARDCODED_ANNOTATIONS = new HashSet<>(
-            List.of("Ljdk/Profile+Annotation;",
-                    "Lsun/Proprietary+Annotation;",
-                    PREVIEW_FEATURE_ANNOTATION_OLD,
-                    PREVIEW_FEATURE_ANNOTATION_NEW,
-                    VALUE_BASED_ANNOTATION));
-
-    private void stripNonExistentAnnotations(LoadDescriptions data) {
-        Set<String> allClasses = data.classes.name2Class.keySet();
-        data.modules.values().forEach(mod -> {
-            stripNonExistentAnnotations(allClasses, mod.header);
-        });
-        data.classes.classes.forEach(clazz -> {
-            stripNonExistentAnnotations(allClasses, clazz.header);
-            stripNonExistentAnnotations(allClasses, clazz.fields);
-            stripNonExistentAnnotations(allClasses, clazz.methods);
-        });
-    }
-
-    private void stripNonExistentAnnotations(Set<String> allClasses, Iterable<? extends FeatureDescription> descs) {
-        descs.forEach(d -> stripNonExistentAnnotations(allClasses, d));
-    }
-
-    private void stripNonExistentAnnotations(Set<String> allClasses, FeatureDescription d) {
-        stripNonExistentAnnotations(allClasses, d.classAnnotations);
-        stripNonExistentAnnotations(allClasses, d.runtimeAnnotations);
-    }
-
-    private void stripNonExistentAnnotations(Set<String> allClasses, List<AnnotationDescription> annotations) {
-        if (annotations != null)
-            annotations.removeIf(ann -> !HARDCODED_ANNOTATIONS.contains(ann.annotationType) &&
-                                        !allClasses.contains(ann.annotationType.substring(1, ann.annotationType.length() - 1)));
-    }
-
     private ZipEntry createZipEntry(String name, long timestamp) {
         ZipEntry ze = new ZipEntry(name);
 
@@ -1185,16 +1140,17 @@ public class CreateSymbols {
             values.put("reflective", essentialAPI != null && !essentialAPI);
         }
 
-        if (VALUE_BASED_ANNOTATION.equals(annotationType)) {
-            //the non-public ValueBased annotation will not be available in ct.sym,
-            //replace with purely synthetic javac-internal annotation:
-            annotationType = VALUE_BASED_ANNOTATION_INTERNAL;
-        }
-
         return new Annotation(null,
                               addString(constantPool, annotationType),
                               createElementPairs(constantPool, values));
     }
+    //where:
+        private static final String PREVIEW_FEATURE_ANNOTATION_OLD =
+                "Ljdk/internal/PreviewFeature;";
+        private static final String PREVIEW_FEATURE_ANNOTATION_NEW =
+                "Ljdk/internal/javac/PreviewFeature;";
+        private static final String PREVIEW_FEATURE_ANNOTATION_INTERNAL =
+                "Ljdk/internal/PreviewFeature+Annotation;";
 
     private element_value_pair[] createElementPairs(List<CPInfo> constantPool, Map<String, Object> annotationAttributes) {
         element_value_pair[] pairs = new element_value_pair[annotationAttributes.size()];

make/modules/jdk.javadoc/Gendata.gmk

@@ -61,54 +61,36 @@ $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
         $(COMPILECREATESYMBOLS_ADD_EXPORTS), \
 ))
 
-GENERATE_SYMBOLS_FROM_JDK_VERSION := 11
-JDK_JAVADOC_DIR := $(JDK_OUTPUTDIR)/modules/jdk.javadoc
-ELEMENT_LISTS_PKG := jdk/javadoc/internal/doclets/toolkit/resources/releases
-ELEMENT_LISTS_DIR := $(JDK_JAVADOC_DIR)/$(ELEMENT_LISTS_PKG)
-
-$(JDK_JAVADOC_DIR)/_element_lists.marker: \
+$(SUPPORT_OUTPUTDIR)/javadoc-symbols/symbols: \
     $(COMPILE_CREATE_SYMBOLS) \
     $(wildcard $(TOPDIR)/make/data/symbols/*) \
     $(MODULE_INFOS)
-	$(call MakeTargetDir)
-	$(call LogInfo, Creating javadoc element lists)
-	$(RM) -r $(ELEMENT_LISTS_DIR)
-        # Generate element-list files for JDK 11 to current-1
-	$(call ExecuteWithLog, $@_historic, \
-	    $(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \
-	        $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
-	        -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols_javadoc \
-	        build.tools.symbolgenerator.CreateSymbols \
-	        build-javadoc-data \
-	        $(CT_DATA_DESCRIPTION) \
-	        $(ELEMENT_LISTS_DIR) \
-	        $(GENERATE_SYMBOLS_FROM_JDK_VERSION) \
-	)
-        # Generate element-list file for the current JDK version
-	$(call ExecuteWithLog, $@_current, \
-	    $(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \
-	        $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
-	        -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols_javadoc \
-	        build.tools.symbolgenerator.JavadocElementList \
-	        $(ELEMENT_LISTS_DIR)/element-list-$(JDK_SOURCE_TARGET_VERSION).txt \
-	        $(JAVADOC_MODULESOURCEPATH) \
-	        $(JAVADOC_MODULES) \
-	)
+	$(RM) -r $(@D)
+	$(MKDIR) -p $(@D)
+	$(ECHO) Creating javadoc element list
+	$(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \
+	    $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
+	    -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols_javadoc \
+	    build.tools.symbolgenerator.CreateSymbols \
+	    build-javadoc-data \
+	    $(CT_DATA_DESCRIPTION) \
+	    $(JDK_OUTPUTDIR)/modules/jdk.javadoc/jdk/javadoc/internal/doclets/toolkit/resources/releases \
+	    11
+	$(JAVA_SMALL) $(INTERIM_LANGTOOLS_ARGS) \
+	    $(COMPILECREATESYMBOLS_ADD_EXPORTS) \
+	    -classpath $(BUILDTOOLS_OUTPUTDIR)/create_symbols_javadoc \
+	    build.tools.symbolgenerator.JavadocElementList \
+	    $(JDK_OUTPUTDIR)/modules/jdk.javadoc/jdk/javadoc/internal/doclets/toolkit/resources/releases/element-list-$(JDK_SOURCE_TARGET_VERSION).txt \
+	    $(JAVADOC_MODULESOURCEPATH) \
+	    $(JAVADOC_MODULES)
 	$(TOUCH) $@
 
-################################################################################
-# Copy element-lists to interim langtools
+# Copy ct.sym to the modules libs dir
+$(eval $(call SetupCopyFiles, COPY_TO_LIBS, \
+    FILES := $(SUPPORT_OUTPUTDIR)/javadoc-symbols/*.txt, \
+    DEST := $(JDK_OUTPUTDIR)/modules/jdk.javadoc/jdk/javadoc/internal/doclets/toolkit/resources/releases, \
+))
 
-INTERIM_JDK_JAVADOC_DIR := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/jdk.javadoc.interim
-INTERIM_ELEMENT_LISTS_DIR := $(INTERIM_JDK_JAVADOC_DIR)/$(ELEMENT_LISTS_PKG)
-
-$(INTERIM_JDK_JAVADOC_DIR)/_element_lists.marker: $(JDK_JAVADOC_DIR)/_element_lists.marker
-	$(call MakeDir, $(INTERIM_ELEMENT_LISTS_DIR))
-	$(RM) -r $(INTERIM_ELEMENT_LISTS_DIR)/*
-	$(CP) -R $(ELEMENT_LISTS_DIR)/* $(INTERIM_ELEMENT_LISTS_DIR)/
-	$(TOUCH) $@
+TARGETS += $(SUPPORT_OUTPUTDIR)/javadoc-symbols/symbols
 
 ################################################################################
-
-TARGETS += $(JDK_JAVADOC_DIR)/_element_lists.marker \
-    $(INTERIM_JDK_JAVADOC_DIR)/_element_lists.marker

make/test/JtregNativeJdk.gmk

@@ -53,8 +53,6 @@ BUILD_JDK_JTREG_EXECUTABLES_CFLAGS_exeJliLaunchTest := \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
     -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli
 
-BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libAsyncStackWalk := $(LIBCXX)
-
 # Platform specific setup
 ifeq ($(call isTargetOs, windows), true)
   BUILD_JDK_JTREG_EXCLUDE += libDirectIO.c libInheritedChannel.c exelauncher.c
@@ -65,7 +63,6 @@ ifeq ($(call isTargetOs, windows), true)
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeJliLaunchTest := $(WIN_LIB_JLI)
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exeCallerAccessTest := jvm.lib
   BUILD_JDK_JTREG_EXECUTABLES_LIBS_exerevokeall := advapi32.lib
-  BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libAsyncStackWalk := /EHsc
 else
   BUILD_JDK_JTREG_LIBRARIES_LIBS_libstringPlatformChars := -ljava
   BUILD_JDK_JTREG_LIBRARIES_LIBS_libDirectIO := -ljava

modules.list

@@ -48,7 +48,4 @@ jdk.security.jgss,
 jdk.unsupported,
 jdk.xml.dom,
 jdk.zipfs,
-jdk.hotspot.agent,
-jetbrains.api,
-jetbrains.api.impl,
-jdk.jcmd
+jdk.hotspot.agent

src/demo/share/java2d/RenderPerfTest/Makefile

@@ -1,74 +0,0 @@
-#
-# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-#   - Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-#
-#   - Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-#   - Neither the name of Oracle nor the names of its
-#     contributors may be used to endorse or promote products derived
-#     from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-SOURCEPATH=src
-CLASSES=build
-DIST=dist
-RESOURCES=resources
-
-RENDERPERF_CLASSES = $(CLASSES)/renderperf/RenderPerfTest.class
-RENDERPERF_SOURCES = $(SOURCEPATH)/renderperf/RenderPerfTest.java
-
-RENDERPERF_RESOURCES = $(CLASSES)/renderperf/images/duke.png 
-
-all: mkdirs $(DIST)/RenderPerfTest.jar
-
-run: mkdirs $(DIST)/RenderPerfTest.jar
-	java -jar $(DIST)/RenderPerfTest.jar
-
-$(DIST)/RenderPerfTest.jar: \
-	$(RENDERPERF_CLASSES) $(RENDERPERF_RESOURCES) \
-	$(CLASSES)/renderperf.manifest
-	jar cvmf $(CLASSES)/renderperf.manifest $(DIST)/RenderPerfTest.jar -C $(CLASSES) .
-
-
-$(CLASSES)/renderperf/images/%: $(RESOURCES)/images/%
-	cp -r $< $@
-
-
-$(CLASSES)/renderperf.manifest:
-	echo "Main-Class: renderperf.RenderPerfTest" > $@
-
-$(DIST):
-	mkdir  $(DIST)
-
-$(CLASSES):
-	mkdir $(CLASSES)
-	mkdir -p $(CLASSES)/renderperf/images
-
-mkdirs: $(DIST) $(CLASSES)
-
-$(RENDERPERF_CLASSES): $(RENDERPERF_SOURCES)
-	javac -g:none -d $(CLASSES) -sourcepath $(SOURCEPATH) $<
-
-clean:
-	rm -rf $(CLASSES)
-	rm -rf $(DIST)

src/demo/share/java2d/RenderPerfTest/README

@@ -1,34 +0,0 @@
------------------------------------------------------------------------
-Introduction
------------------------------------------------------------------------
-
-RenderPerfTest is a set of on-screen rendering microbenchmarks  to
-analyze the  performance of Java2D graphical primitives rendering
-
------------------------------------------------------------------------
-How To Compile
------------------------------------------------------------------------
-
-#> cd RenderPerfTest
-
-The benchmark can be compiled by using either ant:
-
-#> ant
-
-or gnumake (assuming there's 'javac' in the path):
-
-#> gnumake
-
-The jar files will be generated into RenderPerfTest/dist directory.
-
------------------------------------------------------------------------
-How To Run RenderPerfTest
------------------------------------------------------------------------
-Run all tests
-#> ant run
-  or
-#> java -jar dist/RenderPerfTest.jar
-
-Run particular test cases
-
-#> java -jar dist/RenderPerfTest.jar testWhiteTextBubblesGray ...

src/demo/share/java2d/RenderPerfTest/build.xml

@@ -1,94 +0,0 @@
-<!--
- Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
-   - Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-
-   - Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-   - Neither the name of Oracle nor the names of its
-     contributors may be used to endorse or promote products derived
-     from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<project name="RenderPerfTest" default="dist" basedir=".">
-    <description>
-        simple example build file
-    </description>
-  <!-- set global properties for this build -->
-  <property name="src" location="src"/>
-  <property name="build" location="build"/>
-  <property name="dist"  location="dist"/>
-  <property name="resources"  location="resources"/>
-
-  <target name="init">
-    <!-- Create the time stamp -->
-    <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-    <mkdir dir="${build}"/>
-  </target>
-
-  <target name="compile" depends="init"
-        description="compile the source " >
-    <!-- Compile the java code from ${src} into ${build} -->
-    <javac includeantruntime="false" debug="off" srcdir="${src}" destdir="${build}"/>
-  </target>
-
-  <target name="run" depends="dist"
-    description="run RenderPerfTest" >
-    <java jar="${dist}/RenderPerfTest.jar"
-       fork="true"
-    >
-    </java>
-  </target>
-
-  <target name="resources" depends="init"
-        description="copy resources into build dir" >
-    <!-- Copy the resource files from ${resources} into ${build}/ -->
-    <mkdir dir="${dist}"/>
-    <mkdir dir="${dist}/renderperf"/>
-    <mkdir dir="${build}/renderperf/images"/>
-    <copy todir="${build}/renderperf/images">
-      <fileset dir="resources/renderperf/images" />
-    </copy>
-  </target>
-
-  <target name="dist" depends="compile, resources"
-        description="generate the distribution" >
-    <!-- Create the distribution directory -->
-    <mkdir dir="${dist}"/>
-
-    <!-- Put everything in ${build} into the J2DBench.jar file -->
-    <jar jarfile="${dist}/RenderPerfTest.jar" basedir="${build}">
-      <manifest>
-        <attribute name="Built-By" value="${user.name}"/>
-	<attribute name="Main-Class" value="renderperf.RenderPerfTest"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="clean"
-        description="clean up" >
-    <!-- Delete the ${build} and ${dist} directory trees -->
-    <delete dir="${build}"/>
-    <delete dir="${dist}"/>
-  </target>
-</project>

src/demo/share/java2d/RenderPerfTest/src/renderperf/RenderPerfTest.java

@@ -1,739 +0,0 @@
-/*
- * Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package renderperf;
-
-
-import javax.imageio.ImageIO;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Point2D;
-import java.awt.geom.QuadCurve2D;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-
-public class RenderPerfTest {
-    private static HashSet<String> ignoredTests = new HashSet<>();
-
-    private final static int N = 1000;
-    private final static float WIDTH = 800;
-    private final static float HEIGHT = 800;
-    private final static float R = 25;
-    private final static int BW = 50;
-    private final static int BH = 50;
-    private final static int COUNT = 300;
-    private final static int DELAY = 10;
-    private final static int RESOLUTION = 5;
-    private final static int COLOR_TOLERANCE = 10;
-    private final static int MAX_MEASURE_TIME = 5000;
-
-
-    interface Configurable {
-        void configure(Graphics2D g2d);
-    }
-
-    interface Renderable {
-        void setup(Graphics2D g2d);
-        void render(Graphics2D g2d);
-        void update();
-    }
-
-    static class Particles {
-        private float[] bx;
-        private float[] by;
-        private float[] vx;
-        private float[] vy;
-        private float r;
-        private int n;
-
-        private float x0;
-        private float y0;
-        private float width;
-        private float height;
-
-        Particles(int n, float r, float x0, float y0, float width, float height) {
-            bx = new float[n];
-            by = new float[n];
-            vx = new float[n];
-            vy = new float[n];
-            this.n = n;
-            this.r = r;
-            this.x0 = x0;
-            this.y0 = y0;
-            this.width = width;
-            this.height = height;
-            for (int i = 0; i < n; i++) {
-                bx[i] = (float) (x0 + r + 0.1 + Math.random() * (width - 2 * r - 0.2 - x0));
-                by[i] = (float) (y0 + r + 0.1 + Math.random() * (height - 2 * r - 0.2 - y0));
-                vx[i] = 0.1f * (float) (Math.random() * 2 * r - r);
-                vy[i] = 0.1f * (float) (Math.random() * 2 * r - r);
-            }
-
-        }
-
-        void render(Graphics2D g2d, ParticleRenderer renderer) {
-            for (int i = 0; i < n; i++) {
-                renderer.render(g2d, i, bx, by, vx, vy);
-            }
-        }
-
-        void update() {
-            for (int i = 0; i < n; i++) {
-                bx[i] += vx[i];
-                if (bx[i] + r > width || bx[i] - r < x0) vx[i] = -vx[i];
-                by[i] += vy[i];
-                if (by[i] + r > height || by[i] - r < y0) vy[i] = -vy[i];
-            }
-
-        }
-
-    }
-
-    ParticleRenderable createPR(ParticleRenderer renderer) {
-        return new ParticleRenderable(renderer);
-    }
-
-    static class ParticleRenderable implements Renderable {
-        ParticleRenderer renderer;
-        Configurable configure;
-
-        ParticleRenderable(ParticleRenderer renderer, Configurable configure) {
-            this.renderer = renderer;
-            this.configure = configure;
-        }
-
-        ParticleRenderable(ParticleRenderer renderer) {
-            this(renderer, null);
-        }
-
-        @Override
-        public void setup(Graphics2D g2d) {
-            if (configure != null) configure.configure(g2d);
-        }
-
-        @Override
-        public void render(Graphics2D g2d) {
-            balls.render(g2d, renderer);
-        }
-
-        @Override
-        public void update() {
-            balls.update();
-        }
-
-        public ParticleRenderable configure(Configurable configure) {
-            this.configure = configure;
-            return this;
-        }
-    }
-
-    interface ParticleRenderer {
-        void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy);
-
-    }
-
-    static class FlatParticleRenderer implements ParticleRenderer {
-        Color[] colors;
-        float r;
-
-        FlatParticleRenderer(int n, float r) {
-            colors = new Color[n];
-            this.r = r;
-            for (int i = 0; i < n; i++) {
-                colors[i] = new Color((float) Math.random(),
-                        (float) Math.random(), (float) Math.random());
-            }
-        }
-
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            g2d.setColor(colors[id % colors.length]);
-            g2d.fillOval((int)(x[id] - r), (int)(y[id] - r), (int)(2*r), (int)(2*r));
-        }
-
-    }
-
-    static class WhiteTextParticleRenderer implements ParticleRenderer {
-        float r;
-
-        WhiteTextParticleRenderer(float r) {
-            this.r = r;
-        }
-
-        void setPaint(Graphics2D g2d, int id) {
-            g2d.setColor(Color.WHITE);
-        }
-
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            setPaint(g2d, id);
-            g2d.drawString("The quick brown fox jumps over the lazy dog",
-                    (int)(x[id] - r), (int)(y[id] - r));
-            g2d.drawString("The quick brown fox jumps over the lazy dog",
-                    (int)(x[id] - r), (int)y[id]);
-            g2d.drawString("The quick brown fox jumps over the lazy dog",
-                    (int)(x[id] - r), (int)(y[id] + r));
-        }
-    }
-
-    static class TextParticleRenderer extends WhiteTextParticleRenderer {
-        Color[] colors;
-
-        float r;
-
-        TextParticleRenderer(int n, float r) {
-            super(r);
-            colors = new Color[n];
-            this.r = r;
-            for (int i = 0; i < n; i++) {
-                colors[i] = new Color((float) Math.random(),
-                        (float) Math.random(), (float) Math.random());
-            }
-        }
-
-        void setPaint(Graphics2D g2d, int id) {
-            g2d.setColor(colors[id % colors.length]);
-        }
-    }
-
-    static class LargeTextParticleRenderer extends TextParticleRenderer {
-
-        LargeTextParticleRenderer(int n, float r) {
-            super(n, r);
-        }
-
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            setPaint(g2d, id);
-            Font font = new Font("LucidaGrande", Font.PLAIN, 32);
-            g2d.setFont(font);
-            g2d.drawString("The quick brown fox jumps over the lazy dog",
-                    (int)(x[id] - r), (int)(y[id] - r));
-            g2d.drawString("The quick brown fox jumps over the lazy dog",
-                    (int)(x[id] - r), (int)y[id]);
-            g2d.drawString("The quick brown fox jumps over the lazy dog",
-                    (int)(x[id] - r), (int)(y[id] + r));
-        }
-    }
-
-    static class FlatOvalRotParticleRenderer extends FlatParticleRenderer {
-
-
-        FlatOvalRotParticleRenderer(int n, float r) {
-            super(n, r);
-        }
-
-        void setPaint(Graphics2D g2d, int id) {
-            g2d.setColor(colors[id % colors.length]);
-        }
-
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            setPaint(g2d, id);
-            if (Math.abs(vx[id] + vy[id]) > 0.001) {
-                AffineTransform t = (AffineTransform) g2d.getTransform().clone();
-                double l = vx[id] / Math.sqrt(vx[id] * vx[id] + vy[id] * vy[id]);
-                if (vy[id] < 0) {
-                    l = -l;
-                }
-                g2d.translate(x[id], y[id]);
-                g2d.rotate(Math.acos(l));
-                g2d.fillOval(-(int)r, (int)(-0.5*r), (int) (2 * r), (int)r);
-                g2d.setTransform(t);
-            } else {
-                g2d.fillOval((int)(x[id] - r), (int)(y[id] - 0.5*r),
-                        (int) (2 * r), (int) r);
-            }
-        }
-    }
-
-    static class LinGradOvalRotParticleRenderer extends FlatOvalRotParticleRenderer {
-
-
-        LinGradOvalRotParticleRenderer(int n, float r) {
-            super(n, r);
-        }
-
-        @Override
-        void setPaint(Graphics2D g2d, int id) {
-            Point2D start = new Point2D.Double(- r,  - 0.5*r);
-            Point2D end = new Point2D.Double( 2 * r, r);
-            float[] dist = {0.0f, 1.0f};
-            Color[] cls = {colors[id %colors.length], colors[(colors.length - id) %colors.length]};
-            LinearGradientPaint p =
-                    new LinearGradientPaint(start, end, dist, cls);
-            g2d.setPaint(p);
-        }
-    }
-
-    static class FlatBoxParticleRenderer extends FlatParticleRenderer {
-
-
-        FlatBoxParticleRenderer(int n, float r) {
-            super(n, r);
-        }
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            g2d.setColor(colors[id % colors.length]);
-            g2d.fillRect((int)(x[id] - r), (int)(y[id] - r), (int)(2*r), (int)(2*r));
-
-        }
-
-    }
-
-    static class ImgParticleRenderer extends FlatParticleRenderer {
-        BufferedImage dukeImg;
-
-        ImgParticleRenderer(int n, float r) {
-            super(n, r);
-            try {
-                dukeImg = ImageIO.read(
-                        Objects.requireNonNull(
-                                RenderPerfTest.class.getClassLoader().getResourceAsStream(
-                                        "renderperf/images/duke.png")));
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            g2d.setColor(colors[id % colors.length]);
-            g2d.drawImage(dukeImg, (int)(x[id] - r), (int)(y[id] - r), (int)(2*r), (int)(2*r), null);
-        }
-
-    }
-
-    static class FlatBoxRotParticleRenderer extends FlatParticleRenderer {
-
-
-        FlatBoxRotParticleRenderer(int n, float r) {
-            super(n, r);
-        }
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            g2d.setColor(colors[id % colors.length]);
-            if (Math.abs(vx[id] + vy[id]) > 0.001) {
-                AffineTransform t = (AffineTransform) g2d.getTransform().clone();
-                double l = vx[id] / Math.sqrt(vx[id] * vx[id] + vy[id] * vy[id]);
-                if (vy[id] < 0) {
-                    l = -l;
-                }
-                g2d.translate(x[id], y[id]);
-                g2d.rotate(Math.acos(l));
-                g2d.fillRect(-(int)r, -(int)r, (int) (2 * r), (int) (2 * r));
-                g2d.setTransform(t);
-            } else {
-                g2d.fillRect((int)(x[id] - r), (int)(y[id] - r),
-                        (int) (2 * r), (int) (2 * r));
-            }
-        }
-    }
-
-    static class WiredParticleRenderer extends FlatParticleRenderer {
-
-
-        WiredParticleRenderer(int n, float r) {
-            super(n, r);
-        }
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            g2d.setColor(colors[id % colors.length]);
-            g2d.drawOval((int)(x[id] - r), (int)(y[id] - r), (int)(2*r), (int)(2*r));
-        }
-
-    }
-    static class WiredBoxParticleRenderer extends FlatParticleRenderer {
-
-        WiredBoxParticleRenderer(int n, float r) {
-            super(n, r);
-        }
-
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            g2d.setColor(colors[id % colors.length]);
-            g2d.drawRect((int)(x[id] - r), (int)(y[id] - r), (int)(2*r), (int)(2*r));
-        }
-
-    }
-    static class SegParticleRenderer extends FlatParticleRenderer {
-
-        SegParticleRenderer(int n, float r) {
-            super(n, r);
-        }
-
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            double v = Math.sqrt(vx[id]*vx[id]+vy[id]*vy[id]);
-            float nvx = (float) (vx[id]/v);
-            float nvy = (float) (vy[id]/v);
-            g2d.setColor(colors[id % colors.length]);
-            g2d.drawLine((int)(x[id] - r*nvx), (int)(y[id] - r*nvy),
-                    (int)(x[id] + 2*r*nvx), (int)(y[id] + 2*r*nvy));
-        }
-
-    }
-
-
-    static class WiredQuadParticleRenderer extends FlatParticleRenderer {
-
-        WiredQuadParticleRenderer(int n, float r) {
-            super(n, r);
-        }
-
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            if (id > 2 && (id % 3) == 0) {
-                g2d.setColor(colors[id % colors.length]);
-                g2d.draw(new QuadCurve2D.Float(x[id-3], y[id-3], x[id-2], y[id-2], x[id-1], y[id-1]));
-            }
-
-        }
-    }
-
-    static class FlatQuadParticleRenderer extends FlatParticleRenderer {
-
-        FlatQuadParticleRenderer(int n, float r) {
-            super(n, r);
-        }
-
-        @Override
-        public void render(Graphics2D g2d, int id, float[] x, float[] y, float[] vx, float[] vy) {
-            if (id > 2 && (id % 3) == 0) {
-                g2d.setColor(colors[id % colors.length]);
-                g2d.fill(new QuadCurve2D.Float(x[id-3], y[id-3], x[id-2], y[id-2], x[id-1], y[id-1]));
-            }
-
-        }
-    }
-
-    static class PerfMeter {
-        private String name;
-        private int frame = 0;
-
-        private JPanel panel;
-
-        private long time;
-        private double execTime = 0;
-        private Color expColor = Color.RED;
-        AtomicBoolean waiting = new AtomicBoolean(false);
-        private double fps;
-
-        PerfMeter(String name) {
-            this.name = name;
-        }
-
-        PerfMeter exec(final Renderable renderable) throws Exception {
-            final CountDownLatch latch = new CountDownLatch(COUNT);
-            final CountDownLatch latchFrame = new CountDownLatch(1);
-            final long endTime = System.currentTimeMillis() + MAX_MEASURE_TIME;
-
-            final JFrame f = new JFrame();
-            f.addWindowListener(new WindowAdapter() {
-                @Override
-                public void windowClosed(WindowEvent e) {
-                    latchFrame.countDown();
-                }
-            });
-
-            SwingUtilities.invokeAndWait(new Runnable() {
-                @Override
-                public void run() {
-
-                    panel = new JPanel()
-                    {
-                        @Override
-                        protected void paintComponent(Graphics g) {
-
-                            super.paintComponent(g);
-                            time = System.nanoTime();
-                            Graphics2D g2d = (Graphics2D) g.create();
-                            renderable.setup(g2d);
-                            renderable.render(g2d);
-                            g2d.setColor(expColor);
-                            g.fillRect(0, 0, BW, BH);
-                        }
-                    };
-
-                    panel.setPreferredSize(new Dimension((int)(WIDTH + BW), (int)(HEIGHT + BH)));
-                    panel.setBackground(Color.BLACK);
-                    f.add(panel);
-                    f.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-                    f.pack();
-                    f.setVisible(true);
-                }
-            });
-            Robot robot = new Robot();
-
-            Timer timer = new Timer(DELAY, e -> {
-
-                if (waiting.compareAndSet(false, true)) {
-                    Color c = robot.getPixelColor(
-                            panel.getTopLevelAncestor().getX() + panel.getTopLevelAncestor().getInsets().left + BW / 2,
-                            panel.getTopLevelAncestor().getY() + panel.getTopLevelAncestor().getInsets().top + BW / 2);
-                    if (isAlmostEqual(c, Color.BLUE)) {
-                        expColor = Color.RED;
-                    } else {
-                        expColor = Color.BLUE;
-                    }
-                    renderable.update();
-                    panel.getParent().repaint();
-
-                } else {
-                    while (!isAlmostEqual(
-                            robot.getPixelColor(
-                                    panel.getTopLevelAncestor().getX() + panel.getTopLevelAncestor().getInsets().left + BW/2,
-                                    panel.getTopLevelAncestor().getY() + panel.getTopLevelAncestor().getInsets().top + BH/2),
-                            expColor))
-                    {
-                        try {
-                            Thread.sleep(RESOLUTION);
-                        } catch (InterruptedException ex) {
-                            ex.printStackTrace();
-                        }
-                    }
-                    time = System.nanoTime() - time;
-                    execTime += time;
-                    frame++;
-                    waiting.set(false);
-                }
-
-                if (System.currentTimeMillis() < endTime) {
-                    latch.countDown();
-                } else {
-                    while(latch.getCount() > 0) latch.countDown();
-                }
-            });
-            timer.start();
-            latch.await();
-            SwingUtilities.invokeAndWait(() -> {
-                timer.stop();
-                f.setVisible(false);
-                f.dispose();
-            });
-
-            latchFrame.await();
-            if (execTime != 0 && frame != 0) {
-                fps = 1e9 / (execTime / frame);
-            } else {
-                fps = 0;
-            }
-
-            return this;
-        }
-
-        private void report() {
-            System.err.println(name + " : " + String.format("%.2f FPS", fps));
-        }
-
-        private boolean isAlmostEqual(Color c1, Color c2) {
-            return Math.abs(c1.getRed() - c2.getRed()) < COLOR_TOLERANCE ||
-                    Math.abs(c1.getGreen() - c2.getGreen()) < COLOR_TOLERANCE ||
-                    Math.abs(c1.getBlue() - c2.getBlue()) < COLOR_TOLERANCE;
-
-        }
-    }
-
-    private static final Particles balls = new Particles(N, R, BW, BH, WIDTH, HEIGHT);
-    private static final ParticleRenderer flatRenderer = new FlatParticleRenderer(N, R);
-    private static final ParticleRenderer flatOvalRotRenderer = new FlatOvalRotParticleRenderer(N, R);
-    private static final ParticleRenderer flatBoxRenderer = new FlatBoxParticleRenderer(N, R);
-    private static final ParticleRenderer flatBoxRotRenderer = new FlatBoxRotParticleRenderer(N, R);
-    private static final ParticleRenderer linGradOvalRotRenderer = new LinGradOvalRotParticleRenderer(N, R);
-    private static final ParticleRenderer wiredRenderer = new WiredParticleRenderer(N, R);
-    private static final ParticleRenderer wiredBoxRenderer = new WiredBoxParticleRenderer(N, R);
-    private static final ParticleRenderer segRenderer = new SegParticleRenderer(N, R);
-    private static final ParticleRenderer flatQuadRenderer = new FlatQuadParticleRenderer(N, R);
-    private static final ParticleRenderer wiredQuadRenderer = new WiredQuadParticleRenderer(N, R);
-    private static final ParticleRenderer imgRenderer = new ImgParticleRenderer(N, R);
-    private static final ParticleRenderer textRenderer = new TextParticleRenderer(N, R);
-    private static final ParticleRenderer largeTextRenderer = new LargeTextParticleRenderer(N, R);
-    private static final ParticleRenderer whiteTextRenderer = new WhiteTextParticleRenderer(R);
-
-    private static final Configurable AA = (Graphics2D g2d) ->
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
-            RenderingHints.VALUE_ANTIALIAS_ON);
-
-    private static final Configurable TextLCD = (Graphics2D g2d) ->
-        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
-                RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB);
-
-    private static final Configurable TextAA = (Graphics2D g2d) ->
-        g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
-                RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-
-    public void testFlatBubbles() throws Exception {
-        (new PerfMeter("FlatOval")).exec(createPR(flatRenderer)).report();
-    }
-
-    public void testFlatBubblesAA() throws Exception {
-        (new PerfMeter("FlatOvalAA")).exec(createPR(flatRenderer).configure(AA)).report();
-    }
-
-    public void testFlatBoxBubbles() throws Exception {
-        (new PerfMeter("FlatBox")).exec(createPR(flatBoxRenderer)).report();
-    }
-
-    public void testFlatBoxBubblesAA() throws Exception {
-        (new PerfMeter("FlatBoxAA")).exec(createPR(flatBoxRenderer).configure(AA)).report();
-    }
-
-    public void testImgBubbles() throws Exception {
-        (new PerfMeter("Image")).exec(createPR(imgRenderer)).report();
-    }
-
-    public void testImgBubblesAA() throws Exception {
-        (new PerfMeter("ImageAA")).exec(createPR(imgRenderer).configure(AA)).report();
-    }
-
-    public void testFlatBoxRotBubbles() throws Exception {
-        (new PerfMeter("RotatedBox")).exec(createPR(flatBoxRotRenderer)).report();
-    }
-
-    public void testFlatBoxRotBubblesAA() throws Exception {
-        (new PerfMeter("RotatedBoxAA")).exec(createPR(flatBoxRotRenderer).configure(AA)).report();
-    }
-
-    public void testFlatOvalRotBubbles() throws Exception {
-        (new PerfMeter("RotatedOval")).exec(createPR(flatOvalRotRenderer)).report();
-    }
-
-    public void testFlatOvalRotBubblesAA() throws Exception {
-        (new PerfMeter("RotatedOvalAA")).exec(createPR(flatOvalRotRenderer).configure(AA)).report();
-    }
-
-    public void testLinGradOvalRotBubbles() throws Exception {
-        (new PerfMeter("LinGradRotatedOval")).exec(createPR(linGradOvalRotRenderer)).report();
-    }
-
-    public void testLinGradOvalRotBubblesAA() throws Exception {
-        (new PerfMeter("LinGradRotatedOvalAA")).exec(createPR(linGradOvalRotRenderer).configure(AA)).report();
-    }
-
-    public void testWiredBubbles() throws Exception {
-        (new PerfMeter("WiredBubbles")).exec(createPR(wiredRenderer)).report();
-    }
-
-    public void testWiredBubblesAA() throws Exception {
-        (new PerfMeter("WiredBubblesAA")).exec(createPR(wiredRenderer).configure(AA)).report();
-    }
-
-    public void testWiredBoxBubbles() throws Exception {
-        (new PerfMeter("WiredBox")).exec(createPR(wiredBoxRenderer)).report();
-    }
-
-    public void testWiredBoxBubblesAA() throws Exception {
-        (new PerfMeter("WiredBoxAA")).exec(createPR(wiredBoxRenderer).configure(AA)).report();
-    }
-
-    public void testLines() throws Exception {
-        (new PerfMeter("Lines")).exec(createPR(segRenderer)).report();
-    }
-
-    public void testLinesAA() throws Exception {
-        (new PerfMeter("LinesAA")).exec(createPR(segRenderer).configure(AA)).report();
-    }
-
-    public void testFlatQuad() throws Exception {
-        (new PerfMeter("FlatQuad")).exec(createPR(flatQuadRenderer)).report();
-    }
-
-    public void testFlatQuadAA() throws Exception {
-        (new PerfMeter("FlatQuadAA")).exec(createPR(flatQuadRenderer).configure(AA)).report();
-    }
-
-    public void testWiredQuad() throws Exception {
-        (new PerfMeter("WiredQuad")).exec(createPR(wiredQuadRenderer)).report();
-    }
-
-    public void testWiredQuadAA() throws Exception {
-        (new PerfMeter("WiredQuadAA")).exec(createPR(wiredQuadRenderer).configure(AA)).report();
-    }
-
-    public void testTextBubblesNoAA() throws Exception {
-        (new PerfMeter("TextNoAA")).exec(createPR(textRenderer)).report();
-    }
-
-    public void testTextBubblesLCD() throws Exception {
-        (new PerfMeter("TextLCD")).exec(createPR(textRenderer).configure(TextLCD)).report();
-    }
-
-    public void testTextBubblesGray() throws Exception {
-        (new PerfMeter("TextGray")).exec(createPR(textRenderer).configure(TextAA)).report();
-    }
-
-    public void testLargeTextBubblesNoAA() throws Exception {
-        (new PerfMeter("LargeTextNoAA")).exec(createPR(largeTextRenderer)).report();
-    }
-
-    public void testLargeTextBubblesLCD() throws Exception {
-        (new PerfMeter("LargeTextLCD")).exec(createPR(largeTextRenderer).configure(TextLCD)).report();
-    }
-
-    public void testLargeTextBubblesGray() throws Exception {
-        (new PerfMeter("LargeTextGray")).exec(createPR(largeTextRenderer).configure(TextAA)).report();
-    }
-    public void testWhiteTextBubblesNoAA() throws Exception {
-        (new PerfMeter("WhiteTextNoAA")).exec(createPR(whiteTextRenderer)).report();
-    }
-
-    public void testWhiteTextBubblesLCD() throws Exception {
-        (new PerfMeter("WhiteTextLCD")).exec(createPR(whiteTextRenderer).configure(TextLCD)).report();
-    }
-
-    public void testWhiteTextBubblesGray() throws Exception {
-        (new PerfMeter("WhiteTextGray")).exec(createPR(whiteTextRenderer).configure(TextAA)).report();
-    }
-
-    public static void main(String[] args)
-            throws InvocationTargetException, IllegalAccessException, NoSuchMethodException
-    {
-        RenderPerfTest test = new RenderPerfTest();
-
-        if (args.length > 0) {
-            for (String testCase : args) {
-                Method m = RenderPerfTest.class.getDeclaredMethod(testCase);
-                m.invoke(test);
-            }
-        } else {
-            Method[] methods = RenderPerfTest.class.getDeclaredMethods();
-            for (Method m : methods) {
-                if (m.getName().startsWith("test") && !ignoredTests.contains(m.getName())) {
-                    m.invoke(test);
-                }
-            }
-        }
-    }
-}

src/hotspot/cpu/aarch64/aarch64.ad

@@ -2400,14 +2400,6 @@ const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType
   } else { // NEON
     // Special cases
     switch (opcode) {
-    case Op_VectorMaskCmp:
-    // We don't have VectorReinterpret with bit_size less than 64 support for
-    // now, even for byte type. To be refined with fully VectorCast support.
-    case Op_VectorReinterpret:
-      if (vlen < 2 || bit_size < 64) {
-        return false;
-      }
-      break;
     case Op_MulAddVS2VI:
       if (bit_size < 128) {
         return false;
@@ -2421,23 +2413,6 @@ const bool Matcher::match_rule_supported_vector(int opcode, int vlen, BasicType
         return false;
       }
       break;
-    // Some types of VectorCast are not implemented for now.
-    case Op_VectorCastI2X:
-      if (bt == T_BYTE) {
-        return false;
-      }
-      break;
-    case Op_VectorCastS2X:
-      if (vlen < 4 || bit_size < 64) {
-        return false;
-      }
-      break;
-    case Op_VectorCastF2X:
-    case Op_VectorCastD2X:
-      if (bt == T_INT || bt == T_SHORT || bt == T_BYTE || bt == T_LONG) {
-        return false;
-      }
-      break;
     default:
       break;
     }

src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -27,7 +27,6 @@
 #include "asm/assembler.inline.hpp"
 #include "opto/c2_MacroAssembler.hpp"
 #include "opto/intrinsicnode.hpp"
-#include "opto/subnode.hpp"
 #include "runtime/stubRoutines.hpp"
 
 #ifdef PRODUCT
@@ -833,45 +832,3 @@ void C2_MacroAssembler::string_compare(Register str1, Register str2,
 
   BLOCK_COMMENT("} string_compare");
 }
-
-void C2_MacroAssembler::neon_compare(FloatRegister dst, BasicType bt, FloatRegister src1,
-                                     FloatRegister src2, int cond, bool isQ) {
-  SIMD_Arrangement size = esize2arrangement(type2aelembytes(bt), isQ);
-  if (bt == T_FLOAT || bt == T_DOUBLE) {
-    switch (cond) {
-      case BoolTest::eq: fcmeq(dst, size, src1, src2); break;
-      case BoolTest::ne: {
-        fcmeq(dst, size, src1, src2);
-        notr(dst, T16B, dst);
-        break;
-      }
-      case BoolTest::ge: fcmge(dst, size, src1, src2); break;
-      case BoolTest::gt: fcmgt(dst, size, src1, src2); break;
-      case BoolTest::le: fcmge(dst, size, src2, src1); break;
-      case BoolTest::lt: fcmgt(dst, size, src2, src1); break;
-      default:
-        assert(false, "unsupported");
-        ShouldNotReachHere();
-    }
-  } else {
-    switch (cond) {
-      case BoolTest::eq: cmeq(dst, size, src1, src2); break;
-      case BoolTest::ne: {
-        cmeq(dst, size, src1, src2);
-        notr(dst, T16B, dst);
-        break;
-      }
-      case BoolTest::ge: cmge(dst, size, src1, src2); break;
-      case BoolTest::gt: cmgt(dst, size, src1, src2); break;
-      case BoolTest::le: cmge(dst, size, src2, src1); break;
-      case BoolTest::lt: cmgt(dst, size, src2, src1); break;
-      case BoolTest::uge: cmhs(dst, size, src1, src2); break;
-      case BoolTest::ugt: cmhi(dst, size, src1, src2); break;
-      case BoolTest::ult: cmhi(dst, size, src2, src1); break;
-      case BoolTest::ule: cmhs(dst, size, src2, src1); break;
-      default:
-        assert(false, "unsupported");
-        ShouldNotReachHere();
-    }
-  }
-}

src/hotspot/cpu/aarch64/c2_MacroAssembler_aarch64.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+ * 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
@@ -49,8 +49,4 @@
                            Register ch, Register result,
                            Register tmp1, Register tmp2, Register tmp3);
 
-  // SIMD&FP comparison
-  void neon_compare(FloatRegister dst, BasicType bt, FloatRegister src1,
-                    FloatRegister src2, int cond, bool isQ);
-
 #endif // CPU_AARCH64_C2_MACROASSEMBLER_AARCH64_HPP

src/hotspot/cpu/aarch64/frame_aarch64.cpp

@@ -362,16 +362,11 @@ frame frame::sender_for_entry_frame(RegisterMap* map) const {
   return fr;
 }
 
-OptimizedEntryBlob::FrameData* OptimizedEntryBlob::frame_data_for_frame(const frame& frame) const {
+JavaFrameAnchor* OptimizedEntryBlob::jfa_for_frame(const frame& frame) const {
   ShouldNotCallThis();
   return nullptr;
 }
 
-bool frame::optimized_entry_frame_is_first() const {
-  ShouldNotCallThis();
-  return false;
-}
-
 frame frame::sender_for_optimized_entry_frame(RegisterMap* map) const {
   ShouldNotCallThis();
   return {};

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -5339,6 +5339,49 @@ void MacroAssembler::safepoint_isb() {
 #endif
 }
 
+void MacroAssembler::neon_compare(FloatRegister dst, BasicType bt, FloatRegister src1,
+                                  FloatRegister src2, int cond, bool isQ) {
+  SIMD_Arrangement size = esize2arrangement(type2aelembytes(bt), isQ);
+  if (bt == T_FLOAT || bt == T_DOUBLE) {
+    switch (cond) {
+      case BoolTest::eq: fcmeq(dst, size, src1, src2); break;
+      case BoolTest::ne: {
+        fcmeq(dst, size, src1, src2);
+        notr(dst, T16B, dst);
+        break;
+      }
+      case BoolTest::ge: fcmge(dst, size, src1, src2); break;
+      case BoolTest::gt: fcmgt(dst, size, src1, src2); break;
+      case BoolTest::le: fcmge(dst, size, src2, src1); break;
+      case BoolTest::lt: fcmgt(dst, size, src2, src1); break;
+      default:
+        assert(false, "unsupported");
+        ShouldNotReachHere();
+    }
+  } else {
+    switch (cond) {
+      case BoolTest::eq: cmeq(dst, size, src1, src2); break;
+      case BoolTest::ne: {
+        cmeq(dst, size, src1, src2);
+        notr(dst, T16B, dst);
+        break;
+      }
+      case BoolTest::ge: cmge(dst, size, src1, src2); break;
+      case BoolTest::gt: cmgt(dst, size, src1, src2); break;
+      case BoolTest::le: cmge(dst, size, src2, src1); break;
+      case BoolTest::lt: cmgt(dst, size, src2, src1); break;
+      case BoolTest::uge: cmhs(dst, size, src1, src2); break;
+      case BoolTest::ugt: cmhi(dst, size, src1, src2); break;
+      case BoolTest::ult: cmhi(dst, size, src2, src1); break;
+      case BoolTest::ule: cmhs(dst, size, src2, src1); break;
+      default:
+        assert(false, "unsupported");
+        ShouldNotReachHere();
+    }
+  }
+}
+
+
 #ifndef PRODUCT
 void MacroAssembler::verify_cross_modify_fence_not_required() {
   if (VerifyCrossModifyFence) {

src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp

@@ -1058,6 +1058,8 @@ public:
                bool acquire, bool release, bool weak,
                Register result);
 
+  // SIMD&FP comparison
+  void neon_compare(FloatRegister dst, BasicType bt, FloatRegister src1, FloatRegister src2, int cond, bool isQ);
 private:
   void compare_eq(Register rn, Register rm, enum operand_size size);