updated JTreg exclude list

.gitattributes

@@ -1 +0,0 @@
-*	-text

.gitignore

@@ -6,6 +6,7 @@ JTreport
 .idea/modules.xml
 .idea/shelf/
 JetBrainsRuntime.iml
+build/
 # Project exclude paths
 /jb/project/java-gradle/.gradle/
 /build/
@@ -23,4 +24,3 @@ test/nashorn/lib
 NashornProfile.txt
 **/JTreport/**
 **/JTwork/**
-/jb/project/java-gradle/.idea/workspace.xml

.hgtags

@@ -598,46 +598,3 @@ e42c6d1a1993c720a4643140190bb1ba6f1bbf9f jdk-11.0.8+6
 59f8565ee5e224697a9e09ee2c557836733bc579 jdk-11.0.8+9
 0b0d55cb09b29360ab254edeef32a3b386e9713e jdk-11.0.8+10
 0b0d55cb09b29360ab254edeef32a3b386e9713e jdk-11.0.8-ga
-5cc275af8419178813299cc0ed81a2a85dadfdcd jdk-11.0.9+1
-3112657edde9491fb83f098f1a8b7e9275bcb2f7 jdk-11.0.9+2
-d8a0513b92ee262d4e64c1e13d43e1b3f3e5c5d5 jdk-11.0.9+3
-cb299db4a5698b814f6b3ba1f3d73d01f6a0e1f6 jdk-11.0.9+4
-55237fa85afb404bc0dc0f4948a6459d8d3e5dac jdk-11.0.9+5
-c07e785e36f587b95e151de382844cea3d1a5868 jdk-11.0.9+6
-1ba4c16a8afa3f5aaa7830fc1f14a0137cc2553b jdk-11.0.9+7
-8711e8554e15ae2fa38718d5c7dc858da10e8a4a jdk-11.0.9+8
-e872676174c7f171a9864becba83cb783cfec9d0 jdk-11.0.9+9
-6ac1b68e7c0034e08a96d7d37e93e5075a6e8d61 jdk-11.0.9+10
-4397fa4529b2794ddcdf3445c0611fe383243fb4 jdk-11.0.9+11
-4397fa4529b2794ddcdf3445c0611fe383243fb4 jdk-11.0.9-ga
-4fd46d208f0a4b55924af8e0c2fb6bcf46e18ec6 jdk-11.0.9.1+0
-27723943c0dd65a191cbefe031cec001521e4b13 jdk-11.0.9.1+1
-31affc22b3b5f5d43783ffadf57f22848bad9db8 jdk-11.0.9.1-ga
-f3168de4eb0dd74bf8e81537f62742bde5e412c3 jdk-11.0.10+1
-a35aa07b57bab3690224e3af939ee085d50eb476 jdk-11.0.10+2
-bca12c00a776f8cee7a0eeaf788499b9eab9cf9d jdk-11.0.10+3
-9504fa6f98f5aad0aa1ac36d5bff3260a32020c8 jdk-11.0.10+4
-5f5c3544ccb4d0bbc638e665524b292860dd9515 jdk-11.0.10+5
-4b9bc2a1dde0631958393125997855382325964d jdk-11.0.10+6
-c45f74d45787a857d35b5a66c9b0304c91a9c5d0 jdk-11.0.10+7
-43428f69099f6f87f6e1922deacbf13e1adb751f jdk-11.0.10+8
-8b3498547395ee80a6e731078056b2aeb3e3c5e8 jdk-11.0.10+9
-8b3498547395ee80a6e731078056b2aeb3e3c5e8 jdk-11.0.10-ga
-4ed322bf6b0098353ceaecf35662fadf457cd81d jdk-11.0.11+1
-b68647c6ecc1e73111d8047448d75966f255460f jdk-11.0.11+2
-14cc036b17a5f4be5b0643e6b24ed32563684ab9 jdk-11.0.11+3
-c4405735470a92e2c45490b89a8099252f3481d2 jdk-11.0.11+4
-38430a8a4488582612c6a87ab58d109cc5217e8b jdk-11.0.11+5
-e41ae00add1d76a8f25adb558933382947ea840d jdk-11.0.11+6
-14f9928caac31368d27f13e4e21ca25c1e0be950 jdk-11.0.11+7
-9f0347b029d3a0349f23befcfb68ee02d85d9034 jdk-11.0.11+8
-15862747ee15445292b4b9949b4f0f4badba4812 jdk-11.0.11+9
-15862747ee15445292b4b9949b4f0f4badba4812 jdk-11.0.11-ga
-5720ffa08f8514b9f0ea8b3a49e05a872c9c0efe jdk-11.0.12+1
-70a4031a8bef3e693f34864fdd482429c73dc76a jdk-11.0.12+2
-873a691b1ae4fa8b55ca5d08fa21aca3a4904fb8 jdk-11.0.12+3
-40d1e784e1937aaea696a9654cc2d944d3d78996 jdk-11.0.12+4
-6aa6f6860508fca3a97aea1de7a36574498d22bf jdk-11.0.12+5
-91e81ac088545abdc3eaaa707853d31a6cf99af3 jdk-11.0.12+6
-f412f2537f1502a9697a9684c77bea8d848db1ab jdk-11.0.12+7
-f412f2537f1502a9697a9684c77bea8d848db1ab jdk-11.0.12-ga

.idea/copyright/JetBrains.xml

@@ -1,7 +1,9 @@
 <component name="CopyrightManager">
   <copyright>
-    <option name="allowReplaceRegexp" value="JetBrains" />
-    <option name="notice" value="Copyright 2000-&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" />
+    <option name="myLocal" value="true" />
   </copyright>
 </component>

.idea/vcs.xml

@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="IssueNavigationConfiguration">
-    <option name="links">
-      <list>
-        <IssueNavigationLink>
-          <option name="issueRegexp" value="[A-Z]+\-\d+" />
-          <option name="linkRegexp" value="http://youtrack.jetbrains.com/issue/$0" />
-        </IssueNavigationLink>
-        <IssueNavigationLink>
-          <option name="issueRegexp" value="^(\d+)\:" />
-          <option name="linkRegexp" value="https://bugs.openjdk.java.net/browse/JDK-$1" />
-        </IssueNavigationLink>
-      </list>
-    </option>
-  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>

.jcheck/conf

@@ -1,31 +1,2 @@
-[general]
-project=jdk-updates
-jbs=JDK
-version=11.0.15
-
-[checks]
-error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace
-
-[repository]
-tags=(?:jdk-(?:[1-9]([0-9]*)(?:\.(?:0|[1-9][0-9]*)){0,4})(?:\+(?:(?:[0-9]+))|(?:-ga)))|(?:jdk[4-9](?:u\d{1,3})?-(?:(?:b\d{2,3})|(?:ga)))|(?:hs\d\d(?:\.\d{1,2})?-b\d\d)
-branches=
-
-[census]
-version=0
-domain=openjdk.org
-
-[checks "whitespace"]
-files=.*\.cpp|.*\.hpp|.*\.c|.*\.h|.*\.java
-
-[checks "merge"]
-message=Merge
-
-[checks "reviewers"]
-reviewers=1
-ignore=duke
-
-[checks "committer"]
-role=committer
-
-[checks "issues"]
-pattern=^([124-8][0-9]{6}): (\S.*)$
+project=jdk10
+bugids=dup

README.md

@@ -1,7 +1,94 @@
 [![official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 
-# Welcome to JetBrains Runtime! 
-<a name="jetbrains-runtime"></a>
+# Downloads
 
-Do not use this branch. It is [outdated](https://youtrack.jetbrains.com/issue/JBR-4375/New-branch-naming-policy-in-JBR-repo).
-Please use [jbr11](https://github.com/JetBrains/JetBrainsRuntime/tree/jbr11) instead. 
+|Windows-x64  |macOS        |Linux-x64    |
+|-------------|-------------|-------------|
+|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-windows-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-windows-x64/_latestVersion)|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-osx-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-osx-x64/_latestVersion)|[ ![Download](https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk11-linux-x64/images/download.svg) ](https://bintray.com/jetbrains/intellij-jdk/openjdk11-linux-x64/_latestVersion)|
+
+
+# How JetBrains Runtime is organised
+## Workspaces
+
+[github.com/JetBrains/JetBrainsRuntime](https://github.com/JetBrains/JetBrainsRuntime)  
+
+## Getting sources
+__OSX, Linux:__
+```
+git config --global core.autocrlf input
+git clone git@github.com:JetBrains/JetBrainsRuntime.git
+```
+
+__Windows:__
+```
+git config --global core.autocrlf false
+git clone git@github.com:JetBrains/JetBrainsRuntime.git
+```
+
+# Configure Local Build Environment
+[OpenJDK build docs](http://hg.openjdk.java.net/jdk/jdk11/raw-file/tip/doc/building.html)  
+Tip for all platforms: run ./configure and check output.  
+Usually, it has meaningful advice how to solve your problem.
+
+## Linux (docker)
+```
+$ cd jb/project/docker
+$ docker build .
+...
+Successfully built 942ea9900054
+
+$ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
+
+# cd /JetBrainsRuntime
+# sh ./configure
+# make images CONF=linux-x86_64-normal-server-release
+
+```
+
+## Linux (Ubuntu 18.10 desktop)
+```
+$ 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 
+
+$ cd JetBrainsRuntime
+$ sh ./configure --disable-warnings-as-errors
+$ make images
+```
+
+## Windows
+Install:
+
+* [Cygwin x64](http://www.cygwin.com/)  
+  Required packages: autoconf, binutils, cpio, diffutils, file, gawk, gcc-core, make, m4, unzip, zip.  
+  **Install them while installing cygwin**.
+* Visual Studio compiler toolset [Download](https://visualstudio.microsoft.com/downloads/)  
+  Visual Studio 2015 has support by default.  
+  **Install with desktop development kit, it includes Windows SDK and compilers**.
+* [Java 11](http://www.oracle.com/technetwork/java/javase/downloads/index.html)  
+  If you have problems while configuring [read java tips on cygwin](http://horstmann.com/articles/cygwin-tips.html)
+
+From command line 
+```
+"c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
+```
+First command will set env vars, the second will run cygwin shell with proper environment.  
+In cygwin shell 
+```    
+cd JetBrainsRuntime
+bash configure --enable-option-checking=fatal --with-toolchain-version=2015 --with-boot-jdk="/cygdrive/c/Program Files/Java/jdk-11.0.5" --disable-warnings-as-errors
+make images
+```
+
+## OSX
+
+install Xcode console tools, autoconf (via homebrew)
+
+run
+
+```
+sh ./configure --prefix=$(pwd)/build  --disable-warnings-as-errors
+make images
+```
+
+## Contribution
+We will be happy to receive your pull requests. Before you submit one, please sign our Contributor License Agreement (CLA)  https://www.jetbrains.com/agreements/cla/ 

doc/building.html

@@ -68,12 +68,10 @@
 </ul></li>
 <li><a href="#running-tests">Running Tests</a></li>
 <li><a href="#cross-compiling">Cross-compiling</a><ul>
-<li><a href="#cross-compiling-the-easy-way-with-openjdk-devkits">Cross compiling the easy way with OpenJDK devkits</a></li>
 <li><a href="#boot-jdk-and-build-jdk">Boot JDK and Build JDK</a></li>
 <li><a href="#specifying-the-target-platform">Specifying the Target Platform</a></li>
 <li><a href="#toolchain-considerations">Toolchain Considerations</a></li>
 <li><a href="#native-libraries">Native Libraries</a></li>
-<li><a href="#creating-and-using-sysroots-with-qemu-deboostrap">Creating And Using Sysroots With qemu-deboostrap</a></li>
 <li><a href="#building-for-armaarch64">Building for ARM/aarch64</a></li>
 <li><a href="#verifying-the-build">Verifying the Build</a></li>
 </ul></li>
@@ -93,10 +91,12 @@
 <li><a href="#getting-help">Getting Help</a></li>
 </ul></li>
 <li><a href="#hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</a><ul>
+<li><a href="#setting-up-a-forest-for-pushing-changes-defpath">Setting Up a Forest for Pushing Changes (defpath)</a></li>
 <li><a href="#bash-completion">Bash Completion</a></li>
 <li><a href="#using-multiple-configurations">Using Multiple Configurations</a></li>
 <li><a href="#handling-reconfigurations">Handling Reconfigurations</a></li>
 <li><a href="#using-fine-grained-make-targets">Using Fine-Grained Make Targets</a></li>
+<li><a href="#learn-about-mercurial">Learn About Mercurial</a></li>
 </ul></li>
 <li><a href="#understanding-the-build-system">Understanding the Build System</a><ul>
 <li><a href="#configurations">Configurations</a></li>
@@ -110,10 +110,10 @@
 </ul>
 </nav>
 <h2 id="tldr-instructions-for-the-impatient">TL;DR (Instructions for the Impatient)</h2>
-<p>If you are eager to try out building the JDK, these simple steps works most of the time. They assume that you have installed Git (and Cygwin if running on Windows) and cloned the top-level JDK repository that you want to build.</p>
+<p>If you are eager to try out building the JDK, these simple steps works most of the time. They assume that you have installed Mercurial (and Cygwin if running on Windows) and cloned the top-level JDK repository that you want to build.</p>
 <ol type="1">
 <li><p><a href="#getting-the-source-code">Get the complete source code</a>:<br />
-<code>git clone https://git.openjdk.java.net/jdk/</code></p></li>
+<code>hg clone http://hg.openjdk.java.net/jdk/jdk</code></p></li>
 <li><p><a href="#running-configure">Run configure</a>:<br />
 <code>bash configure</code></p>
 <p>If <code>configure</code> fails due to missing dependencies (to either the <a href="#native-compiler-toolchain-requirements">toolchain</a>, <a href="#build-tools-requirements">build tools</a>, <a href="#external-library-requirements">external libraries</a> or the <a href="#boot-jdk-requirements">boot JDK</a>), most of the time it prints a suggestion on how to resolve the situation on your platform. Follow the instructions, and try running <code>bash configure</code> again.</p></li>
@@ -129,8 +129,8 @@
 <p>The JDK is a complex software project. Building it requires a certain amount of technical expertise, a fair number of dependencies on external software, and reasonably powerful hardware.</p>
 <p>If you just want to use the JDK and not build it yourself, this document is not for you. See for instance <a href="http://openjdk.java.net/install">OpenJDK installation</a> for some methods of installing a prebuilt JDK.</p>
 <h2 id="getting-the-source-code">Getting the Source Code</h2>
-<p>Make sure you are getting the correct version. As of JDK 10, the source is no longer split into separate repositories so you only need to clone one single repository. At the <a href="https://git.openjdk.java.net/">OpenJDK Git site</a> you can see a list of all available repositories. If you want to build an older version, e.g. JDK 8, it is recommended that you get the <code>jdk8u</code> forest, which contains incremental updates, instead of the <code>jdk8</code> forest, which was frozen at JDK 8 GA.</p>
-<p>If you are new to Git, a good place to start is the book <a href="https://git-scm.com/book/en/v2">Pro Git</a>. The rest of this document assumes a working knowledge of Git.</p>
+<p>Make sure you are getting the correct version. As of JDK 10, the source is no longer split into separate repositories so you only need to clone one single repository. At the <a href="http://hg.openjdk.java.net/">OpenJDK Mercurial server</a> you can see a list of all available forests. If you want to build an older version, e.g. JDK 8, it is recommended that you get the <code>jdk8u</code> forest, which contains incremental updates, instead of the <code>jdk8</code> forest, which was frozen at JDK 8 GA.</p>
+<p>If you are new to Mercurial, a good place to start is the <a href="http://www.mercurial-scm.org/guide">Mercurial Beginner's Guide</a>. The rest of this document assumes a working knowledge of Mercurial.</p>
 <h3 id="special-considerations">Special Considerations</h3>
 <p>For a smooth building experience, it is recommended that you follow these rules on where and how to check out the source code.</p>
 <ul>
@@ -141,11 +141,7 @@
 <ul>
 <li><p>Create the directory that is going to contain the top directory of the JDK clone by using the <code>mkdir</code> command in the Cygwin bash shell. That is, do <em>not</em> create it using Windows Explorer. This will ensure that it will have proper Cygwin attributes, and that it's children will inherit those attributes.</p></li>
 <li><p>Do not put the JDK clone in a path under your Cygwin home directory. This is especially important if your user name contains spaces and/or mixed upper and lower case letters.</p></li>
-<li><p>You need to install a git client. You have two choices, Cygwin git or Git for Windows. Unfortunately there are pros and cons with each choice.</p>
-<ul>
-<li><p>The Cygwin <code>git</code> client has no line ending issues and understands Cygwin paths (which are used throughout the JDK build system). However, it does not currently work well with the Skara CLI tooling. Please see the <a href="https://wiki.openjdk.java.net/display/SKARA/Skara#Skara-Git">Skara wiki on Git clients</a> for up-to-date information about the Skara git client support.</p></li>
-<li><p>The <a href="https://gitforwindows.org">Git for Windows</a> client has issues with line endings, and do not understand Cygwin paths. It does work well with the Skara CLI tooling, however. To alleviate the line ending problems, make sure you set <code>core.autocrlf</code> to <code>false</code> (this is asked during installation).</p></li>
-</ul></li>
+<li><p>Clone the JDK repository using the Cygwin command line <code>hg</code> client as instructed in this document. That is, do <em>not</em> use another Mercurial client such as TortoiseHg.</p></li>
 </ul>
 <p>Failure to follow this procedure might result in hard-to-debug build problems.</p></li>
 </ul>
@@ -195,7 +191,7 @@
 <p>Windows XP is not a supported platform, but all newer Windows should be able to build the JDK.</p>
 <p>On Windows, it is important that you pay attention to the instructions in the <a href="#special-considerations">Special Considerations</a>.</p>
 <p>Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layer is Cygwin. (Msys is no longer supported due to a too old bash; msys2 and the new Windows Subsystem for Linux (WSL) would likely be possible to support in a future version but that would require effort to implement.)</p>
-<p>Internally in the build system, all paths are represented as Unix-style paths, e.g. <code>/cygdrive/c/git/jdk/Makefile</code> rather than <code>C:\git\jdk\Makefile</code>. This rule also applies to input to the build system, e.g. in arguments to <code>configure</code>. So, use <code>--with-msvcr-dll=/cygdrive/c/msvcr100.dll</code> rather than <code>--with-msvcr-dll=c:\msvcr100.dll</code>. For details on this conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
+<p>Internally in the build system, all paths are represented as Unix-style paths, e.g. <code>/cygdrive/c/hg/jdk9/Makefile</code> rather than <code>C:\hg\jdk9\Makefile</code>. This rule also applies to input to the build system, e.g. in arguments to <code>configure</code>. So, use <code>--with-msvcr-dll=/cygdrive/c/msvcr100.dll</code> rather than <code>--with-msvcr-dll=c:\msvcr100.dll</code>. For details on this conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
 <h4 id="cygwin">Cygwin</h4>
 <p>A functioning <a href="http://www.cygwin.com/">Cygwin</a> environment is thus required for building the JDK on Windows. If you have a 64-bit OS, we strongly recommend using the 64-bit version of Cygwin.</p>
 <p><strong>Note:</strong> Cygwin has a model of continuously updating all packages without any easy way to install or revert to a specific version of a package. This means that whenever you add or update a package in Cygwin, you might (inadvertently) update tools that are used by the JDK build process, and that can cause unexpected build problems.</p>
@@ -357,7 +353,7 @@ cc: Sun C 5.13 SunOS_i386 2014/10/20
 $ CC -V
 CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <h3 id="microsoft-visual-studio">Microsoft Visual Studio</h3>
-<p>The minimum accepted version of Visual Studio is 2010. Older versions will not be accepted by <code>configure</code>. The maximum accepted version of Visual Studio is 2019. Versions older than 2017 are unlikely to continue working for long.</p>
+<p>The minimum accepted version of Visual Studio is 2010. Older versions will not be accepted by <code>configure</code>. The maximum accepted version of Visual Studio is 2017. Versions older than 2017 are unlikely to continue working for long.</p>
 <p>If you have multiple versions of Visual Studio installed, <code>configure</code> will by default pick the latest. You can request a specific version to be used by setting <code>--with-toolchain-version</code>, e.g. <code>--with-toolchain-version=2015</code>.</p>
 <p>If you get <code>LINK: fatal error LNK1123: failure during conversion to COFF: file invalid</code> when building using Visual Studio 2010, you have encountered <a href="http://support.microsoft.com/kb/2757355">KB2757355</a>, a bug triggered by a specific installation order. However, the solution suggested by the KB article does not always resolve the problem. See <a href="https://stackoverflow.com/questions/10888391">this stackoverflow discussion</a> for other suggestions.</p>
 <h3 id="ibm-xl-cc">IBM XL C/C++</h3>
@@ -569,47 +565,6 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <p>This requires a more complex setup and build procedure. This section assumes you are familiar with cross-compiling in general, and will only deal with the particularities of cross-compiling the JDK. If you are new to cross-compiling, please see the <a href="https://en.wikipedia.org/wiki/Cross_compiler#External_links">external links at Wikipedia</a> for a good start on reading materials.</p>
 <p>Cross-compiling the JDK requires you to be able to build both for the build platform and for the target platform. The reason for the former is that we need to build and execute tools during the build process, both native tools and Java tools.</p>
 <p>If all you want to do is to compile a 32-bit version, for the same OS, on a 64-bit machine, consider using <code>--with-target-bits=32</code> instead of doing a full-blown cross-compilation. (While this surely is possible, it's a lot more work and will take much longer to build.)</p>
-<h3 id="cross-compiling-the-easy-way-with-openjdk-devkits">Cross compiling the easy way with OpenJDK devkits</h3>
-<p>The OpenJDK build system provides out-of-the box support for creating and using so called devkits. A <code>devkit</code> is basically a collection of a cross-compiling toolchain and a sysroot environment which can easily be used together with the <code>--with-devkit</code> configure option to cross compile the OpenJDK. On Linux/x86_64, the following command:</p>
-<pre><code>bash configure --with-devkit=&lt;devkit-path&gt; --openjdk-target=ppc64-linux-gnu &amp;&amp; make</code></pre>
-<p>will configure and build OpenJDK for Linux/ppc64 assuming that <code>&lt;devkit-path&gt;</code> points to a Linux/x86_64 to Linux/ppc64 devkit.</p>
-<p>Devkits can be created from the <code>make/devkit</code> directory by executing:</p>
-<pre><code>make [ TARGETS=&quot;&lt;TARGET_TRIPLET&gt;+&quot; ] [ BASE_OS=&lt;OS&gt; ] [ BASE_OS_VERSION=&lt;VER&gt; ]</code></pre>
-<p>where <code>TARGETS</code> contains one or more <code>TARGET_TRIPLET</code>s of the form described in <a href="https://sourceware.org/autobook/autobook/autobook_17.html">section 3.4 of the GNU Autobook</a>. If no targets are given, a native toolchain for the current platform will be created. Currently, at least the following targets are known to work:</p>
-<table>
-<thead>
-<tr class="header">
-<th>Supported devkit targets</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td>x86_64-linux-gnu</td>
-</tr>
-<tr class="even">
-<td>aarch64-linux-gnu</td>
-</tr>
-<tr class="odd">
-<td>arm-linux-gnueabihf</td>
-</tr>
-<tr class="even">
-<td>ppc64-linux-gnu</td>
-</tr>
-<tr class="odd">
-<td>ppc64le-linux-gnu</td>
-</tr>
-<tr class="even">
-<td>s390x-linux-gnu</td>
-</tr>
-</tbody>
-</table>
-<p><code>BASE_OS</code> must be one of &quot;OEL6&quot; for Oracle Enterprise Linux 6 or &quot;Fedora&quot; (if not specified &quot;OEL6&quot; will be the default). If the base OS is &quot;Fedora&quot; the corresponding Fedora release can be specified with the help of the <code>BASE_OS_VERSION</code> option (with &quot;27&quot; as default version). If the build is successful, the new devkits can be found in the <code>build/devkit/result</code> subdirectory:</p>
-<pre><code>cd make/devkit
-make TARGETS=&quot;ppc64le-linux-gnu aarch64-linux-gnu&quot; BASE_OS=Fedora BASE_OS_VERSION=21
-ls -1 ../../build/devkit/result/
-x86_64-linux-gnu-to-aarch64-linux-gnu
-x86_64-linux-gnu-to-ppc64le-linux-gnu</code></pre>
-<p>Notice that devkits are not only useful for targeting different build platforms. Because they contain the full build dependencies for a system (i.e. compiler and root file system), they can easily be used to build well-known, reliable and reproducible build environments. You can for example create and use a devkit with GCC 7.3 and a Fedora 12 sysroot environment (with glibc 2.11) on Ubuntu 14.04 (which doesn't have GCC 7.3 by default) to produce OpenJDK binaries which will run on all Linux systems with runtime libraries newer than the ones from Fedora 12 (e.g. Ubuntu 16.04, SLES 11 or RHEL 6).</p>
 <h3 id="boot-jdk-and-build-jdk">Boot JDK and Build JDK</h3>
 <p>When cross-compiling, make sure you use a boot JDK that runs on the <em>build</em> system, and not on the <em>target</em> system.</p>
 <p>To be able to build, we need a &quot;Build JDK&quot;, which is a JDK built from the current sources (that is, the same as the end result of the entire build process), but able to run on the <em>build</em> system, and not the <em>target</em> system. (In contrast, the Boot JDK should be from an older release, e.g. JDK 8 when building JDK 9.)</p>
@@ -679,85 +634,6 @@ cp: cannot stat `arm-linux-gnueabihf/libSM.so&#39;: No such file or directory
 cp: cannot stat `arm-linux-gnueabihf/libXt.so&#39;: No such file or directory</code></pre></li>
 <li><p>If the X11 libraries are not properly detected by <code>configure</code>, you can point them out by <code>--with-x</code>.</p></li>
 </ul>
-<h3 id="creating-and-using-sysroots-with-qemu-deboostrap">Creating And Using Sysroots With qemu-deboostrap</h3>
-<p>Fortunately, you can create sysroots for foreign architectures with tools provided by your OS. On Debian/Ubuntu systems, one could use <code>qemu-deboostrap</code> to create the <em>target</em> system chroot, which would have the native libraries and headers specific to that <em>target</em> system. After that, we can use the cross-compiler on the <em>build</em> system, pointing into chroot to get the build dependencies right. This allows building for foreign architectures with native compilation speed.</p>
-<p>For example, cross-compiling to AArch64 from x86_64 could be done like this:</p>
-<ul>
-<li><p>Install cross-compiler on the <em>build</em> system:</p>
-<pre><code>apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu</code></pre></li>
-<li><p>Create chroot on the <em>build</em> system, configuring it for <em>target</em> system:</p>
-<pre><code>sudo qemu-debootstrap \
-  --arch=arm64 \
-  --verbose \
-  --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev \
-  --resolve-deps \
-  buster \
-  ~/sysroot-arm64 \
-  http://httpredir.debian.org/debian/</code></pre></li>
-<li><p>Make sure the symlinks inside the newly created chroot point to proper locations:</p>
-<pre><code>sudo chroot ~/sysroot-arm64 symlinks -cr .</code></pre></li>
-<li><p>Configure and build with newly created chroot as sysroot/toolchain-path:</p>
-<pre><code>CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ sh ./configure \
- --openjdk-target=aarch64-linux-gnu \
- --with-sysroot=~/sysroot-arm64 \
- --with-toolchain-path=~/sysroot-arm64 \
- --with-freetype-lib=~/sysroot-arm64/usr/lib/aarch64-linux-gnu/ \
- --with-freetype-include=~/sysroot-arm64/usr/include/freetype2/ \
- --x-libraries=~/sysroot-arm64/usr/lib/aarch64-linux-gnu/
-make images
-ls build/linux-aarch64-normal-server-release/</code></pre></li>
-</ul>
-<p>The build does not create new files in that chroot, so it can be reused for multiple builds without additional cleanup.</p>
-<p>Architectures that are known to successfully cross-compile like this are:</p>
-<table>
-<thead>
-<tr class="header">
-<th style="text-align: left;">Target</th>
-<th style="text-align: left;"><code>CC</code></th>
-<th style="text-align: left;"><code>CXX</code></th>
-<th><code>--arch=...</code></th>
-<th><code>--openjdk-target=...</code></th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td style="text-align: left;">x86</td>
-<td style="text-align: left;">default</td>
-<td style="text-align: left;">default</td>
-<td>i386</td>
-<td>i386-linux-gnu</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">armhf</td>
-<td style="text-align: left;">gcc-arm-linux-gnueabihf</td>
-<td style="text-align: left;">g++-arm-linux-gnueabihf</td>
-<td>armhf</td>
-<td>arm-linux-gnueabihf</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">aarch64</td>
-<td style="text-align: left;">gcc-aarch64-linux-gnu</td>
-<td style="text-align: left;">g++-aarch64-linux-gnu</td>
-<td>arm64</td>
-<td>aarch64-linux-gnu</td>
-</tr>
-<tr class="even">
-<td style="text-align: left;">ppc64el</td>
-<td style="text-align: left;">gcc-powerpc64le-linux-gnu</td>
-<td style="text-align: left;">g++-powerpc64le-linux-gnu</td>
-<td>ppc64el</td>
-<td>powerpc64le-linux-gnu</td>
-</tr>
-<tr class="odd">
-<td style="text-align: left;">s390x</td>
-<td style="text-align: left;">gcc-s390x-linux-gnu</td>
-<td style="text-align: left;">g++-s390x-linux-gnu</td>
-<td>s390x</td>
-<td>s390x-linux-gnu</td>
-</tr>
-</tbody>
-</table>
-<p>Additional architectures might be supported by Debian/Ubuntu Ports.</p>
 <h3 id="building-for-armaarch64">Building for ARM/aarch64</h3>
 <p>A common cross-compilation target is the ARM CPU. When building for ARM, it is useful to set the ABI profile. A number of pre-defined ABI profiles are available using <code>--with-abi-profile</code>: arm-vfp-sflt, arm-vfp-hflt, arm-sflt, armv5-vfp-sflt, armv6-vfp-hflt. Note that soft-float ABIs are no longer properly supported by the JDK.</p>
 <p>The JDK contains two different ports for the aarch64 platform, one is the original aarch64 port from the <a href="http://openjdk.java.net/projects/aarch64-port">AArch64 Port Project</a> and one is a 64-bit version of the Oracle contributed ARM port. When targeting aarch64, by the default the original aarch64 port is used. To select the Oracle ARM 64 port, use <code>--with-cpu-port=arm64</code>. Also set the corresponding value (<code>aarch64</code> or <code>arm64</code>) to --with-abi-profile, to ensure a consistent build.</p>
@@ -804,14 +680,14 @@ ls build/linux-aarch64-normal-server-release/</code></pre></li>
 
 === Output from failing command(s) repeated here ===
 * For target hotspot_variant-server_libjvm_objs_psMemoryPool.o:
-/localhome/git/jdk-sandbox/hotspot/src/share/vm/services/psMemoryPool.cpp:1:1: error: &#39;failhere&#39; does not name a type
+/localhome/hg/jdk9-sandbox/hotspot/src/share/vm/services/psMemoryPool.cpp:1:1: error: &#39;failhere&#39; does not name a type
    ... (rest of output omitted)
 
-* All command lines available in /localhome/git/jdk-sandbox/build/linux-x64/make-support/failure-logs.
+* All command lines available in /localhome/hg/jdk9-sandbox/build/linux-x64/make-support/failure-logs.
 === End of repeated output ===
 
 === Make failed targets repeated here ===
-lib/CompileJvm.gmk:207: recipe for target &#39;/localhome/git/jdk-sandbox/build/linux-x64/hotspot/variant-server/libjvm/objs/psMemoryPool.o&#39; failed
+lib/CompileJvm.gmk:207: recipe for target &#39;/localhome/hg/jdk9-sandbox/build/linux-x64/hotspot/variant-server/libjvm/objs/psMemoryPool.o&#39; failed
 make/Main.gmk:263: recipe for target &#39;hotspot-server-libs&#39; failed
 === End of repeated output ===
 
@@ -834,11 +710,11 @@ Hint: If caused by a warning, try configure --disable-warnings-as-errors.</code>
 <p>Verify that the summary at the end looks correct. Are you indeed using the Boot JDK and native toolchain that you expect?</p>
 <p>By default, the JDK has a strict approach where warnings from the compiler is considered errors which fail the build. For very new or very old compiler versions, this can trigger new classes of warnings, which thus fails the build. Run <code>configure</code> with <code>--disable-warnings-as-errors</code> to turn of this behavior. (The warnings will still show, but not make the build fail.)</p>
 <h4 id="problems-with-incremental-rebuilds">Problems with Incremental Rebuilds</h4>
-<p>Incremental rebuilds mean that when you modify part of the product, only the affected parts get rebuilt. While this works great in most cases, and significantly speed up the development process, from time to time complex interdependencies will result in an incorrect build result. This is the most common cause for unexpected build problems.</p>
+<p>Incremental rebuilds mean that when you modify part of the product, only the affected parts get rebuilt. While this works great in most cases, and significantly speed up the development process, from time to time complex interdependencies will result in an incorrect build result. This is the most common cause for unexpected build problems, together with inconsistencies between the different Mercurial repositories in the forest.</p>
 <p>Here are a suggested list of things to try if you are having unexpected build problems. Each step requires more time than the one before, so try them in order. Most issues will be solved at step 1 or 2.</p>
 <ol type="1">
-<li><p>Make sure your repository is up-to-date</p>
-<p>Run <code>git pull origin master</code> to make sure you have the latest changes.</p></li>
+<li><p>Make sure your forest is up-to-date</p>
+<p>Run <code>bash get_source.sh</code> to make sure you have the latest version of all repositories.</p></li>
 <li><p>Clean build results</p>
 <p>The simplest way to fix incremental rebuild issues is to run <code>make clean</code>. This will remove all build results, but not the configuration or any build system support artifacts. In most cases, this will solve build errors resulting from incremental build mismatches.</p></li>
 <li><p>Completely clean the build directory.</p>
@@ -847,8 +723,8 @@ Hint: If caused by a warning, try configure --disable-warnings-as-errors.</code>
 make dist-clean
 bash configure $(cat current-configuration)
 make</code></pre></li>
-<li><p>Re-clone the Git repository</p>
-<p>Sometimes the Git repository gets in a state that causes the product to be un-buildable. In such a case, the simplest solution is often the &quot;sledgehammer approach&quot;: delete the entire repository, and re-clone it. If you have local changes, save them first to a different location using <code>git format-patch</code>.</p></li>
+<li><p>Re-clone the Mercurial forest</p>
+<p>Sometimes the Mercurial repositories themselves gets in a state that causes the product to be un-buildable. In such a case, the simplest solution is often the &quot;sledgehammer approach&quot;: delete the entire forest, and re-clone it. If you have local changes, save them first to a different location using <code>hg export</code>.</p></li>
 </ol>
 <h3 id="specific-build-issues">Specific Build Issues</h3>
 <h4 id="clock-skew">Clock Skew</h4>
@@ -870,6 +746,20 @@ spawn failed</code></pre>
 <p>If none of the suggestions in this document helps you, or if you find what you believe is a bug in the build system, please contact the Build Group by sending a mail to <a href="mailto:build-dev@openjdk.java.net">build-dev@openjdk.java.net</a>. Please include the relevant parts of the configure and/or build log.</p>
 <p>If you need general help or advice about developing for the JDK, you can also contact the Adoption Group. See the section on <a href="#contributing-to-openjdk">Contributing to OpenJDK</a> for more information.</p>
 <h2 id="hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</h2>
+<h3 id="setting-up-a-forest-for-pushing-changes-defpath">Setting Up a Forest for Pushing Changes (defpath)</h3>
+<p>To help you prepare a proper push path for a Mercurial repository, there exists a useful tool known as <a href="http://openjdk.java.net/projects/code-tools/defpath">defpath</a>. It will help you setup a proper push path for pushing changes to the JDK.</p>
+<p>Install the extension by cloning <code>http://hg.openjdk.java.net/code-tools/defpath</code> and updating your <code>.hgrc</code> file. Here's one way to do this:</p>
+<pre><code>cd ~
+mkdir hg-ext
+cd hg-ext
+hg clone http://hg.openjdk.java.net/code-tools/defpath
+cat &lt;&lt; EOT &gt;&gt; ~/.hgrc
+[extensions]
+defpath=~/hg-ext/defpath/defpath.py
+EOT</code></pre>
+<p>You can now setup a proper push path using:</p>
+<pre><code>hg defpath -d -u &lt;your OpenJDK username&gt;</code></pre>
+<p>If you also have the <code>trees</code> extension installed in Mercurial, you will automatically get a <code>tdefpath</code> command, which is even more useful. By running <code>hg tdefpath -du &lt;username&gt;</code> in the top repository of your forest, all repos will get setup automatically. This is the recommended usage.</p>
 <h3 id="bash-completion">Bash Completion</h3>
 <p>The <code>configure</code> and <code>make</code> commands tries to play nice with bash command-line completion (using <code>&lt;tab&gt;</code> or <code>&lt;tab&gt;&lt;tab&gt;</code>). To use this functionality, make sure you enable completion in your <code>~/.bashrc</code> (see instructions for bash in your operating system).</p>
 <p>Make completion will work out of the box, and will complete valid make targets. For instance, typing <code>make jdk-i&lt;tab&gt;</code> will complete to <code>make jdk-image</code>.</p>
@@ -923,6 +813,14 @@ sudo mv /tmp/configure /usr/local/bin</code></pre>
 <h4 id="rebuilding-part-of-java.base-jdk_filter">Rebuilding Part of java.base (JDK_FILTER)</h4>
 <p>If you are modifying files in <code>java.base</code>, which is the by far largest module in the JDK, then you need to rebuild all those files whenever a single file has changed. (This inefficiency will hopefully be addressed in JDK 10.)</p>
 <p>As a hack, you can use the make control variable <code>JDK_FILTER</code> to specify a pattern that will be used to limit the set of files being recompiled. For instance, <code>make java.base JDK_FILTER=javax/crypto</code> (or, to combine methods, <code>make java.base-java-only JDK_FILTER=javax/crypto</code>) will limit the compilation to files in the <code>javax.crypto</code> package.</p>
+<h3 id="learn-about-mercurial">Learn About Mercurial</h3>
+<p>To become an efficient JDK developer, it is recommended that you invest in learning Mercurial properly. Here are some links that can get you started:</p>
+<ul>
+<li><a href="http://www.mercurial-scm.org/wiki/GitConcepts">Mercurial for git users</a></li>
+<li><a href="http://www.mercurial-scm.org/wiki/Tutorial">The official Mercurial tutorial</a></li>
+<li><a href="http://hginit.com/">hg init</a></li>
+<li><a href="http://hgbook.red-bean.com/read/">Mercurial: The Definitive Guide</a></li>
+</ul>
 <h2 id="understanding-the-build-system">Understanding the Build System</h2>
 <p>This section will give you a more technical description on the details of the build system.</p>
 <h3 id="configurations">Configurations</h3>

doc/building.md

@@ -3,11 +3,11 @@
 ## TL;DR (Instructions for the Impatient)
 
 If you are eager to try out building the JDK, these simple steps works most of
-the time. They assume that you have installed Git (and Cygwin if running
+the time. They assume that you have installed Mercurial (and Cygwin if running
 on Windows) and cloned the top-level JDK repository that you want to build.
 
  1. [Get the complete source code](#getting-the-source-code): \
-    `git clone https://git.openjdk.java.net/jdk/`
+    `hg clone http://hg.openjdk.java.net/jdk/jdk`
 
  2. [Run configure](#running-configure): \
     `bash configure`
@@ -47,14 +47,14 @@ JDK.
 
 Make sure you are getting the correct version. As of JDK 10, the source is no
 longer split into separate repositories so you only need to clone one single
-repository. At the [OpenJDK Git site](https://git.openjdk.java.net/) you
-can see a list of all available repositories. If you want to build an older version,
+repository. At the [OpenJDK Mercurial server](http://hg.openjdk.java.net/) you
+can see a list of all available forests. If you want to build an older version,
 e.g. JDK 8, it is recommended that you get the `jdk8u` forest, which contains
 incremental updates, instead of the `jdk8` forest, which was frozen at JDK 8 GA.
 
-If you are new to Git, a good place to start is the book [Pro
-Git](https://git-scm.com/book/en/v2). The rest of this document
-assumes a working knowledge of Git.
+If you are new to Mercurial, a good place to start is the [Mercurial Beginner's
+Guide](http://www.mercurial-scm.org/guide). The rest of this document assumes a
+working knowledge of Mercurial.
 
 ### Special Considerations
 
@@ -89,21 +89,9 @@ on where and how to check out the source code.
         directory. This is especially important if your user name contains
         spaces and/or mixed upper and lower case letters.
 
-      * You need to install a git client. You have two choices, Cygwin git or
-        Git for Windows. Unfortunately there are pros and cons with each choice.
-
-        * The Cygwin `git` client has no line ending issues and understands
-          Cygwin paths (which are used throughout the JDK build system).
-          However, it does not currently work well with the Skara CLI tooling.
-          Please see the [Skara wiki on Git clients](
-          https://wiki.openjdk.java.net/display/SKARA/Skara#Skara-Git) for
-          up-to-date information about the Skara git client support.
-
-        * The [Git for Windows](https://gitforwindows.org) client has issues
-          with line endings, and do not understand Cygwin paths. It does work
-          well with the Skara CLI tooling, however. To alleviate the line ending
-          problems, make sure you set `core.autocrlf` to `false` (this is asked
-          during installation).
+      * Clone the JDK repository using the Cygwin command line `hg` client
+        as instructed in this document. That is, do *not* use another Mercurial
+        client such as TortoiseHg.
 
     Failure to follow this procedure might result in hard-to-debug build
     problems.
@@ -183,7 +171,7 @@ supported due to a too old bash; msys2 and the new Windows Subsystem for Linux
 require effort to implement.)
 
 Internally in the build system, all paths are represented as Unix-style paths,
-e.g. `/cygdrive/c/git/jdk/Makefile` rather than `C:\git\jdk\Makefile`. This
+e.g. `/cygdrive/c/hg/jdk9/Makefile` rather than `C:\hg\jdk9\Makefile`. This
 rule also applies to input to the build system, e.g. in arguments to
 `configure`. So, use `--with-msvcr-dll=/cygdrive/c/msvcr100.dll` rather than
 `--with-msvcr-dll=c:\msvcr100.dll`. For details on this conversion, see the section
@@ -383,7 +371,7 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30
 
 The minimum accepted version of Visual Studio is 2010. Older versions will not
 be accepted by `configure`. The maximum accepted version of Visual Studio is
-2019. Versions older than 2017 are unlikely to continue working for long.
+2017. Versions older than 2017 are unlikely to continue working for long.
 
 If you have multiple versions of Visual Studio installed, `configure` will by
 default pick the latest. You can request a specific version to be used by
@@ -887,64 +875,6 @@ If all you want to do is to compile a 32-bit version, for the same OS, on a
 full-blown cross-compilation. (While this surely is possible, it's a lot more
 work and will take much longer to build.)
 
-### Cross compiling the easy way with OpenJDK devkits
-
-The OpenJDK build system provides out-of-the box support for creating and using
-so called devkits. A `devkit` is basically a collection of a cross-compiling
-toolchain and a sysroot environment which can easily be used together with the
-`--with-devkit` configure option to cross compile the OpenJDK. On Linux/x86_64,
-the following command:
-```
-bash configure --with-devkit=<devkit-path> --openjdk-target=ppc64-linux-gnu && make
-```
-
-will configure and build OpenJDK for Linux/ppc64 assuming that `<devkit-path>`
-points to a Linux/x86_64 to Linux/ppc64 devkit.
-
-Devkits can be created from the `make/devkit` directory by executing:
-```
-make [ TARGETS="<TARGET_TRIPLET>+" ] [ BASE_OS=<OS> ] [ BASE_OS_VERSION=<VER> ]
-```
-
-where `TARGETS` contains one or more `TARGET_TRIPLET`s of the form
-described in [section 3.4 of the GNU Autobook](
-https://sourceware.org/autobook/autobook/autobook_17.html). If no
-targets are given, a native toolchain for the current platform will be
-created. Currently, at least the following targets are known to work:
-
- Supported devkit targets
- ------------------------
- x86_64-linux-gnu
- aarch64-linux-gnu
- arm-linux-gnueabihf
- ppc64-linux-gnu
- ppc64le-linux-gnu
- s390x-linux-gnu
-
-`BASE_OS` must be one of "OEL6" for Oracle Enterprise Linux 6 or
-"Fedora" (if not specified "OEL6" will be the default). If the base OS
-is "Fedora" the corresponding Fedora release can be specified with the
-help of the `BASE_OS_VERSION` option (with "27" as default version).
-If the build is successful, the new devkits can be found in the
-`build/devkit/result` subdirectory:
-```
-cd make/devkit
-make TARGETS="ppc64le-linux-gnu aarch64-linux-gnu" BASE_OS=Fedora BASE_OS_VERSION=21
-ls -1 ../../build/devkit/result/
-x86_64-linux-gnu-to-aarch64-linux-gnu
-x86_64-linux-gnu-to-ppc64le-linux-gnu
-```
-
-Notice that devkits are not only useful for targeting different build
-platforms. Because they contain the full build dependencies for a
-system (i.e. compiler and root file system), they can easily be used
-to build well-known, reliable and reproducible build environments. You
-can for example create and use a devkit with GCC 7.3 and a Fedora 12
-sysroot environment (with glibc 2.11) on Ubuntu 14.04 (which doesn't
-have GCC 7.3 by default) to produce OpenJDK binaries which will run on
-all Linux systems with runtime libraries newer than the ones from
-Fedora 12 (e.g. Ubuntu 16.04, SLES 11 or RHEL 6).
-
 ### Boot JDK and Build JDK
 
 When cross-compiling, make sure you use a boot JDK that runs on the *build*
@@ -1088,67 +1018,6 @@ Note that X11 is needed even if you only want to build a headless JDK.
   * If the X11 libraries are not properly detected by `configure`, you can
     point them out by `--with-x`.
 
-### Creating And Using Sysroots With qemu-deboostrap
-
-Fortunately, you can create sysroots for foreign architectures with tools
-provided by your OS. On Debian/Ubuntu systems, one could use `qemu-deboostrap` to
-create the *target* system chroot, which would have the native libraries and headers
-specific to that *target* system. After that, we can use the cross-compiler on the *build*
-system, pointing into chroot to get the build dependencies right. This allows building
-for foreign architectures with native compilation speed.
-
-For example, cross-compiling to AArch64 from x86_64 could be done like this:
-
-  * Install cross-compiler on the *build* system:
-    ```
-    apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
-    ```
-
-  * Create chroot on the *build* system, configuring it for *target* system:
-    ```
-    sudo qemu-debootstrap \
-      --arch=arm64 \
-      --verbose \
-      --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev \
-      --resolve-deps \
-      buster \
-      ~/sysroot-arm64 \
-      http://httpredir.debian.org/debian/
-    ```
-
-  * Make sure the symlinks inside the newly created chroot point to proper locations:
-    ```
-    sudo chroot ~/sysroot-arm64 symlinks -cr .
-    ```
-
-  * Configure and build with newly created chroot as sysroot/toolchain-path:
-    ```
-    CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ sh ./configure \
-     --openjdk-target=aarch64-linux-gnu \
-     --with-sysroot=~/sysroot-arm64 \
-     --with-toolchain-path=~/sysroot-arm64 \
-     --with-freetype-lib=~/sysroot-arm64/usr/lib/aarch64-linux-gnu/ \
-     --with-freetype-include=~/sysroot-arm64/usr/include/freetype2/ \
-     --x-libraries=~/sysroot-arm64/usr/lib/aarch64-linux-gnu/
-    make images
-    ls build/linux-aarch64-normal-server-release/
-    ```
-
-The build does not create new files in that chroot, so it can be reused for multiple builds
-without additional cleanup.
-
-Architectures that are known to successfully cross-compile like this are:
-
-  Target        `CC`                      `CXX`                       `--arch=...` `--openjdk-target=...`
-  ------------  ------------------------- --------------------------- ------------ ----------------------
-  x86           default                   default                     i386         i386-linux-gnu
-  armhf         gcc-arm-linux-gnueabihf   g++-arm-linux-gnueabihf     armhf        arm-linux-gnueabihf
-  aarch64       gcc-aarch64-linux-gnu     g++-aarch64-linux-gnu       arm64        aarch64-linux-gnu
-  ppc64el       gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu   ppc64el      powerpc64le-linux-gnu
-  s390x         gcc-s390x-linux-gnu       g++-s390x-linux-gnu         s390x        s390x-linux-gnu
-
-Additional architectures might be supported by Debian/Ubuntu Ports.
-
 ### Building for ARM/aarch64
 
 A common cross-compilation target is the ARM CPU. When building for ARM, it is
@@ -1289,14 +1158,14 @@ ERROR: Build failed for target 'hotspot' in configuration 'linux-x64' (exit code
 
 === Output from failing command(s) repeated here ===
 * For target hotspot_variant-server_libjvm_objs_psMemoryPool.o:
-/localhome/git/jdk-sandbox/hotspot/src/share/vm/services/psMemoryPool.cpp:1:1: error: 'failhere' does not name a type
+/localhome/hg/jdk9-sandbox/hotspot/src/share/vm/services/psMemoryPool.cpp:1:1: error: 'failhere' does not name a type
    ... (rest of output omitted)
 
-* All command lines available in /localhome/git/jdk-sandbox/build/linux-x64/make-support/failure-logs.
+* All command lines available in /localhome/hg/jdk9-sandbox/build/linux-x64/make-support/failure-logs.
 === End of repeated output ===
 
 === Make failed targets repeated here ===
-lib/CompileJvm.gmk:207: recipe for target '/localhome/git/jdk-sandbox/build/linux-x64/hotspot/variant-server/libjvm/objs/psMemoryPool.o' failed
+lib/CompileJvm.gmk:207: recipe for target '/localhome/hg/jdk9-sandbox/build/linux-x64/hotspot/variant-server/libjvm/objs/psMemoryPool.o' failed
 make/Main.gmk:263: recipe for target 'hotspot-server-libs' failed
 === End of repeated output ===
 
@@ -1386,15 +1255,17 @@ Incremental rebuilds mean that when you modify part of the product, only the
 affected parts get rebuilt. While this works great in most cases, and
 significantly speed up the development process, from time to time complex
 interdependencies will result in an incorrect build result. This is the most
-common cause for unexpected build problems.
+common cause for unexpected build problems, together with inconsistencies
+between the different Mercurial repositories in the forest.
 
 Here are a suggested list of things to try if you are having unexpected build
 problems. Each step requires more time than the one before, so try them in
 order. Most issues will be solved at step 1 or 2.
 
- 1. Make sure your repository is up-to-date
+ 1. Make sure your forest is up-to-date
 
-    Run `git pull origin master` to make sure you have the latest changes.
+    Run `bash get_source.sh` to make sure you have the latest version of all
+    repositories.
 
  2. Clean build results
 
@@ -1419,13 +1290,13 @@ order. Most issues will be solved at step 1 or 2.
     make
     ```
 
- 4. Re-clone the Git repository
+ 4. Re-clone the Mercurial forest
 
-    Sometimes the Git repository gets in a state that causes the product
-    to be un-buildable. In such a case, the simplest solution is often the
-    "sledgehammer approach": delete the entire repository, and re-clone it.
-    If you have local changes, save them first to a different location using
-    `git format-patch`.
+    Sometimes the Mercurial repositories themselves gets in a state that causes
+    the product to be un-buildable. In such a case, the simplest solution is
+    often the "sledgehammer approach": delete the entire forest, and re-clone
+    it. If you have local changes, save them first to a different location
+    using `hg export`.
 
 ### Specific Build Issues
 
@@ -1476,6 +1347,38 @@ contact the Adoption Group. See the section on [Contributing to OpenJDK](
 
 ## Hints and Suggestions for Advanced Users
 
+### Setting Up a Forest for Pushing Changes (defpath)
+
+To help you prepare a proper push path for a Mercurial repository, there exists
+a useful tool known as [defpath](
+http://openjdk.java.net/projects/code-tools/defpath). It will help you setup a
+proper push path for pushing changes to the JDK.
+
+Install the extension by cloning
+`http://hg.openjdk.java.net/code-tools/defpath` and updating your `.hgrc` file.
+Here's one way to do this:
+
+```
+cd ~
+mkdir hg-ext
+cd hg-ext
+hg clone http://hg.openjdk.java.net/code-tools/defpath
+cat << EOT >> ~/.hgrc
+[extensions]
+defpath=~/hg-ext/defpath/defpath.py
+EOT
+```
+
+You can now setup a proper push path using:
+```
+hg defpath -d -u <your OpenJDK username>
+```
+
+If you also have the `trees` extension installed in Mercurial, you will
+automatically get a `tdefpath` command, which is even more useful. By running
+`hg tdefpath -du <username>` in the top repository of your forest, all repos
+will get setup automatically. This is the recommended usage.
+
 ### Bash Completion
 
 The `configure` and `make` commands tries to play nice with bash command-line
@@ -1618,6 +1521,16 @@ instance, `make java.base JDK_FILTER=javax/crypto` (or, to combine methods,
 `make java.base-java-only JDK_FILTER=javax/crypto`) will limit the compilation
 to files in the `javax.crypto` package.
 
+### Learn About Mercurial
+
+To become an efficient JDK developer, it is recommended that you invest in
+learning Mercurial properly. Here are some links that can get you started:
+
+  * [Mercurial for git users](http://www.mercurial-scm.org/wiki/GitConcepts)
+  * [The official Mercurial tutorial](http://www.mercurial-scm.org/wiki/Tutorial)
+  * [hg init](http://hginit.com/)
+  * [Mercurial: The Definitive Guide](http://hgbook.red-bean.com/read/)
+
 ## Understanding the Build System
 
 This section will give you a more technical description on the details of the

doc/testing.html

@@ -27,7 +27,6 @@
 <li><a href="#configuration">Configuration</a></li>
 </ul></li>
 <li><a href="#test-selection">Test selection</a><ul>
-<li><a href="#common-test-groups">Common Test Groups</a></li>
 <li><a href="#jtreg">JTReg</a></li>
 <li><a href="#gtest">Gtest</a></li>
 </ul></li>
@@ -60,19 +59,6 @@ $ make exploded-run-test TEST=tier2</code></pre>
 <p>All functionality is available using the run-test make target. In this use case, the test or tests to be executed is controlled using the <code>TEST</code> variable. To speed up subsequent test runs with no source code changes, run-test-only can be used instead, which do not depend on the source and test image build.</p>
 <p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make run-test-tier1</code> is equivalent to <code>make run-test TEST=&quot;tier1&quot;</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>run-test TEST=&quot;x&quot;</code> solution needs to be used.</p>
 <p>The test specifications given in <code>TEST</code> is parsed into fully qualified test descriptors, which clearly and unambigously show which tests will be run. As an example, <code>:tier1</code> will expand to <code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1</code>. You can always submit a list of fully qualified test descriptors in the <code>TEST</code> variable if you want to shortcut the parser.</p>
-<h3 id="common-test-groups">Common Test Groups</h3>
-<p>Ideally, all tests are run for every change but this may not be practical due to the limited testing resources, the scope of the change, etc.</p>
-<p>The source tree currently defines a few common test groups in the relevant <code>TEST.groups</code> files. There are test groups that cover a specific component, for example <code>hotspot_gc</code>. It is a good idea to look into <code>TEST.groups</code> files to get a sense what tests are relevant to a particular JDK component.</p>
-<p>Component-specific tests may miss some unintended consequences of a change, so other tests should also be run. Again, it might be impractical to run all tests, and therefore <em>tiered</em> test groups exist. Tiered test groups are not component-specific, but rather cover the significant parts of the entire JDK.</p>
-<p>Multiple tiers allow balancing test coverage and testing costs. Lower test tiers are supposed to contain the simpler, quicker and more stable tests. Higher tiers are supposed to contain progressively more thorough, slower, and sometimes less stable tests, or the tests that require special configuration.</p>
-<p>Contributors are expected to run the tests for the areas that are changed, and the first N tiers they can afford to run, but at least tier1.</p>
-<p>A brief description of the tiered test groups:</p>
-<ul>
-<li><p><code>tier1</code>: This is the lowest test tier. Multiple developers run these tests every day. Because of the widespread use, the tests in <code>tier1</code> are carefully selected and optimized to run fast, and to run in the most stable manner. The test failures in <code>tier1</code> are usually followed up on quickly, either with fixes, or adding relevant tests to problem list. GitHub Actions workflows, if enabled, run <code>tier1</code> tests.</p></li>
-<li><p><code>tier2</code>: This test group covers even more ground. These contain, among other things, tests that either run for too long to be at <code>tier1</code>, or may require special configuration, or tests that are less stable, or cover the broader range of non-core JVM and JDK features/components (for example, XML).</p></li>
-<li><p><code>tier3</code>: This test group includes more stressful tests, the tests for corner cases not covered by previous tiers, plus the tests that require GUIs. As such, this suite should either be run with low concurrency (<code>TEST_JOBS=1</code>), or without headful tests (<code>JTREG_KEYWORDS=\!headful</code>), or both.</p></li>
-<li><p><code>tier4</code>: This test group includes every other test not covered by previous tiers. It includes, for example, <code>vmTestbase</code> suites for Hotspot, which run for many hours even on large machines. It also runs GUI tests, so the same <code>TEST_JOBS</code> and <code>JTREG_KEYWORDS</code> caveats apply.</p></li>
-</ul>
 <h3 id="jtreg">JTReg</h3>
 <p>JTReg tests can be selected either by picking a JTReg test group, or a selection of files or directories containing JTReg tests.</p>
 <p>JTReg test groups can be specified either without a test root, e.g. <code>:tier1</code> (or <code>tier1</code>, the initial colon is optional), or with, e.g. <code>hotspot:tier1</code>, <code>test/jdk:jdk_util</code> or <code>$(TOPDIR)/test/hotspot/jtreg:hotspot_all</code>. The test root can be specified either as an absolute path, or a path relative to the JDK top directory, or the <code>test</code> directory. For simplicity, the hotspot JTReg test root, which really is <code>hotspot/jtreg</code> can be abbreviated as just <code>hotspot</code>.</p>
@@ -156,8 +142,6 @@ TEST FAILURE</code></pre>
 <p>Additional VM options to JTReg (<code>-vmoption</code>).</p>
 <h4 id="aot_modules-1">AOT_MODULES</h4>
 <p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
-<h4 id="retry_count">RETRY_COUNT</h4>
-<p>Retry failed tests up to a set number of times. Defaults to 0.</p>
 <h3 id="gtest-keywords">Gtest keywords</h3>
 <h4 id="repeat">REPEAT</h4>
 <p>The number of times to repeat the tests (<code>--gtest_repeat</code>).</p>

doc/testing.md

@@ -52,52 +52,6 @@ jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1`. You can
 always submit a list of fully qualified test descriptors in the `TEST` variable
 if you want to shortcut the parser.
 
-### Common Test Groups
-
-Ideally, all tests are run for every change but this may not be practical due to the limited
-testing resources, the scope of the change, etc.
-
-The source tree currently defines a few common test groups in the relevant `TEST.groups`
-files. There are test groups that cover a specific component, for example `hotspot_gc`.
-It is a good idea to look into `TEST.groups` files to get a sense what tests are relevant
-to a particular JDK component.
-
-Component-specific tests may miss some unintended consequences of a change, so other
-tests should also be run. Again, it might be impractical to run all tests, and therefore
-_tiered_ test groups exist. Tiered test groups are not component-specific, but rather cover
-the significant parts of the entire JDK.
-
-Multiple tiers allow balancing test coverage and testing costs. Lower test tiers are supposed to
-contain the simpler, quicker and more stable tests. Higher tiers are supposed to contain
-progressively more thorough, slower, and sometimes less stable tests, or the tests that require
-special configuration.
-
-Contributors are expected to run the tests for the areas that are changed, and the first N tiers
-they can afford to run, but at least tier1.
-
-A brief description of the tiered test groups:
-
-- `tier1`: This is the lowest test tier. Multiple developers run these tests every day.
-Because of the widespread use, the tests in `tier1` are carefully selected and optimized to run
-fast, and to run in the most stable manner. The test failures in `tier1` are usually followed up
-on quickly, either with fixes, or adding relevant tests to problem list. GitHub Actions workflows,
-if enabled, run `tier1` tests.
-
-- `tier2`: This test group covers even more ground. These contain, among other things,
-tests that either run for too long to be at `tier1`, or may require special configuration,
-or tests that are less stable, or cover the broader range of non-core JVM and JDK features/components
-(for example, XML).
-
-- `tier3`: This test group includes more stressful tests, the tests for corner cases
-not covered by previous tiers, plus the tests that require GUIs. As such, this suite
-should either be run with low concurrency (`TEST_JOBS=1`), or without headful tests
-(`JTREG_KEYWORDS=\!headful`), or both.
-
-- `tier4`: This test group includes every other test not covered by previous tiers. It includes,
-for example, `vmTestbase` suites for Hotspot, which run for many hours even on large
-machines. It also runs GUI tests, so the same `TEST_JOBS` and `JTREG_KEYWORDS` caveats
-apply.
-
 ### JTReg
 
 JTReg tests can be selected either by picking a JTReg test group, or a selection
@@ -315,10 +269,6 @@ Generate AOT modules before testing for the specified module, or set of
 modules. If multiple modules are specified, they should be separated by space
 (or, to help avoid quoting issues, the special value `%20`).
 
-#### RETRY_COUNT
-
-Retry failed tests up to a set number of times. Defaults to 0.
-
 ### Gtest keywords
 
 #### REPEAT

jb/project/docker/Dockerfile

@@ -4,9 +4,10 @@ RUN yum -y install centos-release-scl
 RUN yum -y install devtoolset-8
 RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel git
 # Install Java 11
-RUN wget https://cdn.azul.com/zulu/bin/zulu11.45.27-ca-jdk11.0.10-linux_x64.tar.gz \
+RUN wget https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbrsdk-11_0_3-linux-x64-b360.2.tar.gz \
 -O - | tar xz -C /
-ENV JAVA_HOME /zulu11.45.27-ca-jdk11.0.10-linux_x64
+ENV JAVA_HOME /jbrsdk
 ENV PATH $JAVA_HOME/bin:/opt/rh/devtoolset-8/root/usr/bin:$PATH
-RUN git config --global user.email "teamcity@buildserver.intellij.net"
-RUN git config --global user.name "builduser"
+RUN mkdir .git
+RUN git config user.email "builduser@jetbrains.com"
+RUN git config user.name "builduser"

jb/project/docker/Dockerfile.aarch64

@@ -1,39 +0,0 @@
-# NOTE: This Dockerfile is meant to be used from the mkdocker_aarch64.sh script.
-
-# Pull a concrete version of Linux that does NOT recieve updates after it's
-# been created.  This is so that the image is as stable as possible to make
-# image creation reproducible.
-# NB: this also means there may be no security-related fixes there, need to
-# move the version to the next manually.
-FROM arm64v8/centos:7
-
-# Install the necessary build tools
-RUN export DEBIAN_FRONTEND=noninteractive \
-    export DEBCONF_NONINTERACTIVE_SEEN=true && \
-    yum -y update && \
-    yum -y groupinstall \
-        "Development Tools" && \
-    yum -y install centos-release-scl && \
-    yum -y install devtoolset-8 && \
-    yum -y install \
-        centos-release-scl-rh \
-        devtoolset-8 \
-        which \
-        autoconf \
-        git \
-        file \
-        make \
-        libXtst-devel libXt-devel libXrender-devel libXrandr-devel libXi-devel \
-        cups-devel \
-        fontconfig-devel \
-        alsa-lib-devel \
-        unzip \
-        zip \
-        && \
-   yum -y clean all && \
-   rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-ENV PATH /opt/rh/devtoolset-8/root/usr/bin:$PATH
-
-RUN git config --global user.email "teamcity@jetbrains.com" && \
-    git config --global user.name "builduser"

jb/project/docker/Dockerfile.x86

@@ -1,6 +1,7 @@
 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 rsync
+  libpng12-0 libasound2 libfreetype6 libfontconfig1-dev libasound2-dev autoconf

jb/project/docker/mkdocker_aarch64.sh

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

jb/project/tools/common.sh

@@ -1,27 +1,3 @@
 VENDOR_NAME="JetBrains s.r.o."
 VENDOR_VERSION_STRING="JBR-${JBSDK_VERSION_WITH_DOTS}.${JDK_BUILD_NUMBER}-${build_number}"
 [ -z ${bundle_type} ] || VENDOR_VERSION_STRING="${VENDOR_VERSION_STRING}-${bundle_type}"
-
-do_reset_changes=0
-do_reset_dcevm=0
-HEAD_REVISION=0
-WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS="--with-native-debug-symbols=zipped"
-
-function zip_native_debug_symbols() {
-  image_bundle_path=$(echo $1 | cut -d"/" -f-4)
-  jbr_diz_name=$2
-
-  (cd $image_bundle_path && find . -name '*.diz' -exec rsync -R {} ../../../../dizfiles \; )
-
-  (cd dizfiles && find . -print0 | COPYFILE_DISABLE=1 \
-    tar --no-recursion --null -T - -czf ../"$jbr_diz_name".tar.gz) || do_exit $?
-}
-
-function do_exit() {
-  exit_code=$1
-  [ $do_reset_changes -eq 1 ] && git checkout HEAD jb/project/tools/common/modules.list src/java.desktop/share/classes/module-info.java
-  if [ $do_reset_dcevm -eq 1 ]; then
-    [ ! -z $HEAD_REVISION ] && git reset --hard $HEAD_REVISION
-  fi
-  exit $exit_code
-}

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

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# $1 - Boot JDK
-# $2 - JBR part of API version
-
-cd "`dirname "$0"`/../../../../.."
-PWD="`pwd`"
-CONF="$PWD/build/jbr-api.conf"
-./configure --with-debug-level=release --with-boot-jdk=$1 || exit $?
-make jbr-api CONF=release MAKEOVERRIDES= "JBR_API_CONF_FILE=$CONF" JBR_API_JBR_VERSION=$2 || exit $?
-. $CONF || exit $?
-echo "##teamcity[buildNumber '$VERSION']"
-cp "$JAR" ./jbr-api-${VERSION}.jar || exit $?
-cp "$SOURCES_JAR" ./jbr-api-${VERSION}-sources.jar || exit $?
-echo "##teamcity[publishArtifacts '$PWD/jbr-api-${VERSION}.jar']"
-echo "##teamcity[publishArtifacts '$PWD/jbr-api-${VERSION}-sources.jar']"

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

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

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

@@ -1,177 +1,86 @@
 #!/bin/bash -x
 
 # The following parameters must be specified:
-#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument to configure
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
 #   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to be built; possible values:
-#                        jcef - the release bundles with jcef
-#                        dcevm - the release bundles with dcevm patches
-#                        nomod - the release bundles without any additional modules (jcef)
-#                        fd - the fastdebug bundles which also include the jcef module
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
-# jbrsdk-${JBSDK_VERSION}-osx-aarch64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-aarch64-b${build_number}.tar.gz
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 #
 # $ ./java --version
 # openjdk 11.0.6 2020-01-14
 # OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
 # OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
 #
-# Environment variables:
-#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
-#               By default imported modules should be located in ./jcef_linux_aarch64/modular-sdk
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_linux_aarch64
-
-while getopts ":i?" o; do
-    case "${o}" in
-        i)
-            i="incremental build"
-            INC_BUILD=1
-            ;;
-    esac
-done
-shift $((OPTIND-1))
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
-bundle_type=$4
+
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-JCEF_PATH=${JCEF_PATH:=./jcef_linux_aarch64}
-WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=${JCEF_PATH}/modular-sdk}"
 
 source jb/project/tools/common.sh
 
-function do_configure {
-  sh configure \
-    --disable-warnings-as-errors \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="${VENDOR_NAME}" \
-    --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    --with-boot-jdk=${BOOT_JDK} \
-    $WITH_IMPORT_MODULES \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    --enable-cds=yes || do_exit $?
-}
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 
-function create_jbr {
+sh configure \
+  --disable-warnings-as-errors \
+  --with-debug-level=release \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  --with-import-modules=./modular-sdk \
+  --with-boot-jdk=amazon-corretto-11.0.5.10.1-linux-aarch64 \
+  --enable-cds=yes || exit $?
+make clean CONF=linux-aarch64-normal-server-release || exit $?
+make images CONF=linux-aarch64-normal-server-release test-image || exit $?
 
-  JBR_BUNDLE=jbr_${bundle_type}
-
-  case "${bundle_type}" in
-  "jcef" | "dcevm" | "nomod" | "fd")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
-    ;;
-  esac
-  cat jb/project/tools/common/modules.list > modules_tmp.list
-  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
-
-  JBR=${JBR_BASE_NAME}-linux-aarch64-b${build_number}
-
-  echo Running jlink....
-  $JSDK/bin/jlink \
-    --module-path $JSDK/jmods --no-man-pages --compress=2 \
-    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $BASE_DIR/$JBR_BUNDLE  || do_exit $?
-
-  if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]; then
-    cp -R $BASE_DIR/$JBR_BUNDLE $BASE_DIR/jbr
-    rsync -av ${JCEF_PATH}/ $BASE_DIR/$JBR_BUNDLE/lib --exclude="modular-sdk" || do_exit $?
-  fi
-  grep -v "^JAVA_VERSION" $JSDK/release | grep -v "^MODULES" >> $BASE_DIR/$JBR_BUNDLE/release
-
-  echo Creating ${JBR}.tar.gz ...
-  rm -rf ${BASE_DIR}/jbr
-  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-  tar -pcf ${JBR}.tar -C ${BASE_DIR} jbr || do_exit $?
-  gzip -f ${JBR}.tar || do_exit $?
-  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
-}
-
-JBRSDK_BASE_NAME=jbrsdk_${bundle_type}-${JBSDK_VERSION}
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=linux-aarch64-normal-server-release
 JBSDK=${JBRSDK_BASE_NAME}-linux-aarch64-b${build_number}
-case "$bundle_type" in
-  "jcef")
-    git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
-    do_reset_changes=1
-    ;;
-  "dcevm")
-    HEAD_REVISION=$(git rev-parse HEAD)
-    git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
-    do_reset_dcevm=1
-    git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
-    do_reset_changes=1
-    ;;
-  "nomod")
-    WITH_IMPORT_MODULES=""
-    ;;
-  "fd")
-    git apply -p0 < jb/project/tools/patches/add_jcef_module_aarch64.patch || do_exit $?
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=linux-aarch64-normal-server-fastdebug
-    JBSDK=jbrsdk-${JBSDK_VERSION}-linux-aarch64-fastdebug-b${build_number}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
-    ;;
-esac
-
-if [ -z "$INC_BUILD" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
-
-JSDK=build/${RELEASE_NAME}/images/jdk
+BASE_DIR=build/linux-aarch64-normal-server-release/images
+JSDK=${BASE_DIR}/jdk
+JBRSDK_BUNDLE=jbrsdk
 
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-BASE_DIR=build/${RELEASE_NAME}/images
-if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "jcef" ]; then
-  JBRSDK_BUNDLE=jbrsdk_${bundle_type}
-else
-  JBRSDK_BUNDLE=jbrsdk
-fi
-
-rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE}
-cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || do_exit $?
-
-if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]; then
-  rsync -av ${JCEF_PATH}/ $BASE_DIR/$JBRSDK_BUNDLE/lib --exclude="modular-sdk" || do_exit $?
-fi
+rm -rf $BASE_DIR/$JBRSDK_BUNDLE
+cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
 
 echo Creating $JBSDK.tar.gz ...
 sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
 mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
 
-tar -pcf ${JBSDK}.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
-  -C ${BASE_DIR} ${JBRSDK_BUNDLE} || do_exit $?
-gzip -f ${JBSDK}.tar || do_exit $?
+tar -pcf $JBSDK.tar \
+  --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
+  -C $BASE_DIR ${JBRSDK_BUNDLE} || exit $?
+gzip $JBSDK.tar || exit $?
 
-zip_native_debug_symbols ${BASE_DIR}/jdk "${JBSDK}_diz"
+JBR_BUNDLE=jbr
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+rm -rf $BASE_DIR/$JBR_BUNDLE
 
-create_jbr || do_exit $?
+JBR=$JBR_BASE_NAME-linux-aarch64-b$build_number
+grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.aarch64
+echo Running jlink....
+${JSDK}/bin/jlink \
+  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+  --add-modules $(xargs < modules.list.aarch64 | sed s/" "//g | sed s/,$//g) \
+  --output ${BASE_DIR}/${JBR_BUNDLE} || exit $?
 
-if [ "$bundle_type" == "dcevm" ]; then
-  make test-image CONF=$RELEASE_NAME || do_exit $?
+echo Modifying release info ...
+grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${BASE_DIR}/${JBR_BUNDLE}/release
 
-  JBRSDK_TEST=jbrsdk-${JBSDK_VERSION}-linux-test-aarch64-b$build_number
+echo Creating $JBR.tar.gz ...
+tar -pcf $JBR.tar -C $BASE_DIR ${JBR_BUNDLE} || exit $?
+gzip $JBR.tar || exit $?
 
-  echo Creating $JBSDK_TEST.tar.gz ...
-  tar -pcf ${JBRSDK_TEST}.tar -C ${BASE_DIR} --exclude='test/jdk/demos' test || do_exit $?
-  gzip -f ${JBRSDK_TEST}.tar || do_exit $?
-fi
-
-do_exit 0
+JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-aarch64-b$build_number
+echo Creating $JBRSDK_TEST.tar.gz ...
+tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
+gzip $JBRSDK_TEST.tar || exit $?

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

@@ -1,14 +1,12 @@
 #!/bin/bash -x
 
 # The following parameters must be specified:
-#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument to configure
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
 #   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to be built; possible values:
-#                        jcef - the release bundles with jcef
-#                        dcevm - the release bundles with dcevm patches
-#                        nomod - the release bundles without any additional modules (jcef)
-#                        fd - the fastdebug bundles which also include the jcef module
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -20,158 +18,130 @@
 #
 # Environment variables:
 #   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
-#               By default imported modules should be located in ./jcef_linux_x64/modular-sdk
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_linux_x64
-
-while getopts ":i?" o; do
-    case "${o}" in
-        i)
-            i="incremental build"
-            INC_BUILD=1
-            ;;
-    esac
-done
-shift $((OPTIND-1))
+#               By default imported modules should be located in ./modular-sdk
+#   JCEF_PATH - specifies the path to the directory where JCEF binaries are located.
+#               By default imported modules should be located in ./jcef_linux_x64
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
 JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
-WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=${JCEF_PATH}/modular-sdk}"
 
 source jb/project/tools/common.sh
 
-function do_configure {
-  sh configure \
-    --disable-warnings-as-errors \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="${VENDOR_NAME}" \
-    --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    --with-boot-jdk=${BOOT_JDK} \
-    $WITH_IMPORT_MODULES \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    --enable-cds=yes || do_exit $?
-}
-
 function create_jbr {
 
-  JBR_BUNDLE=jbr_${bundle_type}
-
-  case "${bundle_type}" in
-  "jcef" | "dcevm" | "nomod" | "fd")
+  case "$1" in
+  "${bundle_type}_lw")
+    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
+    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
+    ;;
+  "jfx" | "jcef" | "dcevm" | "nomod")
     JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
+    cat modules.list > modules_tmp.list
+    ;;
+  "jfx_jcef")
+    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
+    cat modules.list > modules_tmp.list
     ;;
   *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
+    echo "***ERR*** bundle was not specified" && exit 1
     ;;
   esac
-  cat jb/project/tools/common/modules.list > modules_tmp.list
   rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 
-  JBR=${JBR_BASE_NAME}-linux-x64-b${build_number}
+  JBR=$JBR_BASE_NAME-linux-x64-b$build_number
 
   echo Running jlink....
   $JSDK/bin/jlink \
     --module-path $JSDK/jmods --no-man-pages --compress=2 \
-    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $BASE_DIR/$JBR_BUNDLE  || do_exit $?
+    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output $BASE_DIR/$JBR_BUNDLE
 
-  if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]; then
+  if [[ "$bundle_type" == *jcef* ]] || [[ "$bundle_type" == *dcevm* ]]; then
     cp -R $BASE_DIR/$JBR_BUNDLE $BASE_DIR/jbr
-    rsync -av ${JCEF_PATH}/ $BASE_DIR/$JBR_BUNDLE/lib --exclude="modular-sdk" || do_exit $?
+    cp -R ${JCEF_PATH}/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
   fi
   grep -v "^JAVA_VERSION" $JSDK/release | grep -v "^MODULES" >> $BASE_DIR/$JBR_BUNDLE/release
 
-  echo Creating ${JBR}.tar.gz ...
+  echo Creating $JBR.tar.gz ...
   rm -rf ${BASE_DIR}/jbr
   cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-  tar -pcf ${JBR}.tar -C ${BASE_DIR} jbr || do_exit $?
-  gzip -f ${JBR}.tar || do_exit $?
+  tar -pcf $JBR.tar -C $BASE_DIR jbr || exit $?
+  gzip $JBR.tar || exit $?
   rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 }
 
-JBRSDK_BASE_NAME=jbrsdk_${bundle_type}-${JBSDK_VERSION}
+JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
 WITH_DEBUG_LEVEL="--with-debug-level=release"
 RELEASE_NAME=linux-x86_64-normal-server-release
-JBSDK=${JBRSDK_BASE_NAME}-linux-x64-b${build_number}
+git checkout -- modules.list src/java.desktop/share/classes/module-info.java
 case "$bundle_type" in
+  "jfx")
+    git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch
+    ;;
   "jcef")
-    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-    do_reset_changes=1
+    git apply -p0 < jb/project/tools/patches/exclude_jfx_module.patch
     ;;
   "dcevm")
-    HEAD_REVISION=$(git rev-parse HEAD)
-    git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
-    do_reset_dcevm=1
-    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-    do_reset_changes=1
+    git am jb/project/tools/patches/dcevm/*.patch
     ;;
   "nomod")
+    git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch
+    git apply -p0 < jb/project/tools/patches/exclude_jfx_module.patch
     WITH_IMPORT_MODULES=""
     ;;
-  "fd")
-    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=linux-x86_64-normal-server-fastdebug
-    JBSDK=jbrsdk-${JBSDK_VERSION}-linux-x64-fastdebug-b${build_number}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
-    ;;
 esac
 
-if [ -z "$INC_BUILD" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$RELEASE_NAME || do_exit $?
+sh configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  $WITH_IMPORT_MODULES \
+  --enable-cds=yes || exit $?
 
-JSDK=build/${RELEASE_NAME}/images/jdk
+make images CONF=$RELEASE_NAME || exit $?
+
+JSDK=build/$RELEASE_NAME/images/jdk
+JBSDK=$JBRSDK_BASE_NAME-linux-x64-b$build_number
 
 echo Fixing permissions
 chmod -R a+r $JSDK
 
-BASE_DIR=build/${RELEASE_NAME}/images
-if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "jcef" ]; then
-  JBRSDK_BUNDLE=jbrsdk_${bundle_type}
-else
-  JBRSDK_BUNDLE=jbrsdk
+BASE_DIR=build/$RELEASE_NAME/images
+JBRSDK_BUNDLE=jbrsdk
+
+rm -rf $BASE_DIR/$JBRSDK_BUNDLE
+cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
+
+if [[ "$bundle_type" == *jcef* ]] || [[ "$bundle_type" == *dcevm* ]]; then
+  cp -R ${JCEF_PATH}/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
+fi
+if [ "$bundle_type" == "jfx_jcef" ]; then
+  echo Creating $JBSDK.tar.gz ...
+  sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
+  mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
+
+  tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
+    -C $BASE_DIR $JBRSDK_BUNDLE || exit $?
+  gzip $JBSDK.tar || exit $?
 fi
 
-rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE}
-cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || do_exit $?
+JBR_BUNDLE=jbr_${bundle_type}
+create_jbr ${bundle_type}
 
-if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]; then
-  rsync -av ${JCEF_PATH}/ $BASE_DIR/$JBRSDK_BUNDLE/lib --exclude="modular-sdk" || do_exit $?
-fi
+if [ "$bundle_type" == "jfx_jcef" ]; then
+  make test-image || exit $?
 
-echo Creating $JBSDK.tar.gz ...
-sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
-mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
-
-tar -pcf ${JBSDK}.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
-  -C ${BASE_DIR} ${JBRSDK_BUNDLE} || do_exit $?
-gzip -f ${JBSDK}.tar || do_exit $?
-
-zip_native_debug_symbols ${BASE_DIR}/jdk "${JBSDK}_diz"
-
-create_jbr || do_exit $?
-
-if [ "$bundle_type" == "dcevm" ]; then
-  make test-image CONF=$RELEASE_NAME || do_exit $?
-
-  JBRSDK_TEST=jbrsdk-${JBSDK_VERSION}-linux-test-x64-b$build_number
+  JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x64-b$build_number
 
   echo Creating $JBSDK_TEST.tar.gz ...
-  tar -pcf ${JBRSDK_TEST}.tar -C ${BASE_DIR} --exclude='test/jdk/demos' test || do_exit $?
-  gzip -f ${JBRSDK_TEST}.tar || do_exit $?
-fi
-
-do_exit 0
+  tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' test || exit $?
+  gzip $JBRSDK_TEST.tar || exit $?
+fi

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

@@ -0,0 +1,90 @@
+#!/bin/bash -x
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+# Environment variables:
+#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
+#               By default imported modules should be located in ./modular-sdk
+#   JCEF_PATH - specifies the path to the directory where JCEF binaries are located.
+#               By default imported modules should be located in ./jcef_linux_x64
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
+JCEF_PATH=${JCEF_PATH:=./jcef_linux_x64}
+
+source jb/project/tools/common.sh
+
+
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+
+sh configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  --with-import-modules=./modular-sdk \
+  --enable-cds=yes || exit $?
+make clean CONF=linux-x86_64-normal-server-fastdebug || exit $?
+make images CONF=linux-x86_64-normal-server-fastdebug || exit $?
+
+JBSDK=${JBRSDK_BASE_NAME}-linux-x64-fastdebug-b${build_number}
+BASE_DIR=build/linux-x86_64-normal-server-fastdebug/images
+JSDK=${BASE_DIR}/jdk
+JBRSDK_BUNDLE=jbrsdk
+
+echo Fixing permissions
+chmod -R a+r $JSDK
+
+rm -rf $BASE_DIR/$JBRSDK_BUNDLE
+cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || exit $?
+cp -R jcef_linux_x64/* $BASE_DIR/$JBRSDK_BUNDLE/lib || exit $?
+
+echo Creating $JBSDK.tar.gz ...
+sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/release > release
+mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
+
+tar -pcf $JBSDK.tar \
+  --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man \
+  -C $BASE_DIR ${JBRSDK_BUNDLE} || exit $?
+gzip $JBSDK.tar || exit $?
+
+JBR_BUNDLE=jbr
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+rm -rf $BASE_DIR/$JBR_BUNDLE
+
+JBR=$JBR_BASE_NAME-linux-x64-fastdebug-b$build_number
+echo Running jlink....
+${JSDK}/bin/jlink \
+  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+  --add-modules $(xargs < modules.list | sed s/" "//g | sed s/,$//g) \
+  --output ${BASE_DIR}/${JBR_BUNDLE} || exit $?
+cp -R jcef_linux_x64/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
+
+echo Modifying release info ...
+grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${BASE_DIR}/${JBR_BUNDLE}/release
+
+echo Creating $JBR.tar.gz ...
+tar -czf $JBR.tar -C $BASE_DIR ${JBR_BUNDLE} || exit $?
+gzip $JBR.tar || exit $?

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

@@ -6,6 +6,7 @@
 #   build_number     - specifies the number of JetBrainsRuntime build
 #   bundle_type      - specifies bundle to bu built; possible values:
 #                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -19,7 +20,6 @@
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
-BOOT_JDK=${BOOT_JDK:=$(/jbrsdk-11.0.5-b1)}
 
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
 
@@ -32,12 +32,10 @@ linux32 bash configure \
   --with-debug-level=release \
   --with-vendor-name="${VENDOR_NAME}" \
   --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-  --with-jvm-features=shenandoahgc \
   --with-version-pre= \
   --with-version-build=$JDK_BUILD_NUMBER \
   --with-version-opt=b${build_number} \
-  --with-boot-jdk=${BOOT_JDK} \
-   $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
+  --with-boot-jdk=/jbrsdk-11.0.5-b1 \
   --enable-cds=yes || exit $?
 make clean CONF=linux-x86-normal-server-release || exit $?
 make images CONF=linux-x86-normal-server-release test-image || exit $?
@@ -60,14 +58,12 @@ mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/release
 tar -pcf $JBSDK.tar --exclude=*.debuginfo --exclude=demo --exclude=sample --exclude=man -C $BASE_DIR ${JBRSDK_BUNDLE} || exit $?
 gzip $JBSDK.tar || exit $?
 
-zip_native_debug_symbols ${BASE_DIR}/jdk "${JBSDK}_diz"
-
 JBR_BUNDLE=jbr
 JBR_BASE_NAME=jbr-$JBSDK_VERSION
 rm -rf $BASE_DIR/$JBR_BUNDLE
 
 JBR=$JBR_BASE_NAME-linux-x86-b$build_number
-grep -v javafx jb/project/tools/common/modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.x86
+grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.x86
 echo Running jlink....
 ${JSDK}/bin/jlink \
   --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
@@ -83,4 +79,4 @@ gzip $JBR.tar || exit $?
 JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x86-b$build_number
 echo Creating $JBRSDK_TEST.tar.gz ...
 tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' --exclude='test/hotspot/gtest' test || exit $?
-gzip $JBRSDK_TEST.tar || exit $?
+gzip $JBRSDK_TEST.tar || exit $?

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

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

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

@@ -1,14 +1,12 @@
 #!/bin/bash -x
 
 # The following parameters must be specified:
-#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument to configure
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
 #   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to be built; possible values:
-#                        jcef - the release bundles with jcef
-#                        dcevm - the release bundles with dcevm patches
-#                        nomod - the release bundles without any additional modules (jcef)
-#                        fd - the fastdebug bundles which also include the jcef module
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
 #
 # jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
 # jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
@@ -20,98 +18,39 @@
 #
 # Environment variables:
 #   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
-#               By default imported modules should be located in ./jcef_mac/modular-sdk
-#   JCEF_PATH - specifies the path to the directory with JCEF binaries.
-#               By default JCEF binaries should be located in ./jcef_mac
-
-while getopts ":i?" o; do
-    case "${o}" in
-        i)
-            i="incremental build"
-            INC_BUILD=1
-            ;;
-    esac
-done
-shift $((OPTIND-1))
+#               By default imported modules should be located in ./modular-sdk
+#   JCEF_PATH - specifies the path to the directory where JCEF binaries are located.
+#               By default imported modules should be located in ./jcef_mac
 
 JBSDK_VERSION=$1
 JDK_BUILD_NUMBER=$2
 build_number=$3
 bundle_type=$4
-architecture=$5 # aarch64 or x64
-enable_aot=$6 # temporary param for building test jre with aot under aarch64
 JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
 JCEF_PATH=${JCEF_PATH:=./jcef_mac}
-WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=${JCEF_PATH}/modular-sdk}"
-architecture=${architecture:=x64}
-BOOT_JDK=${BOOT_JDK:=$(/usr/libexec/java_home -v 11)}
 
 source jb/project/tools/common.sh
 
-function do_configure {
-  if [[ "${architecture}" == *aarch64* ]]; then
-    # NOTE: aot, cds aren't supported yet
-    WITH_JVM_FEATURES="--with-jvm-features=-aot"
-    if [[ "${enable_aot}" == *enable_aot* ]]; then
-      echo "Enable unstable jvm feature: AOT"
-      WITH_JVM_FEATURES=""
-    fi
-    sh configure \
-    --disable-warnings-as-errors \
-    $WITH_DEBUG_LEVEL \
-    --with-vendor-name="${VENDOR_NAME}" \
-    --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-    --with-jvm-features=shenandoahgc \
-    --with-version-pre= \
-    --with-version-build=${JDK_BUILD_NUMBER} \
-    --with-version-opt=b${build_number} \
-    $WITH_IMPORT_MODULES \
-    $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-    --with-boot-jdk=${BOOT_JDK} \
-    --disable-hotspot-gtest --disable-javac-server --disable-full-docs --disable-manpages \
-    --enable-cds=no \
-    $WITH_JVM_FEATURES \
-    --with-extra-cflags="-F$(pwd)/Frameworks" \
-    --with-extra-cxxflags="-F$(pwd)/Frameworks" \
-    --with-extra-ldflags="-F$(pwd)/Frameworks" || do_exit $?
-  else
-    sh configure \
-      --disable-warnings-as-errors \
-      $WITH_DEBUG_LEVEL \
-      --with-vendor-name="${VENDOR_NAME}" \
-      --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-      --with-jvm-features=shenandoahgc \
-      --with-version-pre= \
-      --with-version-build=${JDK_BUILD_NUMBER} \
-      --with-version-opt=b${build_number} \
-      $WITH_IMPORT_MODULES \
-      $WITH_ZIPPED_NATIVE_DEBUG_SYMBOLS \
-      --with-boot-jdk=${BOOT_JDK} \
-      --enable-cds=yes || do_exit $?
-  fi
-}
-
 function create_jbr {
 
-  JBR_BUNDLE=jbr_${bundle_type}
-
-  case "${bundle_type}" in
-  "jcef" | "dcevm" | "nomod" | "fd")
+  case "$1" in
+  "${bundle_type}_lw")
+    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
+    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
+    ;;
+  "jfx" | "jcef" | "dcevm" | "nomod")
     JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
+    cat modules.list > modules_tmp.list
+    ;;
+  "jfx_jcef")
+    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
+    cat modules.list > modules_tmp.list
     ;;
   *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
+    echo "***ERR*** bundle was not specified" && exit 1
     ;;
   esac
-  if [[ "${architecture}" == *aarch64* ]] && [[ "${enable_aot}" != *enable_aot* ]]; then
-    # aot isn't supported yet, so remove dependent modules
-    echo "Exclude jdk.internal.vm.compiler and jdk.aot (because aot not supported yet)"
-    cat jb/project/tools/common/modules.list | \
-      grep -v "jdk.internal.vm.compiler\|jdk.aot" \
-      > modules_tmp.list
-  else
-    cat jb/project/tools/common/modules.list > modules_tmp.list
-  fi
   rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 
   JRE_CONTENTS=${BASE_DIR}/${JBR_BUNDLE}/Contents
@@ -121,109 +60,94 @@ function create_jbr {
   fi
   mkdir -p ${JRE_CONTENTS}
 
-  JBR=${JBR_BASE_NAME}-osx-${architecture}-b${build_number}
+  JBR=${JBR_BASE_NAME}-osx-x64-b${build_number}
 
-  echo Running jlink....
   ${BASE_DIR}/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
       --module-path ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/jmods --no-man-pages --compress=2 \
-      --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JRE_HOME}  || do_exit $?
+      --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JRE_HOME}  || exit $?
   grep -v "^JAVA_VERSION" ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release | grep -v "^MODULES" >> ${JRE_HOME}/release
   cp -R ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/MacOS ${JRE_CONTENTS}
   cp ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Info.plist ${JRE_CONTENTS}
 
-  rm -rf ${JRE_CONTENTS}/Frameworks || do_exit $?
-  if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]; then
-    cp -a ${JCEF_PATH}/Frameworks ${JRE_CONTENTS} || do_exit $?
+  if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]]; then
+    rm -rf ${JRE_CONTENTS}/Frameworks || exit $?
+    cp -a ${JCEF_PATH}/Frameworks ${JRE_CONTENTS} || exit $?
   fi
 
   echo Creating ${JBR}.tar.gz ...
   rm -rf ${BASE_DIR}/jbr
   cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-
-  COPYFILE_DISABLE=1 tar -pczf ${JBR}.tar.gz --exclude='*.dSYM' --exclude='man' -C ${BASE_DIR} jbr || do_exit $?
+  COPYFILE_DISABLE=1 tar -pczf ${JBR}.tar.gz --exclude='*.dSYM' --exclude='man' -C ${BASE_DIR} jbr || exit $?
   rm -rf ${BASE_DIR}/${JBR_BUNDLE}
 }
 
-JBRSDK_BASE_NAME=jbrsdk_${bundle_type}-${JBSDK_VERSION}
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
 WITH_DEBUG_LEVEL="--with-debug-level=release"
-CONF_ARCHITECTURE=x86_64
-if [[ "${architecture}" == *aarch64* ]]; then
-  CONF_ARCHITECTURE=aarch64
-fi
-CONF_NAME=macosx-${CONF_ARCHITECTURE}-normal-server-release
-
-JBSDK="${JBRSDK_BASE_NAME}-osx-${architecture}-b${build_number}"
+RELEASE_NAME=macosx-x86_64-normal-server-release
+git checkout -- modules.list src/java.desktop/share/classes/module-info.java
 case "$bundle_type" in
+  "jfx")
+    git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch
+    ;;
   "jcef")
-    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-    do_reset_changes=1
+    git apply -p0 < jb/project/tools/patches/exclude_jfx_module.patch
     ;;
   "dcevm")
-    HEAD_REVISION=$(git rev-parse HEAD)
-    git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
-    do_reset_dcevm=1
-    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-    do_reset_changes=1
+    git am jb/project/tools/patches/dcevm/*.patch
     ;;
   "nomod")
+    git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch
+    git apply -p0 < jb/project/tools/patches/exclude_jfx_module.patch
     WITH_IMPORT_MODULES=""
     ;;
-  "fd")
-    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    CONF_NAME=macosx-${CONF_ARCHITECTURE}-normal-server-fastdebug
-    JBSDK=jbrsdk-${JBSDK_VERSION}-osx-${architecture}-fastdebug-b${build_number}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
-    ;;
 esac
 
-if [ -z "$INC_BUILD" ]; then
-  do_configure || do_exit $?
-  make clean CONF=$RELEASE_NAME || do_exit $?
-fi
-make images CONF=$CONF_NAME || do_exit $?
+sh configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  $WITH_IMPORT_MODULES \
+  --with-boot-jdk=`/usr/libexec/java_home -v 11` \
+  --enable-cds=yes || exit $?
 
-JSDK=build/${CONF_NAME}/images/jdk-bundle
+make clean images CONF=$RELEASE_NAME || exit $?
+
+JSDK=build/$RELEASE_NAME/images/jdk-bundle
+JBSDK=${JBRSDK_BASE_NAME}-osx-x64-b${build_number}
 
 BASE_DIR=jre
-if [ "${bundle_type}" == "dcevm" ] || [ "${bundle_type}" == "jcef" ]; then
-  JBRSDK_BUNDLE=jbrsdk_${bundle_type}
-else
-  JBRSDK_BUNDLE=jbrsdk
-fi
+JBRSDK_BUNDLE=jbrsdk
 
 rm -rf $BASE_DIR
-mkdir $BASE_DIR || do_exit $?
-cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || do_exit $?
-if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]; then
+mkdir $BASE_DIR || exit $?
+cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
+
+if [[ "$bundle_type" == *jcef* ]] || [[ "$bundle_type" == *dcevm* ]]; then
   cp -a ${JCEF_PATH}/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
 fi
-
-echo Creating $JBSDK.tar.gz ...
-sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release > release
-mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release
-[ -f "${JBSDK}.tar.gz" ] && rm "${JBSDK}.tar.gz"
-COPYFILE_DISABLE=1 tar -pczf ${JBSDK}.tar.gz -C ${BASE_DIR} \
-  --exclude='.DS_Store' --exclude='*~' \
-  --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
-  ${JBRSDK_BUNDLE} || do_exit $?
-
-zip_native_debug_symbols ${JSDK} "${JBSDK}_diz"
-
-create_jbr || do_exit $?
-
-if [ "$bundle_type" == "dcevm" ]; then
-  make test-image CONF=$CONF_NAME || do_exit $?
-
-  JBRSDK_TEST=jbrsdk-${JBSDK_VERSION}-osx-test-${architecture}-b$build_number
-
-  echo Creating $JBRSDK_TEST.tar.gz ...
-  [ -f "${JBRSDK_TEST}.tar.gz" ] && rm "${JBRSDK_TEST}.tar.gz"
-  COPYFILE_DISABLE=1 tar -pczf ${JBRSDK_TEST}.tar.gz -C build/${CONF_NAME}/images \
-    --exclude='test/jdk/demos' test || do_exit $?
+if [ "$bundle_type" == "jfx_jcef" ]; then
+  echo Creating $JBSDK.tar.gz ...
+  sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release > release
+  mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release
+  COPYFILE_DISABLE=1 tar -pczf $JBSDK.tar.gz -C $BASE_DIR \
+    --exclude='._*' --exclude='.DS_Store' --exclude='*~' \
+    --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
+    $JBRSDK_BUNDLE || exit $?
 fi
 
-do_exit 0
+JBR_BUNDLE=jbr_${bundle_type}
+create_jbr "${bundle_type}" || exit $?
+
+if [ "$bundle_type" == "jfx_jcef" ]; then
+  make test-image || exit $?
+
+  JBRSDK_TEST=$JBRSDK_BASE_NAME-osx-test-x64-b$build_number
+
+  echo Creating $JBRSDK_TEST.tar.gz ...
+  COPYFILE_DISABLE=1 tar -pczf $JBRSDK_TEST.tar.gz -C build/macosx-x86_64-normal-server-release/images \
+    --exclude='test/jdk/demos' test || exit $?
+fi

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

@@ -0,0 +1,99 @@
+#!/bin/bash -x
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+# Environment variables:
+#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
+#               By default imported modules should be located in ./modular-sdk
+#   JCEF_PATH - specifies the path to the directory where JCEF binaries are located.
+#               By default imported modules should be located in ./jcef_mac
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=./modular-sdk}"
+JCEF_PATH=${JCEF_PATH:=./jcef_mac}
+
+source jb/project/tools/common.sh
+
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
+
+sh configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  $WITH_IMPORT_MODULES \
+  --with-boot-jdk=`/usr/libexec/java_home -v 11` \
+  --enable-cds=yes || exit $?
+make clean CONF=macosx-x86_64-normal-server-fastdebug || exit $?
+make images CONF=macosx-x86_64-normal-server-fastdebug || exit $?
+
+JSDK=build/macosx-x86_64-normal-server-fastdebug/images/jdk-bundle
+JBSDK=${JBRSDK_BASE_NAME}-osx-x64-fastdebug-b${build_number}
+
+BASE_DIR=jre
+JBRSDK_BUNDLE=jbrsdk
+
+rm -rf $BASE_DIR
+mkdir $BASE_DIR || exit $?
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+cp -a $JSDK/jdk-$JBSDK_VERSION_WITH_DOTS.jdk $BASE_DIR/$JBRSDK_BUNDLE || exit $?
+
+echo Creating $JBSDK.tar.gz ...
+cp -a ${JCEF_PATH}/Frameworks $BASE_DIR/$JBRSDK_BUNDLE/Contents/
+
+sed 's/JBR/JBRSDK/g' ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release > release
+mv release ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release
+
+COPYFILE_DISABLE=1 \
+  tar -pczf ${JBSDK}.tar.gz -C ${BASE_DIR} \
+    --exclude='._*' --exclude='.DS_Store' --exclude='*~' \
+    --exclude='Home/demo' --exclude='Home/man' --exclude='Home/sample' \
+    ${JBRSDK_BUNDLE} || exit $?
+
+JBR_BUNDLE=jbr
+JRE_CONTENTS=$BASE_DIR/$JBR_BUNDLE/Contents
+JRE_HOME=$JRE_CONTENTS/Home
+      JBR_BASE_NAME=jbr-$JBSDK_VERSION
+
+mkdir -p $JRE_CONTENTS
+
+if [ -d "$JRE_HOME" ]; then
+  rm -rf $JRE_HOME
+fi
+
+JBR=${JBR_BASE_NAME}-osx-x64-fastdebug-b${build_number}
+
+$BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
+    --module-path $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/jmods --no-man-pages --compress=2 \
+    --add-modules $(xargs < modules.list | sed s/" "//g) --output $JRE_HOME  || exit $?
+grep -v "^JAVA_VERSION" $BASE_DIR/$JBRSDK_BUNDLE/Contents/Home/release | grep -v "^MODULES" >> $JRE_HOME/release
+cp -R $BASE_DIR/$JBRSDK_BUNDLE/Contents/MacOS $JRE_CONTENTS
+cp $BASE_DIR/$JBRSDK_BUNDLE/Contents/Info.plist $JRE_CONTENTS
+cp -a ${JCEF_PATH}/Frameworks ${JRE_CONTENTS} || exit $?
+
+
+echo Creating $JBR.tar.gz ...
+COPYFILE_DISABLE=1 tar -pczf $JBR.tar.gz --exclude='*.dSYM' --exclude='man' -C $BASE_DIR $JBR_BUNDLE || exit $?

jb/project/tools/mac/scripts/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/mac/scripts/sign.sh

@@ -26,30 +26,17 @@ log "Signing libraries and executables..."
 # -perm +111 searches for executables
 for f in \
    "Contents/Home/bin" \
-   "Contents/Home/lib"; do
+   "Contents/Home/lib" \
+   "Contents/Frameworks"; do
   if [ -d "$APP_DIRECTORY/$f" ]; then
     find "$APP_DIRECTORY/$f" \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -perm +111 \) \
-      -exec codesign --timestamp --force \
+      -exec codesign --timestamp \
       -v -s "$JB_CERT" --options=runtime \
       --entitlements entitlements.xml {} \;
   fi
 done
 
-if [ -d "$APP_DIRECTORY/Contents/Frameworks" ]; then
-  log "Signing frameworks..."
-  for f in $APP_DIRECTORY/Contents/Frameworks/*; do
-    find "$f" \
-      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" \) \
-      -exec codesign --timestamp --force \
-      -v -s "$JB_CERT" \
-      --entitlements entitlements.xml {} \;
-    codesign --timestamp --force \
-      -v -s "$JB_CERT" --options=runtime \
-      --entitlements entitlements.xml "$f"
-  done
-fi
-
 log "Signing libraries in jars in $PWD"
 
 # todo: add set -euo pipefail; into the inner sh -c
@@ -68,7 +55,7 @@ find "$APP_DIRECTORY" -name '*.jar' \
 
     find jarfolder \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "jattach" \) \
-      -exec codesign --timestamp --force \
+      -exec codesign --timestamp \
       -v -s "$JB_CERT" --options=runtime \
       --entitlements entitlements.xml {} \;
 
@@ -84,7 +71,7 @@ for f in \
   if [ -d "$APP_DIRECTORY/$f" ]; then
     find "$APP_DIRECTORY/$f" \
       -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -perm +111 \) \
-      -exec codesign --timestamp --force \
+      -exec codesign --timestamp \
       -v -s "$JB_CERT" --options=runtime \
       --entitlements entitlements.xml {} \;
   fi

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

@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 #immediately exit script with an error if a command fails
 set -euo pipefail
@@ -32,10 +32,8 @@ mkdir "$BACKUP_JMODS"
 
 log "Unzipping $INPUT_FILE to $EXPLODED ..."
 tar -xzvf "$INPUT_FILE" --directory $EXPLODED
-BUILD_NAME="$(ls "$EXPLODED")"
-sed -i '' s/BNDL/APPL/ $EXPLODED/$BUILD_NAME/Contents/Info.plist
-rm -f $EXPLODED/$BUILD_NAME/Contents/CodeResources
 rm "$INPUT_FILE"
+BUILD_NAME="$(ls "$EXPLODED")"
 if test -d $EXPLODED/$BUILD_NAME/Contents/Home/jmods; then
   mv $EXPLODED/$BUILD_NAME/Contents/Home/jmods $BACKUP_JMODS
 fi
@@ -127,8 +125,8 @@ log "Zipping $BUILD_NAME to $INPUT_FILE ..."
     mv $BACKUP_JMODS/jmods $EXPLODED/$BUILD_NAME/Contents/Home
   fi
 
-  tar -pczvf $INPUT_FILE --exclude='*.dSYM' --exclude='man' -C $EXPLODED $BUILD_NAME
+  COPYFILE_DISABLE=1 tar -pczf $INPUT_FILE --exclude='*.dSYM' --exclude='man' -C $EXPLODED $BUILD_NAME
   log "Finished zipping"
 )
 rm -rf "$EXPLODED"
-log "Done"
+log "Done"

jb/project/tools/patches/add_jcef_module.patch

@@ -1,30 +0,0 @@
-diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
-index 33375b527c4..76539cbc0e0 100644
---- jb/project/tools/common/modules.list
-+++ jb/project/tools/common/modules.list
-@@ -55,4 +55,7 @@ jdk.unsupported,
- jdk.xml.dom,
- jdk.zipfs,
- jdk.hotspot.agent,
--jdk.jcmd
-+jdk.jcmd,
-+jcef,
-+gluegen.rt,
-+jogl.all
-diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
-index b663b382f52..3e9acdc0c27 100644
---- src/java.desktop/share/classes/module-info.java
-+++ src/java.desktop/share/classes/module-info.java
-@@ -109,7 +109,11 @@ module java.desktop {
-     // see make/GensrcModuleInfo.gmk
-     exports sun.awt to
-         jdk.accessibility,
--        jdk.unsupported.desktop;
-+        jdk.unsupported.desktop,
-+        jcef,
-+        jogl.all;
-+
-+    exports java.awt.peer to jcef;
- 
-     exports java.awt.dnd.peer to jdk.unsupported.desktop;
-     exports sun.awt.dnd to jdk.unsupported.desktop;

jb/project/tools/patches/add_jcef_module_aarch64.patch

@@ -1,27 +0,0 @@
-diff --git jb/project/tools/common/modules.list jb/project/tools/common/modules.list
-index 33375b527c4..76539cbc0e0 100644
---- jb/project/tools/common/modules.list
-+++ jb/project/tools/common/modules.list
-@@ -55,4 +55,5 @@ jdk.unsupported,
- jdk.xml.dom,
- jdk.zipfs,
- jdk.hotspot.agent,
--jdk.jcmd
-+jdk.jcmd,
-+jcef
-diff --git src/java.desktop/share/classes/module-info.java src/java.desktop/share/classes/module-info.java
-index b663b382f52..3e9acdc0c27 100644
---- src/java.desktop/share/classes/module-info.java
-+++ src/java.desktop/share/classes/module-info.java
-@@ -109,7 +109,10 @@ module java.desktop {
-     // see make/GensrcModuleInfo.gmk
-     exports sun.awt to
-         jdk.accessibility,
--        jdk.unsupported.desktop;
-+        jdk.unsupported.desktop,
-+        jcef;
-+
-+    exports java.awt.peer to jcef;
- 
-     exports java.awt.dnd.peer to jdk.unsupported.desktop;
-     exports sun.awt.dnd to jdk.unsupported.desktop;

jb/project/tools/patches/dcevm/0002-We-need-to-set-classRedefinitionCount-on-new-class-n.patch

@@ -0,0 +1,26 @@
+From a4b2a34a6c9d477ce339bece718abe992cdd5002 Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Wed, 14 Nov 2018 21:18:22 +0100
+Subject: [PATCH 02/50] We need to set classRedefinitionCount on new class, not
+ old class.
+
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 83c0952de37..83cf0be090b 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -1904,7 +1904,7 @@ void VM_EnhancedRedefineClasses::increment_class_counter(InstanceKlass *ik, TRAP
+   oop class_mirror = ik->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(class_mirror, new_count);
++  java_lang_Class::set_classRedefinedCount(ik->new_version()->java_mirror(), new_count);
+ 
+   if (class_oop != _the_class_oop) {
+     // _the_class_oop count is printed at end of redefine_single_class()
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0003-Fix-crashes-in-MetadataOnStackMark-MetadataOnSta.patch

@@ -0,0 +1,30 @@
+From e5c0b2d69ab024ec0469f5c105f13f889b598815 Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Wed, 14 Nov 2018 21:22:01 +0100
+Subject: [PATCH 03/50] Fix crashes in MetadataOnStackMark::~MetadataOnSta
+
+MetadataOnStackMark shoukld not remove dcevm stuff. It was added
+accidentaly in dcevm9,
+and never was part of doit() in previous versions.
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 83cf0be090b..61af07d0f86 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -470,7 +470,9 @@ void VM_EnhancedRedefineClasses::doit() {
+ 
+   // Mark methods seen on stack and everywhere else so old methods are not
+   // cleaned up if they're on the stack.
+-  MetadataOnStackMark md_on_stack(true);
++
++  // FIXME: fails in enhanced redefinition
++  // MetadataOnStackMark md_on_stack(true);
+   HandleMark hm(thread);   // make sure any handles created are deleted
+                            // before the stack walk again.
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0003-Support-for-Concurrent-Mark-Sweep-CMS-collector.patch

@@ -1,488 +0,0 @@
-From 049d83cfb1db63a0c20cd53696686a7ae11be824 Mon Sep 17 00:00:00 2001
-From: skybber <lada.dvorak7@gmail.com>
-Date: Wed, 12 Dec 2018 19:38:28 +0100
-Subject: [PATCH 03/44] Support for Concurrent Mark Sweep (CMS) collector
-
----
- .../share/gc/cms/compactibleFreeListSpace.cpp | 139 ++++++++++++------
- .../share/gc/cms/compactibleFreeListSpace.hpp |   5 +-
- .../gc/cms/concurrentMarkSweepThread.cpp      |  10 +-
- src/hotspot/share/gc/serial/markSweep.cpp     |   2 +-
- src/hotspot/share/gc/shared/gcConfig.cpp      |   2 +-
- src/hotspot/share/gc/shared/space.cpp         |  16 +-
- src/hotspot/share/gc/shared/space.hpp         |   6 +-
- src/hotspot/share/gc/shared/space.inline.hpp  |  16 +-
- .../prims/jvmtiEnhancedRedefineClasses.cpp    |  12 +-
- src/hotspot/share/runtime/arguments.cpp       |   6 +-
- 10 files changed, 135 insertions(+), 79 deletions(-)
-
-diff --git a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
-index 4c9918627a2..f335173576f 100644
---- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
-+++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
-@@ -376,55 +376,58 @@ CompactibleFreeListSpace::CompactibleFreeListSpace(BlockOffsetSharedArray* bs, M
-   _used_stable = 0;
- }
- 
-+#define forward_compact_top_DEFN()                                                    \
-+  assert(this == cp->space, "'this' should be current compaction space.");            \
-+  size_t compaction_max_size = pointer_delta(end(), compact_top);                     \
-+  assert(adjustObjectSize(size) == cp->space->adjust_object_size_v(size),             \
-+    "virtual adjustObjectSize_v() method is not correct");                            \
-+  size_t adjusted_size = adjustObjectSize(size);                                      \
-+  assert(compaction_max_size >= MinChunkSize || compaction_max_size == 0,             \
-+         "no small fragments allowed");                                               \
-+  assert(minimum_free_block_size() == MinChunkSize,                                   \
-+         "for de-virtualized reference below");                                       \
-+  /* Can't leave a nonzero size, residual fragment smaller than MinChunkSize */       \
-+  if (adjusted_size + MinChunkSize > compaction_max_size &&                           \
-+      adjusted_size != compaction_max_size) {                                         \
-+    do {                                                                              \
-+      /* switch to next compaction space*/                                            \
-+      cp->space->set_compaction_top(compact_top);                                     \
-+      cp->space = cp->space->next_compaction_space();                                 \
-+      if (cp->space == NULL) {                                                        \
-+        cp->gen = CMSHeap::heap()->young_gen();                                       \
-+        assert(cp->gen != NULL, "compaction must succeed");                           \
-+        cp->space = cp->gen->first_compaction_space();                                \
-+        assert(cp->space != NULL, "generation must have a first compaction space");   \
-+      }                                                                               \
-+      compact_top = cp->space->bottom();                                              \
-+      cp->space->set_compaction_top(compact_top);                                     \
-+      /* The correct adjusted_size may not be the same as that for this method */     \
-+      /* (i.e., cp->space may no longer be "this" so adjust the size again. */        \
-+      /* Use the virtual method which is not used above to save the virtual */        \
-+      /* dispatch. */                                                                 \
-+      adjusted_size = cp->space->adjust_object_size_v(size);                          \
-+      compaction_max_size = pointer_delta(cp->space->end(), compact_top);             \
-+      assert(cp->space->minimum_free_block_size() == 0, "just checking");             \
-+    } while (adjusted_size > compaction_max_size);                                    \
-+  }
-+
-+
- HeapWord* CompactibleFreeListSpace::forward_compact_top(size_t size,
-                                     CompactPoint* cp, HeapWord* compact_top) {
--  ShouldNotReachHere();
--  return NULL;
-+  forward_compact_top_DEFN()
-+  return compact_top;
- }
- 
- // Like CompactibleSpace forward() but always calls cross_threshold() to
- // update the block offset table.  Removed initialize_threshold call because
- // CFLS does not use a block offset array for contiguous spaces.
- HeapWord* CompactibleFreeListSpace::forward(oop q, size_t size,
--                                    CompactPoint* cp, HeapWord* compact_top) {
--  // q is alive
--  // First check if we should switch compaction space
--  assert(this == cp->space, "'this' should be current compaction space.");
--  size_t compaction_max_size = pointer_delta(end(), compact_top);
--  assert(adjustObjectSize(size) == cp->space->adjust_object_size_v(size),
--    "virtual adjustObjectSize_v() method is not correct");
--  size_t adjusted_size = adjustObjectSize(size);
--  assert(compaction_max_size >= MinChunkSize || compaction_max_size == 0,
--         "no small fragments allowed");
--  assert(minimum_free_block_size() == MinChunkSize,
--         "for de-virtualized reference below");
--  // Can't leave a nonzero size, residual fragment smaller than MinChunkSize
--  if (adjusted_size + MinChunkSize > compaction_max_size &&
--      adjusted_size != compaction_max_size) {
--    do {
--      // switch to next compaction space
--      cp->space->set_compaction_top(compact_top);
--      cp->space = cp->space->next_compaction_space();
--      if (cp->space == NULL) {
--        cp->gen = CMSHeap::heap()->young_gen();
--        assert(cp->gen != NULL, "compaction must succeed");
--        cp->space = cp->gen->first_compaction_space();
--        assert(cp->space != NULL, "generation must have a first compaction space");
--      }
--      compact_top = cp->space->bottom();
--      cp->space->set_compaction_top(compact_top);
--      // The correct adjusted_size may not be the same as that for this method
--      // (i.e., cp->space may no longer be "this" so adjust the size again.
--      // Use the virtual method which is not used above to save the virtual
--      // dispatch.
--      adjusted_size = cp->space->adjust_object_size_v(size);
--      compaction_max_size = pointer_delta(cp->space->end(), compact_top);
--      assert(cp->space->minimum_free_block_size() == 0, "just checking");
--    } while (adjusted_size > compaction_max_size);
--  }
-+                                    CompactPoint* cp, HeapWord* compact_top, bool force_forward) {
-+  forward_compact_top_DEFN()
- 
-   // store the forwarding pointer into the mark word
--  if ((HeapWord*)q != compact_top) {
-+  // the size of object changed for: new_version() != NULL
-+  if (force_forward || (HeapWord*)q != compact_top || q->klass()->new_version() != NULL) {
-     q->forward_to(oop(compact_top));
-     assert(q->is_gc_marked(), "encoding the pointer should preserve the mark");
-   } else {
-@@ -2209,13 +2212,60 @@ CompactibleFreeListSpace::refillLinearAllocBlock(LinearAllocBlock* blk) {
- 
- // Support for compaction
- void CompactibleFreeListSpace::prepare_for_compaction(CompactPoint* cp) {
--  scan_and_forward(this, cp, false);
--   // of the free lists doesn't work after.
-+  if (!Universe::is_redefining_gc_run()) {
-+    scan_and_forward(this, cp, false);
-+  } else {
-+    // Redefinition run
-+    scan_and_forward(this, cp, true);
-+  }
-   // Prepare_for_compaction() uses the space between live objects
-   // so that later phase can skip dead space quickly.  So verification
-   // of the free lists doesn't work after.
- }
- 
-+bool CompactibleFreeListSpace::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) return false;
-+
-+  int new_size = adjustObjectSize(old_obj->size_given_klass(oop(old_obj)->klass()->new_version()));
-+  int original_size = adjustObjectSize(old_obj->size());
-+
-+  Generation* tenured_gen = CMSHeap::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);
-+  if (old_in_tenured == new_in_tenured) {
-+    // Rescue if object may overlap with a higher memory address.
-+    bool overlap = ((HeapWord*)old_obj + original_size < (HeapWord*)new_obj + new_size);
-+    if (old_in_tenured) {
-+      // Old and new address are in same space, so just compare the address.
-+      // Must rescue if object moves towards the top of the space.
-+      assert(space_index(old_obj) == space_index(new_obj), "old_obj and new_obj must be in same space");
-+    } else {
-+      // In the new generation, eden is located before the from space, so a
-+      // simple pointer comparison is sufficient.
-+      assert(CMSHeap::heap()->young_gen()->is_in_reserved(old_obj), "old_obj must be in DefNewGeneration");
-+      assert(CMSHeap::heap()->young_gen()->is_in_reserved(new_obj), "new_obj must be in DefNewGeneration");
-+      assert(overlap == (space_index(old_obj) < space_index(new_obj)), "slow and fast computation must yield same result");
-+    }
-+    return overlap;
-+
-+  } else {
-+    assert(space_index(old_obj) != space_index(new_obj), "old_obj and new_obj must be in different spaces");
-+    if (new_in_tenured) {
-+      // Must never rescue when moving from the new into the old generation.
-+      assert(CMSHeap::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");
-+      return false;
-+
-+    } else /* if (tenured_gen->is_in_reserved(old_obj)) */ {
-+      // Must always rescue when moving from the old into the new generation.
-+      assert(CMSHeap::heap()->young_gen()->is_in_reserved(new_obj), "new_obj must be in DefNewGeneration");
-+      assert(space_index(old_obj) < space_index(new_obj), "must be");
-+      return true;
-+    }
-+  }
-+}
-+
- void CompactibleFreeListSpace::adjust_pointers() {
-   // In other versions of adjust_pointers(), a bail out
-   // based on the amount of live data in the generation
-@@ -2228,7 +2278,12 @@ void CompactibleFreeListSpace::adjust_pointers() {
- }
- 
- void CompactibleFreeListSpace::compact() {
--  scan_and_compact(this, false);
-+  if(!Universe::is_redefining_gc_run()) {
-+    scan_and_compact(this, false);
-+  } else {
-+    // Redefinition run
-+    scan_and_compact(this, true);
-+  }
- }
- 
- // Fragmentation metric = 1 - [sum of (fbs**2) / (sum of fbs)**2]
-diff --git a/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
-index 9fd2ea58320..d29b81f6fca 100644
---- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
-+++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
-@@ -201,7 +201,7 @@ class CompactibleFreeListSpace: public CompactibleSpace {
-   // Support for compacting cms
-   HeapWord* cross_threshold(HeapWord* start, HeapWord* end);
-   HeapWord* forward_compact_top(size_t size, CompactPoint* cp, HeapWord* compact_top);
--  HeapWord* forward(oop q, size_t size, CompactPoint* cp, HeapWord* compact_top);
-+  HeapWord* forward(oop q, size_t size, CompactPoint* cp, HeapWord* compact_top, bool force_forward);
- 
-   // Initialization helpers.
-   void initializeIndexedFreeListArray();
-@@ -576,6 +576,9 @@ class CompactibleFreeListSpace: public CompactibleSpace {
- 
-   // Support for compaction.
-   void prepare_for_compaction(CompactPoint* cp);
-+
-+  bool must_rescue(oop old_obj, oop new_obj);
-+
-   void adjust_pointers();
-   void compact();
-   // Reset the space to reflect the fact that a compaction of the
-diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp
-index 3ada5755875..b6e930922d7 100644
---- a/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp
-+++ b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp
-@@ -78,10 +78,12 @@ void ConcurrentMarkSweepThread::run_service() {
-   while (!should_terminate()) {
-     sleepBeforeNextCycle();
-     if (should_terminate()) break;
--    GCIdMark gc_id_mark;
--    GCCause::Cause cause = _collector->_full_gc_requested ?
--      _collector->_full_gc_cause : GCCause::_cms_concurrent_mark;
--    _collector->collect_in_background(cause);
-+    if (!Universe::is_redefining_gc_run()) {
-+        GCIdMark gc_id_mark;
-+        GCCause::Cause cause = _collector->_full_gc_requested ?
-+          _collector->_full_gc_cause : GCCause::_cms_concurrent_mark;
-+        _collector->collect_in_background(cause);
-+    }
-   }
- 
-   // Check that the state of any protocol for synchronization
-diff --git a/src/hotspot/share/gc/serial/markSweep.cpp b/src/hotspot/share/gc/serial/markSweep.cpp
-index d0ff86c8215..b4ed59f020c 100644
---- a/src/hotspot/share/gc/serial/markSweep.cpp
-+++ b/src/hotspot/share/gc/serial/markSweep.cpp
-@@ -247,7 +247,7 @@ void MarkSweep::copy_rescued_objects_back() {
- 
-       FREE_RESOURCE_ARRAY(HeapWord, rescued_ptr, size);
- 
--      new_obj->init_mark();
-+      new_obj->init_mark_raw();
-       assert(oopDesc::is_oop(new_obj), "must be a valid oop");
-     }
-     _rescued_oops->clear();
-diff --git a/src/hotspot/share/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
-index 9779df92447..adb0f5dd25c 100644
---- a/src/hotspot/share/gc/shared/gcConfig.cpp
-+++ b/src/hotspot/share/gc/shared/gcConfig.cpp
-@@ -106,7 +106,7 @@ void GCConfig::fail_if_unsupported_gc_is_selected() {
- }
- 
- void GCConfig::select_gc_ergonomically() {
--  if (AllowEnhancedClassRedefinition) {
-+  if (AllowEnhancedClassRedefinition && !UseConcMarkSweepGC) {
-     // Enhanced class redefinition only supports serial GC at the moment
-     FLAG_SET_ERGO(bool, UseSerialGC, true);
-   } else if (os::is_server_class_machine()) {
-diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
-index bc0dd1980db..56b144b46f1 100644
---- a/src/hotspot/share/gc/shared/space.cpp
-+++ b/src/hotspot/share/gc/shared/space.cpp
-@@ -388,11 +388,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 ((HeapWord*)q != compact_top || (size_t)q->size() != size) {
-+  if (force_forward || (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 {
-@@ -514,7 +514,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");
-@@ -858,14 +858,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;
-   }
- 
-@@ -879,7 +879,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.
-@@ -895,11 +895,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 8eb5669fb79..901c89d8a30 100644
---- a/src/hotspot/share/gc/shared/space.hpp
-+++ b/src/hotspot/share/gc/shared/space.hpp
-@@ -421,7 +421,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
-@@ -452,11 +452,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 6b109fcd2e5..8c255d6d428 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.
-@@ -352,7 +355,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
-       HeapWord* compaction_top = (HeapWord*)oop(cur_obj)->forwardee();
- 
-       if (redefinition_run &&  space->must_rescue(oop(cur_obj), oop(cur_obj)->forwardee())) {
--         space->rescue(cur_obj);
-+        space->rescue(cur_obj);
-         debug_only(Copy::fill_to_words(cur_obj, size, 0));
-         cur_obj += size;
-         continue;
-@@ -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 92ce6c27b8a..41e82ae7a69 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -54,6 +54,7 @@
- #include "prims/jvmtiThreadState.inline.hpp"
- #include "utilities/events.hpp"
- #include "oops/constantPool.inline.hpp"
-+#include "gc/cms/cmsHeap.hpp"
- 
- Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
- Array<Method*>* VM_EnhancedRedefineClasses::_new_methods = NULL;
-@@ -416,13 +417,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);
-@@ -432,11 +431,6 @@ public:
-           //  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);
--          }
-         }
-       } else {
-         obj->set_klass(obj->klass()->new_version());
-diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index 4e2a3ff1083..e3cb44d8690 100644
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -2045,14 +2045,14 @@ 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.
--    if (!UseSerialGC && i >= 1) {
-+    if ((!UseSerialGC && !UseConcMarkSweepGC) && i >= 1) {
-       jio_fprintf(defaultStream::error_stream(),
--                  "Must use the serial GC with enhanced class redefinition\n");
-+                  "Must use the serial or concurrent mark sweep GC with enhanced class redefinition.\n");
-       return false;
-     }
-   }
- 
--  if (i > 1) {
-+  if (i > 2) {
-     jio_fprintf(defaultStream::error_stream(),
-                 "Conflicting collector combinations in option list; "
-                 "please refer to the release notes for the combinations "
--- 
-2.23.0
-

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

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

jb/project/tools/patches/dcevm/0004-Fix-problem-with-nested-members.patch

@@ -0,0 +1,25 @@
+From 360fbbd15357fb3cb19abc6ffb40320efadce616 Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Mon, 3 Dec 2018 19:34:53 +0100
+Subject: [PATCH 04/50] Fix problem with nested members
+
+Reported at : https://stackoverflow.com/questions/53370380/hotswapagent-incompatibleclasschangeerror-type-headerpanel1-is-not-a-nest-mem
+---
+ src/hotspot/share/oops/instanceKlass.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index 8a262bc3735..9b6ba7e9304 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -178,6 +178,7 @@ bool InstanceKlass::has_nest_member(InstanceKlass* k, TRAPS) const {
+       }
+ 
+       Klass* k2 = _constants->klass_at(cp_index, CHECK_false);
++      k2 = k2->newest_version();
+       if (k2 == k) {
+         log_trace(class, nestmates)("- class is listed as a nest member");
+         return true;
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0005-HotswapAgent-integration.patch

@@ -1,659 +0,0 @@
-From 238ef84478962cdba49b479803163b6e71f46914 Mon Sep 17 00:00:00 2001
-From: skybber <lada.dvorak7@gmail.com>
-Date: Wed, 14 Nov 2018 21:20:08 +0100
-Subject: [PATCH 05/44] HotswapAgent integration
-
-It include:
-
-- option to compile DCEVM only version with -DDCEVM_ONLY added
-to CFLAGS (bash configure --with-extra-cflags="-DDCEVM_ONLY"), by
-default compilation goes with HotswapAgent
-
-Allow ha class initializer calls
-
-Add --add-opens for necessary modules/packages
-- java.base/java.lang - for reflection access to Proxy.proxyCache
-- java.base/jdk.internal.loader - for access proxyCache class
-- java.desktop/java.beans - for reflection access to Introspector
-- java.desktop/com.sun.beans
-- java.base/java.io
-- com.sun.beans.util
-
-Open jdk module to access ClassInfo.CACHE
-
-- be quiet if HotswapAgent is not found in lib/, it is compatible with
-old DCEVM
-- disable HotswapAgent for -Xshare:dump
-- disable HotswapAgent in jvm tools
-- disable HotswapAgent in keytool
----
- make/launcher/Launcher-java.base.gmk          |  1 +
- make/launcher/Launcher-java.rmi.gmk           |  2 +
- make/launcher/Launcher-java.scripting.gmk     |  3 +-
- make/launcher/Launcher-java.security.jgss.gmk |  3 +
- make/launcher/Launcher-jdk.aot.gmk            |  2 +
- make/launcher/Launcher-jdk.compiler.gmk       |  5 +-
- make/launcher/Launcher-jdk.hotspot.agent.gmk  |  1 +
- make/launcher/Launcher-jdk.jartool.gmk        |  2 +
- make/launcher/Launcher-jdk.javadoc.gmk        |  3 +-
- make/launcher/Launcher-jdk.jcmd.gmk           | 13 +++-
- make/launcher/Launcher-jdk.jconsole.gmk       |  5 +-
- make/launcher/Launcher-jdk.jdeps.gmk          |  3 +
- make/launcher/Launcher-jdk.jdi.gmk            |  1 +
- make/launcher/Launcher-jdk.jlink.gmk          |  5 +-
- make/launcher/Launcher-jdk.jshell.gmk         |  1 +
- make/launcher/Launcher-jdk.jstatd.gmk         |  1 +
- make/launcher/Launcher-jdk.pack.gmk           |  1 +
- make/launcher/Launcher-jdk.rmic.gmk           |  1 +
- .../Launcher-jdk.scripting.nashorn.shell.gmk  |  3 +-
- src/hotspot/share/classfile/vmSymbols.hpp     |  1 +
- .../share/interpreter/linkResolver.cpp        |  2 +-
- src/hotspot/share/runtime/arguments.cpp       | 67 +++++++++++++++++++
- src/hotspot/share/runtime/arguments.hpp       |  3 +
- src/hotspot/share/runtime/globals.hpp         | 12 +++-
- .../sun/beans/introspect/package-info.java    | 26 +++++++
- .../classes/com/sun/beans/package-info.java   | 26 +++++++
- .../com/sun/beans/util/package-info.java      | 26 +++++++
- .../share/classes/module-info.java            |  3 +
- 28 files changed, 210 insertions(+), 12 deletions(-)
- create mode 100644 src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java
- create mode 100644 src/java.desktop/share/classes/com/sun/beans/package-info.java
- create mode 100644 src/java.desktop/share/classes/com/sun/beans/util/package-info.java
-
-diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk
-index f6d4aa28fe6..38ba29530d8 100644
---- a/make/launcher/Launcher-java.base.gmk
-+++ b/make/launcher/Launcher-java.base.gmk
-@@ -52,6 +52,7 @@ endif
- 
- $(eval $(call SetupBuildLauncher, keytool, \
-     MAIN_CLASS := sun.security.tools.keytool.Main, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- ################################################################################
-diff --git a/make/launcher/Launcher-java.rmi.gmk b/make/launcher/Launcher-java.rmi.gmk
-index a69a90bcc81..07046232275 100644
---- a/make/launcher/Launcher-java.rmi.gmk
-+++ b/make/launcher/Launcher-java.rmi.gmk
-@@ -27,8 +27,10 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, rmid, \
-     MAIN_CLASS := sun.rmi.server.Activation, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, rmiregistry, \
-     MAIN_CLASS := sun.rmi.registry.RegistryImpl, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
-diff --git a/make/launcher/Launcher-java.scripting.gmk b/make/launcher/Launcher-java.scripting.gmk
-index 057d2bf3aca..cf100e20789 100644
---- a/make/launcher/Launcher-java.scripting.gmk
-+++ b/make/launcher/Launcher-java.scripting.gmk
-@@ -27,5 +27,6 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jrunscript, \
-     MAIN_CLASS := com.sun.tools.script.shell.Main, \
--    JAVA_ARGS := --add-modules ALL-DEFAULT, \
-+    JAVA_ARGS := --add-modules ALL-DEFAULT \
-+        -XX:+DisableHotswapAgent, \
- ))
-diff --git a/make/launcher/Launcher-java.security.jgss.gmk b/make/launcher/Launcher-java.security.jgss.gmk
-index 7411e1a21c4..2b856bfccb4 100644
---- a/make/launcher/Launcher-java.security.jgss.gmk
-+++ b/make/launcher/Launcher-java.security.jgss.gmk
-@@ -28,13 +28,16 @@ include LauncherCommon.gmk
- ifeq ($(OPENJDK_TARGET_OS), windows)
-   $(eval $(call SetupBuildLauncher, kinit, \
-       MAIN_CLASS := sun.security.krb5.internal.tools.Kinit, \
-+      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-   ))
- 
-   $(eval $(call SetupBuildLauncher, klist, \
-       MAIN_CLASS := sun.security.krb5.internal.tools.Klist, \
-+      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-   ))
- 
-   $(eval $(call SetupBuildLauncher, ktab, \
-       MAIN_CLASS := sun.security.krb5.internal.tools.Ktab, \
-+      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-   ))
- endif
-diff --git a/make/launcher/Launcher-jdk.aot.gmk b/make/launcher/Launcher-jdk.aot.gmk
-index 10717a5e1c5..2c52c31a555 100644
---- a/make/launcher/Launcher-jdk.aot.gmk
-+++ b/make/launcher/Launcher-jdk.aot.gmk
-@@ -31,6 +31,7 @@ include LauncherCommon.gmk
- $(eval $(call SetupBuildLauncher, jaotc, \
-     MAIN_CLASS := jdk.tools.jaotc.Main, \
-     EXTRA_JAVA_ARGS := -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI \
-+        -XX:+DisableHotswapAgent \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.amd64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-@@ -40,6 +41,7 @@ $(eval $(call SetupBuildLauncher, jaotc, \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-     , \
-     JAVA_ARGS := --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-+        -XX:+DisableHotswapAgent \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-diff --git a/make/launcher/Launcher-jdk.compiler.gmk b/make/launcher/Launcher-jdk.compiler.gmk
-index f71c37adf74..744969546de 100644
---- a/make/launcher/Launcher-jdk.compiler.gmk
-+++ b/make/launcher/Launcher-jdk.compiler.gmk
-@@ -27,12 +27,14 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, javac, \
-    MAIN_CLASS := com.sun.tools.javac.Main, \
--   JAVA_ARGS := --add-modules ALL-DEFAULT, \
-+   JAVA_ARGS := --add-modules ALL-DEFAULT \
-+       -XX:+DisableHotswapAgent, \
-    CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, serialver, \
-     MAIN_CLASS := sun.tools.serialver.SerialVer, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
-@@ -41,6 +43,7 @@ ifeq ($(ENABLE_SJAVAC), yes)
-   # into any real images
-   $(eval $(call SetupBuildLauncher, sjavac, \
-       MAIN_CLASS := com.sun.tools.sjavac.Main, \
-+      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-       CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
-       OUTPUT_DIR := $(JDK_OUTPUTDIR)/bin, \
-   ))
-diff --git a/make/launcher/Launcher-jdk.hotspot.agent.gmk b/make/launcher/Launcher-jdk.hotspot.agent.gmk
-index 76da3600368..9f12b05b172 100644
---- a/make/launcher/Launcher-jdk.hotspot.agent.gmk
-+++ b/make/launcher/Launcher-jdk.hotspot.agent.gmk
-@@ -27,5 +27,6 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jhsdb, \
-     MAIN_CLASS := sun.jvm.hotspot.SALauncher, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     MACOSX_PRIVILEGED := true, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jartool.gmk b/make/launcher/Launcher-jdk.jartool.gmk
-index f74e82bfdae..647d82b65b1 100644
---- a/make/launcher/Launcher-jdk.jartool.gmk
-+++ b/make/launcher/Launcher-jdk.jartool.gmk
-@@ -27,8 +27,10 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jar, \
-     MAIN_CLASS := sun.tools.jar.Main, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jarsigner, \
-     MAIN_CLASS := sun.security.tools.jarsigner.Main, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
-diff --git a/make/launcher/Launcher-jdk.javadoc.gmk b/make/launcher/Launcher-jdk.javadoc.gmk
-index 889028a2b17..c3d2093be04 100644
---- a/make/launcher/Launcher-jdk.javadoc.gmk
-+++ b/make/launcher/Launcher-jdk.javadoc.gmk
-@@ -27,6 +27,7 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, javadoc, \
-     MAIN_CLASS := jdk.javadoc.internal.tool.Main, \
--    JAVA_ARGS := --add-modules ALL-DEFAULT, \
-+    JAVA_ARGS := --add-modules ALL-DEFAULT \
-+        -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jcmd.gmk b/make/launcher/Launcher-jdk.jcmd.gmk
-index 7117fa78059..761a52d8466 100644
---- a/make/launcher/Launcher-jdk.jcmd.gmk
-+++ b/make/launcher/Launcher-jdk.jcmd.gmk
-@@ -30,6 +30,7 @@ $(eval $(call SetupBuildLauncher, jinfo, \
-     JAVA_ARGS := \
-         -Dsun.jvm.hotspot.debugger.useProcDebugger \
-         -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
-+        -XX:+DisableHotswapAgent, \
-     MACOSX_PRIVILEGED := true, \
- ))
- 
-@@ -37,28 +38,36 @@ $(eval $(call SetupBuildLauncher, jmap, \
-     MAIN_CLASS := sun.tools.jmap.JMap, \
-     JAVA_ARGS := \
-         -Dsun.jvm.hotspot.debugger.useProcDebugger \
--        -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
-+        -Dsun.jvm.hotspot.debugger.useWindbgDebugger \
-+        -XX:+DisableHotswapAgent, \
-     MACOSX_PRIVILEGED := true, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jps, \
-     MAIN_CLASS := sun.tools.jps.Jps, \
-+    JAVA_ARGS := \
-+        -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jstack, \
-     MAIN_CLASS := sun.tools.jstack.JStack, \
-     JAVA_ARGS := \
-         -Dsun.jvm.hotspot.debugger.useProcDebugger \
--        -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
-+        -Dsun.jvm.hotspot.debugger.useWindbgDebugger \
-+        -XX:+DisableHotswapAgent, \
-     MACOSX_PRIVILEGED := true, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jstat, \
-     MAIN_CLASS := sun.tools.jstat.Jstat, \
-+    JAVA_ARGS := \
-+        -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jcmd, \
-     MAIN_CLASS := sun.tools.jcmd.JCmd, \
-+    JAVA_ARGS := \
-+        -XX:+DisableHotswapAgent, \
- ))
- 
- # Hook to include the corresponding custom file, if present.
-diff --git a/make/launcher/Launcher-jdk.jconsole.gmk b/make/launcher/Launcher-jdk.jconsole.gmk
-index 575b9e0595b..2ec087d710f 100644
---- a/make/launcher/Launcher-jdk.jconsole.gmk
-+++ b/make/launcher/Launcher-jdk.jconsole.gmk
-@@ -28,8 +28,9 @@ include LauncherCommon.gmk
- $(eval $(call SetupBuildLauncher, jconsole, \
-     MAIN_CLASS := sun.tools.jconsole.JConsole, \
-     JAVA_ARGS := --add-opens java.base/java.io=jdk.jconsole \
--		 -Djconsole.showOutputViewer \
--		 -Djdk.attach.allowAttachSelf=true, \
-+      -Djconsole.showOutputViewer \
-+      -Djdk.attach.allowAttachSelf=true \
-+      -XX:+DisableHotswapAgent, \
-     CFLAGS_windows := -DJAVAW, \
-     LIBS_windows := user32.lib, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jdeps.gmk b/make/launcher/Launcher-jdk.jdeps.gmk
-index 217523c48cc..5448278dae7 100644
---- a/make/launcher/Launcher-jdk.jdeps.gmk
-+++ b/make/launcher/Launcher-jdk.jdeps.gmk
-@@ -27,15 +27,18 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, javap, \
-     MAIN_CLASS := com.sun.tools.javap.Main, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jdeps, \
-     MAIN_CLASS := com.sun.tools.jdeps.Main, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jdeprscan, \
-     MAIN_CLASS := com.sun.tools.jdeprscan.Main, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jdi.gmk b/make/launcher/Launcher-jdk.jdi.gmk
-index fcce98cf430..27bd448e3ae 100644
---- a/make/launcher/Launcher-jdk.jdi.gmk
-+++ b/make/launcher/Launcher-jdk.jdi.gmk
-@@ -27,4 +27,5 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jdb, \
-     MAIN_CLASS := com.sun.tools.example.debug.tty.TTY, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jlink.gmk b/make/launcher/Launcher-jdk.jlink.gmk
-index df2173996d7..9e61edeb2c8 100644
---- a/make/launcher/Launcher-jdk.jlink.gmk
-+++ b/make/launcher/Launcher-jdk.jlink.gmk
-@@ -27,18 +27,21 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jimage,\
-     MAIN_CLASS := jdk.tools.jimage.Main, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DENABLE_ARG_FILES, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jlink,\
-     MAIN_CLASS := jdk.tools.jlink.internal.Main, \
--    JAVA_ARGS :=  --add-modules ALL-DEFAULT, \
-+    JAVA_ARGS :=  --add-modules ALL-DEFAULT \
-+        -XX:+DisableHotswapAgent, \
-     CFLAGS := -DENABLE_ARG_FILES \
-         -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jmod,\
-     MAIN_CLASS := jdk.tools.jmod.Main, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DENABLE_ARG_FILES \
-         -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jshell.gmk b/make/launcher/Launcher-jdk.jshell.gmk
-index 349eb88e9eb..7287f8f998a 100644
---- a/make/launcher/Launcher-jdk.jshell.gmk
-+++ b/make/launcher/Launcher-jdk.jshell.gmk
-@@ -27,5 +27,6 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jshell, \
-     MAIN_CLASS := jdk.internal.jshell.tool.JShellToolProvider, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jstatd.gmk b/make/launcher/Launcher-jdk.jstatd.gmk
-index e9286d63094..e1657910c67 100644
---- a/make/launcher/Launcher-jdk.jstatd.gmk
-+++ b/make/launcher/Launcher-jdk.jstatd.gmk
-@@ -27,6 +27,7 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jstatd, \
-     MAIN_CLASS := sun.tools.jstatd.Jstatd, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- # Hook to include the corresponding custom file, if present.
-diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk
-index a93fd2a9017..64bbbb7c949 100644
---- a/make/launcher/Launcher-jdk.pack.gmk
-+++ b/make/launcher/Launcher-jdk.pack.gmk
-@@ -28,6 +28,7 @@ include LauncherCommon.gmk
- $(eval $(call SetupBuildLauncher, pack200, \
-     MAIN_MODULE := java.base, \
-     MAIN_CLASS := com.sun.java.util.jar.pack.Driver, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- ################################################################################
-diff --git a/make/launcher/Launcher-jdk.rmic.gmk b/make/launcher/Launcher-jdk.rmic.gmk
-index d60c3d9b60b..b8a55900b0e 100644
---- a/make/launcher/Launcher-jdk.rmic.gmk
-+++ b/make/launcher/Launcher-jdk.rmic.gmk
-@@ -27,5 +27,6 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, rmic, \
-     MAIN_CLASS := sun.rmi.rmic.Main, \
-+    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
-index 82311e69fd6..bd39f8595b2 100644
---- a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
-+++ b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
-@@ -27,6 +27,7 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jjs, \
-     MAIN_CLASS := jdk.nashorn.tools.jjs.Main, \
--    JAVA_ARGS := --add-modules ALL-DEFAULT, \
-+    JAVA_ARGS := --add-modules ALL-DEFAULT \
-+        -XX:+DisableHotswapAgent, \
-     CFLAGS := -DENABLE_ARG_FILES, \
- ))
-diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
-index 17f7e720c95..0d0badeabd0 100644
---- a/src/hotspot/share/classfile/vmSymbols.hpp
-+++ b/src/hotspot/share/classfile/vmSymbols.hpp
-@@ -343,6 +343,7 @@
-   /* common method and field names */                                                             \
-   template(object_initializer_name,                   "<init>")                                   \
-   template(class_initializer_name,                    "<clinit>")                                 \
-+  template(ha_class_initializer_name,                 "$$ha$clinit")                              \
-   template(println_name,                              "println")                                  \
-   template(printStackTrace_name,                      "printStackTrace")                          \
-   template(main_name,                                 "main")                                     \
-diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
-index 0c24146ff00..9dc184d02f5 100644
---- a/src/hotspot/share/interpreter/linkResolver.cpp
-+++ b/src/hotspot/share/interpreter/linkResolver.cpp
-@@ -1009,7 +1009,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
-         assert(!m.is_null(), "information about the current method must be available for 'put' bytecodes");
-         bool is_initialized_static_final_update = (byte == Bytecodes::_putstatic &&
-                                                    fd.is_static() &&
--                                                   !m()->is_static_initializer());
-+                                                   !(m()->is_static_initializer() || m()->name() == vmSymbols::ha_class_initializer_name()));
-         bool is_initialized_instance_final_update = ((byte == Bytecodes::_putfield || byte == Bytecodes::_nofast_putfield) &&
-                                                      !fd.is_static() &&
-                                                      !m->is_object_initializer());
-diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index e3cb44d8690..36276741b5c 100644
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -3967,6 +3967,8 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
-   // Set object alignment values.
-   set_object_alignment();
- 
-+  setup_hotswap_agent();
-+
- #if !INCLUDE_CDS
-   if (DumpSharedSpaces || RequireSharedSpaces) {
-     jio_fprintf(defaultStream::error_stream(),
-@@ -4300,3 +4302,68 @@ 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 (!AllowEnhancedClassRedefinition)
-+    return;
-+
-+  // Set HotswapAgent
-+  if (!DisableHotswapAgent) {
-+
-+    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) {
-+      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());
-+    }
-+
-+    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_property("jdk.module.addopens", "java.base/java.lang=ALL-UNNAMED", addopens_count++);
-+  // Class of  field java.lang.reflect.Proxy/proxyCache
-+  create_numbered_property("jdk.module.addopens", "java.base/jdk.internal.loader=ALL-UNNAMED", addopens_count++);
-+  // Use to access java.io.Reader, java.io.InputStream, java.io.FileInputStream
-+  create_numbered_property("jdk.module.addopens", "java.base/java.io=ALL-UNNAMED", addopens_count++);
-+  // java.beans.Introspector access
-+  create_numbered_property("jdk.module.addopens", "java.desktop/java.beans=ALL-UNNAMED", addopens_count++);
-+  // java.beans.Introspector access
-+  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans=ALL-UNNAMED", addopens_count++);
-+  // com.sun.beans.introspect.ClassInfo access
-+  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans.introspect=ALL-UNNAMED", addopens_count++);
-+  // com.sun.beans.introspect.util.Cache access
-+  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans.util=ALL-UNNAMED", addopens_count++);
-+
-+}
-diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
-index 5cb7f5c4bd8..d7fd03d079e 100644
---- a/src/hotspot/share/runtime/arguments.hpp
-+++ b/src/hotspot/share/runtime/arguments.hpp
-@@ -507,6 +507,9 @@ 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/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 35b8205f7c7..4d6fe0034a3 100644
---- a/src/hotspot/share/runtime/globals.hpp
-+++ b/src/hotspot/share/runtime/globals.hpp
-@@ -32,6 +32,12 @@
- 
- #include <float.h> // for DBL_MAX
- 
-+#ifdef DCEVM_ONLY
-+#define DISABLED_HOTSWAP_AGENT true
-+#else
-+#define DISABLED_HOTSWAP_AGENT false
-+#endif
-+
- // The larger HeapWordSize for 64bit requires larger heaps
- // for the same application running in 64bit.  See bug 4967770.
- // The minimum alignment to a heap word size is done.  Other
-@@ -2687,8 +2693,10 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
-                                                                             \
-   product(bool, AllowEnhancedClassRedefinition, true,                       \
-              "Allow enhanced class redefinition beyond swapping method "    \
--             "bodies")
--
-+             "bodies")                                                      \
-+                                                                            \
-+  product(bool, DisableHotswapAgent, DISABLED_HOTSWAP_AGENT,                \
-+             "Disable integrated Hotswap Agent (HotswapVM only)")
- #define VM_FLAGS(develop,                                                   \
-                  develop_pd,                                                \
-                  product,                                                   \
-diff --git a/src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java b/src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java
-new file mode 100644
-index 00000000000..6636e4dd62a
---- /dev/null
-+++ b/src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (c) 1998, 2017, 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 com.sun.beans.introspect;
-diff --git a/src/java.desktop/share/classes/com/sun/beans/package-info.java b/src/java.desktop/share/classes/com/sun/beans/package-info.java
-new file mode 100644
-index 00000000000..5c097eeaa53
---- /dev/null
-+++ b/src/java.desktop/share/classes/com/sun/beans/package-info.java
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (c) 1998, 2017, 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 com.sun.beans;
-diff --git a/src/java.desktop/share/classes/com/sun/beans/util/package-info.java b/src/java.desktop/share/classes/com/sun/beans/util/package-info.java
-new file mode 100644
-index 00000000000..2d5d735ffa8
---- /dev/null
-+++ b/src/java.desktop/share/classes/com/sun/beans/util/package-info.java
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (c) 1998, 2017, 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 com.sun.beans.util;
-diff --git a/src/java.desktop/share/classes/module-info.java b/src/java.desktop/share/classes/module-info.java
-index b663b382f52..2a8f0a67d52 100644
---- a/src/java.desktop/share/classes/module-info.java
-+++ b/src/java.desktop/share/classes/module-info.java
-@@ -104,6 +104,9 @@ module java.desktop {
-     exports javax.swing.text.rtf;
-     exports javax.swing.tree;
-     exports javax.swing.undo;
-+    exports com.sun.beans;
-+    exports com.sun.beans.introspect;
-+    exports com.sun.beans.util;
- 
-     // qualified exports may be inserted at build time
-     // see make/GensrcModuleInfo.gmk
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0005-Use-init_mark_raw.patch

@@ -0,0 +1,26 @@
+From 4e2aef4c3b201e9639acdd39aa9e7ecdc9fb6a86 Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Mon, 10 Dec 2018 20:12:07 +0100
+Subject: [PATCH 05/50] Use init_mark_raw()
+
+method changed since j8 - it used init_mark()
+---
+ src/hotspot/share/gc/shared/space.inline.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp
+index 4394eff00c5..75d7e685edf 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 {
+           MarkSweep::update_fields(oop(cur_obj), oop(compaction_top));
+         }
+-        oop(compaction_top)->init_mark();
++        oop(compaction_top)->init_mark_raw();
+         assert(oop(compaction_top)->klass() != NULL, "should have a class");
+ 
+         debug_only(prev_obj = cur_obj);
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0006-Fix-methodHandles.patch

@@ -0,0 +1,25 @@
+From 15194627b2573f109aef2cacc6ebfb600d0a20f0 Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Thu, 13 Dec 2018 20:51:09 +0100
+Subject: [PATCH 06/50] Fix methodHandles
+
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 61af07d0f86..1c7595787a1 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -248,7 +248,7 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+     int ref_kind =       (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK;
+     if (MethodHandles::ref_kind_is_method(ref_kind)) {
+       Method* m = (Method*) java_lang_invoke_MemberName::vmtarget(obj);
+-      if (m != NULL && m->method_holder()->new_version() != NULL) {
++      if (m != NULL && m->method_holder()->is_redefining()) {
+         // Let's try to re-resolve method
+         InstanceKlass* newest = InstanceKlass::cast(m->method_holder()->newest_version());
+         Method* new_method = newest->find_method(m->name(), m->signature());
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -1,258 +0,0 @@
-From 2b6afed7b4bd890326b2cc7a3eaf3020e3f0fe44 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sun, 4 Oct 2020 21:12:12 +0200
-Subject: [PATCH 06/44] Support for Lambda class redefinition
-
----
- .../share/classfile/classLoaderData.cpp       |  9 +++
- .../share/classfile/classLoaderData.hpp       |  1 +
- .../share/classfile/systemDictionary.cpp      | 12 +++-
- .../share/classfile/systemDictionary.hpp      |  2 +
- .../prims/jvmtiEnhancedRedefineClasses.cpp    | 65 +++++++++++++++++--
- .../prims/jvmtiEnhancedRedefineClasses.hpp    |  1 +
- .../share/prims/resolvedMethodTable.cpp       |  4 +-
- src/hotspot/share/prims/unsafe.cpp            |  1 +
- 8 files changed, 85 insertions(+), 10 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 3f75bffce8a..a901b4309b9 100644
---- a/src/hotspot/share/classfile/classLoaderData.cpp
-+++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -663,6 +663,15 @@ Dictionary* ClassLoaderData::create_dictionary() {
-   return new Dictionary(this, size, resizable);
- }
- 
-+void ClassLoaderData::exchange_holders(ClassLoaderData* cld) {
-+  oop holder_oop = _holder.peek();
-+  _holder.replace(cld->_holder.peek());
-+  cld->_holder.replace(holder_oop);
-+  WeakHandle<vm_class_loader_data> exchange = _holder;
-+  _holder = cld->_holder;
-+  cld->_holder = exchange;
-+}
-+
- // Tell the GC to keep this klass alive while iterating ClassLoaderDataGraph
- oop ClassLoaderData::holder_phantom() const {
-   // A klass that was previously considered dead can be looked up in the
-diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp
-index b5a7cf21c85..c4f617ab800 100644
---- a/src/hotspot/share/classfile/classLoaderData.hpp
-+++ b/src/hotspot/share/classfile/classLoaderData.hpp
-@@ -292,6 +292,7 @@ class ClassLoaderData : public CHeapObj<mtClass> {
-   void accumulate_modified_oops()        { if (has_modified_oops()) _accumulated_modified_oops = true; }
-   void clear_accumulated_modified_oops() { _accumulated_modified_oops = false; }
-   bool has_accumulated_modified_oops()   { return _accumulated_modified_oops; }
-+  void exchange_holders(ClassLoaderData* cld);
-  private:
- 
-   void unload();
-diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 0059af83584..89375cd59fa 100644
---- a/src/hotspot/share/classfile/systemDictionary.cpp
-+++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -970,12 +970,16 @@ InstanceKlass* SystemDictionary::parse_stream(Symbol* class_name,
-                                               Handle protection_domain,
-                                               ClassFileStream* st,
-                                               const InstanceKlass* host_klass,
-+                                              InstanceKlass* old_klass,
-                                               GrowableArray<Handle>* cp_patches,
-                                               TRAPS) {
- 
-   EventClassLoad class_load_start_event;
- 
-   ClassLoaderData* loader_data;
-+
-+  bool is_redefining = (old_klass != NULL);
-+
-   if (host_klass != NULL) {
-     // Create a new CLD for anonymous class, that uses the same class loader
-     // as the host_klass
-@@ -999,8 +1003,12 @@ InstanceKlass* SystemDictionary::parse_stream(Symbol* class_name,
-                                                       protection_domain,
-                                                       host_klass,
-                                                       cp_patches,
--                                                      false, // pick_newest
-+                                                      is_redefining, // pick_newest
-                                                       CHECK_NULL);
-+  if (is_redefining && k != NULL) {
-+    k->set_redefining(true);
-+    k->set_old_version(old_klass);
-+  }
- 
-   if (host_klass != NULL && k != NULL) {
-     // Anonymous classes must update ClassLoaderData holder (was host_klass loader)
-@@ -1841,7 +1849,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 8b5ba8546dd..0002abe6122 100644
---- a/src/hotspot/share/classfile/systemDictionary.hpp
-+++ b/src/hotspot/share/classfile/systemDictionary.hpp
-@@ -307,6 +307,7 @@ public:
-                         protection_domain,
-                         st,
-                         NULL, // host klass
-+                        NULL, // old class
-                         NULL, // cp_patches
-                         THREAD);
-   }
-@@ -315,6 +316,7 @@ public:
-                                      Handle protection_domain,
-                                      ClassFileStream* st,
-                                      const InstanceKlass* host_klass,
-+                                     InstanceKlass* old_klass,
-                                      GrowableArray<Handle>* cp_patches,
-                                      TRAPS);
- 
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 41e82ae7a69..b94caa39562 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -488,6 +488,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;
-@@ -750,12 +752,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();
- 
-@@ -1436,6 +1460,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];
-@@ -1973,7 +2021,10 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
-   // Find classes not directly redefined, but affected by a redefinition (because one of its supertypes is redefined)
-   AffectedKlassClosure closure(_affected_klasses);
-   // Updated in j10, from original SystemDictionary::classes_do
--  ClassLoaderDataGraph::dictionary_classes_do(&closure);
-+
-+  ClassLoaderDataGraph::classes_do(&closure);
-+  //ClassLoaderDataGraph::dictionary_classes_do(&closure);
-+
-   log_trace(redefine, class, load)("%d classes affected", _affected_klasses->length());
- 
-   // Sort the affected klasses such that a supertype is always on a smaller array index than its subtype.
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index 60b62c3170a..d8a11b51fe9 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -116,6 +116,7 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
-   void rollback();
-   static void mark_as_scavengable(nmethod* nm);
-   static void unpatch_bytecode(Method* method);
-+  static void fix_invoke_method(Method* method);
- 
-   // Figure out which new methods match old methods in name and signature,
-   // which methods have been added, and which are no longer present
-diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index 8098b80baa6..5a5d5e98623 100644
---- a/src/hotspot/share/prims/resolvedMethodTable.cpp
-+++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -203,7 +203,7 @@ void ResolvedMethodTable::print() {
- 
- void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
-   assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
--  // For each entry in RMT, change to new method
-+  // For each entry in RMT, change to new methodadjust_method_entries_dcevm
-   for (int i = 0; i < _the_table->table_size(); ++i) {
-     for (ResolvedMethodEntry* entry = _the_table->bucket(i);
-          entry != NULL;
-@@ -274,6 +274,8 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
-         InstanceKlass* newer_klass = InstanceKlass::cast(old_method->method_holder()->new_version());
-         Method* newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
- 
-+        log_info(redefine, class, load, exceptions)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
-+
-         assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
-         assert(newer_method != NULL, "method_with_idnum() should not be NULL");
-         assert(old_method != newer_method, "sanity check");
-diff --git a/src/hotspot/share/prims/unsafe.cpp b/src/hotspot/share/prims/unsafe.cpp
-index 5f9f93c6b4c..c35ef044e65 100644
---- a/src/hotspot/share/prims/unsafe.cpp
-+++ b/src/hotspot/share/prims/unsafe.cpp
-@@ -820,6 +820,7 @@ Unsafe_DefineAnonymousClass_impl(JNIEnv *env,
-                                                 host_domain,
-                                                 &st,
-                                                 InstanceKlass::cast(host_klass),
-+                                                NULL,
-                                                 cp_patches,
-                                                 CHECK_NULL);
-   if (anonk == NULL) {
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0007-Fix-field-method.patch

@@ -0,0 +1,58 @@
+From 23a83be457df96d519db8de59a49dd65731efcc4 Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Sat, 15 Dec 2018 18:23:30 +0100
+Subject: [PATCH 07/50] Fix field method
+
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 19 ++++++++++++-------
+ 1 file changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 1c7595787a1..a3b65b273e5 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -264,21 +264,26 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+         }
+       }
+     } else if (MethodHandles::ref_kind_is_field(ref_kind)) {
+-      Klass* k = (Klass*) java_lang_invoke_MemberName::vmtarget(obj);
++      oop clazz = java_lang_invoke_MemberName::clazz(obj);
++      if (clazz == NULL) {
++        return false;
++      }
++      Klass* k = java_lang_Class::as_Klass(clazz);
+       if (k == NULL) {
+         return false; // Was cleared before, this MemberName is invalid.
+       }
+ 
+-      if (k != NULL && k->new_version() != NULL) {
++      if (k->is_redefining()) {
+         // Let's try to re-resolve field
++        InstanceKlass* old = InstanceKlass::cast(k->old_version());
+         fieldDescriptor fd;
+         int offset = java_lang_invoke_MemberName::vmindex(obj);
+         bool is_static = MethodHandles::ref_kind_is_static(ref_kind);
+-        InstanceKlass* ik = InstanceKlass::cast(k);
+-        if (ik->find_local_field_from_offset(offset, is_static, &fd)) {
+-          InstanceKlass* newest = InstanceKlass::cast(k->newest_version());
++        InstanceKlass* ik_old = InstanceKlass::cast(old);
++        if (ik_old->find_local_field_from_offset(offset, is_static, &fd)) {
++          InstanceKlass* ik_new = InstanceKlass::cast(k->newest_version());
+           fieldDescriptor fd_new;
+-          if (newest->find_local_field(fd.name(), fd.signature(), &fd_new)) {
++          if (ik_new->find_local_field(fd.name(), fd.signature(), &fd_new)) {
+             Handle objHandle(Thread::current(), obj);  // TODO : review thread
+             MethodHandles::init_field_MemberName(objHandle, fd_new, MethodHandles::ref_kind_is_setter(ref_kind));
+           } else {
+@@ -288,7 +293,7 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+             // Eventually, we probably want to replace them with something more meaningful,
+             // like instance throwing NoSuchFieldError or DMH that will resort to dynamic
+             // field resolution (with possibility of type conversion)
+-            java_lang_invoke_MemberName::set_method(obj, NULL);
++            java_lang_invoke_MemberName::set_clazz(obj, NULL);
+             java_lang_invoke_MemberName::set_vmindex(obj, 0);
+             return false;
+           }
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -1,135 +0,0 @@
-From d78e34a89b273508d3502d7456bf40b568edb3fd Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sat, 23 May 2020 10:02:15 +0200
-Subject: [PATCH 07/44] Fix "no original bytecode found" error if method with
- bkp is missing
-
-Sometimes IDE can deploy class with erroneous method, such method has
-n bytecode, but breakpoint position can still exist.
----
- src/hotspot/share/interpreter/bytecodes.cpp    |  2 +-
- .../share/interpreter/interpreterRuntime.cpp   |  2 +-
- src/hotspot/share/oops/method.cpp              |  8 ++++----
- src/hotspot/share/oops/method.hpp              |  4 ++--
- .../prims/jvmtiEnhancedRedefineClasses.cpp     | 18 ++++++++++--------
- 5 files changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/src/hotspot/share/interpreter/bytecodes.cpp b/src/hotspot/share/interpreter/bytecodes.cpp
-index e377e36b88c..262ecc021b2 100644
---- a/src/hotspot/share/interpreter/bytecodes.cpp
-+++ b/src/hotspot/share/interpreter/bytecodes.cpp
-@@ -84,7 +84,7 @@ Bytecodes::Code Bytecodes::code_at(Method* method, int bci) {
- Bytecodes::Code Bytecodes::non_breakpoint_code_at(const Method* method, address bcp) {
-   assert(method != NULL, "must have the method for breakpoint conversion");
-   assert(method->contains(bcp), "must be valid bcp in method");
--  return method->orig_bytecode_at(method->bci_from(bcp));
-+  return method->orig_bytecode_at(method->bci_from(bcp), false);
- }
- 
- int Bytecodes::special_length_at(Bytecodes::Code code, address bcp, address end) {
-diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
-index aeafba285f0..026fe9234fb 100644
---- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
-+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
-@@ -819,7 +819,7 @@ IRT_END
- // Invokes
- 
- IRT_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);
- IRT_END
- 
- IRT_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 0a12f01536a..037ceef2c44 100644
---- a/src/hotspot/share/oops/method.cpp
-+++ b/src/hotspot/share/oops/method.cpp
-@@ -1789,14 +1789,14 @@ bool CompressedLineNumberReadStream::read_pair() {
- 
- #if INCLUDE_JVMTI
- 
--Bytecodes::Code Method::orig_bytecode_at(int bci) const {
-+Bytecodes::Code Method::orig_bytecode_at(int bci, bool no_fatal) const {
-   BreakpointInfo* bp = method_holder()->breakpoints();
-   for (; bp != NULL; bp = bp->next()) {
-     if (bp->match(this, bci)) {
-       return bp->orig_bytecode();
-     }
-   }
--  {
-+  if (!no_fatal) {
-     ResourceMark rm;
-     fatal("no original bytecode found in %s at bci %d", name_and_sig_as_C_string(), bci);
-   }
-@@ -1942,7 +1942,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int bci) {
-   _signature_index = m->signature_index();
-   _orig_bytecode = (Bytecodes::Code) *m->bcp_from(_bci);
-   if (_orig_bytecode == Bytecodes::_breakpoint)
--    _orig_bytecode = m->orig_bytecode_at(_bci);
-+    _orig_bytecode = m->orig_bytecode_at(_bci, false);
-   _next = NULL;
- }
- 
-@@ -1951,7 +1951,7 @@ void BreakpointInfo::set(Method* method) {
-   {
-     Bytecodes::Code code = (Bytecodes::Code) *method->bcp_from(_bci);
-     if (code == Bytecodes::_breakpoint)
--      code = method->orig_bytecode_at(_bci);
-+      code = method->orig_bytecode_at(_bci, false);
-     assert(orig_bytecode() == code, "original bytecode must be the same");
-   }
- #endif
-diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
-index 4ac3e6e80de..9ff4f0e8036 100644
---- a/src/hotspot/share/oops/method.hpp
-+++ b/src/hotspot/share/oops/method.hpp
-@@ -230,7 +230,7 @@ class Method : public Metadata {
- 
-   // JVMTI breakpoints
- #if !INCLUDE_JVMTI
--  Bytecodes::Code orig_bytecode_at(int bci) const {
-+  Bytecodes::Code orig_bytecode_at(int bci, bool no_fatal) const {
-     ShouldNotReachHere();
-     return Bytecodes::_shouldnotreachhere;
-   }
-@@ -239,7 +239,7 @@ class Method : public Metadata {
-   };
-   u2   number_of_breakpoints() const {return 0;}
- #else // !INCLUDE_JVMTI
--  Bytecodes::Code orig_bytecode_at(int bci) const;
-+  Bytecodes::Code orig_bytecode_at(int bci, bool no_fatal) const;
-   void set_orig_bytecode_at(int bci, Bytecodes::Code code);
-   void set_breakpoint(int bci);
-   void clear_breakpoint(int bci);
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index b94caa39562..1fbba406087 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -1356,14 +1356,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/0008-Fix-nonstatic-field-handles.patch

@@ -0,0 +1,43 @@
+From 1fe56253f7e63d69f9a12963316889c5e87111eb Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Sat, 15 Dec 2018 20:16:37 +0100
+Subject: [PATCH 08/50] Fix nonstatic field handles
+
+---
+ 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 a3b65b273e5..c64d6bb1bb5 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -337,6 +337,7 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+     if (obj == NULL) {
+       return;
+     }
++    bool oop_updated  = false;
+     if (obj->is_instance() && InstanceKlass::cast(obj->klass())->is_mirror_instance_klass()) {
+       Klass* klass = java_lang_Class::as_Klass(obj);
+       if (klass != NULL && klass->is_instance_klass()) {
+@@ -344,13 +345,17 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+         if (klass->new_version() != NULL) {
+           obj = InstanceKlass::cast(klass->new_version())->java_mirror();
+           S::oop_store(p, obj);
++          oop_updated = true;
+         }
+       }
+     }
+ 
++
+     // JSR 292 support, uptade java.lang.invoke.MemberName instances
+     if (java_lang_invoke_MemberName::is_instance(obj)) {
+-      update_member_name(obj);
++      if (oop_updated) {
++        update_member_name(obj);
++      }
+     } else if (java_lang_invoke_DirectMethodHandle::is_instance(obj)) {
+       if (!update_direct_method_handle(obj)) {
+         // DMH is no longer valid, replace it with null reference.
+-- 
+2.24.3 (Apple Git-128)
+

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

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

jb/project/tools/patches/dcevm/0009-Support-for-Concurrent-Mark-Sweep-CMS-collector.patch

@@ -0,0 +1,488 @@
+From cbe52ffcde1851f2c3527825f37145428aeedc67 Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Wed, 12 Dec 2018 19:38:28 +0100
+Subject: [PATCH 09/50] Support for Concurrent Mark Sweep (CMS) collector
+
+---
+ .../share/gc/cms/compactibleFreeListSpace.cpp | 139 ++++++++++++------
+ .../share/gc/cms/compactibleFreeListSpace.hpp |   5 +-
+ .../gc/cms/concurrentMarkSweepThread.cpp      |  10 +-
+ src/hotspot/share/gc/serial/markSweep.cpp     |   2 +-
+ src/hotspot/share/gc/shared/gcConfig.cpp      |   2 +-
+ src/hotspot/share/gc/shared/space.cpp         |  16 +-
+ src/hotspot/share/gc/shared/space.hpp         |   6 +-
+ src/hotspot/share/gc/shared/space.inline.hpp  |  16 +-
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    |  12 +-
+ src/hotspot/share/runtime/arguments.cpp       |   6 +-
+ 10 files changed, 135 insertions(+), 79 deletions(-)
+
+diff --git a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
+index a93f764f1b9..efaa09473a9 100644
+--- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
++++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
+@@ -376,55 +376,58 @@ CompactibleFreeListSpace::CompactibleFreeListSpace(BlockOffsetSharedArray* bs, M
+   _used_stable = 0;
+ }
+ 
++#define forward_compact_top_DEFN()                                                    \
++  assert(this == cp->space, "'this' should be current compaction space.");            \
++  size_t compaction_max_size = pointer_delta(end(), compact_top);                     \
++  assert(adjustObjectSize(size) == cp->space->adjust_object_size_v(size),             \
++    "virtual adjustObjectSize_v() method is not correct");                            \
++  size_t adjusted_size = adjustObjectSize(size);                                      \
++  assert(compaction_max_size >= MinChunkSize || compaction_max_size == 0,             \
++         "no small fragments allowed");                                               \
++  assert(minimum_free_block_size() == MinChunkSize,                                   \
++         "for de-virtualized reference below");                                       \
++  /* Can't leave a nonzero size, residual fragment smaller than MinChunkSize */       \
++  if (adjusted_size + MinChunkSize > compaction_max_size &&                           \
++      adjusted_size != compaction_max_size) {                                         \
++    do {                                                                              \
++      /* switch to next compaction space*/                                            \
++      cp->space->set_compaction_top(compact_top);                                     \
++      cp->space = cp->space->next_compaction_space();                                 \
++      if (cp->space == NULL) {                                                        \
++        cp->gen = CMSHeap::heap()->young_gen();                                       \
++        assert(cp->gen != NULL, "compaction must succeed");                           \
++        cp->space = cp->gen->first_compaction_space();                                \
++        assert(cp->space != NULL, "generation must have a first compaction space");   \
++      }                                                                               \
++      compact_top = cp->space->bottom();                                              \
++      cp->space->set_compaction_top(compact_top);                                     \
++      /* The correct adjusted_size may not be the same as that for this method */     \
++      /* (i.e., cp->space may no longer be "this" so adjust the size again. */        \
++      /* Use the virtual method which is not used above to save the virtual */        \
++      /* dispatch. */                                                                 \
++      adjusted_size = cp->space->adjust_object_size_v(size);                          \
++      compaction_max_size = pointer_delta(cp->space->end(), compact_top);             \
++      assert(cp->space->minimum_free_block_size() == 0, "just checking");             \
++    } while (adjusted_size > compaction_max_size);                                    \
++  }
++
++
+ HeapWord* CompactibleFreeListSpace::forward_compact_top(size_t size,
+                                     CompactPoint* cp, HeapWord* compact_top) {
+-  ShouldNotReachHere();
+-  return NULL;
++  forward_compact_top_DEFN()
++  return compact_top;
+ }
+ 
+ // Like CompactibleSpace forward() but always calls cross_threshold() to
+ // update the block offset table.  Removed initialize_threshold call because
+ // CFLS does not use a block offset array for contiguous spaces.
+ HeapWord* CompactibleFreeListSpace::forward(oop q, size_t size,
+-                                    CompactPoint* cp, HeapWord* compact_top) {
+-  // q is alive
+-  // First check if we should switch compaction space
+-  assert(this == cp->space, "'this' should be current compaction space.");
+-  size_t compaction_max_size = pointer_delta(end(), compact_top);
+-  assert(adjustObjectSize(size) == cp->space->adjust_object_size_v(size),
+-    "virtual adjustObjectSize_v() method is not correct");
+-  size_t adjusted_size = adjustObjectSize(size);
+-  assert(compaction_max_size >= MinChunkSize || compaction_max_size == 0,
+-         "no small fragments allowed");
+-  assert(minimum_free_block_size() == MinChunkSize,
+-         "for de-virtualized reference below");
+-  // Can't leave a nonzero size, residual fragment smaller than MinChunkSize
+-  if (adjusted_size + MinChunkSize > compaction_max_size &&
+-      adjusted_size != compaction_max_size) {
+-    do {
+-      // switch to next compaction space
+-      cp->space->set_compaction_top(compact_top);
+-      cp->space = cp->space->next_compaction_space();
+-      if (cp->space == NULL) {
+-        cp->gen = CMSHeap::heap()->young_gen();
+-        assert(cp->gen != NULL, "compaction must succeed");
+-        cp->space = cp->gen->first_compaction_space();
+-        assert(cp->space != NULL, "generation must have a first compaction space");
+-      }
+-      compact_top = cp->space->bottom();
+-      cp->space->set_compaction_top(compact_top);
+-      // The correct adjusted_size may not be the same as that for this method
+-      // (i.e., cp->space may no longer be "this" so adjust the size again.
+-      // Use the virtual method which is not used above to save the virtual
+-      // dispatch.
+-      adjusted_size = cp->space->adjust_object_size_v(size);
+-      compaction_max_size = pointer_delta(cp->space->end(), compact_top);
+-      assert(cp->space->minimum_free_block_size() == 0, "just checking");
+-    } while (adjusted_size > compaction_max_size);
+-  }
++                                    CompactPoint* cp, HeapWord* compact_top, bool force_forward) {
++  forward_compact_top_DEFN()
+ 
+   // store the forwarding pointer into the mark word
+-  if ((HeapWord*)q != compact_top) {
++  // the size of object changed for: new_version() != NULL
++  if (force_forward || (HeapWord*)q != compact_top || q->klass()->new_version() != NULL) {
+     q->forward_to(oop(compact_top));
+     assert(q->is_gc_marked(), "encoding the pointer should preserve the mark");
+   } else {
+@@ -2196,13 +2199,60 @@ CompactibleFreeListSpace::refillLinearAllocBlock(LinearAllocBlock* blk) {
+ 
+ // Support for compaction
+ void CompactibleFreeListSpace::prepare_for_compaction(CompactPoint* cp) {
+-  scan_and_forward(this, cp, false);
+-   // of the free lists doesn't work after.
++  if (!Universe::is_redefining_gc_run()) {
++    scan_and_forward(this, cp, false);
++  } else {
++    // Redefinition run
++    scan_and_forward(this, cp, true);
++  }
+   // Prepare_for_compaction() uses the space between live objects
+   // so that later phase can skip dead space quickly.  So verification
+   // of the free lists doesn't work after.
+ }
+ 
++bool CompactibleFreeListSpace::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) return false;
++
++  int new_size = adjustObjectSize(old_obj->size_given_klass(oop(old_obj)->klass()->new_version()));
++  int original_size = adjustObjectSize(old_obj->size());
++
++  Generation* tenured_gen = CMSHeap::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);
++  if (old_in_tenured == new_in_tenured) {
++    // Rescue if object may overlap with a higher memory address.
++    bool overlap = ((HeapWord*)old_obj + original_size < (HeapWord*)new_obj + new_size);
++    if (old_in_tenured) {
++      // Old and new address are in same space, so just compare the address.
++      // Must rescue if object moves towards the top of the space.
++      assert(space_index(old_obj) == space_index(new_obj), "old_obj and new_obj must be in same space");
++    } else {
++      // In the new generation, eden is located before the from space, so a
++      // simple pointer comparison is sufficient.
++      assert(CMSHeap::heap()->young_gen()->is_in_reserved(old_obj), "old_obj must be in DefNewGeneration");
++      assert(CMSHeap::heap()->young_gen()->is_in_reserved(new_obj), "new_obj must be in DefNewGeneration");
++      assert(overlap == (space_index(old_obj) < space_index(new_obj)), "slow and fast computation must yield same result");
++    }
++    return overlap;
++
++  } else {
++    assert(space_index(old_obj) != space_index(new_obj), "old_obj and new_obj must be in different spaces");
++    if (new_in_tenured) {
++      // Must never rescue when moving from the new into the old generation.
++      assert(CMSHeap::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");
++      return false;
++
++    } else /* if (tenured_gen->is_in_reserved(old_obj)) */ {
++      // Must always rescue when moving from the old into the new generation.
++      assert(CMSHeap::heap()->young_gen()->is_in_reserved(new_obj), "new_obj must be in DefNewGeneration");
++      assert(space_index(old_obj) < space_index(new_obj), "must be");
++      return true;
++    }
++  }
++}
++
+ void CompactibleFreeListSpace::adjust_pointers() {
+   // In other versions of adjust_pointers(), a bail out
+   // based on the amount of live data in the generation
+@@ -2215,7 +2265,12 @@ void CompactibleFreeListSpace::adjust_pointers() {
+ }
+ 
+ void CompactibleFreeListSpace::compact() {
+-  scan_and_compact(this, false);
++  if(!Universe::is_redefining_gc_run()) {
++    scan_and_compact(this, false);
++  } else {
++    // Redefinition run
++    scan_and_compact(this, true);
++  }
+ }
+ 
+ // Fragmentation metric = 1 - [sum of (fbs**2) / (sum of fbs)**2]
+diff --git a/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
+index 9fd2ea58320..d29b81f6fca 100644
+--- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
++++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.hpp
+@@ -201,7 +201,7 @@ class CompactibleFreeListSpace: public CompactibleSpace {
+   // Support for compacting cms
+   HeapWord* cross_threshold(HeapWord* start, HeapWord* end);
+   HeapWord* forward_compact_top(size_t size, CompactPoint* cp, HeapWord* compact_top);
+-  HeapWord* forward(oop q, size_t size, CompactPoint* cp, HeapWord* compact_top);
++  HeapWord* forward(oop q, size_t size, CompactPoint* cp, HeapWord* compact_top, bool force_forward);
+ 
+   // Initialization helpers.
+   void initializeIndexedFreeListArray();
+@@ -576,6 +576,9 @@ class CompactibleFreeListSpace: public CompactibleSpace {
+ 
+   // Support for compaction.
+   void prepare_for_compaction(CompactPoint* cp);
++
++  bool must_rescue(oop old_obj, oop new_obj);
++
+   void adjust_pointers();
+   void compact();
+   // Reset the space to reflect the fact that a compaction of the
+diff --git a/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp
+index 3ada5755875..b6e930922d7 100644
+--- a/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp
++++ b/src/hotspot/share/gc/cms/concurrentMarkSweepThread.cpp
+@@ -78,10 +78,12 @@ void ConcurrentMarkSweepThread::run_service() {
+   while (!should_terminate()) {
+     sleepBeforeNextCycle();
+     if (should_terminate()) break;
+-    GCIdMark gc_id_mark;
+-    GCCause::Cause cause = _collector->_full_gc_requested ?
+-      _collector->_full_gc_cause : GCCause::_cms_concurrent_mark;
+-    _collector->collect_in_background(cause);
++    if (!Universe::is_redefining_gc_run()) {
++        GCIdMark gc_id_mark;
++        GCCause::Cause cause = _collector->_full_gc_requested ?
++          _collector->_full_gc_cause : GCCause::_cms_concurrent_mark;
++        _collector->collect_in_background(cause);
++    }
+   }
+ 
+   // Check that the state of any protocol for synchronization
+diff --git a/src/hotspot/share/gc/serial/markSweep.cpp b/src/hotspot/share/gc/serial/markSweep.cpp
+index d0ff86c8215..b4ed59f020c 100644
+--- a/src/hotspot/share/gc/serial/markSweep.cpp
++++ b/src/hotspot/share/gc/serial/markSweep.cpp
+@@ -247,7 +247,7 @@ void MarkSweep::copy_rescued_objects_back() {
+ 
+       FREE_RESOURCE_ARRAY(HeapWord, rescued_ptr, size);
+ 
+-      new_obj->init_mark();
++      new_obj->init_mark_raw();
+       assert(oopDesc::is_oop(new_obj), "must be a valid oop");
+     }
+     _rescued_oops->clear();
+diff --git a/src/hotspot/share/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
+index 8aac2b39e1e..39364a64cb2 100644
+--- a/src/hotspot/share/gc/shared/gcConfig.cpp
++++ b/src/hotspot/share/gc/shared/gcConfig.cpp
+@@ -101,7 +101,7 @@ void GCConfig::fail_if_unsupported_gc_is_selected() {
+ }
+ 
+ void GCConfig::select_gc_ergonomically() {
+-  if (AllowEnhancedClassRedefinition) {
++  if (AllowEnhancedClassRedefinition && !UseConcMarkSweepGC) {
+     // Enhanced class redefinition only supports serial GC at the moment
+     FLAG_SET_ERGO(bool, UseSerialGC, true);
+   } else if (os::is_server_class_machine()) {
+diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
+index 763abc91a39..947dff8ae0c 100644
+--- a/src/hotspot/share/gc/shared/space.cpp
++++ b/src/hotspot/share/gc/shared/space.cpp
+@@ -388,11 +388,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 ((HeapWord*)q != compact_top || (size_t)q->size() != size) {
++  if (force_forward || (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 {
+@@ -514,7 +514,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");
+@@ -858,14 +858,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 && oop(q)->klass()->new_version()->update_information() != 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;
+   }
+ 
+@@ -879,7 +879,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.
+@@ -895,11 +895,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 8eb5669fb79..901c89d8a30 100644
+--- a/src/hotspot/share/gc/shared/space.hpp
++++ b/src/hotspot/share/gc/shared/space.hpp
+@@ -421,7 +421,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
+@@ -452,11 +452,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 75d7e685edf..26e56ae6f7e 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.
+@@ -351,7 +354,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
+       HeapWord* compaction_top = (HeapWord*)oop(cur_obj)->forwardee();
+ 
+       if (redefinition_run &&  space->must_rescue(oop(cur_obj), oop(cur_obj)->forwardee())) {
+-         space->rescue(cur_obj);
++        space->rescue(cur_obj);
+         debug_only(Copy::fill_to_words(cur_obj, size, 0));
+         cur_obj += size;
+         continue;
+@@ -361,8 +364,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 c64d6bb1bb5..9b8678a53fb 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -52,6 +52,7 @@
+ #include "prims/jvmtiThreadState.inline.hpp"
+ #include "utilities/events.hpp"
+ #include "oops/constantPool.inline.hpp"
++#include "gc/cms/cmsHeap.hpp"
+ 
+ Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
+ Array<Method*>* VM_EnhancedRedefineClasses::_new_methods = NULL;
+@@ -420,13 +421,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);
+@@ -436,11 +435,6 @@ public:
+           //  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);
+-          }
+         }
+       } else {
+         obj->set_klass(obj->klass()->new_version());
+diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
+index ca57b524593..2ca6dde069d 100644
+--- a/src/hotspot/share/runtime/arguments.cpp
++++ b/src/hotspot/share/runtime/arguments.cpp
+@@ -2047,14 +2047,14 @@ 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.
+-    if (!UseSerialGC && i >= 1) {
++    if ((!UseSerialGC && !UseConcMarkSweepGC) && i >= 1) {
+       jio_fprintf(defaultStream::error_stream(),
+-                  "Must use the serial GC with enhanced class redefinition\n");
++                  "Must use the serial or concurrent mark sweep GC with enhanced class redefinition.\n");
+       return false;
+     }
+   }
+ 
+-  if (i > 1) {
++  if (i > 2) {
+     jio_fprintf(defaultStream::error_stream(),
+                 "Conflicting collector combinations in option list; "
+                 "please refer to the release notes for the combinations "
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -1,50 +0,0 @@
-From 840e28ad947e63d97d40a5e05fdacc0bfd371962 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sat, 13 Jun 2020 18:50:59 +0200
-Subject: [PATCH 10/44] 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 e67fc2dd58f..5be9bb74305 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -915,7 +915,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 c7996df51bc..082d3d26c34 100644
---- a/src/hotspot/share/prims/resolvedMethodTable.cpp
-+++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -273,7 +273,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");
-@@ -293,7 +293,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
- 
-         ResourceMark rm;
-         if (!(*trace_name_printed)) {
--          log_info(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
-+          log_debug(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
-            *trace_name_printed = true;
-         }
-         log_debug(redefine, class, update, constantpool)
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0010-Code-cleanup.patch

@@ -0,0 +1,257 @@
+From 11d10158d77512795b1b8ab8378620b95b67f175 Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Sat, 29 Dec 2018 13:22:29 +0100
+Subject: [PATCH 10/50] Code cleanup
+
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 125 ++++++------------
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |   3 -
+ 2 files changed, 40 insertions(+), 88 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 9b8678a53fb..0aa1ac4ff80 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -35,7 +35,7 @@
+ #include "memory/metaspaceShared.hpp"
+ #include "memory/resourceArea.hpp"
+ #include "memory/iterator.inline.hpp"
+-#include "gc/serial/markSweep.hpp" // FIXME: other GC?
++#include "gc/serial/markSweep.hpp"
+ #include "oops/fieldStreams.hpp"
+ #include "oops/klassVtable.hpp"
+ #include "oops/oop.inline.hpp"
+@@ -485,7 +485,9 @@ void VM_EnhancedRedefineClasses::doit() {
+   }
+ 
+   // Deoptimize all compiled code that depends on this class (do only once, because it clears whole cache)
+-  flush_dependent_code(NULL, thread);
++  //if (_max_redefinition_flags > Klass::ModifyClass) {
++    flush_dependent_code(NULL, thread);
++  //}
+ 
+   // JSR-292 support
+   if (_any_class_has_resolved_methods) {
+@@ -593,17 +595,28 @@ void VM_EnhancedRedefineClasses::doit() {
+   // See jvmtiExport.hpp for detailed explanation.
+   JvmtiExport::set_has_redefined_a_class();
+ 
+-  // check_class() is optionally called for product bits, but is
+-  // always called for non-product bits.
+ #ifdef PRODUCT
+   if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
+ #endif
+-    log_trace(redefine, class, obsolete, metadata)("calling check_class");
+-    CheckClass check_class(thread);
+-    ClassLoaderDataGraph::classes_do(&check_class);
++  for (int i=0; i<_affected_klasses->length(); i++) {
++    Klass* the_class = _affected_klasses->at(i);
++    assert(the_class->new_version() != NULL, "Must have been redefined");
++    Klass* new_version = the_class->new_version();
++    assert(new_version->new_version() == NULL, "Must be newest version");
++
++    if (!(new_version->super() == NULL || new_version->super()->new_version() == NULL)) {
++      new_version->print();
++      new_version->super()->print();
++    }
++    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");
++  CheckClass check_class(thread);
++  ClassLoaderDataGraph::classes_do(&check_class);
+ #ifdef PRODUCT
+   }
+ #endif
++
+ }
+ 
+ /**
+@@ -1279,24 +1292,23 @@ void VM_EnhancedRedefineClasses::calculate_instance_update_information(Klass* ne
+   GrowableArray<int> result = cl.finish();
+   ik->store_update_information(result);
+   ik->set_copying_backwards(cl.does_copy_backwards());
+-/* TODO logging
+-  if (RC_TRACE_ENABLED(0x00000001)) {
+-    RC_TRACE(0x00000001, ("Instance update information for %s:", new_version->name()->as_C_string()));
++  if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
++    log_trace(redefine, class, obsolete, metadata)("Instance update information for %s:", new_version->name()->as_C_string());
+     if (cl.does_copy_backwards()) {
+-      RC_TRACE(0x00000001, ("\tDoes copy backwards!"));
++      log_trace(redefine, class, obsolete, metadata)("\tDoes copy backwards!");
+     }
+     for (int i=0; i<result.length(); i++) {
+       int curNum = result.at(i);
+       if (curNum < 0) {
+-        RC_TRACE(0x00000001, ("\t%d CLEAN", curNum));
++        log_trace(redefine, class, obsolete, metadata)("\t%d CLEAN", curNum);
+       } else if (curNum > 0) {
+-        RC_TRACE(0x00000001, ("\t%d COPY from %d", curNum, result.at(i + 1)));
++        log_trace(redefine, class, obsolete, metadata)("\t%d COPY from %d", curNum, result.at(i + 1));
+         i++;
+       } else {
+-        RC_TRACE(0x00000001, ("\tEND"));
++        log_trace(redefine, class, obsolete, metadata)("\tEND");
+       }
+     }
+-  }*/
++  }
+ }
+ 
+ /**
+@@ -1813,6 +1825,7 @@ void VM_EnhancedRedefineClasses::compute_added_deleted_matching_methods() {
+ /**
+   FIXME - swap_annotations is never called, check that annotations work
+ */
++// TODO : delete it
+ void VM_EnhancedRedefineClasses::swap_annotations(InstanceKlass* the_class,
+                                           InstanceKlass* new_class) {
+   // FIXME - probably original implementation only 
+@@ -1822,7 +1835,6 @@ void VM_EnhancedRedefineClasses::swap_annotations(InstanceKlass* the_class,
+   new_class->set_annotations(old_annotations);
+ }
+ 
+-
+ // Install the redefinition of a class:
+ //    - house keeping (flushing breakpoints and caches, deoptimizing
+ //      dependent compiled code)
+@@ -1853,7 +1865,9 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_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
+-  //  flush_dependent_code(the_class, THREAD);
++  //if (_max_redefinition_flags <= Klass::ModifyClass) {
++    //flush_dependent_code(the_class, THREAD);
++  //}
+ 
+   _old_methods = the_class->methods();
+   _new_methods = new_class->methods();
+@@ -1928,64 +1942,15 @@ void VM_EnhancedRedefineClasses::increment_class_counter(InstanceKlass *ik, TRAP
+   }
+ }
+ 
+-// FIXME - class check is currently disabled
+ void VM_EnhancedRedefineClasses::CheckClass::do_klass(Klass* k) {
+-  return;
+-  bool no_old_methods = true;  // be optimistic
+-
+-  // Both array and instance classes have vtables.
+-  // a vtable should never contain old or obsolete methods
+-  ResourceMark rm(_thread);
+-  if (k->vtable_length() > 0 &&
+-      !k->vtable().check_no_old_or_obsolete_entries()) {
+-    if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
+-      log_trace(redefine, class, obsolete, metadata)
+-        ("klassVtable::check_no_old_or_obsolete_entries failure -- OLD or OBSOLETE method found -- class: %s",
+-         k->signature_name());
+-      k->vtable().dump_vtable();
+-    }
+-    no_old_methods = false;
+-  }
+-
+-  if (k->is_instance_klass()) {
+-    HandleMark hm(_thread);
+-    InstanceKlass *ik = InstanceKlass::cast(k);
++  HandleMark hm(_thread);
++  InstanceKlass *ik = (InstanceKlass *) k;
++  assert(ik->new_version() == NULL, "must be latest version in system dictionary");
+ 
+-    // an itable should never contain old or obsolete methods
+-    if (ik->itable_length() > 0 &&
+-        !ik->itable().check_no_old_or_obsolete_entries()) {
+-      if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
+-        log_trace(redefine, class, obsolete, metadata)
+-          ("klassItable::check_no_old_or_obsolete_entries failure -- OLD or OBSOLETE method found -- class: %s",
+-           ik->signature_name());
+-        ik->itable().dump_itable();
+-      }
+-      no_old_methods = false;
+-    }
+-
+-    // the constant pool cache should never contain non-deleted old or obsolete methods
+-    if (ik->constants() != NULL &&
+-        ik->constants()->cache() != NULL &&
+-        !ik->constants()->cache()->check_no_old_or_obsolete_entries()) {
+-      if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
+-        log_trace(redefine, class, obsolete, metadata)
+-          ("cp-cache::check_no_old_or_obsolete_entries failure -- OLD or OBSOLETE method found -- class: %s",
+-           ik->signature_name());
+-        ik->constants()->cache()->dump_cache();
+-      }
+-      no_old_methods = false;
+-    }
+-  }
+-
+-  // print and fail guarantee if old methods are found.
+-  if (!no_old_methods) {
+-    if (log_is_enabled(Trace, redefine, class, obsolete, metadata)) {
+-      dump_methods();
+-    } else {
+-      log_trace(redefine, class)("Use the '-Xlog:redefine+class*:' option "
+-        "to see more info about the following guarantee() failure.");
+-    }
+-    guarantee(false, "OLD and/or OBSOLETE method(s) found");
++  if (ik->vtable_length() > 0) {
++    ResourceMark rm(_thread);
++    assert(ik->vtable().check_no_old_or_obsolete_entries(), "old method found");
++    ik->vtable().verify(tty, true);
+   }
+ }
+ 
+@@ -2051,15 +2016,6 @@ void VM_EnhancedRedefineClasses::dump_methods() {
+   }
+ }
+ 
+-// TODO - is it called anywhere?
+-void VM_EnhancedRedefineClasses::print_on_error(outputStream* st) const {
+-  VM_Operation::print_on_error(st);
+-  if (_the_class_oop != NULL) {
+-    ResourceMark rm;
+-    st->print_cr(", redefining class %s", _the_class_oop->external_name());
+-  }
+-}
+-
+ /**
+  Helper class to traverse all loaded classes and figure out if the class is affected by redefinition.
+ */
+@@ -2093,7 +2049,7 @@ class AffectedKlassClosure : public KlassClosure {
+         log_trace(redefine, class, load)("found affected class: %s", klass->name()->as_C_string());
+         klass->set_redefinition_flag(Klass::MarkedAsAffected);
+         _affected_klasses->append(klass);
+-         return;
++        return;
+       }
+     }
+ 
+@@ -2125,7 +2081,7 @@ 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);
+-  // TODO: j10 - review chancge from SystemDictionary::classes_do(&closure);
++  // Updated in j10, from original SystemDictionary::classes_do
+   ClassLoaderDataGraph::dictionary_classes_do(&closure);
+   log_trace(redefine, class, load)("%d classes affected", _affected_klasses->length());
+ 
+@@ -2160,7 +2116,6 @@ 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?
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index b712d69a193..37e63a1810f 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -195,8 +195,5 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   // Modifiable test must be shared between IsModifiableClass query
+   // and redefine implementation
+   static bool is_modifiable_class(oop klass_mirror);
+-
+-  // Error printing
+-  void print_on_error(outputStream* st) const;
+ };
+ #endif // SHARE_VM_PRIMS_JVMTIREDEFINECLASSES2_HPP
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -1,26 +0,0 @@
-From 68c65981000d71555a529443831a18c9738c9566 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Tue, 6 Oct 2020 22:15:31 +0200
-Subject: [PATCH 11/44] AllowEnhancedClassRedefinition is false (disabled) by
- default
-
----
- src/hotspot/share/runtime/globals.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 4d6fe0034a3..1984b8c28f9 100644
---- a/src/hotspot/share/runtime/globals.hpp
-+++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2691,7 +2691,7 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
-   experimental(bool, UseFastUnorderedTimeStamps, false,                     \
-           "Use platform unstable time where supported for timestamps only") \
-                                                                             \
--  product(bool, AllowEnhancedClassRedefinition, true,                       \
-+  product(bool, AllowEnhancedClassRedefinition, false,                      \
-              "Allow enhanced class redefinition beyond swapping method "    \
-              "bodies")                                                      \
-                                                                             \
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0011-Fix-check_class.patch

@@ -0,0 +1,118 @@
+From 1765f4c1b2e8958b458fa17d329be98ad025069c Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Sat, 29 Dec 2018 16:05:25 +0100
+Subject: [PATCH 11/50] Fix check_class
+
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 39 +++++++------------
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |  5 +--
+ 2 files changed, 16 insertions(+), 28 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 0aa1ac4ff80..c08b3e82b2e 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -1,4 +1,4 @@
+-/*
++  /*
+  * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+  *
+@@ -28,6 +28,7 @@
+ #include "classfile/metadataOnStackMark.hpp"
+ #include "classfile/systemDictionary.hpp"
+ #include "classfile/verifier.hpp"
++#include "classfile/dictionary.hpp"
+ #include "interpreter/oopMapCache.hpp"
+ #include "interpreter/rewriter.hpp"
+ #include "logging/logStream.hpp"
+@@ -611,8 +612,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");
+-  CheckClass check_class(thread);
+-  ClassLoaderDataGraph::classes_do(&check_class);
++  ClassLoaderData::the_null_class_loader_data()->dictionary()->classes_do(check_class, thread);
+ #ifdef PRODUCT
+   }
+ #endif
+@@ -1822,19 +1822,6 @@ void VM_EnhancedRedefineClasses::compute_added_deleted_matching_methods() {
+   assert(_matching_methods_length + _added_methods_length == _new_methods->length(), "sanity");
+ }
+ 
+-/**
+-  FIXME - swap_annotations is never called, check that annotations work
+-*/
+-// TODO : delete it
+-void VM_EnhancedRedefineClasses::swap_annotations(InstanceKlass* the_class,
+-                                          InstanceKlass* new_class) {
+-  // FIXME - probably original implementation only 
+-  // Swap annotation fields values
+-  Annotations* old_annotations = the_class->annotations();
+-  the_class->set_annotations(new_class->annotations());
+-  new_class->set_annotations(old_annotations);
+-}
+-
+ // Install the redefinition of a class:
+ //    - house keeping (flushing breakpoints and caches, deoptimizing
+ //      dependent compiled code)
+@@ -1942,15 +1929,17 @@ void VM_EnhancedRedefineClasses::increment_class_counter(InstanceKlass *ik, TRAP
+   }
+ }
+ 
+-void VM_EnhancedRedefineClasses::CheckClass::do_klass(Klass* k) {
+-  HandleMark hm(_thread);
+-  InstanceKlass *ik = (InstanceKlass *) k;
+-  assert(ik->new_version() == NULL, "must be latest version in system dictionary");
++void VM_EnhancedRedefineClasses::check_class(InstanceKlass* ik, TRAPS) {
++  if (ik->is_instance_klass() && ik->old_version() != NULL) {
++    HandleMark hm(THREAD);
++
++    assert(ik->new_version() == NULL, "must be latest version in system dictionary");
+ 
+-  if (ik->vtable_length() > 0) {
+-    ResourceMark rm(_thread);
+-    assert(ik->vtable().check_no_old_or_obsolete_entries(), "old method found");
+-    ik->vtable().verify(tty, true);
++    if (ik->vtable_length() > 0) {
++      ResourceMark rm(THREAD);
++      assert(ik->vtable().check_no_old_or_obsolete_entries(), "old method found");
++      ik->vtable().verify(tty, true);
++    }
+   }
+ }
+ 
+@@ -2017,7 +2006,7 @@ void VM_EnhancedRedefineClasses::dump_methods() {
+ }
+ 
+ /**
+- Helper class to traverse all loaded classes and figure out if the class is affected by redefinition.
++  Helper class to traverse all loaded classes and figure out if the class is affected by redefinition.
+ */
+ class AffectedKlassClosure : public KlassClosure {
+  private:
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 37e63a1810f..5b3ebc13661 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -144,15 +144,14 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   // Install the redefinition of a class
+   void redefine_single_class(InstanceKlass* new_class_oop, TRAPS);
+ 
+-  void swap_annotations(InstanceKlass* new_class,
+-                        InstanceKlass* scratch_class);
+-
+   // Increment the classRedefinedCount field in the specific InstanceKlass
+   // and in all direct and indirect subclasses.
+   void increment_class_counter(InstanceKlass *ik, TRAPS);
+ 
+   void flush_dependent_code(InstanceKlass* k_h, TRAPS);
+ 
++  static void check_class(InstanceKlass* k_oop, TRAPS);
++
+   static void dump_methods();
+ 
+   // Check that there are no old or obsolete methods
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0012-Fix-force_forward-in-dead-space.patch

@@ -0,0 +1,24 @@
+From 0851d437a65dc9ac6d8355b54689d36e77e104b3 Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Sat, 29 Dec 2018 17:58:39 +0100
+Subject: [PATCH 12/50] Fix force_forward in dead space
+
+---
+ src/hotspot/share/gc/shared/space.inline.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp
+index 26e56ae6f7e..8c255d6d428 100644
+--- a/src/hotspot/share/gc/shared/space.inline.hpp
++++ b/src/hotspot/share/gc/shared/space.inline.hpp
+@@ -213,6 +213,7 @@ inline void CompactibleSpace::scan_and_forward(SpaceType* space, CompactPoint* c
+         // see if this is the first dead region.
+         if (first_dead == NULL) {
+           first_dead = cur_obj;
++          force_forward = true;
+         }
+       }
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0012-add-jvmtiEnhancedRedefineClasses.-to-CMakeLists.txt.patch

@@ -1,32 +0,0 @@
-From b7e705f79f0a6fcc486511a5b8d7007dde4feec0 Mon Sep 17 00:00:00 2001
-From: Artem Khvastunov <artem.khvastunov@jetbrains.com>
-Date: Tue, 14 Apr 2020 19:11:35 +0200
-Subject: [PATCH 12/44] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
-
----
- jb/project/hotspot-cmake/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/jb/project/hotspot-cmake/CMakeLists.txt b/jb/project/hotspot-cmake/CMakeLists.txt
-index 8b552c27206..6516e39058f 100644
---- a/jb/project/hotspot-cmake/CMakeLists.txt
-+++ b/jb/project/hotspot-cmake/CMakeLists.txt
-@@ -1663,6 +1663,7 @@ set(SOURCE_FILES
- ../../../src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp
- ../../../src/hotspot/share/prims/jvmtiAgentThread.hpp
- ../../../src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp
-+../../../src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
- ../../../src/hotspot/share/prims/stackwalk.cpp
- ../../../src/hotspot/share/prims/privilegedStack.hpp
- ../../../src/hotspot/share/prims/jvmtiUtil.hpp
-@@ -1684,6 +1685,7 @@ set(SOURCE_FILES
- ../../../src/hotspot/share/prims/stackwalk.hpp
- ../../../src/hotspot/share/prims/privilegedStack.cpp
- ../../../src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp
-+../../../src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
- ../../../src/hotspot/share/prims/jvmtiUtil.cpp
- ../../../src/hotspot/share/prims/jvmtiEnvBase.cpp
- ../../../src/hotspot/share/prims/methodHandles.cpp
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0013-Cleanup.patch

@@ -0,0 +1,25 @@
+From 35aba247d8a3e25f5d19403ba5f293bfdaf6539c Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Fri, 1 Mar 2019 18:45:13 +0100
+Subject: [PATCH 13/50] Cleanup
+
+---
+ src/hotspot/share/gc/shared/space.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
+index 947dff8ae0c..56b144b46f1 100644
+--- a/src/hotspot/share/gc/shared/space.cpp
++++ b/src/hotspot/share/gc/shared/space.cpp
+@@ -862,7 +862,7 @@ 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 && oop(q)->klass()->new_version()->update_information() != NULL) {
++  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");
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -1,25 +0,0 @@
-From 7f887b3b4819fbbe79a8caaae0e4f175c1368f77 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Mon, 19 Oct 2020 20:00:04 +0200
-Subject: [PATCH 13/44] 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 f8945e435aa..30f6b825493 100644
---- a/make/autoconf/version-numbers
-+++ b/make/autoconf/version-numbers
-@@ -44,7 +44,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/0014-Add-codecache-flush-optimization-but-just-flush-all-.patch

@@ -0,0 +1,61 @@
+From 26a5079eb61a2e23328fbd8ca59ffc2ab6b6193b Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Sat, 29 Dec 2018 17:38:27 +0100
+Subject: [PATCH 14/50] Add codecache flush optimization, but just flush all
+ cache.
+
+Redefined class can define a new method that overrides
+method in superclass which is already used in codecache for
+optimized non-virtual calls, etc...
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp     | 18 ++++++++++++------
+ 1 file changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index c08b3e82b2e..4ca638548dc 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -486,9 +486,9 @@ 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) {
++  // if (_max_redefinition_flags > Klass::ModifyClass) {
+     flush_dependent_code(NULL, thread);
+-  //}
++  // }
+ 
+   // JSR-292 support
+   if (_any_class_has_resolved_methods) {
+@@ -1736,8 +1736,14 @@ void VM_EnhancedRedefineClasses::flush_dependent_code(InstanceKlass* k_h, TRAPS)
+   // All dependencies have been recorded from startup or this is a second or
+   // subsequent use of RedefineClasses
+   // FIXME: for now, deoptimize all!
+-  if (0 && JvmtiExport::all_dependencies_are_recorded()) {
++  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();
++    }
+   } else {
+     CodeCache::mark_all_nmethods_for_deoptimization();
+ 
+@@ -1852,9 +1858,9 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_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);
+-  //}
++//  if (_max_redefinition_flags <= Klass::ModifyClass) {
++//    flush_dependent_code(the_class, THREAD);
++//  }
+ 
+   _old_methods = the_class->methods();
+   _new_methods = new_class->methods();
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -1,71 +0,0 @@
-From 01acfab08f6fb1c1a0db80915cacf8987021272c Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sun, 11 Oct 2020 10:43:28 +0200
-Subject: [PATCH 14/44] 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 5be9bb74305..f4bde7504c8 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -217,7 +217,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);
-@@ -520,8 +527,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);
-       }
-@@ -544,6 +552,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/0015-HotswapAgent-integration.patch

@@ -0,0 +1,484 @@
+From 24a60477aef7098ea23ab50a573332957741ea7b Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Wed, 14 Nov 2018 21:20:08 +0100
+Subject: [PATCH 15/50] HotswapAgent integration
+
+It include:
+
+- option to compile DCEVM only version with -DDCEVM_ONLY added
+to CFLAGS (bash configure --with-extra-cflags="-DDCEVM_ONLY"), by
+default compilation goes with HotswapAgent
+
+Add --add-opens for necessary modules/packages
+- java.base/java.lang - for reflection access to Proxy.proxyCache
+- java.base/jdk.internal.loader - for access proxyCache class
+- java.desktop/java.beans - for reflection access to Introspector
+
+- be quiet if HotswapAgent is not found in lib/, it is compatible with
+old DCEVM
+- disable hotswapagent for -Xshare:dump
+- disable HotswapAgent in jvm tools
+---
+ make/launcher/Launcher-java.rmi.gmk           |  2 +
+ make/launcher/Launcher-java.scripting.gmk     |  3 +-
+ make/launcher/Launcher-java.security.jgss.gmk |  3 +
+ make/launcher/Launcher-jdk.aot.gmk            |  2 +
+ make/launcher/Launcher-jdk.compiler.gmk       |  5 +-
+ make/launcher/Launcher-jdk.hotspot.agent.gmk  |  1 +
+ make/launcher/Launcher-jdk.jartool.gmk        |  2 +
+ make/launcher/Launcher-jdk.javadoc.gmk        |  3 +-
+ make/launcher/Launcher-jdk.jcmd.gmk           | 13 +++-
+ make/launcher/Launcher-jdk.jconsole.gmk       |  3 +-
+ make/launcher/Launcher-jdk.jdeps.gmk          |  3 +
+ make/launcher/Launcher-jdk.jdi.gmk            |  1 +
+ make/launcher/Launcher-jdk.jlink.gmk          |  5 +-
+ make/launcher/Launcher-jdk.jshell.gmk         |  1 +
+ make/launcher/Launcher-jdk.jstatd.gmk         |  1 +
+ make/launcher/Launcher-jdk.pack.gmk           |  1 +
+ make/launcher/Launcher-jdk.rmic.gmk           |  1 +
+ .../Launcher-jdk.scripting.nashorn.shell.gmk  |  3 +-
+ src/hotspot/share/runtime/arguments.cpp       | 59 +++++++++++++++++++
+ src/hotspot/share/runtime/arguments.hpp       |  3 +
+ src/hotspot/share/runtime/globals.hpp         | 12 +++-
+ 21 files changed, 117 insertions(+), 10 deletions(-)
+
+diff --git a/make/launcher/Launcher-java.rmi.gmk b/make/launcher/Launcher-java.rmi.gmk
+index a69a90bcc81..07046232275 100644
+--- a/make/launcher/Launcher-java.rmi.gmk
++++ b/make/launcher/Launcher-java.rmi.gmk
+@@ -27,8 +27,10 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, rmid, \
+     MAIN_CLASS := sun.rmi.server.Activation, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, rmiregistry, \
+     MAIN_CLASS := sun.rmi.registry.RegistryImpl, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+ ))
+diff --git a/make/launcher/Launcher-java.scripting.gmk b/make/launcher/Launcher-java.scripting.gmk
+index 057d2bf3aca..cf100e20789 100644
+--- a/make/launcher/Launcher-java.scripting.gmk
++++ b/make/launcher/Launcher-java.scripting.gmk
+@@ -27,5 +27,6 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, jrunscript, \
+     MAIN_CLASS := com.sun.tools.script.shell.Main, \
+-    JAVA_ARGS := --add-modules ALL-DEFAULT, \
++    JAVA_ARGS := --add-modules ALL-DEFAULT \
++        -XX:+DisableHotswapAgent, \
+ ))
+diff --git a/make/launcher/Launcher-java.security.jgss.gmk b/make/launcher/Launcher-java.security.jgss.gmk
+index 7411e1a21c4..2b856bfccb4 100644
+--- a/make/launcher/Launcher-java.security.jgss.gmk
++++ b/make/launcher/Launcher-java.security.jgss.gmk
+@@ -28,13 +28,16 @@ include LauncherCommon.gmk
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+   $(eval $(call SetupBuildLauncher, kinit, \
+       MAIN_CLASS := sun.security.krb5.internal.tools.Kinit, \
++      JAVA_ARGS := -XX:+DisableHotswapAgent, \
+   ))
+ 
+   $(eval $(call SetupBuildLauncher, klist, \
+       MAIN_CLASS := sun.security.krb5.internal.tools.Klist, \
++      JAVA_ARGS := -XX:+DisableHotswapAgent, \
+   ))
+ 
+   $(eval $(call SetupBuildLauncher, ktab, \
+       MAIN_CLASS := sun.security.krb5.internal.tools.Ktab, \
++      JAVA_ARGS := -XX:+DisableHotswapAgent, \
+   ))
+ endif
+diff --git a/make/launcher/Launcher-jdk.aot.gmk b/make/launcher/Launcher-jdk.aot.gmk
+index 10717a5e1c5..2c52c31a555 100644
+--- a/make/launcher/Launcher-jdk.aot.gmk
++++ b/make/launcher/Launcher-jdk.aot.gmk
+@@ -31,6 +31,7 @@ include LauncherCommon.gmk
+ $(eval $(call SetupBuildLauncher, jaotc, \
+     MAIN_CLASS := jdk.tools.jaotc.Main, \
+     EXTRA_JAVA_ARGS := -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI \
++        -XX:+DisableHotswapAgent \
+         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
+         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.amd64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
+         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
+@@ -40,6 +41,7 @@ $(eval $(call SetupBuildLauncher, jaotc, \
+         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
+     , \
+     JAVA_ARGS := --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
++        -XX:+DisableHotswapAgent \
+         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
+         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
+         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
+diff --git a/make/launcher/Launcher-jdk.compiler.gmk b/make/launcher/Launcher-jdk.compiler.gmk
+index f71c37adf74..744969546de 100644
+--- a/make/launcher/Launcher-jdk.compiler.gmk
++++ b/make/launcher/Launcher-jdk.compiler.gmk
+@@ -27,12 +27,14 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, javac, \
+    MAIN_CLASS := com.sun.tools.javac.Main, \
+-   JAVA_ARGS := --add-modules ALL-DEFAULT, \
++   JAVA_ARGS := --add-modules ALL-DEFAULT \
++       -XX:+DisableHotswapAgent, \
+    CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, serialver, \
+     MAIN_CLASS := sun.tools.serialver.SerialVer, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
+ ))
+ 
+@@ -41,6 +43,7 @@ ifeq ($(ENABLE_SJAVAC), yes)
+   # into any real images
+   $(eval $(call SetupBuildLauncher, sjavac, \
+       MAIN_CLASS := com.sun.tools.sjavac.Main, \
++      JAVA_ARGS := -XX:+DisableHotswapAgent, \
+       CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
+       OUTPUT_DIR := $(JDK_OUTPUTDIR)/bin, \
+   ))
+diff --git a/make/launcher/Launcher-jdk.hotspot.agent.gmk b/make/launcher/Launcher-jdk.hotspot.agent.gmk
+index 76da3600368..9f12b05b172 100644
+--- a/make/launcher/Launcher-jdk.hotspot.agent.gmk
++++ b/make/launcher/Launcher-jdk.hotspot.agent.gmk
+@@ -27,5 +27,6 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, jhsdb, \
+     MAIN_CLASS := sun.jvm.hotspot.SALauncher, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+     MACOSX_PRIVILEGED := true, \
+ ))
+diff --git a/make/launcher/Launcher-jdk.jartool.gmk b/make/launcher/Launcher-jdk.jartool.gmk
+index f74e82bfdae..647d82b65b1 100644
+--- a/make/launcher/Launcher-jdk.jartool.gmk
++++ b/make/launcher/Launcher-jdk.jartool.gmk
+@@ -27,8 +27,10 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, jar, \
+     MAIN_CLASS := sun.tools.jar.Main, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, jarsigner, \
+     MAIN_CLASS := sun.security.tools.jarsigner.Main, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+ ))
+diff --git a/make/launcher/Launcher-jdk.javadoc.gmk b/make/launcher/Launcher-jdk.javadoc.gmk
+index 889028a2b17..c3d2093be04 100644
+--- a/make/launcher/Launcher-jdk.javadoc.gmk
++++ b/make/launcher/Launcher-jdk.javadoc.gmk
+@@ -27,6 +27,7 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, javadoc, \
+     MAIN_CLASS := jdk.javadoc.internal.tool.Main, \
+-    JAVA_ARGS := --add-modules ALL-DEFAULT, \
++    JAVA_ARGS := --add-modules ALL-DEFAULT \
++        -XX:+DisableHotswapAgent, \
+     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
+ ))
+diff --git a/make/launcher/Launcher-jdk.jcmd.gmk b/make/launcher/Launcher-jdk.jcmd.gmk
+index 7117fa78059..761a52d8466 100644
+--- a/make/launcher/Launcher-jdk.jcmd.gmk
++++ b/make/launcher/Launcher-jdk.jcmd.gmk
+@@ -30,6 +30,7 @@ $(eval $(call SetupBuildLauncher, jinfo, \
+     JAVA_ARGS := \
+         -Dsun.jvm.hotspot.debugger.useProcDebugger \
+         -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
++        -XX:+DisableHotswapAgent, \
+     MACOSX_PRIVILEGED := true, \
+ ))
+ 
+@@ -37,28 +38,36 @@ $(eval $(call SetupBuildLauncher, jmap, \
+     MAIN_CLASS := sun.tools.jmap.JMap, \
+     JAVA_ARGS := \
+         -Dsun.jvm.hotspot.debugger.useProcDebugger \
+-        -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
++        -Dsun.jvm.hotspot.debugger.useWindbgDebugger \
++        -XX:+DisableHotswapAgent, \
+     MACOSX_PRIVILEGED := true, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, jps, \
+     MAIN_CLASS := sun.tools.jps.Jps, \
++    JAVA_ARGS := \
++        -XX:+DisableHotswapAgent, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, jstack, \
+     MAIN_CLASS := sun.tools.jstack.JStack, \
+     JAVA_ARGS := \
+         -Dsun.jvm.hotspot.debugger.useProcDebugger \
+-        -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
++        -Dsun.jvm.hotspot.debugger.useWindbgDebugger \
++        -XX:+DisableHotswapAgent, \
+     MACOSX_PRIVILEGED := true, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, jstat, \
+     MAIN_CLASS := sun.tools.jstat.Jstat, \
++    JAVA_ARGS := \
++        -XX:+DisableHotswapAgent, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, jcmd, \
+     MAIN_CLASS := sun.tools.jcmd.JCmd, \
++    JAVA_ARGS := \
++        -XX:+DisableHotswapAgent, \
+ ))
+ 
+ # Hook to include the corresponding custom file, if present.
+diff --git a/make/launcher/Launcher-jdk.jconsole.gmk b/make/launcher/Launcher-jdk.jconsole.gmk
+index 6205ae63d16..5ca6a0c123b 100644
+--- a/make/launcher/Launcher-jdk.jconsole.gmk
++++ b/make/launcher/Launcher-jdk.jconsole.gmk
+@@ -28,7 +28,8 @@ include LauncherCommon.gmk
+ $(eval $(call SetupBuildLauncher, jconsole, \
+     MAIN_CLASS := sun.tools.jconsole.JConsole, \
+     JAVA_ARGS := --add-opens java.base/java.io=jdk.jconsole \
+-		 -Djconsole.showOutputViewer, \
++      -Djconsole.showOutputViewer \
++      -XX:+DisableHotswapAgent, \
+     CFLAGS_windows := -DJAVAW, \
+     LIBS_windows := user32.lib, \
+ ))
+diff --git a/make/launcher/Launcher-jdk.jdeps.gmk b/make/launcher/Launcher-jdk.jdeps.gmk
+index 217523c48cc..5448278dae7 100644
+--- a/make/launcher/Launcher-jdk.jdeps.gmk
++++ b/make/launcher/Launcher-jdk.jdeps.gmk
+@@ -27,15 +27,18 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, javap, \
+     MAIN_CLASS := com.sun.tools.javap.Main, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, jdeps, \
+     MAIN_CLASS := com.sun.tools.jdeps.Main, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, jdeprscan, \
+     MAIN_CLASS := com.sun.tools.jdeprscan.Main, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
+ ))
+diff --git a/make/launcher/Launcher-jdk.jdi.gmk b/make/launcher/Launcher-jdk.jdi.gmk
+index fcce98cf430..27bd448e3ae 100644
+--- a/make/launcher/Launcher-jdk.jdi.gmk
++++ b/make/launcher/Launcher-jdk.jdi.gmk
+@@ -27,4 +27,5 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, jdb, \
+     MAIN_CLASS := com.sun.tools.example.debug.tty.TTY, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+ ))
+diff --git a/make/launcher/Launcher-jdk.jlink.gmk b/make/launcher/Launcher-jdk.jlink.gmk
+index df2173996d7..9e61edeb2c8 100644
+--- a/make/launcher/Launcher-jdk.jlink.gmk
++++ b/make/launcher/Launcher-jdk.jlink.gmk
+@@ -27,18 +27,21 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, jimage,\
+     MAIN_CLASS := jdk.tools.jimage.Main, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+     CFLAGS := -DENABLE_ARG_FILES, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, jlink,\
+     MAIN_CLASS := jdk.tools.jlink.internal.Main, \
+-    JAVA_ARGS :=  --add-modules ALL-DEFAULT, \
++    JAVA_ARGS :=  --add-modules ALL-DEFAULT \
++        -XX:+DisableHotswapAgent, \
+     CFLAGS := -DENABLE_ARG_FILES \
+         -DEXPAND_CLASSPATH_WILDCARDS, \
+ ))
+ 
+ $(eval $(call SetupBuildLauncher, jmod,\
+     MAIN_CLASS := jdk.tools.jmod.Main, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+     CFLAGS := -DENABLE_ARG_FILES \
+         -DEXPAND_CLASSPATH_WILDCARDS, \
+ ))
+diff --git a/make/launcher/Launcher-jdk.jshell.gmk b/make/launcher/Launcher-jdk.jshell.gmk
+index 349eb88e9eb..7287f8f998a 100644
+--- a/make/launcher/Launcher-jdk.jshell.gmk
++++ b/make/launcher/Launcher-jdk.jshell.gmk
+@@ -27,5 +27,6 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, jshell, \
+     MAIN_CLASS := jdk.internal.jshell.tool.JShellToolProvider, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
+ ))
+diff --git a/make/launcher/Launcher-jdk.jstatd.gmk b/make/launcher/Launcher-jdk.jstatd.gmk
+index e9286d63094..e1657910c67 100644
+--- a/make/launcher/Launcher-jdk.jstatd.gmk
++++ b/make/launcher/Launcher-jdk.jstatd.gmk
+@@ -27,6 +27,7 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, jstatd, \
+     MAIN_CLASS := sun.tools.jstatd.Jstatd, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+ ))
+ 
+ # Hook to include the corresponding custom file, if present.
+diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk
+index a93fd2a9017..64bbbb7c949 100644
+--- a/make/launcher/Launcher-jdk.pack.gmk
++++ b/make/launcher/Launcher-jdk.pack.gmk
+@@ -28,6 +28,7 @@ include LauncherCommon.gmk
+ $(eval $(call SetupBuildLauncher, pack200, \
+     MAIN_MODULE := java.base, \
+     MAIN_CLASS := com.sun.java.util.jar.pack.Driver, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+ ))
+ 
+ ################################################################################
+diff --git a/make/launcher/Launcher-jdk.rmic.gmk b/make/launcher/Launcher-jdk.rmic.gmk
+index d60c3d9b60b..b8a55900b0e 100644
+--- a/make/launcher/Launcher-jdk.rmic.gmk
++++ b/make/launcher/Launcher-jdk.rmic.gmk
+@@ -27,5 +27,6 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, rmic, \
+     MAIN_CLASS := sun.rmi.rmic.Main, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
+ ))
+diff --git a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
+index 82311e69fd6..bd39f8595b2 100644
+--- a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
++++ b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
+@@ -27,6 +27,7 @@ include LauncherCommon.gmk
+ 
+ $(eval $(call SetupBuildLauncher, jjs, \
+     MAIN_CLASS := jdk.nashorn.tools.jjs.Main, \
+-    JAVA_ARGS := --add-modules ALL-DEFAULT, \
++    JAVA_ARGS := --add-modules ALL-DEFAULT \
++        -XX:+DisableHotswapAgent, \
+     CFLAGS := -DENABLE_ARG_FILES, \
+ ))
+diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
+index 2ca6dde069d..c75bb5d8f49 100644
+--- a/src/hotspot/share/runtime/arguments.cpp
++++ b/src/hotspot/share/runtime/arguments.cpp
+@@ -3937,6 +3937,8 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
+   // Set object alignment values.
+   set_object_alignment();
+ 
++  setup_hotswap_agent();
++
+ #if !INCLUDE_CDS
+   if (DumpSharedSpaces || RequireSharedSpaces) {
+     jio_fprintf(defaultStream::error_stream(),
+@@ -4270,3 +4272,60 @@ 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 (!AllowEnhancedClassRedefinition)
++    return;
++
++  // Set HotswapAgent
++  if (!DisableHotswapAgent) {
++
++    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) {
++      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());
++    }
++
++    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_property("jdk.module.addopens", "java.base/java.lang=ALL-UNNAMED", addopens_count++);
++  // Class of  field java.lang.reflect.Proxy/proxyCache
++  create_numbered_property("jdk.module.addopens", "java.base/jdk.internal.loader=ALL-UNNAMED", addopens_count++);
++  // java.beans.Introspector access
++  create_numbered_property("jdk.module.addopens", "java.desktop/java.beans=ALL-UNNAMED", addopens_count++);
++
++}
+diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
+index 46450cce5c9..3dc5b3d4bae 100644
+--- a/src/hotspot/share/runtime/arguments.hpp
++++ b/src/hotspot/share/runtime/arguments.hpp
+@@ -506,6 +506,9 @@ 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/globals.hpp b/src/hotspot/share/runtime/globals.hpp
+index f3cf08fffb6..5f6c7b8e388 100644
+--- a/src/hotspot/share/runtime/globals.hpp
++++ b/src/hotspot/share/runtime/globals.hpp
+@@ -32,6 +32,12 @@
+ 
+ #include <float.h> // for DBL_MAX
+ 
++#ifdef DCEVM_ONLY
++#define DISABLED_HOTSWAP_AGENT true
++#else
++#define DISABLED_HOTSWAP_AGENT false
++#endif
++
+ // The larger HeapWordSize for 64bit requires larger heaps
+ // for the same application running in 64bit.  See bug 4967770.
+ // The minimum alignment to a heap word size is done.  Other
+@@ -2675,8 +2681,10 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
+                                                                             \
+   product(bool, AllowEnhancedClassRedefinition, true,                       \
+              "Allow enhanced class redefinition beyond swapping method "    \
+-             "bodies")
+-
++             "bodies")                                                      \
++                                                                            \
++  product(bool, DisableHotswapAgent, DISABLED_HOTSWAP_AGENT,                \
++             "Disable integrated Hotswap Agent (HotswapVM only)")
+ #define VM_FLAGS(develop,                                                   \
+                  develop_pd,                                                \
+                  product,                                                   \
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -1,26 +0,0 @@
-From ca37cdca38fa1dd08844767510fce418a8c49b9e Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Thu, 22 Oct 2020 20:15:20 +0200
-Subject: [PATCH 15/44] 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 037ceef2c44..6b8e2198e55 100644
---- a/src/hotspot/share/oops/method.cpp
-+++ b/src/hotspot/share/oops/method.cpp
-@@ -83,7 +83,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/0016-Add-dcevm-distro-name.patch

@@ -0,0 +1,25 @@
+From dc397b652d9810f6f261070afbb8519f1c2964ee Mon Sep 17 00:00:00 2001
+From: skybber <lada.dvorak7@gmail.com>
+Date: Sun, 16 Dec 2018 09:55:31 +0100
+Subject: [PATCH 16/50] Add dcevm distro name
+
+---
+ 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 b5a23138213..5c0a3242c80 100644
+--- a/make/autoconf/version-numbers
++++ b/make/autoconf/version-numbers
+@@ -43,7 +43,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.24.3 (Apple Git-128)
+

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

@@ -1,191 +0,0 @@
-From 400fa82043b7b9589e1f77c43f6696b133fc1188 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Fri, 23 Oct 2020 10:20:26 +0200
-Subject: [PATCH 16/44] Clear dcevm code separation
-
----
- src/hotspot/share/classfile/systemDictionary.cpp   |  4 ++--
- src/hotspot/share/gc/serial/genMarkSweep.cpp       |  8 +++++---
- src/hotspot/share/interpreter/linkResolver.cpp     | 14 ++++++++++----
- .../instrumentation/jfrEventClassTransformer.cpp   |  2 +-
- src/hotspot/share/oops/instanceKlass.cpp           | 10 ++++++----
- src/hotspot/share/oops/method.cpp                  |  2 +-
- src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp  |  2 +-
- src/hotspot/share/runtime/reflection.cpp           |  2 +-
- 8 files changed, 27 insertions(+), 17 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 89375cd59fa..a61c342f5bd 100644
---- a/src/hotspot/share/classfile/systemDictionary.cpp
-+++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -1147,7 +1147,7 @@ InstanceKlass* SystemDictionary::resolve_from_stream(Symbol* class_name,
-     MutexLocker mu(SystemDictionary_lock, THREAD);
- 
-     Klass* check = find_class(h_name, k->class_loader_data());
--    assert((check == k && !k->is_redefining()) || (k->is_redefining() && check == k->old_version()), "should be present in the dictionary");
-+    assert(check == k && !k->is_redefining() || k->is_redefining() && check == k->old_version(), "should be present in the dictionary");
-   } );
- 
-   return k;
-@@ -2149,7 +2149,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 b18682f9a12..590b5389b4d 100644
---- a/src/hotspot/share/gc/serial/genMarkSweep.cpp
-+++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp
-@@ -343,7 +343,9 @@ void GenMarkSweep::mark_sweep_phase4() {
- 
-   GenCompactClosure blk;
-   gch->generation_iterate(&blk, true);
--  DcevmSharedGC::copy_rescued_objects_back(MarkSweep::_rescued_oops, true);
--  DcevmSharedGC::clear_rescued_objects_resource(MarkSweep::_rescued_oops);
--  MarkSweep::_rescued_oops = NULL;
-+  if (AllowEnhancedClassRedefinition) {
-+    DcevmSharedGC::copy_rescued_objects_back(MarkSweep::_rescued_oops, true);
-+    DcevmSharedGC::clear_rescued_objects_resource(MarkSweep::_rescued_oops);
-+    MarkSweep::_rescued_oops = NULL;
-+  }
- }
-diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
-index 9dc184d02f5..bff1c3627b0 100644
---- a/src/hotspot/share/interpreter/linkResolver.cpp
-+++ b/src/hotspot/share/interpreter/linkResolver.cpp
-@@ -295,8 +295,13 @@ void LinkResolver::check_klass_accessability(Klass* ref_klass, Klass* sel_klass,
-       return;  // no relevant check to do
-     }
-   }
--  Reflection::VerifyClassAccessResults vca_result =
--    Reflection::verify_class_access(ref_klass->newest_version(), InstanceKlass::cast(base_klass->newest_version()), true);
-+  Klass* refKlassNewest = ref_klass;
-+  Klass* baseKlassNewest = base_klass;
-+  if (AllowEnhancedClassRedefinition) {
-+    refKlassNewest = ref_klass->newest_version();
-+    baseKlassNewest = base_klass->newest_version();
-+  }
-+  Reflection::VerifyClassAccessResults vca_result = Reflection::verify_class_access(refKlassNewest, InstanceKlass::cast(baseKlassNewest), true);
-   if (vca_result != Reflection::ACCESS_OK) {
-     ResourceMark rm(THREAD);
-     char* msg = Reflection::verify_class_access_msg(ref_klass,
-@@ -572,7 +577,8 @@ void LinkResolver::check_method_accessability(Klass* ref_klass,
-   // We'll check for the method name first, as that's most likely
-   // to be false (so we'll short-circuit out of these tests).
-   if (sel_method->name() == vmSymbols::clone_name() &&
--      sel_klass->newest_version() == SystemDictionary::Object_klass()->newest_version() &&
-+      ( !AllowEnhancedClassRedefinition && sel_klass == SystemDictionary::Object_klass() ||
-+      AllowEnhancedClassRedefinition && sel_klass->newest_version() == SystemDictionary::Object_klass()->newest_version()) &&
-       resolved_klass->is_array_klass()) {
-     // We need to change "protected" to "public".
-     assert(flags.is_protected(), "clone not protected?");
-@@ -997,7 +1003,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
-       ResourceMark rm(THREAD);
-       stringStream ss;
- 
--      if (sel_klass != current_klass && sel_klass != current_klass->active_version()) {
-+      if (sel_klass != current_klass && (!AllowEnhancedClassRedefinition || sel_klass != current_klass->active_version())) {
-         ss.print("Update to %s final field %s.%s attempted from a different class (%s) than the field's declaring class",
-                  is_static ? "static" : "non-static", resolved_klass->external_name(), fd.name()->as_C_string(),
-                 current_klass->external_name());
-diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
-index 61a406377ee..da9df7a21a2 100644
---- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
-+++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
-@@ -1471,7 +1471,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
-                              NULL, // host klass
-                              NULL, // cp_patches
-                              ClassFileParser::INTERNAL, // internal visibility
--							 false,
-+                             false,
-                              THREAD);
-   if (HAS_PENDING_EXCEPTION) {
-     log_pending_exception(PENDING_EXCEPTION);
-diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index b10e566b7c3..7557a84fbf3 100644
---- a/src/hotspot/share/oops/instanceKlass.cpp
-+++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -178,7 +178,9 @@ bool InstanceKlass::has_nest_member(InstanceKlass* k, TRAPS) const {
-       }
- 
-       Klass* k2 = _constants->klass_at(cp_index, CHECK_false);
--      k2 = k2->newest_version();
-+      if (AllowEnhancedClassRedefinition) {
-+        k2 = k2->newest_version();
-+      }
-       if (k2 == k) {
-         log_trace(class, nestmates)("- class is listed as a nest member");
-         return true;
-@@ -837,7 +839,7 @@ bool InstanceKlass::link_class_impl(bool throw_verifyerror, TRAPS) {
- #endif
-       set_init_state(linked);
-       // (DCEVM) Must check for old version in order to prevent infinite loops.
--      if (JvmtiExport::should_post_class_prepare() && old_version() == NULL /* JVMTI deadlock otherwise */) {
-+      if (JvmtiExport::should_post_class_prepare() && (!AllowEnhancedClassRedefinition || old_version() == NULL) /* JVMTI deadlock otherwise */) {
-         Thread *thread = THREAD;
-         assert(thread->is_Java_thread(), "thread->is_Java_thread()");
-         JvmtiExport::post_class_prepare((JavaThread *) thread, this);
-@@ -919,7 +921,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
-     // that aren't expected to throw.  This would wreak havoc.  See 6320309.
-     // (DCEVM) Wait also for the old class version to be fully initialized.
-     while((is_being_initialized() && !is_reentrant_initialization(self))
--        || (old_version() != NULL && InstanceKlass::cast(old_version())->is_being_initialized())) {
-+        || (AllowEnhancedClassRedefinition && old_version() != NULL && InstanceKlass::cast(old_version())->is_being_initialized())) {
-         wait = true;
-       ol.waitUninterruptibly(CHECK);
-     }
-@@ -3632,7 +3634,7 @@ void InstanceKlass::verify_on(outputStream* st) {
- 
-     guarantee(sib->is_klass(), "should be klass");
-     // TODO: (DCEVM) explain
--    guarantee(sib->super() == super || super->newest_version() == SystemDictionary::Object_klass(), "siblings should have same superklass");
-+    guarantee(sib->super() == super || AllowEnhancedClassRedefinition && super->newest_version() == SystemDictionary::Object_klass(), "siblings should have same superklass");
-   }
- 
-   // Verify implementor fields requires the Compile_lock, but this is sometimes
-diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index 6b8e2198e55..2af3e71635e 100644
---- a/src/hotspot/share/oops/method.cpp
-+++ b/src/hotspot/share/oops/method.cpp
-@@ -2144,7 +2144,7 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
- // Add a method id to the jmethod_ids
- jmethodID Method::make_jmethod_id(ClassLoaderData* loader_data, Method* m) {
-   // FIXME: (DCEVM) ???
--  if (m != m->newest_version()) {
-+  if (AllowEnhancedClassRedefinition && m != m->newest_version()) {
-     m = m->newest_version();
-   }
-   ClassLoaderData* cld = loader_data;
-diff --git a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-index 60604c645ff..325bffb7ad0 100644
---- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-@@ -51,7 +51,7 @@ public:
-     //         the new version (SystemDictionary stores only new versions). But the LoadedClassesClosure's functionality was
-     //         changed in java8  where jvmtiLoadedClasses collects all classes from all classloaders, therefore we
-     //         must use new versions only.
--    if (k->new_version()==NULL) {
-+    if (AllowEnhancedClassRedefinition && k->new_version()==NULL) {
-       _classStack.push((jclass) _env->jni_reference(Handle(_cur_thread, k->java_mirror())));
-     }
-   }
-diff --git a/src/hotspot/share/runtime/reflection.cpp b/src/hotspot/share/runtime/reflection.cpp
-index ac233f3b373..ae0cb65969a 100644
---- a/src/hotspot/share/runtime/reflection.cpp
-+++ b/src/hotspot/share/runtime/reflection.cpp
-@@ -660,7 +660,7 @@ bool Reflection::verify_member_access(const Klass* current_class,
-                                       TRAPS) {
- 
-   // (DCEVM) Decide accessibility based on active version
--  if (current_class != NULL) {
-+  if (AllowEnhancedClassRedefinition && current_class != NULL) {
-     current_class = current_class->active_version();
-   }
- 
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0017-Fix-metadataOnStack-bug.patch

@@ -1,160 +0,0 @@
-From 22608d7381bc606fa488389c3d4e56987abd166b Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Fri, 23 Oct 2020 11:07:40 +0200
-Subject: [PATCH 17/44] Fix metadataOnStack bug
-
----
- .../share/classfile/classLoaderData.cpp       |  7 +-
- .../share/classfile/metadataOnStackMark.cpp   | 67 ++++++++++---------
- .../share/classfile/metadataOnStackMark.hpp   |  3 +-
- .../share/prims/jvmtiRedefineClasses.cpp      |  2 +-
- 4 files changed, 41 insertions(+), 38 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index a901b4309b9..7b88f6b44d9 100644
---- a/src/hotspot/share/classfile/classLoaderData.cpp
-+++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1401,13 +1401,10 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
-   // Klassesoto delete.
- 
-   // FIXME: dcevm - block asserts in MetadataOnStackMark
--  bool walk_all_metadata = false;
--  if (!AllowEnhancedClassRedefinition) {
--    walk_all_metadata = clean_previous_versions &&
-+  bool walk_all_metadata = clean_previous_versions &&
-                              JvmtiExport::has_redefined_a_class() &&
-                              InstanceKlass::has_previous_versions_and_reset();
--    MetadataOnStackMark md_on_stack(walk_all_metadata);
--  }
-+  MetadataOnStackMark md_on_stack(walk_all_metadata, AllowEnhancedClassRedefinition);
- 
-   // Save previous _unloading pointer for CMS which may add to unloading list before
-   // purging and we don't want to rewalk the previously unloaded class loader data.
-diff --git a/src/hotspot/share/classfile/metadataOnStackMark.cpp b/src/hotspot/share/classfile/metadataOnStackMark.cpp
-index 3a62c789702..9d7bdbde74b 100644
---- a/src/hotspot/share/classfile/metadataOnStackMark.cpp
-+++ b/src/hotspot/share/classfile/metadataOnStackMark.cpp
-@@ -46,23 +46,25 @@ NOT_PRODUCT(bool MetadataOnStackMark::_is_active = false;)
- // it.  Class unloading only deletes in-error class files, methods created by
- // the relocator and dummy constant pools.  None of these appear anywhere except
- // in metadata Handles.
--MetadataOnStackMark::MetadataOnStackMark(bool redefinition_walk) {
-+MetadataOnStackMark::MetadataOnStackMark(bool redefinition_walk, bool ignore) : _ignore(ignore) {
-   assert(SafepointSynchronize::is_at_safepoint(), "sanity check");
-   assert(_used_buffers == NULL, "sanity check");
-   assert(!_is_active, "MetadataOnStackMarks do not nest");
-   NOT_PRODUCT(_is_active = true;)
- 
--  Threads::metadata_handles_do(Metadata::mark_on_stack);
-+  if (!ignore) {
-+    Threads::metadata_handles_do(Metadata::mark_on_stack);
- 
--  if (redefinition_walk) {
--    Threads::metadata_do(Metadata::mark_on_stack);
--    CodeCache::metadata_do(Metadata::mark_on_stack);
--    CompileBroker::mark_on_stack();
--    JvmtiCurrentBreakpoints::metadata_do(Metadata::mark_on_stack);
--    ThreadService::metadata_do(Metadata::mark_on_stack);
-+    if (redefinition_walk) {
-+      Threads::metadata_do(Metadata::mark_on_stack);
-+      CodeCache::metadata_do(Metadata::mark_on_stack);
-+      CompileBroker::mark_on_stack();
-+      JvmtiCurrentBreakpoints::metadata_do(Metadata::mark_on_stack);
-+      ThreadService::metadata_do(Metadata::mark_on_stack);
- #if INCLUDE_JVMCI
--    JVMCIRuntime::metadata_do(Metadata::mark_on_stack);
-+      JVMCIRuntime::metadata_do(Metadata::mark_on_stack);
- #endif
-+    }
-   }
- }
- 
-@@ -71,32 +73,35 @@ MetadataOnStackMark::~MetadataOnStackMark() {
-   // Unmark everything that was marked.   Can't do the same walk because
-   // redefine classes messes up the code cache so the set of methods
-   // might not be the same.
--  retire_current_buffer();
--
--  MetadataOnStackBuffer* buffer = _used_buffers;
--  while (buffer != NULL) {
--    // Clear on stack state for all metadata.
--    size_t size = buffer->size();
--    for (size_t i  = 0; i < size; i++) {
--      Metadata* md = buffer->at(i);
--      md->set_on_stack(false);
-+  if (!_ignore)
-+  {
-+    retire_current_buffer();
-+
-+    MetadataOnStackBuffer* buffer = _used_buffers;
-+    while (buffer != NULL) {
-+      // Clear on stack state for all metadata.
-+      size_t size = buffer->size();
-+      for (size_t i  = 0; i < size; i++) {
-+        Metadata* md = buffer->at(i);
-+        md->set_on_stack(false);
-+      }
-+
-+      MetadataOnStackBuffer* next = buffer->next_used();
-+
-+      // Move the buffer to the free list.
-+      buffer->clear();
-+      buffer->set_next_used(NULL);
-+      buffer->set_next_free(_free_buffers);
-+      _free_buffers = buffer;
-+
-+      // Step to next used buffer.
-+      buffer = next;
-     }
- 
--    MetadataOnStackBuffer* next = buffer->next_used();
--
--    // Move the buffer to the free list.
--    buffer->clear();
--    buffer->set_next_used(NULL);
--    buffer->set_next_free(_free_buffers);
--    _free_buffers = buffer;
-+    _used_buffers = NULL;
- 
--    // Step to next used buffer.
--    buffer = next;
-+    NOT_PRODUCT(_is_active = false;)
-   }
--
--  _used_buffers = NULL;
--
--  NOT_PRODUCT(_is_active = false;)
- }
- 
- void MetadataOnStackMark::retire_buffer(MetadataOnStackBuffer* buffer) {
-diff --git a/src/hotspot/share/classfile/metadataOnStackMark.hpp b/src/hotspot/share/classfile/metadataOnStackMark.hpp
-index 8da4ac6f92b..6d327ab98f2 100644
---- a/src/hotspot/share/classfile/metadataOnStackMark.hpp
-+++ b/src/hotspot/share/classfile/metadataOnStackMark.hpp
-@@ -47,8 +47,9 @@ class MetadataOnStackMark : public StackObj {
-   static MetadataOnStackBuffer* allocate_buffer();
-   static void retire_buffer(MetadataOnStackBuffer* buffer);
- 
-+  bool _ignore;
-  public:
--  MetadataOnStackMark(bool redefinition_walk);
-+  MetadataOnStackMark(bool redefinition_walk, bool ignore);
-    ~MetadataOnStackMark();
- 
-   static void record(Metadata* m);
-diff --git a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
-index aee84b1d7c5..3dd86d63a1f 100644
---- a/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiRedefineClasses.cpp
-@@ -199,7 +199,7 @@ void VM_RedefineClasses::doit() {
- 
-   // Mark methods seen on stack and everywhere else so old methods are not
-   // cleaned up if they're on the stack.
--  MetadataOnStackMark md_on_stack(true);
-+  MetadataOnStackMark md_on_stack(true, false);
-   HandleMark hm(thread);   // make sure any handles created are deleted
-                            // before the stack walk again.
- 
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0017-java.desktop-com.sun.beans-ALL-UNNAMED.patch

@@ -0,0 +1,24 @@
+From 987645d54a6682f28a733731965d6b377e892974 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Tue, 19 Nov 2019 19:58:27 +0100
+Subject: [PATCH 17/50] java.desktop/com.sun.beans=ALL-UNNAMED
+
+---
+ src/hotspot/share/runtime/arguments.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
+index c75bb5d8f49..ba6e78d6daa 100644
+--- a/src/hotspot/share/runtime/arguments.cpp
++++ b/src/hotspot/share/runtime/arguments.cpp
+@@ -4327,5 +4327,7 @@ void Arguments::setup_hotswap_agent() {
+   create_numbered_property("jdk.module.addopens", "java.base/jdk.internal.loader=ALL-UNNAMED", addopens_count++);
+   // java.beans.Introspector access
+   create_numbered_property("jdk.module.addopens", "java.desktop/java.beans=ALL-UNNAMED", addopens_count++);
++  // java.beans.Introspector access
++  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans=ALL-UNNAMED", addopens_count++);
+ 
+ }
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0018-Ignore-MetadataOnStackMark-if-redefining_gc_run.patch

@@ -1,25 +0,0 @@
-From 371093160151f400b149a5e5e4cd1acc89b1ab52 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sun, 1 Nov 2020 21:19:00 +0100
-Subject: [PATCH 18/44] Ignore MetadataOnStackMark if redefining_gc_run
-
----
- src/hotspot/share/classfile/classLoaderData.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 7b88f6b44d9..2f6329f3e4d 100644
---- a/src/hotspot/share/classfile/classLoaderData.cpp
-+++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1404,7 +1404,7 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
-   bool walk_all_metadata = clean_previous_versions &&
-                              JvmtiExport::has_redefined_a_class() &&
-                              InstanceKlass::has_previous_versions_and_reset();
--  MetadataOnStackMark md_on_stack(walk_all_metadata, AllowEnhancedClassRedefinition);
-+  MetadataOnStackMark md_on_stack(walk_all_metadata, Universe::is_redefining_gc_run());
- 
-   // Save previous _unloading pointer for CMS which may add to unloading list before
-   // purging and we don't want to rewalk the previously unloaded class loader data.
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0018-increment_class_counter-using-orig-dcevm-code.patch

@@ -0,0 +1,113 @@
+From 60569257636a2d0b31b04ab2638d81f840d75e58 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Tue, 19 Nov 2019 21:07:59 +0100
+Subject: [PATCH 18/50] increment_class_counter() using orig dcevm code
+
+Probably it is cause of SISEGV on:
+_
+VM_EnhancedRedefineClasses::redefine_single_class->java_mirror()
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 39 ++++++-------------
+ 1 file changed, 12 insertions(+), 27 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 4ca638548dc..efb9e806508 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -1146,9 +1146,9 @@ int VM_EnhancedRedefineClasses::calculate_redefinition_flags(InstanceKlass* new_
+ }
+ 
+ 
+-/** 
++/**
+   Searches for the class bytecode of the given class and returns it as a byte array.
+-  
++
+   @param the_class definition of a class, either existing class or new_class
+   @param class_bytes - if the class is redefined, it contains new class definition, otherwise just original class bytecode.
+   @param class_byte_count - size of class_bytes
+@@ -1460,7 +1460,7 @@ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+ //
+ //      ik->itable()->adjust_method_entries(the_class, &trace_name_printed);
+ //    }
+-   
++
+    constantPoolHandle other_cp = constantPoolHandle(ik->constants());
+ 
+   // Update host klass of anonymous classes (for example, produced by lambdas) to newest version.
+@@ -1764,7 +1764,7 @@ void VM_EnhancedRedefineClasses::flush_dependent_code(InstanceKlass* k_h, TRAPS)
+ /**
+   Compare _old_methods and _new_methods arrays and store the result into
+ 	_matching_old_methods, _matching_new_methods, _added_methods, _deleted_methods
+-  
++
+   Setup _old_methods and _new_methods before the call - it should be called for one class only!
+ */
+ void VM_EnhancedRedefineClasses::compute_added_deleted_matching_methods() {
+@@ -1898,13 +1898,13 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+     ResourceMark rm(THREAD);
+     // increment the classRedefinedCount field in the_class and in any
+     // direct and indirect subclasses of the_class
+-    increment_class_counter(the_class, THREAD);
++    increment_class_counter(new_class, THREAD);
+     log_info(redefine, class, load)
+       ("redefined name=%s, count=%d (avail_mem=" UINT64_FORMAT "K)",
+-       the_class->external_name(), java_lang_Class::classRedefinedCount(the_class->java_mirror()), os::available_memory() >> 10);
++       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",
+-                             the_class->external_name(),
+-                             java_lang_Class::classRedefinedCount(the_class->java_mirror()));
++                             new_class->external_name(),
++                             java_lang_Class::classRedefinedCount(new_class->java_mirror()));
+ 
+   }
+   _timer_rsc_phase2.stop();
+@@ -1914,25 +1914,10 @@ 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) {
+-  oop class_mirror = ik->java_mirror();
++  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->new_version()->java_mirror(), new_count);
+-
+-  if (class_oop != _the_class_oop) {
+-    // _the_class_oop count is printed at end of redefine_single_class()
+-    log_debug(redefine, class, subclass)("updated count in subclass=%s to %d", ik->external_name(), new_count);
+-  }
+-
+-  for (Klass *subk = ik->subklass(); subk != NULL;
+-       subk = subk->next_sibling()) {
+-    if (subk->is_instance_klass()) {
+-      // Only update instanceKlasses
+-      InstanceKlass *subik = InstanceKlass::cast(subk);
+-      // recursively do subclasses of the current subclass
+-      increment_class_counter(subik, THREAD);
+-    }
+-  }
++  java_lang_Class::set_classRedefinedCount(ik->java_mirror(), new_count);
+ }
+ 
+ void VM_EnhancedRedefineClasses::check_class(InstanceKlass* ik, TRAPS) {
+@@ -2063,7 +2048,7 @@ class AffectedKlassClosure : public KlassClosure {
+ 
+ /**
+   Find all affected classes by current redefinition (either because of redefine, class hierarchy or interface change).
+-  Affected classes are stored in _affected_klasses and parent classes always precedes child class.  
++  Affected classes are stored in _affected_klasses and parent classes always precedes child class.
+ */
+ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
+   for (int i = 0; i < _class_count; i++) {
+@@ -2112,7 +2097,7 @@ static bool match_second(void* value, KlassPair elem) {
+  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?
+ */
+ jvmtiError VM_EnhancedRedefineClasses::do_topological_class_sorting(TRAPS) {
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0019-Allow-11715ha-class-initializer-calls.patch

@@ -0,0 +1,38 @@
+From 41d2963b54490601e22cf5309ed73f78566d35ae Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Thu, 21 Nov 2019 19:30:07 +0100
+Subject: [PATCH 19/50] Allow 11715ha class initializer calls
+
+---
+ src/hotspot/share/classfile/vmSymbols.hpp      | 1 +
+ src/hotspot/share/interpreter/linkResolver.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
+index e2bac31b27f..6eeda3b8f68 100644
+--- a/src/hotspot/share/classfile/vmSymbols.hpp
++++ b/src/hotspot/share/classfile/vmSymbols.hpp
+@@ -340,6 +340,7 @@
+   /* common method and field names */                                                             \
+   template(object_initializer_name,                   "<init>")                                   \
+   template(class_initializer_name,                    "<clinit>")                                 \
++  template(ha_class_initializer_name,                 "$$ha$clinit")                              \
+   template(println_name,                              "println")                                  \
+   template(printStackTrace_name,                      "printStackTrace")                          \
+   template(main_name,                                 "main")                                     \
+diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
+index b9ccdee8cca..cb76d2ef50c 100644
+--- a/src/hotspot/share/interpreter/linkResolver.cpp
++++ b/src/hotspot/share/interpreter/linkResolver.cpp
+@@ -1009,7 +1009,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
+         assert(!m.is_null(), "information about the current method must be available for 'put' bytecodes");
+         bool is_initialized_static_final_update = (byte == Bytecodes::_putstatic &&
+                                                    fd.is_static() &&
+-                                                   !m()->is_static_initializer());
++                                                   !(m()->is_static_initializer() || m()->name() == vmSymbols::ha_class_initializer_name()));
+         bool is_initialized_instance_final_update = ((byte == Bytecodes::_putfield || byte == Bytecodes::_nofast_putfield) &&
+                                                      !fd.is_static() &&
+                                                      !m->is_object_initializer());
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -1,26 +0,0 @@
-From 3151c71be433365e2d8ce5fb6e061b12fbca009a Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Wed, 11 Nov 2020 18:45:15 +0100
-Subject: [PATCH 19/44] Fix LoadedClassesClosure - fixes problems with remote
- debugging
-
----
- src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-index 325bffb7ad0..30752e37f1c 100644
---- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-@@ -51,7 +51,7 @@ public:
-     //         the new version (SystemDictionary stores only new versions). But the LoadedClassesClosure's functionality was
-     //         changed in java8  where jvmtiLoadedClasses collects all classes from all classloaders, therefore we
-     //         must use new versions only.
--    if (AllowEnhancedClassRedefinition && k->new_version()==NULL) {
-+    if (!AllowEnhancedClassRedefinition || k->new_version()==NULL) {
-       _classStack.push((jclass) _env->jni_reference(Handle(_cur_thread, k->java_mirror())));
-     }
-   }
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0020-Disable-AllowEnhancedClassRedefinition-in-flight-rec.patch

@@ -1,31 +0,0 @@
-From 9a869a57205c3e0f75ea0c23f6c5dc4334e6ddd8 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Fri, 5 Feb 2021 23:30:49 +0100
-Subject: [PATCH 20/44] 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 0db55d00bd3..65839b842e2 100644
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -3967,6 +3967,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;
-+    }
-+  }
-+
-   setup_hotswap_agent();
- 
- #if !INCLUDE_CDS
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0020-Disable-HA-in-keytool.patch

@@ -0,0 +1,24 @@
+From 09799f079ef1148248ca60c917205003d2a565b3 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Tue, 26 Nov 2019 22:13:07 +0100
+Subject: [PATCH 20/50] Disable HA in keytool
+
+---
+ make/launcher/Launcher-java.base.gmk | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk
+index 5ee4530004b..88c1a14b2aa 100644
+--- a/make/launcher/Launcher-java.base.gmk
++++ b/make/launcher/Launcher-java.base.gmk
+@@ -63,6 +63,7 @@ endif
+ 
+ $(eval $(call SetupBuildLauncher, keytool, \
+     MAIN_CLASS := sun.security.tools.keytool.Main, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+ ))
+ 
+ ################################################################################
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0021-JBR-3106-Check-InstanceKlass-has_nestmate_access_to-.patch

@@ -1,41 +0,0 @@
-From a6b2a48880db25c3c8ce5bc3bae9040eda6f18f2 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Fri, 12 Feb 2021 12:33:11 +0100
-Subject: [PATCH 21/44] JBR-3106 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 | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index 7557a84fbf3..ed26b33466a 100644
---- a/src/hotspot/share/oops/instanceKlass.cpp
-+++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -327,11 +327,21 @@ 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) {
-+    cur_host = InstanceKlass::cast(cur_host->active_version());
-+  }
-+
-   Klass* k_nest_host = k->nest_host(icce, CHECK_false);
-   if (k_nest_host == NULL) {
-     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);
- 
-   if (log_is_enabled(Trace, class, nestmates)) {
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0021-Open-jdk-module-to-access-ClassInfo.CACHE.patch

@@ -0,0 +1,24 @@
+From e1d8f42f428d7d18f09f1a7098f56fdce808c3fe Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Thu, 28 Nov 2019 18:53:11 +0100
+Subject: [PATCH 21/50] Open jdk module to access ClassInfo.CACHE
+
+---
+ src/hotspot/share/runtime/arguments.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
+index ba6e78d6daa..0081f688120 100644
+--- a/src/hotspot/share/runtime/arguments.cpp
++++ b/src/hotspot/share/runtime/arguments.cpp
+@@ -4329,5 +4329,7 @@ void Arguments::setup_hotswap_agent() {
+   create_numbered_property("jdk.module.addopens", "java.desktop/java.beans=ALL-UNNAMED", addopens_count++);
+   // java.beans.Introspector access
+   create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans=ALL-UNNAMED", addopens_count++);
++  // com.sun.beans.introspect.ClassInfo access
++  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans.introspect=ALL-UNNAMED", addopens_count++);
+ 
+ }
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0022-JBR-3110-Fix-assert-in-MetadataOnStackMark.patch

@@ -1,31 +0,0 @@
-From 01b00e2df98dbcfc2e37c42017a545de5f29e852 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sun, 7 Feb 2021 12:08:58 +0100
-Subject: [PATCH 22/44] JBR-3110 Fix assert in MetadataOnStackMark
-
-Fixed fastdebug tests crashes in redefine gc run
----
- src/hotspot/share/classfile/metadataOnStackMark.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/metadataOnStackMark.cpp b/src/hotspot/share/classfile/metadataOnStackMark.cpp
-index 9d7bdbde74b..66049f11629 100644
---- a/src/hotspot/share/classfile/metadataOnStackMark.cpp
-+++ b/src/hotspot/share/classfile/metadataOnStackMark.cpp
-@@ -49,10 +49,11 @@ NOT_PRODUCT(bool MetadataOnStackMark::_is_active = false;)
- MetadataOnStackMark::MetadataOnStackMark(bool redefinition_walk, bool ignore) : _ignore(ignore) {
-   assert(SafepointSynchronize::is_at_safepoint(), "sanity check");
-   assert(_used_buffers == NULL, "sanity check");
--  assert(!_is_active, "MetadataOnStackMarks do not nest");
--  NOT_PRODUCT(_is_active = true;)
- 
-   if (!ignore) {
-+    assert(!_is_active, "MetadataOnStackMarks do not nest");
-+    NOT_PRODUCT(_is_active = true;)
-+
-     Threads::metadata_handles_do(Metadata::mark_on_stack);
- 
-     if (redefinition_walk) {
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0022-Open-java.base-java.io-module.patch

@@ -0,0 +1,25 @@
+From 8b7323c57ee07c03a02ba951ce6d453ec4cc1a54 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sun, 8 Dec 2019 17:55:01 +0100
+Subject: [PATCH 22/50] Open java.base/java.io module
+
+---
+ src/hotspot/share/runtime/arguments.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
+index 0081f688120..0cdd8c88315 100644
+--- a/src/hotspot/share/runtime/arguments.cpp
++++ b/src/hotspot/share/runtime/arguments.cpp
+@@ -4325,6 +4325,8 @@ void Arguments::setup_hotswap_agent() {
+   create_numbered_property("jdk.module.addopens", "java.base/java.lang=ALL-UNNAMED", addopens_count++);
+   // Class of  field java.lang.reflect.Proxy/proxyCache
+   create_numbered_property("jdk.module.addopens", "java.base/jdk.internal.loader=ALL-UNNAMED", addopens_count++);
++  // Use to access java.io.Reader, java.io.InputStream, java.io.FileInputStream
++  create_numbered_property("jdk.module.addopens", "java.base/java.io=ALL-UNNAMED", addopens_count++);
+   // java.beans.Introspector access
+   create_numbered_property("jdk.module.addopens", "java.desktop/java.beans=ALL-UNNAMED", addopens_count++);
+   // java.beans.Introspector access
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0023-Code-cleanup.patch

@@ -1,78 +0,0 @@
-From 214a02487be521857a088595f8568df7846acd62 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Fri, 12 Feb 2021 11:27:39 +0100
-Subject: [PATCH 23/44] Code cleanup
-
-- Rename confusing method name old_if_redefined to old_if_redefining
-- Remove unused is_redefining_gc_run
----
- src/hotspot/share/classfile/dictionary.cpp | 6 +++---
- src/hotspot/share/classfile/dictionary.hpp | 2 +-
- src/hotspot/share/memory/universe.hpp      | 5 -----
- 3 files changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index 86dc1f26933..d347f572350 100644
---- a/src/hotspot/share/classfile/dictionary.cpp
-+++ b/src/hotspot/share/classfile/dictionary.cpp
-@@ -381,7 +381,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;
-   }
-@@ -394,7 +394,7 @@ InstanceKlass* Dictionary::find_class(int index, 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);
- }
- 
- 
-@@ -406,7 +406,7 @@ InstanceKlass* Dictionary::find_shared_class(int index, 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);
- }
- 
- 
-diff --git a/src/hotspot/share/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp
-index 5eaa741d500..f6e08e7bfd5 100644
---- a/src/hotspot/share/classfile/dictionary.hpp
-+++ b/src/hotspot/share/classfile/dictionary.hpp
-@@ -120,7 +120,7 @@ public:
-   void rollback_redefinition();
- 
-   // (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;
-   }
- };
-diff --git a/src/hotspot/share/memory/universe.hpp b/src/hotspot/share/memory/universe.hpp
-index b32db16b9cf..742dada0e8f 100644
---- a/src/hotspot/share/memory/universe.hpp
-+++ b/src/hotspot/share/memory/universe.hpp
-@@ -52,13 +52,8 @@ class LatestMethodCache : public CHeapObj<mtClass> {
-   Klass*                _klass;
-   int                   _method_idnum;
- 
--  static bool _is_redefining_gc_run;
--
-  public:
- 
--   static bool is_redefining_gc_run()               { return _is_redefining_gc_run; }
--   static void set_redefining_gc_run(bool b)        { _is_redefining_gc_run = b;    }
--
-   LatestMethodCache()   { _klass = NULL; _method_idnum = -1; }
-   ~LatestMethodCache()  { _klass = NULL; _method_idnum = -1; }
- 
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0023-Fix-fieldDescriptor.inline.hpp.patch

@@ -0,0 +1,54 @@
+From 14c82a29cbf8254f8da626753ea34086d38e71b4 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
+Date: Fri, 6 Mar 2020 09:28:24 +0100
+Subject: [PATCH 23/50] Fix fieldDescriptor.inline.hpp
+
+---
+ .../share/prims/jvmtiEnhancedRedefineClasses.cpp       | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index efb9e806508..a404fd3f016 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -49,6 +49,7 @@
+ #include "runtime/deoptimization.hpp"
+ #include "runtime/jniHandles.inline.hpp"
+ #include "runtime/relocator.hpp"
++#include "runtime/fieldDescriptor.inline.hpp"
+ #include "utilities/bitMap.inline.hpp"
+ #include "prims/jvmtiThreadState.inline.hpp"
+ #include "utilities/events.hpp"
+@@ -490,6 +491,11 @@ void VM_EnhancedRedefineClasses::doit() {
+     flush_dependent_code(NULL, 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);
++
++
+   // JSR-292 support
+   if (_any_class_has_resolved_methods) {
+     bool trace_name_printed = false;
+@@ -1890,9 +1896,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+   }
+   */
+ 
+-  // Adjust constantpool caches for all classes that reference methods of the evolved class.
+-  ClearCpoolCacheAndUnpatch clear_cpool_cache(THREAD);
+-  ClassLoaderDataGraph::classes_do(&clear_cpool_cache);
+ 
+   {
+     ResourceMark rm(THREAD);
+@@ -1905,7 +1908,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+     Events::log_redefinition(THREAD, "redefined class name=%s, count=%d",
+                              new_class->external_name(),
+                              java_lang_Class::classRedefinedCount(new_class->java_mirror()));
+-
+   }
+   _timer_rsc_phase2.stop();
+ } // end redefine_single_class()
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0024-Fix-clear_cpool_cache.patch

@@ -0,0 +1,38 @@
+From 5a56f2278c0a79f4a26f369a55f4c1c4dab2621e Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
+Date: Fri, 6 Mar 2020 15:46:51 +0100
+Subject: [PATCH 24/50] Fix clear_cpool_cache
+
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index a404fd3f016..1f5a67f8866 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -491,11 +491,6 @@ void VM_EnhancedRedefineClasses::doit() {
+     flush_dependent_code(NULL, 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);
+-
+-
+   // JSR-292 support
+   if (_any_class_has_resolved_methods) {
+     bool trace_name_printed = false;
+@@ -1896,6 +1891,9 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+   }
+   */
+ 
++  // Adjust constantpool caches for all classes that reference methods of the evolved class.
++  ClearCpoolCacheAndUnpatch clear_cpool_cache(THREAD);
++  ClassLoaderDataGraph::classes_do(&clear_cpool_cache);
+ 
+   {
+     ResourceMark rm(THREAD);
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0024-JBR-3111-Update-class-in-all-dictionaries-where-it-w.patch

@@ -1,95 +0,0 @@
-From 88d359a84fb3a7dd7556c91ed0e17dca5b8d7d25 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sat, 13 Feb 2021 20:47:52 +0100
-Subject: [PATCH 24/44] 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/classLoaderData.cpp  | 9 +++++++++
- src/hotspot/share/classfile/classLoaderData.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/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 2f6329f3e4d..68df33b6c40 100644
---- a/src/hotspot/share/classfile/classLoaderData.cpp
-+++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1277,6 +1277,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;
-+}
-+
- // Walks all entries in the dictionary including entries initiated by this class loader.
- void ClassLoaderDataGraph::dictionary_all_entries_do(void f(InstanceKlass*, ClassLoaderData*)) {
-   Thread* thread = Thread::current();
-diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp
-index c4f617ab800..92f57dac23e 100644
---- a/src/hotspot/share/classfile/classLoaderData.hpp
-+++ b/src/hotspot/share/classfile/classLoaderData.hpp
-@@ -130,6 +130,9 @@ class ClassLoaderDataGraph : public AllStatic {
-   // Enhanced class redefinition
-   static void rollback_redefinition();
- 
-+  // Enhanced class redefinition
-+  static bool dictionary_classes_do_update_klass(Symbol* name, InstanceKlass* k, InstanceKlass* old_klass);
-+
-   // Iterate all classes and their class loaders, including initiating class loaders.
-   static void dictionary_all_entries_do(void f(InstanceKlass*, ClassLoaderData*));
- 
-diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index d347f572350..fd9ef491ba1 100644
---- a/src/hotspot/share/classfile/dictionary.cpp
-+++ b/src/hotspot/share/classfile/dictionary.cpp
-@@ -345,7 +345,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 f6e08e7bfd5..2932cc9c320 100644
---- a/src/hotspot/share/classfile/dictionary.hpp
-+++ b/src/hotspot/share/classfile/dictionary.hpp
-@@ -115,7 +115,7 @@ public:
-   void free_entry(DictionaryEntry* entry);
- 
-   // Enhanced class redefinition
--  bool update_klass(unsigned int hash, Symbol* name, ClassLoaderData* loader_data, InstanceKlass* k, InstanceKlass* old_klass);
-+  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 a61c342f5bd..cf0a05176c8 100644
---- a/src/hotspot/share/classfile/systemDictionary.cpp
-+++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -1603,7 +1603,9 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, InstanceKlass* ol
-   Dictionary* dictionary = loader_data->dictionary();
-   unsigned int d_hash = dictionary->compute_hash(name_h);
-   if (is_redefining) {
--    bool ok = dictionary->update_klass(d_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(d_hash, k, class_loader_h, !is_redefining, CHECK);
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0025-JBR-3140-support-for-modularized-HotswapAgent.patch

@@ -1,527 +0,0 @@
-From cfdbad725c55a4ce45d407393a4591d8b8f333c9 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Thu, 18 Jun 2020 18:40:11 +0200
-Subject: [PATCH 25/44] JBR-3140 - support for modularized HotswapAgent
-
-Add -XX:HotswapAgent=[disabled,fatjar.core]
----
- make/launcher/Launcher-java.base.gmk          |  1 -
- make/launcher/Launcher-java.rmi.gmk           |  2 -
- make/launcher/Launcher-java.scripting.gmk     |  3 +-
- make/launcher/Launcher-java.security.jgss.gmk |  3 --
- make/launcher/Launcher-jdk.aot.gmk            |  2 -
- make/launcher/Launcher-jdk.compiler.gmk       |  5 +-
- make/launcher/Launcher-jdk.hotspot.agent.gmk  |  1 -
- make/launcher/Launcher-jdk.jartool.gmk        |  2 -
- make/launcher/Launcher-jdk.javadoc.gmk        |  3 +-
- make/launcher/Launcher-jdk.jcmd.gmk           | 13 +----
- make/launcher/Launcher-jdk.jdeps.gmk          |  3 --
- make/launcher/Launcher-jdk.jdi.gmk            |  1 -
- make/launcher/Launcher-jdk.jlink.gmk          |  5 +-
- make/launcher/Launcher-jdk.jshell.gmk         |  1 -
- make/launcher/Launcher-jdk.jstatd.gmk         |  1 -
- make/launcher/Launcher-jdk.pack.gmk           |  1 -
- make/launcher/Launcher-jdk.rmic.gmk           |  1 -
- .../Launcher-jdk.scripting.nashorn.shell.gmk  |  3 +-
- src/hotspot/share/runtime/arguments.cpp       | 48 +++++++++++--------
- .../runtime/flags/jvmFlagConstraintList.cpp   | 23 +++++++++
- .../runtime/flags/jvmFlagConstraintList.hpp   |  1 +
- .../flags/jvmFlagConstraintsRuntime.cpp       | 10 ++++
- .../flags/jvmFlagConstraintsRuntime.hpp       |  1 +
- src/hotspot/share/runtime/globals.hpp         | 12 ++++-
- 24 files changed, 81 insertions(+), 65 deletions(-)
-
-diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk
-index 38ba29530d8..f6d4aa28fe6 100644
---- a/make/launcher/Launcher-java.base.gmk
-+++ b/make/launcher/Launcher-java.base.gmk
-@@ -52,7 +52,6 @@ endif
- 
- $(eval $(call SetupBuildLauncher, keytool, \
-     MAIN_CLASS := sun.security.tools.keytool.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- ################################################################################
-diff --git a/make/launcher/Launcher-java.rmi.gmk b/make/launcher/Launcher-java.rmi.gmk
-index 07046232275..a69a90bcc81 100644
---- a/make/launcher/Launcher-java.rmi.gmk
-+++ b/make/launcher/Launcher-java.rmi.gmk
-@@ -27,10 +27,8 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, rmid, \
-     MAIN_CLASS := sun.rmi.server.Activation, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, rmiregistry, \
-     MAIN_CLASS := sun.rmi.registry.RegistryImpl, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
-diff --git a/make/launcher/Launcher-java.scripting.gmk b/make/launcher/Launcher-java.scripting.gmk
-index cf100e20789..057d2bf3aca 100644
---- a/make/launcher/Launcher-java.scripting.gmk
-+++ b/make/launcher/Launcher-java.scripting.gmk
-@@ -27,6 +27,5 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jrunscript, \
-     MAIN_CLASS := com.sun.tools.script.shell.Main, \
--    JAVA_ARGS := --add-modules ALL-DEFAULT \
--        -XX:+DisableHotswapAgent, \
-+    JAVA_ARGS := --add-modules ALL-DEFAULT, \
- ))
-diff --git a/make/launcher/Launcher-java.security.jgss.gmk b/make/launcher/Launcher-java.security.jgss.gmk
-index 2b856bfccb4..7411e1a21c4 100644
---- a/make/launcher/Launcher-java.security.jgss.gmk
-+++ b/make/launcher/Launcher-java.security.jgss.gmk
-@@ -28,16 +28,13 @@ include LauncherCommon.gmk
- ifeq ($(OPENJDK_TARGET_OS), windows)
-   $(eval $(call SetupBuildLauncher, kinit, \
-       MAIN_CLASS := sun.security.krb5.internal.tools.Kinit, \
--      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-   ))
- 
-   $(eval $(call SetupBuildLauncher, klist, \
-       MAIN_CLASS := sun.security.krb5.internal.tools.Klist, \
--      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-   ))
- 
-   $(eval $(call SetupBuildLauncher, ktab, \
-       MAIN_CLASS := sun.security.krb5.internal.tools.Ktab, \
--      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-   ))
- endif
-diff --git a/make/launcher/Launcher-jdk.aot.gmk b/make/launcher/Launcher-jdk.aot.gmk
-index 2c52c31a555..10717a5e1c5 100644
---- a/make/launcher/Launcher-jdk.aot.gmk
-+++ b/make/launcher/Launcher-jdk.aot.gmk
-@@ -31,7 +31,6 @@ include LauncherCommon.gmk
- $(eval $(call SetupBuildLauncher, jaotc, \
-     MAIN_CLASS := jdk.tools.jaotc.Main, \
-     EXTRA_JAVA_ARGS := -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI \
--        -XX:+DisableHotswapAgent \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.amd64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-@@ -41,7 +40,6 @@ $(eval $(call SetupBuildLauncher, jaotc, \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-     , \
-     JAVA_ARGS := --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
--        -XX:+DisableHotswapAgent \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.sparc=$(call CommaList, jdk.internal.vm.compiler  jdk.aot) \
-diff --git a/make/launcher/Launcher-jdk.compiler.gmk b/make/launcher/Launcher-jdk.compiler.gmk
-index 744969546de..f71c37adf74 100644
---- a/make/launcher/Launcher-jdk.compiler.gmk
-+++ b/make/launcher/Launcher-jdk.compiler.gmk
-@@ -27,14 +27,12 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, javac, \
-    MAIN_CLASS := com.sun.tools.javac.Main, \
--   JAVA_ARGS := --add-modules ALL-DEFAULT \
--       -XX:+DisableHotswapAgent, \
-+   JAVA_ARGS := --add-modules ALL-DEFAULT, \
-    CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, serialver, \
-     MAIN_CLASS := sun.tools.serialver.SerialVer, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
-@@ -43,7 +41,6 @@ ifeq ($(ENABLE_SJAVAC), yes)
-   # into any real images
-   $(eval $(call SetupBuildLauncher, sjavac, \
-       MAIN_CLASS := com.sun.tools.sjavac.Main, \
--      JAVA_ARGS := -XX:+DisableHotswapAgent, \
-       CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
-       OUTPUT_DIR := $(JDK_OUTPUTDIR)/bin, \
-   ))
-diff --git a/make/launcher/Launcher-jdk.hotspot.agent.gmk b/make/launcher/Launcher-jdk.hotspot.agent.gmk
-index 9f12b05b172..76da3600368 100644
---- a/make/launcher/Launcher-jdk.hotspot.agent.gmk
-+++ b/make/launcher/Launcher-jdk.hotspot.agent.gmk
-@@ -27,6 +27,5 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jhsdb, \
-     MAIN_CLASS := sun.jvm.hotspot.SALauncher, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     MACOSX_PRIVILEGED := true, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jartool.gmk b/make/launcher/Launcher-jdk.jartool.gmk
-index 647d82b65b1..f74e82bfdae 100644
---- a/make/launcher/Launcher-jdk.jartool.gmk
-+++ b/make/launcher/Launcher-jdk.jartool.gmk
-@@ -27,10 +27,8 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jar, \
-     MAIN_CLASS := sun.tools.jar.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jarsigner, \
-     MAIN_CLASS := sun.security.tools.jarsigner.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
-diff --git a/make/launcher/Launcher-jdk.javadoc.gmk b/make/launcher/Launcher-jdk.javadoc.gmk
-index c3d2093be04..889028a2b17 100644
---- a/make/launcher/Launcher-jdk.javadoc.gmk
-+++ b/make/launcher/Launcher-jdk.javadoc.gmk
-@@ -27,7 +27,6 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, javadoc, \
-     MAIN_CLASS := jdk.javadoc.internal.tool.Main, \
--    JAVA_ARGS := --add-modules ALL-DEFAULT \
--        -XX:+DisableHotswapAgent, \
-+    JAVA_ARGS := --add-modules ALL-DEFAULT, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jcmd.gmk b/make/launcher/Launcher-jdk.jcmd.gmk
-index 761a52d8466..7117fa78059 100644
---- a/make/launcher/Launcher-jdk.jcmd.gmk
-+++ b/make/launcher/Launcher-jdk.jcmd.gmk
-@@ -30,7 +30,6 @@ $(eval $(call SetupBuildLauncher, jinfo, \
-     JAVA_ARGS := \
-         -Dsun.jvm.hotspot.debugger.useProcDebugger \
-         -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
--        -XX:+DisableHotswapAgent, \
-     MACOSX_PRIVILEGED := true, \
- ))
- 
-@@ -38,36 +37,28 @@ $(eval $(call SetupBuildLauncher, jmap, \
-     MAIN_CLASS := sun.tools.jmap.JMap, \
-     JAVA_ARGS := \
-         -Dsun.jvm.hotspot.debugger.useProcDebugger \
--        -Dsun.jvm.hotspot.debugger.useWindbgDebugger \
--        -XX:+DisableHotswapAgent, \
-+        -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
-     MACOSX_PRIVILEGED := true, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jps, \
-     MAIN_CLASS := sun.tools.jps.Jps, \
--    JAVA_ARGS := \
--        -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jstack, \
-     MAIN_CLASS := sun.tools.jstack.JStack, \
-     JAVA_ARGS := \
-         -Dsun.jvm.hotspot.debugger.useProcDebugger \
--        -Dsun.jvm.hotspot.debugger.useWindbgDebugger \
--        -XX:+DisableHotswapAgent, \
-+        -Dsun.jvm.hotspot.debugger.useWindbgDebugger, \
-     MACOSX_PRIVILEGED := true, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jstat, \
-     MAIN_CLASS := sun.tools.jstat.Jstat, \
--    JAVA_ARGS := \
--        -XX:+DisableHotswapAgent, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jcmd, \
-     MAIN_CLASS := sun.tools.jcmd.JCmd, \
--    JAVA_ARGS := \
--        -XX:+DisableHotswapAgent, \
- ))
- 
- # Hook to include the corresponding custom file, if present.
-diff --git a/make/launcher/Launcher-jdk.jdeps.gmk b/make/launcher/Launcher-jdk.jdeps.gmk
-index 5448278dae7..217523c48cc 100644
---- a/make/launcher/Launcher-jdk.jdeps.gmk
-+++ b/make/launcher/Launcher-jdk.jdeps.gmk
-@@ -27,18 +27,15 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, javap, \
-     MAIN_CLASS := com.sun.tools.javap.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jdeps, \
-     MAIN_CLASS := com.sun.tools.jdeps.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jdeprscan, \
-     MAIN_CLASS := com.sun.tools.jdeprscan.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jdi.gmk b/make/launcher/Launcher-jdk.jdi.gmk
-index 27bd448e3ae..fcce98cf430 100644
---- a/make/launcher/Launcher-jdk.jdi.gmk
-+++ b/make/launcher/Launcher-jdk.jdi.gmk
-@@ -27,5 +27,4 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jdb, \
-     MAIN_CLASS := com.sun.tools.example.debug.tty.TTY, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jlink.gmk b/make/launcher/Launcher-jdk.jlink.gmk
-index 9e61edeb2c8..df2173996d7 100644
---- a/make/launcher/Launcher-jdk.jlink.gmk
-+++ b/make/launcher/Launcher-jdk.jlink.gmk
-@@ -27,21 +27,18 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jimage,\
-     MAIN_CLASS := jdk.tools.jimage.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DENABLE_ARG_FILES, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jlink,\
-     MAIN_CLASS := jdk.tools.jlink.internal.Main, \
--    JAVA_ARGS :=  --add-modules ALL-DEFAULT \
--        -XX:+DisableHotswapAgent, \
-+    JAVA_ARGS :=  --add-modules ALL-DEFAULT, \
-     CFLAGS := -DENABLE_ARG_FILES \
-         -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
- 
- $(eval $(call SetupBuildLauncher, jmod,\
-     MAIN_CLASS := jdk.tools.jmod.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DENABLE_ARG_FILES \
-         -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jshell.gmk b/make/launcher/Launcher-jdk.jshell.gmk
-index 7287f8f998a..349eb88e9eb 100644
---- a/make/launcher/Launcher-jdk.jshell.gmk
-+++ b/make/launcher/Launcher-jdk.jshell.gmk
-@@ -27,6 +27,5 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jshell, \
-     MAIN_CLASS := jdk.internal.jshell.tool.JShellToolProvider, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.jstatd.gmk b/make/launcher/Launcher-jdk.jstatd.gmk
-index e1657910c67..e9286d63094 100644
---- a/make/launcher/Launcher-jdk.jstatd.gmk
-+++ b/make/launcher/Launcher-jdk.jstatd.gmk
-@@ -27,7 +27,6 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jstatd, \
-     MAIN_CLASS := sun.tools.jstatd.Jstatd, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- # Hook to include the corresponding custom file, if present.
-diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk
-index 64bbbb7c949..a93fd2a9017 100644
---- a/make/launcher/Launcher-jdk.pack.gmk
-+++ b/make/launcher/Launcher-jdk.pack.gmk
-@@ -28,7 +28,6 @@ include LauncherCommon.gmk
- $(eval $(call SetupBuildLauncher, pack200, \
-     MAIN_MODULE := java.base, \
-     MAIN_CLASS := com.sun.java.util.jar.pack.Driver, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
- ))
- 
- ################################################################################
-diff --git a/make/launcher/Launcher-jdk.rmic.gmk b/make/launcher/Launcher-jdk.rmic.gmk
-index b8a55900b0e..d60c3d9b60b 100644
---- a/make/launcher/Launcher-jdk.rmic.gmk
-+++ b/make/launcher/Launcher-jdk.rmic.gmk
-@@ -27,6 +27,5 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, rmic, \
-     MAIN_CLASS := sun.rmi.rmic.Main, \
--    JAVA_ARGS := -XX:+DisableHotswapAgent, \
-     CFLAGS := -DEXPAND_CLASSPATH_WILDCARDS, \
- ))
-diff --git a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
-index bd39f8595b2..82311e69fd6 100644
---- a/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
-+++ b/make/launcher/Launcher-jdk.scripting.nashorn.shell.gmk
-@@ -27,7 +27,6 @@ include LauncherCommon.gmk
- 
- $(eval $(call SetupBuildLauncher, jjs, \
-     MAIN_CLASS := jdk.nashorn.tools.jjs.Main, \
--    JAVA_ARGS := --add-modules ALL-DEFAULT \
--        -XX:+DisableHotswapAgent, \
-+    JAVA_ARGS := --add-modules ALL-DEFAULT, \
-     CFLAGS := -DENABLE_ARG_FILES, \
- ))
-diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index 65839b842e2..dce89a044e9 100644
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -4315,11 +4315,17 @@ void Arguments::setup_hotswap_agent() {
-   if (DumpSharedSpaces)
-     return;
- 
--  if (!AllowEnhancedClassRedefinition)
-+  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 (!DisableHotswapAgent) {
-+  if (ha_fatjar || ha_core) {
- 
-     char ext_path_str[JVM_MAXPATHLEN];
- 
-@@ -4338,23 +4344,27 @@ void Arguments::setup_hotswap_agent() {
-       }
-     }
-     if (ext_path_length < JVM_MAXPATHLEN - 10) {
--      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());
--    }
--
--    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);
--//    }
-+      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
-diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.cpp
-index 16d8030fd1c..94044c4831c 100644
---- a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.cpp
-+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.cpp
-@@ -199,6 +199,26 @@ public:
-   }
- };
- 
-+class JVMFlagConstraint_ccstr : public JVMFlagConstraint {
-+  JVMFlagConstraintFunc_ccstr _constraint;
-+  const ccstr* _ptr;
-+
-+public:
-+  // the "name" argument must be a string literal
-+  JVMFlagConstraint_ccstr(const char* name, const ccstr* ptr,
-+                                   JVMFlagConstraintFunc_ccstr func,
-+                                 ConstraintType type) : JVMFlagConstraint(name, type), _constraint(func), _ptr(ptr) {}
-+
-+  JVMFlag::Error apply(bool verbose) {
-+    ccstr value = *_ptr;
-+    return _constraint(value, verbose);
-+  }
-+
-+  JVMFlag::Error apply_ccstr(ccstr value, bool verbose) {
-+    return _constraint(value, verbose);
-+  }
-+};
-+
- // No constraint emitting
- void emit_constraint_no(...)                                                      { /* NOP */ }
- 
-@@ -239,6 +259,9 @@ void emit_constraint_size_t(const char* name, const size_t* ptr, JVMFlagConstrai
- void emit_constraint_double(const char* name, const double* ptr, JVMFlagConstraintFunc_double func, JVMFlagConstraint::ConstraintType type) {
-   JVMFlagConstraintList::add(new JVMFlagConstraint_double(name, ptr, func, type));
- }
-+void emit_constraint_ccstr(const char* name, ccstr* ptr, JVMFlagConstraintFunc_ccstr func, JVMFlagConstraint::ConstraintType type) {
-+  JVMFlagConstraintList::add(new JVMFlagConstraint_ccstr(name, ptr, func, type));
-+}
- 
- // Generate code to call emit_constraint_xxx function
- #define EMIT_CONSTRAINT_PRODUCT_FLAG(type, name, value, doc)      ); emit_constraint_##type(#name,&name
-diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp
-index 9c27f1db955..b644f7b817a 100644
---- a/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp
-+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintList.hpp
-@@ -47,6 +47,7 @@ typedef JVMFlag::Error (*JVMFlagConstraintFunc_uintx)(uintx value, bool verbose)
- typedef JVMFlag::Error (*JVMFlagConstraintFunc_uint64_t)(uint64_t value, bool verbose);
- typedef JVMFlag::Error (*JVMFlagConstraintFunc_size_t)(size_t value, bool verbose);
- typedef JVMFlag::Error (*JVMFlagConstraintFunc_double)(double value, bool verbose);
-+typedef JVMFlag::Error (*JVMFlagConstraintFunc_ccstr)(ccstr value, bool verbose);
- 
- class JVMFlagConstraint : public CHeapObj<mtArguments> {
- public:
-diff --git a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
-index 6559d4252f0..21afac72a2e 100644
---- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
-+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.cpp
-@@ -140,3 +140,13 @@ JVMFlag::Error ThreadLocalHandshakesConstraintFunc(bool value, bool verbose) {
-   }
-   return JVMFlag::SUCCESS;
- }
-+
-+JVMFlag::Error HotswapAgentConstraintFunc(char const* 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 8763b83fd37..c9ed15a89e1 100644
---- a/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
-+++ b/src/hotspot/share/runtime/flags/jvmFlagConstraintsRuntime.hpp
-@@ -46,5 +46,6 @@ JVMFlag::Error PerfDataSamplingIntervalFunc(intx value, bool verbose);
- 
- JVMFlag::Error ThreadLocalHandshakesConstraintFunc(bool value, bool verbose);
- 
-+JVMFlag::Error HotswapAgentConstraintFunc(char const* value, bool verbose);
- 
- #endif /* SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSRUNTIME_HPP */
-diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 1984b8c28f9..c015b89b176 100644
---- a/src/hotspot/share/runtime/globals.hpp
-+++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2695,8 +2695,16 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
-              "Allow enhanced class redefinition beyond swapping method "    \
-              "bodies")                                                      \
-                                                                             \
--  product(bool, DisableHotswapAgent, DISABLED_HOTSWAP_AGENT,                \
--             "Disable integrated Hotswap Agent (HotswapVM only)")
-+  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)
-+
-+
- #define VM_FLAGS(develop,                                                   \
-                  develop_pd,                                                \
-                  product,                                                   \
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0025-Refactor-ClearCpoolCacheAndUnpatch.patch

@@ -0,0 +1,163 @@
+From c1aafaafaf15780d6bca1312162d551da4f63036 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
+Date: Mon, 9 Mar 2020 09:54:04 +0100
+Subject: [PATCH 25/50] Refactor ClearCpoolCacheAndUnpatch
+
+Call it after redefinition of all classes
+---
+ make/common/MakeBase.gmk                      |  4 +-
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 98 ++++---------------
+ 2 files changed, 21 insertions(+), 81 deletions(-)
+
+diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
+index a040effe83a..c33a7d52ddb 100644
+--- a/make/common/MakeBase.gmk
++++ b/make/common/MakeBase.gmk
+@@ -1044,7 +1044,9 @@ DependOnVariableHelper = \
+               $(info NewVariable $1: >$(strip $($1))<) \
+               $(info OldVariable $1: >$(strip $($1_old))<)) \
+           $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
+-              $($1_filename))) \
++ $($1_filename)) \
++ $(eval $($1_filename): ) \
++ ) \
+         $($1_filename) \
+     )
+ 
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 1f5a67f8866..24fb76b6de4 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -491,6 +491,11 @@ void VM_EnhancedRedefineClasses::doit() {
+     flush_dependent_code(NULL, 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);
++
++
+   // JSR-292 support
+   if (_any_class_has_resolved_methods) {
+     bool trace_name_printed = false;
+@@ -1383,86 +1388,23 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
+     }
+   }
+ 
+-// Unevolving classes may point to methods of the_class directly
++// Unevolving classes may point to old methods directly
+ // from their constant pool caches, itables, and/or vtables. We
+-// use the ClassLoaderDataGraph::classes_do() facility and this helper
+-// to fix up these pointers.
+-// Adjust cpools and vtables closure
++// use the SystemDictionary::classes_do() facility and this helper
++// to fix up these pointers. Additional field offsets and vtable indices
++// in the constant pool cache entries are fixed.
++//
++// Note: We currently don't support updating the vtable in
++// arrayKlassOops. See Open Issues in jvmtiRedefineClasses.hpp.
+ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+-  // This is a very busy routine. We don't want too much tracing
+-  // printed out.
+-  bool trace_name_printed = false;
+-  InstanceKlass *the_class = InstanceKlass::cast(_the_class_oop);
+-
+-  // If the class being redefined is java.lang.Object, we need to fix all
+-  // array class vtables also
+-  if (k->is_array_klass() && _the_class_oop == SystemDictionary::Object_klass()) {
+-    k->vtable().adjust_method_entries(the_class, &trace_name_printed);
+-  } else if (k->is_instance_klass()) {
+-    HandleMark hm(_thread);
+-    InstanceKlass *ik = InstanceKlass::cast(k);
++  if (!k->is_instance_klass()) {
++	return;
++  }
+ 
+-    // HotSpot specific optimization! HotSpot does not currently
+-    // support delegation from the bootstrap class loader to a
+-    // user-defined class loader. This means that if the bootstrap
+-    // class loader is the initiating class loader, then it will also
+-    // be the defining class loader. This also means that classes
+-    // loaded by the bootstrap class loader cannot refer to classes
+-    // loaded by a user-defined class loader. Note: a user-defined
+-    // class loader can delegate to the bootstrap class loader.
+-    //
+-    // If the current class being redefined has a user-defined class
+-    // loader as its defining class loader, then we can skip all
+-    // classes loaded by the bootstrap class loader.
+-    bool is_user_defined =
+-            InstanceKlass::cast(_the_class_oop)->class_loader() != NULL;
+-    if (is_user_defined && ik->class_loader() == NULL) {
+-       return;
+-    }
+-
+-    // Fix the vtable embedded in the_class and subclasses of the_class,
+-    // if one exists. We discard scratch_class and we don't keep an
+-    // InstanceKlass around to hold obsolete methods so we don't have
+-    // any other InstanceKlass embedded vtables to update. The vtable
+-    // holds the Method*s for virtual (but not final) methods.
+-    // Default methods, or concrete methods in interfaces are stored
+-    // in the vtable, so if an interface changes we need to check
+-    // adjust_method_entries() for every InstanceKlass, which will also
+-    // adjust the default method vtable indices.
+-    // We also need to adjust any default method entries that are
+-    // not yet in the vtable, because the vtable setup is in progress.
+-    // This must be done after we adjust the default_methods and
+-    // default_vtable_indices for methods already in the vtable.
+-    // If redefining Unsafe, walk all the vtables looking for entries.
+-// FIXME - code from standard redefine - if needed, it should switch to new_class
+-//    if (ik->vtable_length() > 0 && (_the_class_oop->is_interface()
+-//        || _the_class_oop == SystemDictionary::internal_Unsafe_klass()
+-//        || ik->is_subtype_of(_the_class_oop))) {
+-//      // ik->vtable() creates a wrapper object; rm cleans it up
+-//      ResourceMark rm(_thread);
+-//
+-//      ik->vtable()->adjust_method_entries(the_class, &trace_name_printed);
+-//      ik->adjust_default_methods(the_class, &trace_name_printed);
+-//    }
+-
+-    // If the current class has an itable and we are either redefining an
+-    // interface or if the current class is a subclass of the_class, then
+-    // we potentially have to fix the itable. If we are redefining an
+-    // interface, then we have to call adjust_method_entries() for
+-    // every InstanceKlass that has an itable since there isn't a
+-    // subclass relationship between an interface and an InstanceKlass.
+-    // If redefining Unsafe, walk all the itables looking for entries.
+-// FIXME - code from standard redefine - if needed, it should switch to new_class
+-//    if (ik->itable_length() > 0 && (_the_class_oop->is_interface()
+-//        || _the_class_oop == SystemDictionary::internal_Unsafe_klass()
+-//        || ik->is_subclass_of(_the_class_oop))) {
+-//      // ik->itable() creates a wrapper object; rm cleans it up
+-//      ResourceMark rm(_thread);
+-//
+-//      ik->itable()->adjust_method_entries(the_class, &trace_name_printed);
+-//    }
++  HandleMark hm(_thread);
++  InstanceKlass *ik = InstanceKlass::cast(k);
+ 
+-   constantPoolHandle other_cp = constantPoolHandle(ik->constants());
++  constantPoolHandle other_cp = constantPoolHandle(ik->constants());
+ 
+   // Update host klass of anonymous classes (for example, produced by lambdas) to newest version.
+   if (ik->is_anonymous() && ik->host_klass()->new_version() != NULL) {
+@@ -1491,7 +1433,6 @@ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+   if (RewriteBytecodes) {
+     ik->methods_do(unpatch_bytecode);
+   }
+-  }
+ }
+ 
+ // Clean method data for this class
+@@ -1891,9 +1832,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+   }
+   */
+ 
+-  // Adjust constantpool caches for all classes that reference methods of the evolved class.
+-  ClearCpoolCacheAndUnpatch clear_cpool_cache(THREAD);
+-  ClassLoaderDataGraph::classes_do(&clear_cpool_cache);
+ 
+   {
+     ResourceMark rm(THREAD);
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -0,0 +1,29 @@
+From d6a3286b9b57df4c09d859e38833f2e3dc1574d9 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
+Date: Wed, 11 Mar 2020 14:19:34 +0100
+Subject: [PATCH 26/50] Fix class cast exception on redefinition of class A,
+ that is superclass of B that has anonymous class C
+
+---
+ src/hotspot/share/oops/instanceKlass.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index 9b6ba7e9304..8cbd4b8edf2 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -788,7 +788,10 @@ bool InstanceKlass::link_class_impl(bool throw_verifyerror, TRAPS) {
+ 
+     if (!is_linked()) {
+       if (!is_rewritten()) {
+-        {
++        // In cases, if class A is being redefined and class B->A (B is extended from A) and B is host class of anonymous class C
++        // then second redefinition fails with cannot cast klass exception. So we currently turn off bytecode verification 
++        // on redefinition.
++        if (!newest_version()->is_redefining()) {
+           bool verify_ok = verify_code(throw_verifyerror, THREAD);
+           if (!verify_ok) {
+             return false;
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0026-Support-for-redefinition-of-Well-Known-classses-java.patch

@@ -1,333 +0,0 @@
-From a9468fd22397d85bc238b6ec763f4643245999ab 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 26/44] 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 ++
- .../share/classfile/systemDictionary.cpp      | 10 +++
- .../share/classfile/systemDictionary.hpp      |  2 +
- 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         |  3 +
- .../prims/jvmtiEnhancedRedefineClasses.cpp    | 61 ++++++++++++++++++-
- .../prims/jvmtiEnhancedRedefineClasses.hpp    |  2 +
- 11 files changed, 139 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/ci/ciKlass.hpp b/src/hotspot/share/ci/ciKlass.hpp
-index 896f489453a..c610c365aba 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_VM_CI_CIKLASS_HPP
-diff --git a/src/hotspot/share/ci/ciObjectFactory.cpp b/src/hotspot/share/ci/ciObjectFactory.cpp
-index b2ab15c4b65..d997a90a055 100644
---- a/src/hotspot/share/ci/ciObjectFactory.cpp
-+++ b/src/hotspot/share/ci/ciObjectFactory.cpp
-@@ -70,7 +70,10 @@ GrowableArray<ciMetadata*>* ciObjectFactory::_shared_ci_metadata = NULL;
- ciSymbol*                 ciObjectFactory::_shared_ci_symbols[vmSymbols::SID_LIMIT];
- int                       ciObjectFactory::_shared_ident_limit = 0;
- volatile bool             ciObjectFactory::_initialized = false;
-+volatile bool             ciObjectFactory::_reinitialize_wk_klasses = false;
- 
-+// TODO: review...
-+Arena* ciObjectFactory::_initial_arena = NULL;
- 
- // ------------------------------------------------------------------
- // ciObjectFactory::ciObjectFactory
-@@ -112,6 +115,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();
-@@ -120,6 +124,36 @@ void ciObjectFactory::initialize() {
- 
- }
- 
-+// (DCEVM) wk classes could be modified
-+void ciObjectFactory::reinitialize_wk_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_wk_classes();
-+  _reinitialize_wk_klasses = false;
-+}
-+
-+// (DCEVM) wk classes could be modified
-+void ciObjectFactory::do_reinitialize_wk_classes() {
-+#define WK_KLASS_DEFN(name, ignore_s, opt)   \
-+  if (ciEnv::_##name != NULL && ciEnv::_##name->new_version() != NULL) { \
-+    int old_ident = ciEnv::_##name->ident(); \
-+    ciEnv::_##name = get_metadata(SystemDictionary::name())->as_instance_klass(); \
-+    ciEnv::_##name->compute_nonstatic_fields(); \
-+    ciEnv::_##name->set_ident(old_ident); \
-+  }
-+
-+  WK_KLASSES_DO(WK_KLASS_DEFN)
-+#undef WK_KLASS_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 5d573350aa2..2978261328c 100644
---- a/src/hotspot/share/ci/ciObjectFactory.hpp
-+++ b/src/hotspot/share/ci/ciObjectFactory.hpp
-@@ -41,9 +41,11 @@ class ciObjectFactory : public ResourceObj {
- 
- private:
-   static volatile bool _initialized;
-+  static volatile bool _reinitialize_wk_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;
-@@ -89,10 +91,14 @@ private:
-   ciInstance* get_unloaded_instance(ciInstanceKlass* klass);
- 
-   static int compare_cimetadata(ciMetadata** a, ciMetadata** b);
-+  void do_reinitialize_wk_classes();
- public:
-   static bool is_initialized() { return _initialized; }
-+  static bool is_reinitialize_wk_klasses() { return _reinitialize_wk_klasses; }
-+  static void set_reinitialize_wk_klasses() { _reinitialize_wk_klasses = true; }
- 
-   static void initialize();
-+  static void reinitialize_wk_classes();
-   void init_shared_objects();
-   void remove_symbols();
- 
-diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index cf0a05176c8..be7fcbf2b47 100644
---- a/src/hotspot/share/classfile/systemDictionary.cpp
-+++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -1979,6 +1979,16 @@ bool SystemDictionary::is_well_known_klass(Symbol* class_name) {
- }
- #endif
- 
-+bool SystemDictionary::update_well_known_klass(InstanceKlass* old_klass, InstanceKlass* new_klass) {
-+  for (int id = FIRST_WKID; id < WKID_LIMIT; id++) {
-+    if (well_known_klass((WKID) id) == old_klass) {
-+      *well_known_klass_addr((WKID)id) = new_klass;
-+      return true;
-+    }
-+  }
-+  return false;
-+}
-+
- bool SystemDictionary::resolve_wk_klass(WKID id, int init_opt, TRAPS) {
-   assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob");
-   int  info = wk_init_info[id - FIRST_WKID];
-diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
-index 0002abe6122..707ff871e19 100644
---- a/src/hotspot/share/classfile/systemDictionary.hpp
-+++ b/src/hotspot/share/classfile/systemDictionary.hpp
-@@ -463,6 +463,8 @@ public:
-   static bool is_well_known_klass(Symbol* class_name);
- #endif
- 
-+  static bool update_well_known_klass(InstanceKlass* new_klass, InstanceKlass* old_klass);
-+
-   // Enhanced class redefinition
-   static void remove_from_hierarchy(InstanceKlass* k);
-   static void update_constraints_after_redefinition();
-diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
-index 0d0badeabd0..3477a408cb6 100644
---- a/src/hotspot/share/classfile/vmSymbols.hpp
-+++ b/src/hotspot/share/classfile/vmSymbols.hpp
-@@ -356,6 +356,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 1ff09ebf3ec..bd662b5ebef 100644
---- a/src/hotspot/share/compiler/compileBroker.cpp
-+++ b/src/hotspot/share/compiler/compileBroker.cpp
-@@ -1871,6 +1871,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_wk_klasses())
-+          {
-+            ASSERT_IN_VM;
-+            MutexLocker only_one (CompileThread_lock, thread);
-+            if (ciObjectFactory::is_reinitialize_wk_klasses()) {
-+              ciObjectFactory::reinitialize_wk_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 2e4f597cf1f..4b2c3e62941 100644
---- a/src/hotspot/share/memory/universe.cpp
-+++ b/src/hotspot/share/memory/universe.cpp
-@@ -1030,6 +1030,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,
-+                          SystemDictionary::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 742dada0e8f..d1af82b5fa7 100644
---- a/src/hotspot/share/memory/universe.hpp
-+++ b/src/hotspot/share/memory/universe.hpp
-@@ -349,6 +349,9 @@ class Universe: AllStatic {
-   // Function to initialize these
-   static void initialize_known_methods(TRAPS);
- 
-+  // Enhanced class redefinition
-+  static void reinitialize_loader_addClass_method(TRAPS);
-+
-   static oop          null_ptr_exception_instance()   { return _null_ptr_exception_instance;   }
-   static oop          arithmetic_exception_instance() { return _arithmetic_exception_instance; }
-   static oop          virtual_machine_error_instance() { return _virtual_machine_error_instance; }
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index f4bde7504c8..80d4e68ccae 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -497,6 +497,16 @@ void VM_EnhancedRedefineClasses::doit() {
-     redefine_single_class(_new_classes->at(i), thread);
-   }
- 
-+  // Update possible redefinition of well-known classes (like ClassLoader)
-+  for (int i = 0; i < _new_classes->length(); i++) {
-+    InstanceKlass* cur = _new_classes->at(i);
-+    if (cur->old_version() != NULL && SystemDictionary::update_well_known_klass(InstanceKlass::cast(cur->old_version()), cur))
-+    {
-+      log_trace(redefine, class, obsolete, metadata)("Well known class updated %s", cur->external_name());
-+      ciObjectFactory::set_reinitialize_wk_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(NULL, thread);
-@@ -672,12 +682,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 == SystemDictionary::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;
-   }
-@@ -1589,7 +1643,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 4c0412d343d..79ea17b0d47 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -141,6 +141,8 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
- 
-   void flush_dependent_code(InstanceKlass* k_h, TRAPS);
- 
-+  void reinitializeJDKClasses();
-+
-   static void check_class(InstanceKlass* k_oop, TRAPS);
- 
-   static void dump_methods();
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0027-JBR-3458-Skip-dynamic-proxy-classes-based-on-com.sun.patch

@@ -1,27 +0,0 @@
-From acafc3515aa1083d2214336af596cb579a488c8d 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 27/44] 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 80d4e68ccae..10c375d601c 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -689,7 +689,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 == SystemDictionary::ClassLoader_klass()) {
-           // ClassLoader.addClass method is cached in Universe, we must redefine
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0027-Update-klass-reference-in-Klass.implementor.patch

@@ -0,0 +1,60 @@
+From a4ab453f532839ea3b09027736bb6e74d288bf1d Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Fri, 10 Apr 2020 23:28:07 +0200
+Subject: [PATCH 27/50] Update klass reference in Klass.implementor()
+
+If interface X is removed from class Y then old reference to Y could be
+stored in X.implementor()
+---
+ .../share/prims/jvmtiEnhancedRedefineClasses.cpp     | 12 ++++++++++++
+ .../share/prims/jvmtiEnhancedRedefineClasses.hpp     | 11 -----------
+ 2 files changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 24fb76b6de4..f6d2d3a40fe 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -1411,6 +1411,18 @@ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+     ik->set_host_klass(InstanceKlass::cast(ik->host_klass()->newest_version()));
+   }
+ 
++  // Update implementor if there is only one, in this case implementor() can reference old class
++  if (ik->is_interface()) {
++    Klass* implKlass = ik->implementor();
++    if (implKlass != NULL && implKlass != ik && implKlass->new_version() != NULL) {
++      InstanceKlass* newest_impl = InstanceKlass::cast(implKlass->newest_version());
++      ik->init_implementor();
++      if (newest_impl->implements_interface(ik)) {
++        ik->add_implementor(newest_impl);
++      }
++    }
++  }
++
+   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);
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 5b3ebc13661..2d114635ee5 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -69,17 +69,6 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   // RetransformClasses.  Indicate which.
+   JvmtiClassLoadKind          _class_load_kind;
+ 
+-  // _index_map_count is just an optimization for knowing if
+-  // _index_map_p contains any entries.
+-  int                         _index_map_count;
+-  intArray *                  _index_map_p;
+-
+-  // _operands_index_map_count is just an optimization for knowing if
+-  // _operands_index_map_p contains any entries.
+-  int                         _operands_cur_length;
+-  int                         _operands_index_map_count;
+-  intArray *                  _operands_index_map_p;
+-
+   GrowableArray<InstanceKlass*>*      _new_classes;
+   jvmtiError                  _res;
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0028-Fix-DirectMethodHandle-accessors-klasses.patch

@@ -0,0 +1,96 @@
+From 015c9c88e63f2dde4b8b2a09d2832a8c2a3caf25 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Fri, 10 Apr 2020 23:30:21 +0200
+Subject: [PATCH 28/50] Fix DirectMethodHandle accessors klasses
+
+---
+ src/hotspot/share/classfile/javaClasses.cpp | 28 +++++++++++++++------
+ src/hotspot/share/classfile/javaClasses.hpp |  4 +++
+ 2 files changed, 24 insertions(+), 8 deletions(-)
+
+diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
+index a89443d22ea..ea0588e5388 100644
+--- a/src/hotspot/share/classfile/javaClasses.cpp
++++ b/src/hotspot/share/classfile/javaClasses.cpp
+@@ -3641,14 +3641,20 @@ void java_lang_invoke_DirectMethodHandle_StaticAccessor::set_static_offset(oop d
+   dmh->long_field_put(_static_offset_offset, static_offset);
+ }
+ 
++#define DIRECTMETHODHANDLE_STATIC_ACCESSOR_FIELDS_DO(macro) \
++  macro(_static_offset_offset, k, vmSymbols::static_offset_name(), long_signature, false)
+ 
+ void java_lang_invoke_DirectMethodHandle_StaticAccessor::compute_offsets() {
+-  Klass* klass_oop = SystemDictionary::DirectMethodHandle_StaticAccessor_klass();
+-  if (klass_oop != NULL) {
+-    compute_offset(_static_offset_offset, InstanceKlass::cast(klass_oop), vmSymbols::static_offset_name(), vmSymbols::long_signature());
+-  }
++  InstanceKlass* k = SystemDictionary::DirectMethodHandle_StaticAccessor_klass();
++  DIRECTMETHODHANDLE_STATIC_ACCESSOR_FIELDS_DO(FIELD_COMPUTE_OFFSET);
+ }
+ 
++#if INCLUDE_CDS
++void java_lang_invoke_DirectMethodHandle_StaticAccessor::serialize_offsets(SerializeClosure* f) {
++  DIRECTMETHODHANDLE_STATIC_ACCESSOR_FIELDS_DO(FIELD_SERIALIZE_OFFSET);
++}
++#endif
++
+ // Support for java_lang_invoke_DirectMethodHandle$Accessor
+ 
+ int java_lang_invoke_DirectMethodHandle_Accessor::_field_offset_offset;
+@@ -3663,14 +3669,20 @@ void java_lang_invoke_DirectMethodHandle_Accessor::set_field_offset(oop dmh, int
+   dmh->int_field_put(_field_offset_offset, field_offset);
+ }
+ 
++#define DIRECTMETHODHANDLE_ACCESSOR_FIELDS_DO(macro) \
++  macro(_field_offset_offset, k, vmSymbols::field_offset_name(), int_signature, false)
+ 
+ void java_lang_invoke_DirectMethodHandle_Accessor::compute_offsets() {
+-  Klass* klass_oop = SystemDictionary::DirectMethodHandle_Accessor_klass();
+-  if (klass_oop != NULL) {
+-    compute_offset(_field_offset_offset, InstanceKlass::cast(klass_oop), vmSymbols::field_offset_name(), vmSymbols::int_signature());
+-  }
++  InstanceKlass* k = SystemDictionary::DirectMethodHandle_Accessor_klass();
++  DIRECTMETHODHANDLE_ACCESSOR_FIELDS_DO(FIELD_COMPUTE_OFFSET);
+ }
+ 
++#if INCLUDE_CDS
++void java_lang_invoke_DirectMethodHandle_Accessor::serialize_offsets(SerializeClosure* f) {
++  DIRECTMETHODHANDLE_ACCESSOR_FIELDS_DO(FIELD_SERIALIZE_OFFSET);
++}
++#endif
++
+ // Support for java_lang_invoke_MethodHandle
+ 
+ int java_lang_invoke_MethodHandle::_type_offset;
+diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
+index ceb1670df5d..55f9fa62e2b 100644
+--- a/src/hotspot/share/classfile/javaClasses.hpp
++++ b/src/hotspot/share/classfile/javaClasses.hpp
+@@ -67,6 +67,8 @@
+   f(java_lang_invoke_LambdaForm) \
+   f(java_lang_invoke_MethodType) \
+   f(java_lang_invoke_CallSite) \
++  f(java_lang_invoke_DirectMethodHandle_StaticAccessor) \
++  f(java_lang_invoke_DirectMethodHandle_Accessor) \
+   f(java_lang_invoke_MethodHandleNatives_CallSiteContext) \
+   f(java_security_AccessControlContext) \
+   f(java_lang_reflect_AccessibleObject) \
+@@ -1077,6 +1079,7 @@ class java_lang_invoke_DirectMethodHandle_StaticAccessor: AllStatic {
+   static bool is_instance(oop obj) {
+     return obj != NULL && is_subclass(obj->klass());
+   }
++  static void serialize_offsets(SerializeClosure* f) NOT_CDS_RETURN;
+ };
+ 
+ // Interface to java.lang.invoke.DirectMethodHandle$Accessor objects
+@@ -1101,6 +1104,7 @@ class java_lang_invoke_DirectMethodHandle_Accessor: AllStatic {
+   static bool is_instance(oop obj) {
+     return obj != NULL && is_subclass(obj->klass());
+   }
++  static void serialize_offsets(SerializeClosure* f) NOT_CDS_RETURN;
+ };
+ 
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0028-JBR-3459-Fix-race-condition-in-ClassLoaderDataGraph-.patch

@@ -1,79 +0,0 @@
-From 4ba18f232db0dd92369d110cbb4f38f5a35eb5c7 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 28/44] 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.
----
- src/hotspot/share/classfile/classLoaderData.cpp     | 10 ++++++++++
- src/hotspot/share/classfile/classLoaderData.hpp     |  4 ++++
- .../share/prims/jvmtiEnhancedRedefineClasses.cpp    | 13 +++++++++++--
- 3 files changed, 25 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 68df33b6c40..b12784954af 100644
---- a/src/hotspot/share/classfile/classLoaderData.cpp
-+++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1169,6 +1169,16 @@ void ClassLoaderDataGraph::classes_do(KlassClosure* klass_closure) {
-   }
- }
- 
-+void ClassLoaderDataGraph::anonymous_classes_do(KlassClosure* klass_closure) {
-+  Thread* thread = Thread::current();
-+  for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
-+    if (cld->is_anonymous()) {
-+      Handle holder(thread, cld->holder_phantom());
-+      cld->classes_do(klass_closure);
-+    }
-+  }
-+}
-+
- void ClassLoaderDataGraph::classes_do(void f(Klass* const)) {
-   Thread* thread = Thread::current();
-   for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
-diff --git a/src/hotspot/share/classfile/classLoaderData.hpp b/src/hotspot/share/classfile/classLoaderData.hpp
-index 92f57dac23e..c4c17112a2d 100644
---- a/src/hotspot/share/classfile/classLoaderData.hpp
-+++ b/src/hotspot/share/classfile/classLoaderData.hpp
-@@ -108,6 +108,10 @@ class ClassLoaderDataGraph : public AllStatic {
-   // for redefinition.  These classes are removed during the next class unloading.
-   // Walking the ClassLoaderDataGraph also includes anonymous classes.
-   static void classes_do(KlassClosure* klass_closure);
-+
-+  // Enhanced class redefinition
-+  static void anonymous_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 10c375d601c..5de5f78aea0 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -2130,8 +2130,17 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
-   AffectedKlassClosure closure(_affected_klasses);
-   // Updated in j10, from original SystemDictionary::classes_do
- 
--  ClassLoaderDataGraph::classes_do(&closure);
--  //ClassLoaderDataGraph::dictionary_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 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_classes_do(&closure);
- 
-   log_trace(redefine, class, load)("%d classes affected", _affected_klasses->length());
- 
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0029-JBR-3867-update-keys-of-jvmti-TAG-map-after-redefini.patch

@@ -1,222 +0,0 @@
-From f0c417c9f5eaf721a7c022e7c901af59a0993885 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Sun, 10 Oct 2021 20:25:30 +0200
-Subject: [PATCH 29/44] JBR-3867 - update keys of jvmti TAG map after
- redefinition
-
-jdwp keeps relation class_ptr->class_ref in jvmti tag. class_ptr is used
-as a tag key, tag value is refnode. There are new class_ptrs after
-redefinition, therefore jdwp redefinition method update all affected
-keys in the tag map.
----
- src/hotspot/share/prims/jvmtiExtensions.cpp   | 24 ++++++++++++++
- .../share/native/libjdwp/VirtualMachineImpl.c | 20 +++++++++++
- .../share/native/libjdwp/commonRef.c          | 29 ++++++++++++++++
- .../share/native/libjdwp/commonRef.h          |  2 ++
- .../share/native/libjdwp/util.c               | 33 +++++++++++++++++++
- .../share/native/libjdwp/util.h               |  3 ++
- 6 files changed, 111 insertions(+)
-
-diff --git a/src/hotspot/share/prims/jvmtiExtensions.cpp b/src/hotspot/share/prims/jvmtiExtensions.cpp
-index 36bc47ad0b5..8a6058fd884 100644
---- a/src/hotspot/share/prims/jvmtiExtensions.cpp
-+++ b/src/hotspot/share/prims/jvmtiExtensions.cpp
-@@ -49,6 +49,15 @@ static jvmtiError JNICALL IsClassUnloadingEnabled(const jvmtiEnv* env, ...) {
-   return JVMTI_ERROR_NONE;
- }
- 
-+// extension function
-+static jvmtiError JNICALL IsEnhancedClassRedefinitionEnabled(const jvmtiEnv* env, jboolean* enabled, ...) {
-+  if (enabled == NULL) {
-+    return JVMTI_ERROR_NULL_POINTER;
-+  }
-+  *enabled = (jboolean)AllowEnhancedClassRedefinition;
-+  return JVMTI_ERROR_NONE;
-+}
-+
- // register extension functions and events. In this implementation we
- // have a single extension function (to prove the API) that tests if class
- // unloading is enabled or disabled. We also have a single extension event
-@@ -88,6 +97,21 @@ void JvmtiExtensions::register_extensions() {
-     event_params
-   };
-   _ext_events->append(&ext_event);
-+
-+  static jvmtiParamInfo func_params_enh_redef[] = {
-+    { (char*)"IsEnhancedClassRedefinitionEnabled", JVMTI_KIND_OUT,  JVMTI_TYPE_JBOOLEAN, JNI_FALSE }
-+
-+  };
-+  static jvmtiExtensionFunctionInfo ext_func_enh_redef = {
-+    (jvmtiExtensionFunction)IsEnhancedClassRedefinitionEnabled,
-+    (char*)"com.sun.hotspot.functions.IsEnhancedClassRedefinitionEnabled",
-+    (char*)"Tell if enhanced class redefinition is enabled (-noclassgc)",
-+    sizeof(func_params_enh_redef)/sizeof(func_params_enh_redef[0]),
-+    func_params_enh_redef,
-+    0,              // no non-universal errors
-+    NULL
-+  };
-+  _ext_functions->append(&ext_func_enh_redef);
- }
- 
- 
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-index d7ca956dc57..faa8f55f91f 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-@@ -475,6 +475,14 @@ redefineClasses(PacketInputStream *in, PacketOutputStream *out)
-     if (ok == JNI_TRUE) {
-         jvmtiError error;
- 
-+        jlong classIds[classCount];
-+
-+        if (gdata->isEnhancedClassRedefinitionEnabled) {
-+            for (i = 0; i < classCount; ++i) {
-+              classIds[i] = commonRef_refToID(env, classDefs[i].klass);
-+            }
-+        }
-+
-         error = JVMTI_FUNC_PTR(gdata->jvmti,RedefineClasses)
-                         (gdata->jvmti, classCount, classDefs);
-         if (error != JVMTI_ERROR_NONE) {
-@@ -484,6 +492,18 @@ redefineClasses(PacketInputStream *in, PacketOutputStream *out)
-             for ( i = 0 ; i < classCount; i++ ) {
-                 eventHandler_freeClassBreakpoints(classDefs[i].klass);
-             }
-+
-+            if (gdata->isEnhancedClassRedefinitionEnabled) {
-+                /* Update tags in jvmti to use new classes */
-+                for ( i = 0 ; i < classCount; i++ ) {
-+                    /* pointer in classIds[i] is updated by advanced redefinition to a new class */
-+                    error = commonRef_updateTags(env, classIds[i]);
-+                    if (error != JVMTI_ERROR_NONE) {
-+                        break;
-+                    }
-+                }
-+            }
-+
-         }
-     }
- 
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
-index 2a8f55014d9..3f33b423209 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.c
-@@ -618,3 +618,32 @@ commonRef_unlock(void)
- {
-     debugMonitorExit(gdata->refLock);
- }
-+
-+/*
-+ * Update JVMTI tags, used from enhanced redefinition
-+ */
-+jvmtiError
-+commonRef_updateTags(JNIEnv *env, jlong id)
-+{
-+    jvmtiError error;
-+
-+    error = JVMTI_ERROR_NONE;
-+
-+    if (id == NULL_OBJECT_ID) {
-+        return error;
-+    }
-+
-+    debugMonitorEnter(gdata->refLock); {
-+        RefNode *node;
-+
-+        node = findNodeByID(env, id);
-+        if (node != NULL) {
-+            error = JVMTI_FUNC_PTR(gdata->jvmti, SetTag)
-+                                  (gdata->jvmti, node->ref, ptr_to_jlong(node));
-+        } else {
-+            printf("Node not found\n");
-+        }
-+    } debugMonitorExit(gdata->refLock);
-+
-+    return error;
-+}
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h
-index 7c76667eb19..d7b01e62a47 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/commonRef.h
-@@ -41,4 +41,6 @@ void commonRef_compact(void);
- void commonRef_lock(void);
- void commonRef_unlock(void);
- 
-+jvmtiError commonRef_updateTags(JNIEnv *env, jlong id);
-+
- #endif
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.c b/src/jdk.jdwp.agent/share/native/libjdwp/util.c
-index f4a1d19589d..0642c4a3d7f 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/util.c
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.c
-@@ -41,6 +41,7 @@ BackendGlobalData *gdata = NULL;
- static jboolean isInterface(jclass clazz);
- static jboolean isArrayClass(jclass clazz);
- static char * getPropertyUTF8(JNIEnv *env, char *propertyName);
-+static jboolean isEnhancedClassRedefinitionEnabled(JNIEnv *env);
- 
- /* Save an object reference for use later (create a NewGlobalRef) */
- void
-@@ -281,6 +282,8 @@ util_initialize(JNIEnv *env)
-             }
-         }
- 
-+        gdata->isEnhancedClassRedefinitionEnabled = isEnhancedClassRedefinitionEnabled(env);
-+
-     } END_WITH_LOCAL_REFS(env);
- 
- }
-@@ -1739,6 +1742,36 @@ getPropertyUTF8(JNIEnv *env, char *propertyName)
-     return value;
- }
- 
-+static jboolean
-+isEnhancedClassRedefinitionEnabled(JNIEnv *env)
-+{
-+    jvmtiError error;
-+    jint count, i;
-+    jvmtiExtensionFunctionInfo* ext_funcs;
-+
-+    error = JVMTI_FUNC_PTR(gdata->jvmti,GetExtensionFunctions)
-+                (gdata->jvmti, &count, &ext_funcs);
-+    if (error != JVMTI_ERROR_NONE) {
-+        return JNI_FALSE;
-+    }
-+
-+    for (i=0; i<count; i++) {
-+        if (strcmp(ext_funcs[i].id, (char*)"com.sun.hotspot.functions.IsEnhancedClassRedefinitionEnabled") == 0) {
-+            jboolean enabled;
-+            error = (*ext_funcs[i].func)(gdata->jvmti, &enabled);
-+
-+            if (error != JVMTI_ERROR_NONE) {
-+                return JNI_FALSE;
-+            } else {
-+                return enabled;
-+            }
-+        }
-+    }
-+
-+    return JNI_FALSE;
-+}
-+
-+
- jboolean
- isMethodObsolete(jmethodID method)
- {
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/util.h b/src/jdk.jdwp.agent/share/native/libjdwp/util.h
-index bcb59457120..72a365ad3c3 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/util.h
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/util.h
-@@ -126,6 +126,9 @@ typedef struct {
-     int           objectsByIDsize;
-     int           objectsByIDcount;
- 
-+    /* true if enhanced class redefinition is enabled */
-+    jboolean isEnhancedClassRedefinitionEnabled;
-+
-      /* Indication that the agent has been loaded */
-      jboolean isLoaded;
- 
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0029-cleanup-direct-method-handles-code.patch

@@ -0,0 +1,60 @@
+From 14005f6176420c16fa1d152c78a3dacd26ecb647 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sat, 11 Apr 2020 12:07:43 +0200
+Subject: [PATCH 29/50] cleanup direct method handles code
+
+---
+ src/hotspot/share/classfile/javaClasses.hpp        | 10 ++++------
+ src/hotspot/share/classfile/javaClasses.inline.hpp |  8 ++++++++
+ 2 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
+index 55f9fa62e2b..da004d1b307 100644
+--- a/src/hotspot/share/classfile/javaClasses.hpp
++++ b/src/hotspot/share/classfile/javaClasses.hpp
+@@ -1076,9 +1076,8 @@ class java_lang_invoke_DirectMethodHandle_StaticAccessor: AllStatic {
+   static bool is_subclass(Klass* klass) {
+     return klass->is_subclass_of(SystemDictionary::DirectMethodHandle_StaticAccessor_klass());
+   }
+-  static bool is_instance(oop obj) {
+-    return obj != NULL && is_subclass(obj->klass());
+-  }
++  static bool is_instance(oop obj);
++
+   static void serialize_offsets(SerializeClosure* f) NOT_CDS_RETURN;
+ };
+ 
+@@ -1101,9 +1100,8 @@ class java_lang_invoke_DirectMethodHandle_Accessor: AllStatic {
+   static bool is_subclass(Klass* klass) {
+     return klass->is_subclass_of(SystemDictionary::DirectMethodHandle_Accessor_klass());
+   }
+-  static bool is_instance(oop obj) {
+-    return obj != NULL && is_subclass(obj->klass());
+-  }
++  static bool is_instance(oop obj);
++
+   static void serialize_offsets(SerializeClosure* f) NOT_CDS_RETURN;
+ };
+ 
+diff --git a/src/hotspot/share/classfile/javaClasses.inline.hpp b/src/hotspot/share/classfile/javaClasses.inline.hpp
+index 6c5787f4b70..ba9cffa8c62 100644
+--- a/src/hotspot/share/classfile/javaClasses.inline.hpp
++++ b/src/hotspot/share/classfile/javaClasses.inline.hpp
+@@ -175,6 +175,14 @@ inline bool java_lang_invoke_DirectMethodHandle::is_instance(oop obj) {
+   return obj != NULL && is_subclass(obj->klass());
+ }
+ 
++inline bool java_lang_invoke_DirectMethodHandle_StaticAccessor::is_instance(oop obj) {
++  return obj != NULL && is_subclass(obj->klass());
++}
++
++inline bool java_lang_invoke_DirectMethodHandle_Accessor::is_instance(oop obj) {
++  return obj != NULL && is_subclass(obj->klass());
++}
++
+ inline bool java_lang_Module::is_instance(oop obj) {
+   return obj != NULL && obj->klass() == SystemDictionary::Module_klass();
+ }
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0030-Add-init_implementor_from_redefine-that-skips-compil.patch

@@ -0,0 +1,68 @@
+From 990ffe4111fe73c3a183f8d35402cbf9e81bd587 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sat, 11 Apr 2020 17:52:13 +0200
+Subject: [PATCH 30/50] Add init_implementor_from_redefine, that skips compiler
+ lock assert
+
+---
+ src/hotspot/share/oops/instanceKlass.cpp               | 10 +++++++++-
+ src/hotspot/share/oops/instanceKlass.hpp               |  1 +
+ .../share/prims/jvmtiEnhancedRedefineClasses.cpp       |  2 +-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index 8cbd4b8edf2..c04bdf5abfc 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -789,7 +789,7 @@ bool InstanceKlass::link_class_impl(bool throw_verifyerror, TRAPS) {
+     if (!is_linked()) {
+       if (!is_rewritten()) {
+         // In cases, if class A is being redefined and class B->A (B is extended from A) and B is host class of anonymous class C
+-        // then second redefinition fails with cannot cast klass exception. So we currently turn off bytecode verification 
++        // then second redefinition fails with cannot cast klass exception. So we currently turn off bytecode verification
+         // on redefinition.
+         if (!newest_version()->is_redefining()) {
+           bool verify_ok = verify_code(throw_verifyerror, THREAD);
+@@ -1139,6 +1139,14 @@ void InstanceKlass::init_implementor() {
+   }
+ }
+ 
++void InstanceKlass::init_implementor_from_redefine() {
++  assert(is_interface(), "not interface");
++  Klass** addr = adr_implementor();
++  assert(addr != NULL, "null addr");
++  if (addr != NULL) {
++    *addr = NULL;
++  }
++}
+ 
+ void InstanceKlass::process_interfaces(Thread *thread) {
+   // link this class into the implementors list of every interface it implements
+diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
+index 2cc98b636f1..e8107a39813 100644
+--- a/src/hotspot/share/oops/instanceKlass.hpp
++++ b/src/hotspot/share/oops/instanceKlass.hpp
+@@ -1020,6 +1020,7 @@ public:
+   int  nof_implementors() const;
+   void add_implementor(Klass* k);  // k is a new class that implements this interface
+   void init_implementor();           // initialize
++  void init_implementor_from_redefine();           // initialize
+ 
+   // link this class into the implementors list of every interface it implements
+   void process_interfaces(Thread *thread);
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index f6d2d3a40fe..aac9ba0911f 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -1416,7 +1416,7 @@ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+     Klass* implKlass = ik->implementor();
+     if (implKlass != NULL && implKlass != ik && implKlass->new_version() != NULL) {
+       InstanceKlass* newest_impl = InstanceKlass::cast(implKlass->newest_version());
+-      ik->init_implementor();
++      ik->init_implementor_from_redefine();
+       if (newest_impl->implements_interface(ik)) {
+         ik->add_implementor(newest_impl);
+       }
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0030-JBR-3867-fix-msvc-compilation-issue-with-non-const-a.patch

@@ -1,54 +0,0 @@
-From 43ad1316176425552ac8aa34e26ab8554ec3a9f1 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Mon, 11 Oct 2021 20:22:26 +0200
-Subject: [PATCH 30/44] JBR-3867 - fix msvc compilation issue with non const
- array on stack
-
----
- .../share/native/libjdwp/VirtualMachineImpl.c      | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-index faa8f55f91f..53f7e44f579 100644
---- a/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-+++ b/src/jdk.jdwp.agent/share/native/libjdwp/VirtualMachineImpl.c
-@@ -475,11 +475,16 @@ redefineClasses(PacketInputStream *in, PacketOutputStream *out)
-     if (ok == JNI_TRUE) {
-         jvmtiError error;
- 
--        jlong classIds[classCount];
-+        jlong* classIds = NULL;
- 
-         if (gdata->isEnhancedClassRedefinitionEnabled) {
--            for (i = 0; i < classCount; ++i) {
--              classIds[i] = commonRef_refToID(env, classDefs[i].klass);
-+            classIds = jvmtiAllocate(classCount*(int)sizeof(jlong));
-+            if (classIds == NULL) {
-+                outStream_setError(out, JDWP_ERROR(OUT_OF_MEMORY));
-+                return JNI_TRUE;
-+            }
-+            for (i = 0; i < classCount; i++) {
-+                classIds[i] = commonRef_refToID(env, classDefs[i].klass);
-             }
-         }
- 
-@@ -493,7 +498,7 @@ redefineClasses(PacketInputStream *in, PacketOutputStream *out)
-                 eventHandler_freeClassBreakpoints(classDefs[i].klass);
-             }
- 
--            if (gdata->isEnhancedClassRedefinitionEnabled) {
-+            if (gdata->isEnhancedClassRedefinitionEnabled && classIds != NULL) {
-                 /* Update tags in jvmti to use new classes */
-                 for ( i = 0 ; i < classCount; i++ ) {
-                     /* pointer in classIds[i] is updated by advanced redefinition to a new class */
-@@ -502,6 +507,7 @@ redefineClasses(PacketInputStream *in, PacketOutputStream *out)
-                         break;
-                     }
-                 }
-+                jvmtiDeallocate((void*) classIds);
-             }
- 
-         }
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0031-Attempt-to-fix-JBR-3887.patch

@@ -1,31 +0,0 @@
-From 39d5a7e6ffd06362a40984c43a439b5778b65d53 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Tue, 19 Oct 2021 17:02:35 +0200
-Subject: [PATCH 31/44] Attempt to fix JBR-3887
-
----
- src/hotspot/share/prims/jvmtiExtensions.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiExtensions.cpp b/src/hotspot/share/prims/jvmtiExtensions.cpp
-index 8a6058fd884..9c8c98cb70e 100644
---- a/src/hotspot/share/prims/jvmtiExtensions.cpp
-+++ b/src/hotspot/share/prims/jvmtiExtensions.cpp
-@@ -50,7 +50,13 @@ static jvmtiError JNICALL IsClassUnloadingEnabled(const jvmtiEnv* env, ...) {
- }
- 
- // extension function
--static jvmtiError JNICALL IsEnhancedClassRedefinitionEnabled(const jvmtiEnv* env, jboolean* enabled, ...) {
-+static jvmtiError JNICALL IsEnhancedClassRedefinitionEnabled(const jvmtiEnv* env, ...) {
-+  jboolean* enabled = NULL;
-+  va_list ap;
-+
-+  va_start(ap, env);
-+  enabled = va_arg(ap, jboolean *);
-+  va_end(ap);
-   if (enabled == NULL) {
-     return JVMTI_ERROR_NULL_POINTER;
-   }
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0031-not-nullable-oop_store_not_null-method-handle-NULL-i.patch

@@ -0,0 +1,73 @@
+From 9dcddc7c2573c34579161e3ad1240b029dda1e96 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Mon, 13 Apr 2020 20:59:35 +0200
+Subject: [PATCH 31/50] not nullable oop_store_not_null() method+handle NULL in
+ mem_name in dmh
+
+---
+ .../share/prims/jvmtiEnhancedRedefineClasses.cpp | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index aac9ba0911f..8d861ef43c9 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -225,13 +225,15 @@ void VM_EnhancedRedefineClasses::mark_as_scavengable(nmethod* nm) {
+ // TODO comment
+ struct StoreBarrier {
+   // TODO: j10 review change ::oop_store -> HeapAccess<>::oop_store
+-  template <class T> static void oop_store(T* p, oop v) { HeapAccess<>::oop_store(p, v); }
++  template <class T> static void oop_store_not_null(T* p, oop v) { HeapAccess<IS_NOT_NULL>::oop_store(p, v); }
++  template <class T> static void oop_store(T* p) { HeapAccess<>::oop_store(p, oop(NULL)); }
+ };
+ 
+ 
+ // TODO comment
+ struct StoreNoBarrier {
+-  template <class T> static void oop_store(T* p, oop v) { RawAccess<IS_NOT_NULL>::oop_store(p, v); }
++  template <class T> static void oop_store_not_null(T* p, oop v) { RawAccess<IS_NOT_NULL>::oop_store(p, v); }
++  template <class T> static void oop_store(T* p) { RawAccess<>::oop_store(p, oop(NULL)); }
+ };
+ 
+ /**
+@@ -309,6 +311,9 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+   bool update_direct_method_handle(oop obj) {
+     // Always update member name first.
+     oop mem_name = java_lang_invoke_DirectMethodHandle::member(obj);
++    if (mem_name == NULL) {
++      return true;
++    }
+     if (!update_member_name(mem_name)) {
+       return false;
+     }
+@@ -347,7 +352,7 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+         assert(obj == InstanceKlass::cast(klass)->java_mirror(), "just checking");
+         if (klass->new_version() != NULL) {
+           obj = InstanceKlass::cast(klass->new_version())->java_mirror();
+-          S::oop_store(p, obj);
++          S::oop_store_not_null(p, obj);
+           oop_updated = true;
+         }
+       }
+@@ -363,7 +368,7 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+       if (!update_direct_method_handle(obj)) {
+         // DMH is no longer valid, replace it with null reference.
+         // See note above. We probably want to replace this with something more meaningful.
+-        S::oop_store(p, NULL);
++        S::oop_store(p);
+       }
+     }
+   }
+@@ -1430,8 +1435,7 @@ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+         // Constant pool entry points to redefined class -- update to the new version
+         other_cp->klass_at_put(i, klass->newest_version());
+       }
+-      klass = other_cp->resolved_klass_at(i);
+-      assert(klass->new_version() == NULL, "Must be new klass!");
++      assert(other_cp->resolved_klass_at(i)->new_version() == NULL, "Must be new klass!");
+     }
+   }
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0032-JBR-3937-Fix-crashes-in-C1-C2-compilers.patch

@@ -1,141 +0,0 @@
-From 56b381db23651cc1cec0a4b649dd2796b85e8b09 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Mon, 1 Nov 2021 19:00:41 +0100
-Subject: [PATCH 32/44] JBR-3937 Fix crashes in C1/C2 compilers
-
-There is a race condition in enhanced redefinition with C1/C2. Therefore
-the patch stops C1/C2 compilation before redefinition and release after
-redefinition finishing. There is no performance impact since dcevm
-flushes all code cache.
----
- src/hotspot/share/compiler/compileBroker.cpp | 39 +++++++++++++++++++-
- src/hotspot/share/compiler/compileBroker.hpp |  6 +++
- src/hotspot/share/prims/jvmtiEnv.cpp         |  7 ++++
- 3 files changed, 51 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/compiler/compileBroker.cpp b/src/hotspot/share/compiler/compileBroker.cpp
-index bd662b5ebef..bd0f9f0efab 100644
---- a/src/hotspot/share/compiler/compileBroker.cpp
-+++ b/src/hotspot/share/compiler/compileBroker.cpp
-@@ -133,6 +133,8 @@ CompileLog** CompileBroker::_compiler2_logs = NULL;
- // These counters are used to assign an unique ID to each compilation.
- volatile jint CompileBroker::_compilation_id     = 0;
- volatile jint CompileBroker::_osr_compilation_id = 0;
-+volatile bool CompileBroker::_compilation_stopped = false;
-+volatile int CompileBroker::_active_compilations = 0;
- 
- // Debugging information
- int  CompileBroker::_last_compile_type     = no_compile;
-@@ -2191,7 +2193,22 @@ void CompileBroker::invoke_compiler_on_method(CompileTask* task) {
-           locker.wait(Mutex::_no_safepoint_check_flag);
-         }
-       }
--      comp->compile_method(&ci_env, target, osr_bci, directive);
-+
-+      if (AllowEnhancedClassRedefinition) {
-+        {
-+          MonitorLockerEx locker(Compilation_lock, Mutex::_no_safepoint_check_flag);
-+          while (_compilation_stopped) {
-+            locker.wait(Mutex::_no_safepoint_check_flag);
-+          }
-+          Atomic::add(1, &_active_compilations);
-+        }
-+
-+        comp->compile_method(&ci_env, target, osr_bci, directive);
-+        Atomic::sub(1, &_active_compilations);
-+
-+      } else {
-+        comp->compile_method(&ci_env, target, osr_bci, directive);
-+      }
-     }
- 
-     if (!ci_env.failing() && task->code() == NULL) {
-@@ -2853,3 +2870,23 @@ void CompileBroker::print_heapinfo(outputStream* out, const char* function, size
-   }
-   out->print_cr("\n__ CodeHeapStateAnalytics total duration %10.3f seconds _________\n", ts_total.seconds());
- }
-+
-+void CompileBroker::stopCompilationBeforeEnhancedRedefinition() {
-+  if (AllowEnhancedClassRedefinition) {
-+    MonitorLockerEx locker(Compilation_lock, Mutex::_no_safepoint_check_flag);
-+    _compilation_stopped = true;
-+    while (_active_compilations > 0) {
-+      VM_ThreadsSuspendJVMTI tsj;
-+      VMThread::execute(&tsj);
-+      locker.wait(Mutex::_no_safepoint_check_flag);
-+    }
-+  }
-+}
-+
-+void CompileBroker::releaseCompilationAfterEnhancedRedefinition() {
-+  if (AllowEnhancedClassRedefinition) {
-+    MonitorLockerEx locker(Compilation_lock, Mutex::_no_safepoint_check_flag);
-+    _compilation_stopped = false;
-+    locker.notify_all();
-+  }
-+}
-diff --git a/src/hotspot/share/compiler/compileBroker.hpp b/src/hotspot/share/compiler/compileBroker.hpp
-index 53e496cd306..fa50e778d9e 100644
---- a/src/hotspot/share/compiler/compileBroker.hpp
-+++ b/src/hotspot/share/compiler/compileBroker.hpp
-@@ -173,6 +173,9 @@ class CompileBroker: AllStatic {
-   static volatile jint _compilation_id;
-   static volatile jint _osr_compilation_id;
- 
-+  static volatile bool _compilation_stopped;
-+  static volatile int _active_compilations;
-+
-   static int  _last_compile_type;
-   static int  _last_compile_level;
-   static char _last_method_compiled[name_buffer_length];
-@@ -421,6 +424,9 @@ public:
-   // CodeHeap State Analytics.
-   static void print_info(outputStream *out);
-   static void print_heapinfo(outputStream *out, const char* function, size_t granularity);
-+
-+  static void stopCompilationBeforeEnhancedRedefinition();
-+  static void releaseCompilationAfterEnhancedRedefinition();
- };
- 
- #endif // SHARE_VM_COMPILER_COMPILEBROKER_HPP
-diff --git a/src/hotspot/share/prims/jvmtiEnv.cpp b/src/hotspot/share/prims/jvmtiEnv.cpp
-index 54617f05b5a..0ca9ec020a9 100644
---- a/src/hotspot/share/prims/jvmtiEnv.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnv.cpp
-@@ -29,6 +29,7 @@
- #include "classfile/modules.hpp"
- #include "classfile/systemDictionary.hpp"
- #include "classfile/vmSymbols.hpp"
-+#include "compiler/compileBroker.hpp"
- #include "interpreter/bytecodeStream.hpp"
- #include "interpreter/interpreter.hpp"
- #include "jvmtifiles/jvmtiEnv.hpp"
-@@ -453,9 +454,12 @@ JvmtiEnv::RetransformClasses(jint class_count, const jclass* classes) {
-     class_definitions[index].klass              = jcls;
-   }
-   if (AllowEnhancedClassRedefinition) {
-+    // Stop compilation to avoid compilator race condition (crashes) with advanced redefinition
-+    CompileBroker::stopCompilationBeforeEnhancedRedefinition();
-     MutexLocker sd_mutex(EnhancedRedefineClasses_lock);
-     VM_EnhancedRedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_retransform);
-     VMThread::execute(&op);
-+    CompileBroker::releaseCompilationAfterEnhancedRedefinition();
-     return (op.check_error());
-   }
-   VM_RedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_retransform);
-@@ -469,9 +473,12 @@ JvmtiEnv::RetransformClasses(jint class_count, const jclass* classes) {
- jvmtiError
- JvmtiEnv::RedefineClasses(jint class_count, const jvmtiClassDefinition* class_definitions) {
-   if (AllowEnhancedClassRedefinition) {
-+    // Stop compilation to avoid compilator race condition (crashes) with advanced redefinition
-+    CompileBroker::stopCompilationBeforeEnhancedRedefinition();
-     MutexLocker sd_mutex(EnhancedRedefineClasses_lock);
-     VM_EnhancedRedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_redefine);
-     VMThread::execute(&op);
-+    CompileBroker::releaseCompilationAfterEnhancedRedefinition();
-     return (op.check_error());
-   }
-   VM_RedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_redefine);
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0032-add-jvmtiEnhancedRedefineClasses.-to-CMakeLists.txt.patch

@@ -0,0 +1,32 @@
+From 800b44f545c7b99026d203690def30ec4b9ed08e Mon Sep 17 00:00:00 2001
+From: Artem Khvastunov <artem.khvastunov@jetbrains.com>
+Date: Tue, 14 Apr 2020 19:11:35 +0200
+Subject: [PATCH 32/50] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
+
+---
+ jb/project/hotspot-cmake/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/jb/project/hotspot-cmake/CMakeLists.txt b/jb/project/hotspot-cmake/CMakeLists.txt
+index 8b552c27206..6516e39058f 100644
+--- a/jb/project/hotspot-cmake/CMakeLists.txt
++++ b/jb/project/hotspot-cmake/CMakeLists.txt
+@@ -1663,6 +1663,7 @@ set(SOURCE_FILES
+ ../../../src/hotspot/share/prims/jvmtiGetLoadedClasses.hpp
+ ../../../src/hotspot/share/prims/jvmtiAgentThread.hpp
+ ../../../src/hotspot/share/prims/jvmtiCodeBlobEvents.cpp
++../../../src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+ ../../../src/hotspot/share/prims/stackwalk.cpp
+ ../../../src/hotspot/share/prims/privilegedStack.hpp
+ ../../../src/hotspot/share/prims/jvmtiUtil.hpp
+@@ -1684,6 +1685,7 @@ set(SOURCE_FILES
+ ../../../src/hotspot/share/prims/stackwalk.hpp
+ ../../../src/hotspot/share/prims/privilegedStack.cpp
+ ../../../src/hotspot/share/prims/jvmtiCodeBlobEvents.hpp
++../../../src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+ ../../../src/hotspot/share/prims/jvmtiUtil.cpp
+ ../../../src/hotspot/share/prims/jvmtiEnvBase.cpp
+ ../../../src/hotspot/share/prims/methodHandles.cpp
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0033-JBR-3938-fix-race-condition-in-anonymous-class-loadi.patch

@@ -1,121 +0,0 @@
-From 962796e56be75ef70c1d6dcaa9eaf19e755c61d8 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Mon, 1 Nov 2021 19:20:13 +0100
-Subject: [PATCH 33/44] JBR-3938 - fix race condition in anonymous class
- loading
-
-Anonymous class must be checked if it is fully initialized if it is used
-in ClassLoaderDataGraph closure.
----
- .../prims/jvmtiEnhancedRedefineClasses.cpp    | 44 ++++++-------------
- .../prims/jvmtiEnhancedRedefineClasses.hpp    |  1 -
- 2 files changed, 14 insertions(+), 31 deletions(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 5de5f78aea0..a8546a5fbe2 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -517,8 +517,6 @@ 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;
-@@ -647,10 +645,6 @@ void VM_EnhancedRedefineClasses::doit() {
-   // TODO: explain...
-   ciObjectFactory::resort_shared_ci_metadata();
- 
--  // FIXME - check if it was in JDK8. Copied from standard JDK9 hotswap.
--  //MethodDataCleaner clean_weak_method_links;
--  //ClassLoaderDataGraph::classes_do(&clean_weak_method_links);
--
-   // Disable any dependent concurrent compilations
-   SystemDictionary::notice_modification();
- 
-@@ -1568,29 +1562,6 @@ 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) {
-@@ -2071,12 +2042,23 @@ void VM_EnhancedRedefineClasses::dump_methods() {
- class AffectedKlassClosure : public KlassClosure {
-  private:
-    GrowableArray<Klass*>* _affected_klasses;
-+   bool _is_anonymous;
-  public:
--  AffectedKlassClosure(GrowableArray<Klass*>* affected_klasses) : _affected_klasses(affected_klasses) {}
-+  AffectedKlassClosure(GrowableArray<Klass*>* affected_klasses) : _affected_klasses(affected_klasses), _is_anonymous(false) {}
-+
-+  bool is_anonymous() { return _is_anonymous; }
-+  void set_anonymous(bool value) { _is_anonymous = value; }
- 
-   void do_klass(Klass* klass) {
-     assert(!_affected_klasses->contains(klass), "must not occur more than once!");
- 
-+    if (_is_anonymous && klass->is_instance_klass()) {
-+      InstanceKlass *ik = InstanceKlass::cast(klass);
-+      if (ik->is_not_initialized()) {
-+        return;  // anonymous class does not need to be initialized
-+      }
-+    }
-+
-     if (klass->new_version() != NULL) {
-       return;
-     }
-@@ -2135,11 +2117,13 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
-   // ClassLoaderDataGraph::classes_do(&closure);
- 
-   // 1. Scan over dictionaries
-+  closure.set_anonymous(false);
-   ClassLoaderDataGraph::dictionary_classes_do(&closure);
- 
-   // 2. Anonymous 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
-+  closure.set_anonymous(true);
-   ClassLoaderDataGraph::anonymous_classes_do(&closure);
- 
-   log_trace(redefine, class, load)("%d classes affected", _affected_klasses->length());
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index 79ea17b0d47..fc0d8e82643 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -119,7 +119,6 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
-   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);
- 
-   // Figure out which new methods match old methods in name and signature,
-   // which methods have been added, and which are no longer present
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0033-migrate-DCEVM-to-11.0.7.patch

@@ -0,0 +1,25 @@
+From e009b4fcc48e9719b5b896f7f3838fbc7c579ba7 Mon Sep 17 00:00:00 2001
+From: Artem Khvastunov <artem.khvastunov@jetbrains.com>
+Date: Sun, 19 Apr 2020 11:36:12 +0200
+Subject: [PATCH 33/50] migrate DCEVM to 11.0.7
+
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 2d114635ee5..6cabdca9c27 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -30,7 +30,7 @@
+ #include "memory/resourceArea.hpp"
+ #include "oops/objArrayKlass.hpp"
+ #include "oops/objArrayOop.hpp"
+-#include "runtime/vm_operations.hpp"
++#include "runtime/vmOperations.hpp"
+ #include "gc/shared/vmGCOperations.hpp"
+ #include "../../../java.base/unix/native/include/jni_md.h"
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0034-Fix-11.0.7-compilation-issues.patch

@@ -0,0 +1,33 @@
+From 5653e2a5f05a9693f934b0f9c4d9286c01576807 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Fri, 8 May 2020 21:07:50 +0200
+Subject: [PATCH 34/50] Fix 11.0.7 compilation issues
+
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 6cabdca9c27..ed44f0e27ce 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -16,6 +16,8 @@
+  * 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.
+@@ -30,7 +32,6 @@
+ #include "memory/resourceArea.hpp"
+ #include "oops/objArrayKlass.hpp"
+ #include "oops/objArrayOop.hpp"
+-#include "runtime/vmOperations.hpp"
+ #include "gc/shared/vmGCOperations.hpp"
+ #include "../../../java.base/unix/native/include/jni_md.h"
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0035-JBR-3963-fix-memory-leaks-in-G1-in-redefinition.patch

@@ -1,27 +0,0 @@
-From 15d06f325a892e2fa665698b4b76988cff236075 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
-Date: Fri, 5 Nov 2021 18:16:01 +0100
-Subject: [PATCH 35/44] JBR-3963 - fix memory leaks in G1 in redefinition
-
-ChangePointersObjectClosure allocates handles and resources, that must
-be properly released in worker thread
----
- src/hotspot/share/gc/g1/g1CollectedHeap.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-index d33a5ff3a54..7c68dbf4bf1 100644
---- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-+++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-@@ -2125,6 +2125,8 @@ class G1IterateObjectClosureTask : public AbstractGangTask {
-     _cl(cl), _g1h(g1h),  _hrclaimer(g1h->workers()->active_workers()) { }
- 
-   virtual void work(uint worker_id) {
-+    ResourceMark rm;
-+    HandleMark hm;
-     IterateObjectClosureRegionClosure blk(_cl);
-     _g1h->heap_region_par_iterate_from_worker_offset(&blk, &_hrclaimer, worker_id);
-   }
--- 
-2.23.0
-

jb/project/tools/patches/dcevm/0035-Use-INCLUDE_CDS-condition-on-UseSharedSpaces-block-f.patch

@@ -0,0 +1,33 @@
+From 0b9b021f889ec001d579d192f1bd9a7a43f63871 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sat, 9 May 2020 10:08:17 +0200
+Subject: [PATCH 35/50] Use INCLUDE_CDS condition on "UseSharedSpaces" block
+ from master
+
+---
+ 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 8d861ef43c9..660bf3a2e97 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -467,6 +467,7 @@ public:
+ void VM_EnhancedRedefineClasses::doit() {
+   Thread *thread = Thread::current();
+ 
++#if INCLUDE_CDS
+   if (UseSharedSpaces) {
+     // Sharing is enabled so we remap the shared readonly space to
+     // shared readwrite, private just in case we need to redefine
+@@ -478,6 +479,7 @@ void VM_EnhancedRedefineClasses::doit() {
+       return;
+     }
+   }
++#endif
+ 
+   // Mark methods seen on stack and everywhere else so old methods are not
+   // cleaned up if they're on the stack.
+-- 
+2.24.3 (Apple Git-128)
+