CMake: defined MACOSX macro for project sources

Provide gamma correction for both light and dark text

.gitignore

@@ -8,4 +8,19 @@ JTreport
 JetBrainsRuntime.iml
 build/
 # Project exclude paths
-/jb/project/java-gradle/.gradle/
+/jb/project/java-gradle/.gradle/
+/build/
+/dist/
+/.idea/
+nbproject/private/
+/webrev
+/.src-rev
+/.jib/
+.DS_Store
+.metadata/
+.recommenders/
+test/nashorn/script/external
+test/nashorn/lib
+NashornProfile.txt
+**/JTreport/**
+**/JTwork/**

.hgtags

@@ -542,3 +542,59 @@ c9865fee1a6d39a7bd2a5313f54c812d9a0852f5 jdk-11.0.3+5
 8e139b8b4f62c0a1c4b13fa216f6fd975df81c1c jdk-11.0.3+6
 175eb80c253addb5b49a91c53daa7e204f124581 jdk-11.0.3+7
 175eb80c253addb5b49a91c53daa7e204f124581 jdk-11.0.3-ga
+b3f7a4c524f2e37a8068ca797859df86d9865aad jdk-11.0.4+1
+3b9194001c2eebea3109777c2b308cd784a5dcc7 jdk-11.0.4+2
+3b6fc7cd594608b7125eb0b75bdc05132e7b5f39 jdk-11.0.4+3
+e442b78d7687744475676724bd27b1d52f096d38 jdk-11.0.4+4
+371ce104ac19a12012dfe3749240b0309bfc86ee jdk-11.0.4+5
+9ab8738bf30663e01924f40e04d6d04751271b77 jdk-11.0.4+6
+640251cdca0577fd8aa4a51ddb7c71c3b874033c jdk-11.0.4+7
+ce601e800f56af59edfda40e19a92a8d3121a1cd jdk-11.0.4+8
+26958299a5f8012736b99782c835ec685e18dd43 jdk-11.0.4+9
+3f5829d9d7629ba3893456e20731949a570cc277 jdk-11.0.4+10
+6a4d57474e1c971cccf4165b3d9d023928510010 jdk-11.0.4+11
+6a4d57474e1c971cccf4165b3d9d023928510010 jdk-11.0.4-ga
+3ba9c532128b1feccf59ab8ce812b1fce2b6f681 jdk-11.0.5+1
+b249a2a2034e3392c647c61d401a41ac7237d635 jdk-11.0.5+2
+d84dae4fba034adc749e3f28fc444b3d95b8f670 jdk-11.0.5+3
+315e873712092d48fbfa23885bdf2c6fd654c1ab jdk-11.0.5+4
+d43c5ab1a337b94fffee1cab871543da06f8113c jdk-11.0.5+5
+deaef57bf366fdab908b97a9760d0fa6e273abcd jdk-11.0.5+6
+046604d257d7bc698ee213d70af09793f5008ff1 jdk-11.0.5+7
+2c29e9b3a2856350d55a188635c36c5b23c1c9e3 jdk-11.0.5+8
+ee7128cf507a670ae84841b202a7a06711608359 jdk-11.0.5+9
+6385eb06af947d8ec5fd51a4733bc8187efb88b5 jdk-11.0.5+10
+6385eb06af947d8ec5fd51a4733bc8187efb88b5 jdk-11.0.5-ga
+6eb89e59a06a2f83f7fe0399da4bf4ca638d46f3 jdk-11.0.6+1
+8d3e0c2c009815cae59ad3c9bf9e4b1f090efc8b jdk-11.0.6+2
+f8b2e95a1d41585a757729ed28ce35d43aba1b3f jdk-11.0.6+3
+577a1fc440666e3c0724e07f6a8d736b2c7905cf jdk-11.0.6+4
+bfce7426e091127450a70b7d07941c0f9e02d347 jdk-11.0.6+5
+aa260c24480a2bd7d21ad1c863e6fe9a3973011e jdk-11.0.6+6
+42500af9232ed5b2990ff618a1e92ef6ccc0b9af jdk-11.0.6+7
+0c54fb645a7388cb7e3d587b4df75a2edd7826e2 jdk-11.0.6+8
+1859de77ee6cd7e10ac0b9e71027d9f974a6e481 jdk-11.0.6+9
+837b7afec083aaddeef0a6c3e6501b2200eaf1d4 jdk-11.0.6+10
+837b7afec083aaddeef0a6c3e6501b2200eaf1d4 jdk-11.0.6-ga
+8cdfd6139b1efc9064b10f24a82848b1bb4a0550 jdk-11.0.7+1
+15cc1c8a63718c394e9cd1f35d735bb74a850084 jdk-11.0.7+2
+f2d8162261ae3c1e50eb0667b3c9669caa67c652 jdk-11.0.7+3
+d3d1f7f67de13fd5c227424b9ddc514c0ca32aff jdk-11.0.7+4
+f03574cfc0d728ca7b5146ca22c707717f9f899f jdk-11.0.7+5
+17d2e0c27889a00a3df7de9bcea0e8caf0d1771a jdk-11.0.7+6
+f56b853d452bd339e3f4360cf4be42cc90f9284c jdk-11.0.7+7
+3c570d183ab2afc0b204a8e980be69e7fbe761ef jdk-11.0.7+8
+7201cd0c64776aa574d252b03a4c92b25d0a7d7f jdk-11.0.7+9
+44ce940b344b9f240be4807f5b8f06e178e3aecd jdk-11.0.7+10
+44ce940b344b9f240be4807f5b8f06e178e3aecd jdk-11.0.7-ga
+2eb415c82056bdc308d23ee6761f422de46dc5e5 jdk-11.0.8+1
+88eaa453331e9aeca979d58509538ebb74831ce4 jdk-11.0.8+2
+2c0c9cfe2a4e1340f7db106e2220dbd0d5b86092 jdk-11.0.8+3
+aa6c93b4f1acf4166d74d0252b35c53ad71d8540 jdk-11.0.8+4
+8df1a601187c0b4cb9e525075bd7b85ee3d72595 jdk-11.0.8+5
+e42c6d1a1993c720a4643140190bb1ba6f1bbf9f jdk-11.0.8+6
+46d4984bb3c6dd1b0f5135505b77921d23c69841 jdk-11.0.8+7
+40b646e9d8fbb2d70992b61e4f4b08ca5652c907 jdk-11.0.8+8
+59f8565ee5e224697a9e09ee2c557836733bc579 jdk-11.0.8+9
+0b0d55cb09b29360ab254edeef32a3b386e9713e jdk-11.0.8+10
+0b0d55cb09b29360ab254edeef32a3b386e9713e jdk-11.0.8-ga

README.md

@@ -4,7 +4,7 @@
 
 |Windows-x64  |macOS        |Linux-x64    |
 |-------------|-------------|-------------|
-|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-windows-x64/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-windows-x64/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-osx-x64/_latestVersion"> <img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-osx-x64/images/download.svg"/></a>|<a href="https://bintray.com/jetbrains/intellij-jdk/openjdk9-linux-x64/_latestVersion"><img src="https://api.bintray.com/packages/jetbrains/intellij-jdk/openjdk9-linux-x64/images/download.svg"/></a>|
+|[ ![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
@@ -26,6 +26,10 @@ 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
@@ -43,7 +47,7 @@ $ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
 
 ## Linux (Ubuntu 18.10 desktop)
 ```
-$ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev install libcups2-dev libfontconfig1-dev libasound2-dev 
+$ 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
@@ -51,10 +55,40 @@ $ make images
 ```
 
 ## Windows
-#### TBD
+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
-#### TBD
+
+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

@@ -277,7 +277,7 @@
 </tr>
 <tr class="even">
 <td style="text-align: left;">Windows</td>
-<td style="text-align: left;">Microsoft Visual Studio 2017 update 15.5.5</td>
+<td style="text-align: left;">Microsoft Visual Studio 2017 update 15.9.16</td>
 </tr>
 </tbody>
 </table>
@@ -369,10 +369,10 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <p>On Linux you can also get a JDK from the Linux distribution. On apt-based distros (like Debian and Ubuntu), <code>sudo apt-get install openjdk-&lt;VERSION&gt;-jdk</code> is typically enough to install a JDK &lt;VERSION&gt;. On rpm-based distros (like Fedora and Red Hat), try <code>sudo yum install java-&lt;VERSION&gt;-openjdk-devel</code>.</p>
 <h2 id="external-library-requirements">External Library Requirements</h2>
 <p>Different platforms require different external libraries. In general, libraries are not optional - that is, they are either required or not used.</p>
-<p>If a required library is not detected by <code>configure</code>, you need to provide the path to it. There are two forms of the <code>configure</code> arguments to point to an external library: <code>--with-&lt;LIB&gt;=&lt;path&gt;</code> or <code>--with-&lt;LIB&gt;-include=&lt;path to include&gt; --with-&lt;LIB&gt;-lib=&lt;path to lib&gt;</code>. The first variant is more concise, but require the include files an library files to reside in a default hierarchy under this directory. In most cases, it works fine.</p>
+<p>If a required library is not detected by <code>configure</code>, you need to provide the path to it. There are two forms of the <code>configure</code> arguments to point to an external library: <code>--with-&lt;LIB&gt;=&lt;path&gt;</code> or <code>--with-&lt;LIB&gt;-include=&lt;path to include&gt; --with-&lt;LIB&gt;-lib=&lt;path to lib&gt;</code>. The first variant is more concise, but require the include files and library files to reside in a default hierarchy under this directory. In most cases, it works fine.</p>
 <p>As a fallback, the second version allows you to point to the include directory and the lib directory separately.</p>
 <h3 id="freetype">FreeType</h3>
-<p>FreeType2 from <a href="http://www.freetype.org/">The FreeType Project</a> is not required on any platform. The exception is on Unix-based platforms when configuring such that the build artifacts will reference a system installed library, rather than bundling the JDK’s own copy.</p>
+<p>FreeType2 from <a href="http://www.freetype.org/">The FreeType Project</a> is not required on any platform. The exception is on Unix-based platforms when configuring such that the build artifacts will reference a system installed library, rather than bundling the JDK's own copy.</p>
 <ul>
 <li>To install on an apt-based Linux, try running <code>sudo apt-get install libfreetype6-dev</code>.</li>
 <li>To install on an rpm-based Linux, try running <code>sudo yum install freetype-devel</code>.</li>
@@ -433,7 +433,7 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <p>To build the JDK, you need a &quot;configuration&quot;, which consists of a directory where to store the build output, coupled with information about the platform, the specific build machine, and choices that affect how the JDK is built.</p>
 <p>The configuration is created by the <code>configure</code> script. The basic invocation of the <code>configure</code> script looks like this:</p>
 <pre><code>bash configure [options]</code></pre>
-<p>This will create an output directory containing the configuration and setup an area for the build result. This directory typically looks like <code>build/linux-x64-normal-server-release</code>, but the actual name depends on your specific configuration. (It can also be set directly, see <a href="#using-multiple-configurations">Using Multiple Configurations</a>). This directory is referred to as <code>$BUILD</code> in this documentation.</p>
+<p>This will create an output directory containing the configuration and setup an area for the build result. This directory typically looks like <code>build/linux-x64-server-release</code>, but the actual name depends on your specific configuration. (It can also be set directly, see <a href="#using-multiple-configurations">Using Multiple Configurations</a>). This directory is referred to as <code>$BUILD</code> in this documentation.</p>
 <p><code>configure</code> will try to figure out what system you are running on and where all necessary build components are. If you have all prerequisites for building installed, it should find everything. If it fails to detect any component automatically, it will exit and inform you about the problem.</p>
 <p>Some command line examples:</p>
 <ul>

doc/building.md

@@ -293,7 +293,7 @@ issues.
  Linux              gcc 7.3.0
  macOS              Apple Xcode 9.4 (using clang 9.1.0)
  Solaris            Oracle Solaris Studio 12.4 (with compiler version 5.13)
- Windows            Microsoft Visual Studio 2017 update 15.5.5
+ Windows            Microsoft Visual Studio 2017 update 15.9.16
 
 ### gcc
 
@@ -436,8 +436,8 @@ If a required library is not detected by `configure`, you need to provide the
 path to it. There are two forms of the `configure` arguments to point to an
 external library: `--with-<LIB>=<path>` or `--with-<LIB>-include=<path to
 include> --with-<LIB>-lib=<path to lib>`. The first variant is more concise,
-but require the include files an library files to reside in a default hierarchy
-under this directory. In most cases, it works fine.
+but require the include files and library files to reside in a default
+hierarchy under this directory. In most cases, it works fine.
 
 As a fallback, the second version allows you to point to the include directory
 and the lib directory separately.
@@ -447,7 +447,7 @@ and the lib directory separately.
 FreeType2 from [The FreeType Project](http://www.freetype.org/) is not required
 on any platform. The exception is on Unix-based platforms when configuring such
 that the build artifacts will reference a system installed library,
-rather than bundling the JDK’s own copy.
+rather than bundling the JDK's own copy.
 
   * To install on an apt-based Linux, try running `sudo apt-get install
     libfreetype6-dev`.
@@ -586,8 +586,8 @@ bash configure [options]
 
 This will create an output directory containing the configuration and setup an
 area for the build result. This directory typically looks like
-`build/linux-x64-normal-server-release`, but the actual name depends on your
-specific configuration. (It can also be set directly, see [Using Multiple
+`build/linux-x64-server-release`, but the actual name depends on your specific
+configuration. (It can also be set directly, see [Using Multiple
 Configurations](#using-multiple-configurations)). This directory is referred to
 as `$BUILD` in this documentation.
 

doc/ide.html

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
+<head>
+  <meta charset="utf-8" />
+  <meta name="generator" content="pandoc" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+  <title>IDE support in the JDK</title>
+  <style type="text/css">
+      code{white-space: pre-wrap;}
+      span.smallcaps{font-variant: small-caps;}
+      span.underline{text-decoration: underline;}
+      div.column{display: inline-block; vertical-align: top; width: 50%;}
+  </style>
+  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
+  <!--[if lt IE 9]>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
+  <![endif]-->
+</head>
+<body>
+<header id="title-block-header">
+<h1 class="title">IDE support in the JDK</h1>
+</header>
+<nav id="TOC">
+<ul>
+<li><a href="#introduction">Introduction</a><ul>
+<li><a href="#ide-support-for-native-code">IDE support for native code</a></li>
+<li><a href="#ide-support-for-java-code">IDE support for Java code</a></li>
+</ul></li>
+</ul>
+</nav>
+<h2 id="introduction">Introduction</h2>
+<p>When you are familiar with building and testing the JDK, you may want to configure an IDE to work with the source code. The instructions differ a bit depending on whether you are interested in working with the native (C/C++) or the Java code.</p>
+<h3 id="ide-support-for-native-code">IDE support for native code</h3>
+<p>There are a few ways to generate IDE configuration for the native sources, depending on which IDE to use.</p>
+<h4 id="visual-studio-code">Visual Studio Code</h4>
+<p>The make system can generate a <a href="https://code.visualstudio.com">Visual Studio Code</a> workspace that has C/C++ source indexing configured correctly, as well as launcher targets for tests and the Java launcher. After configuring, a workspace for the configuration can be generated using:</p>
+<pre class="shell"><code>make vscode-project</code></pre>
+<p>This creates a file called <code>jdk.code-workspace</code> in the build output folder. The full location will be printed after the workspace has been generated. To use it, choose <code>File -&gt; Open Workspace...</code> in Visual Studio Code.</p>
+<h5 id="alternative-indexers">Alternative indexers</h5>
+<p>The main <code>vscode-project</code> target configures the default C++ support in Visual Studio Code. There are also other source indexers that can be installed, that may provide additional features. It's currently possible to generate configuration for two such indexers, <a href="https://clang.llvm.org/extra/clangd/">clangd</a> and <a href="https://github.com/Andersbakken/rtags">rtags</a>. These can be configured by appending the name of the indexer to the make target, such as:</p>
+<pre class="shell"><code>make vscode-project-clangd</code></pre>
+<p>Additional instructions for configuring the given indexer will be displayed after the workspace has been generated.</p>
+<h4 id="visual-studio">Visual Studio</h4>
+<p>This section is a work in progress.</p>
+<pre class="shell"><code>make ide-project</code></pre>
+<h4 id="compilation-database">Compilation Database</h4>
+<p>The make system can generate generic native code indexing support in the form of a <a href="https://clang.llvm.org/docs/JSONCompilationDatabase.html">Compilation Database</a> that can be used by many different IDEs and source code indexers.</p>
+<pre class="shell"><code>make compile-commands</code></pre>
+<p>It's also possible to generate the Compilation Database for the HotSpot source code only, which is a bit faster as it includes less information.</p>
+<pre class="shell"><code>make compile-commands-hotspot</code></pre>
+<h3 id="ide-support-for-java-code">IDE support for Java code</h3>
+<p>This section is a work in progress.</p>
+</body>
+</html>

doc/ide.md

@@ -0,0 +1,73 @@
+% IDE support in the JDK
+
+## Introduction
+
+When you are familiar with building and testing the JDK, you may want to
+configure an IDE to work with the source code. The instructions differ a bit
+depending on whether you are interested in working with the native (C/C++) or
+the Java code.
+
+### IDE support for native code
+
+There are a few ways to generate IDE configuration for the native sources,
+depending on which IDE to use.
+
+#### Visual Studio Code
+
+The make system can generate a [Visual Studio Code](https://code.visualstudio.com)
+workspace that has C/C++ source indexing configured correctly, as well as
+launcher targets for tests and the Java launcher. After configuring, a workspace
+for the configuration can be generated using:
+
+```shell
+make vscode-project
+```
+
+This creates a file called `jdk.code-workspace` in the build output folder. The
+full location will be printed after the workspace has been generated. To use it,
+choose `File -> Open Workspace...` in Visual Studio Code.
+
+##### Alternative indexers
+
+The main `vscode-project` target configures the default C++ support in Visual
+Studio Code. There are also other source indexers that can be installed, that
+may provide additional features. It's currently possible to generate
+configuration for two such indexers, [clangd](https://clang.llvm.org/extra/clangd/)
+and [rtags](https://github.com/Andersbakken/rtags). These can be configured by
+appending the name of the indexer to the make target, such as:
+
+```shell
+make vscode-project-clangd
+```
+
+Additional instructions for configuring the given indexer will be displayed
+after the workspace has been generated.
+
+#### Visual Studio
+
+This section is a work in progress.
+
+```shell
+make ide-project
+```
+
+#### Compilation Database
+
+The make system can generate generic native code indexing support in the form of
+a [Compilation Database](https://clang.llvm.org/docs/JSONCompilationDatabase.html)
+that can be used by many different IDEs and source code indexers.
+
+```shell
+make compile-commands
+```
+
+It's also possible to generate the Compilation Database for the HotSpot source
+code only, which is a bit faster as it includes less information.
+
+```shell
+make compile-commands-hotspot
+```
+
+### IDE support for Java code
+
+This section is a work in progress.

doc/testing.html

@@ -11,14 +11,14 @@
       span.underline{text-decoration: underline;}
       div.column{display: inline-block; vertical-align: top; width: 50%;}
   </style>
-  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css">
+  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css" />
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
   <style type="text/css">pre, code, tt { color: #1d6ae5; }</style>
 </head>
 <body>
-<header>
+<header id="title-block-header">
 <h1 class="title">Testing the JDK</h1>
 </header>
 <nav id="TOC">
@@ -32,9 +32,14 @@
 </ul></li>
 <li><a href="#test-results-and-summary">Test results and summary</a></li>
 <li><a href="#test-suite-control">Test suite control</a><ul>
+<li><a href="#general-keywords-test_opts">General keywords (TEST_OPTS)</a></li>
 <li><a href="#jtreg-keywords">JTReg keywords</a></li>
 <li><a href="#gtest-keywords">Gtest keywords</a></li>
 </ul></li>
+<li><a href="#notes-for-specific-tests">Notes for Specific Tests</a><ul>
+<li><a href="#docker-tests">Docker Tests</a></li>
+<li><a href="#client-ui-tests">Client UI Tests</a></li>
+</ul></li>
 </ul>
 </nav>
 <h2 id="using-the-run-test-framework">Using the run-test framework</h2>
@@ -86,11 +91,24 @@ TEST FAILURE</code></pre>
 <p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG=&quot;...;...&quot;</code>. This will also make sure spaces are preserved, as in <code>JTREG=&quot;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;</code>.</p>
 <p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p>
 <p>As far as possible, the names of the keywords have been standardized between test suites.</p>
-<h3 id="jtreg-keywords">JTReg keywords</h3>
+<h3 id="general-keywords-test_opts">General keywords (TEST_OPTS)</h3>
+<p>Some keywords are valid across different test suites. If you want to run tests from multiple test suites, or just don’t want to care which test suite specific control variable to use, then you can use the general TEST_OPTS control variable.</p>
+<p>There are also some keywords that applies globally to the test runner system, not to any specific test suites. These are also available as TEST_OPTS keywords.</p>
 <h4 id="jobs">JOBS</h4>
+<p>Currently only applies to JTReg.</p>
+<h4 id="timeout_factor">TIMEOUT_FACTOR</h4>
+<p>Currently only applies to JTReg.</p>
+<h4 id="vm_options">VM_OPTIONS</h4>
+<p>Applies to JTReg, GTest and Micro.</p>
+<h4 id="java_options">JAVA_OPTIONS</h4>
+<p>Applies to JTReg, GTest and Micro.</p>
+<h4 id="aot_modules">AOT_MODULES</h4>
+<p>Applies to JTReg and GTest.</p>
+<h3 id="jtreg-keywords">JTReg keywords</h3>
+<h4 id="jobs-1">JOBS</h4>
 <p>The test concurrency (<code>-concurrency</code>).</p>
 <p>Defaults to TEST_JOBS (if set by <code>--with-test-jobs=</code>), otherwise it defaults to JOBS, except for Hotspot, where the default is <em>number of CPU cores/2</em>, but never more than 12.</p>
-<h4 id="timeout">TIMEOUT</h4>
+<h4 id="timeout_factor-1">TIMEOUT_FACTOR</h4>
 <p>The timeout factor (<code>-timeoutFactor</code>).</p>
 <p>Defaults to 4.</p>
 <h4 id="test_mode">TEST_MODE</h4>
@@ -109,13 +127,21 @@ TEST FAILURE</code></pre>
 <p>Limit memory consumption (<code>-Xmx</code> and <code>-vmoption:-Xmx</code>, or none).</p>
 <p>Limit memory consumption for JTReg test framework and VM under test. Set to 0 to disable the limits.</p>
 <p>Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).</p>
+<h4 id="keywords">KEYWORDS</h4>
+<p>JTReg kewords sent to JTReg using <code>-k</code>. Please be careful in making sure that spaces and special characters (like <code>!</code>) are properly quoted. To avoid some issues, the special value <code>%20</code> can be used instead of space.</p>
+<h4 id="extra_problem_lists">EXTRA_PROBLEM_LISTS</h4>
+<p>Use additional problem lists file or files, in addition to the default ProblemList.txt located at the JTReg test roots.</p>
+<p>If multiple file names are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p>
+<p>The file names should be either absolute, or relative to the JTReg test root of the tests to be run.</p>
 <h4 id="options">OPTIONS</h4>
 <p>Additional options to the JTReg test framework.</p>
 <p>Use <code>JTREG=&quot;OPTIONS=--help all&quot;</code> to see all available JTReg options.</p>
-<h4 id="java_options">JAVA_OPTIONS</h4>
+<h4 id="java_options-1">JAVA_OPTIONS</h4>
 <p>Additional Java options to JTReg (<code>-javaoption</code>).</p>
-<h4 id="vm_options">VM_OPTIONS</h4>
+<h4 id="vm_options-1">VM_OPTIONS</h4>
 <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>
 <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>
@@ -123,5 +149,23 @@ TEST FAILURE</code></pre>
 <h4 id="options-1">OPTIONS</h4>
 <p>Additional options to the Gtest test framework.</p>
 <p>Use <code>GTEST=&quot;OPTIONS=--help&quot;</code> to see all available Gtest options.</p>
+<h4 id="aot_modules-2">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>
+<h2 id="notes-for-specific-tests">Notes for Specific Tests</h2>
+<h3 id="docker-tests">Docker Tests</h3>
+<p>Docker tests with default parameters may fail on systems with glibc versions not compatible with the one used in the default docker image (e.g., Oracle Linux 7.6 for x86). For example, they pass on Ubuntu 16.04 but fail on Ubuntu 18.04 if run like this on x86:</p>
+<pre><code>$ make run-test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot;</code></pre>
+<p>To run these tests correctly, additional parameters for the correct docker image are required on Ubuntu 18.04 by using <code>JAVA_OPTIONS</code>.</p>
+<pre><code>$ make run-test TEST=&quot;jtreg:test/hotspot/jtreg/containers/docker&quot; JTREG=&quot;JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest&quot;</code></pre>
+<h3 id="client-ui-tests">Client UI Tests</h3>
+<p>Some Client UI tests use key sequences which may be reserved by the operating system. Usually that causes the test failure. So it is highly recommended to disable system key shortcuts prior testing. The steps to access and disable system key shortcuts for various platforms are provided below.</p>
+<h4 id="macos">MacOS</h4>
+<p>Choose Apple menu; System Preferences, click Keyboard, then click Shortcuts; select or deselect desired shortcut.</p>
+<p>For example, test/jdk/javax/swing/TooltipManager/JMenuItemToolTipKeyBindingsTest/JMenuItemToolTipKeyBindingsTest.java fails on MacOS because it uses <code>CTRL + F1</code> key sequence to show or hide tooltip message but the key combination is reserved by the operating system. To run the test correctly the default global key shortcut should be disabled using the steps described above, and then deselect “Turn keyboard access on or off” option which is responsible for <code>CTRL + F1</code> combination.</p>
+<h4 id="linux">Linux</h4>
+<p>Open the Activities overview and start typing Settings; Choose Settings, click Devices, then click Keyboard; set or override desired shortcut.</p>
+<h4 id="windows">Windows</h4>
+<p>Type <code>gpedit</code> in the Search and then click Edit group policy; navigate to User Configuration -&gt; Administrative Templates -&gt; Windows Components -&gt; File Explorer; in the right-side pane look for “Turn off Windows key hotkeys” and double click on it; enable or disable hotkeys.</p>
+<p>Note: restart is required to make the settings take effect.</p>
 </body>
 </html>

doc/testing.md

@@ -162,6 +162,35 @@ proper quoting of command line arguments through.)
 As far as possible, the names of the keywords have been standardized between
 test suites.
 
+### General keywords (TEST_OPTS)
+
+Some keywords are valid across different test suites. If you want to run
+tests from multiple test suites, or just don't want to care which test suite specific
+control variable to use, then you can use the general TEST_OPTS control variable.
+
+There are also some keywords that applies globally to the test runner system,
+not to any specific test suites. These are also available as TEST_OPTS keywords.
+
+#### JOBS
+
+Currently only applies to JTReg.
+
+#### TIMEOUT_FACTOR
+
+Currently only applies to JTReg.
+
+#### VM_OPTIONS
+
+Applies to JTReg, GTest and Micro.
+
+#### JAVA_OPTIONS
+
+Applies to JTReg, GTest and Micro.
+
+#### AOT_MODULES
+
+Applies to JTReg and GTest.
+
 ### JTReg keywords
 
 #### JOBS
@@ -171,7 +200,7 @@ Defaults to TEST_JOBS (if set by `--with-test-jobs=`), otherwise it defaults to
 JOBS, except for Hotspot, where the default is *number of CPU cores/2*, but
 never more than 12.
 
-#### TIMEOUT
+#### TIMEOUT_FACTOR
 The timeout factor (`-timeoutFactor`).
 
 Defaults to 4.
@@ -205,6 +234,24 @@ to disable the limits.
 
 Defaults to 512m, except for hotspot, where it defaults to 0 (no limit).
 
+#### KEYWORDS
+
+JTReg kewords sent to JTReg using `-k`. Please be careful in making sure that
+spaces and special characters (like `!`) are properly quoted. To avoid some
+issues, the special value `%20` can be used instead of space.
+
+#### EXTRA_PROBLEM_LISTS
+
+Use additional problem lists file or files, in addition to the default
+ProblemList.txt located at the JTReg test roots.
+
+If multiple file names are specified, they should be separated by space (or, to
+help avoid quoting issues, the special value `%20`).
+
+The file names should be either absolute, or relative to the JTReg test root of
+the tests to be run.
+
+
 #### OPTIONS
 Additional options to the JTReg test framework.
 
@@ -216,6 +263,12 @@ Additional Java options to JTReg (`-javaoption`).
 #### VM_OPTIONS
 Additional VM options to JTReg (`-vmoption`).
 
+#### AOT_MODULES
+
+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`).
+
 ### Gtest keywords
 
 #### REPEAT
@@ -230,6 +283,56 @@ Additional options to the Gtest test framework.
 
 Use `GTEST="OPTIONS=--help"` to see all available Gtest options.
 
+#### AOT_MODULES
+
+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`).
+
+## Notes for Specific Tests
+
+### Docker Tests
+
+Docker tests with default parameters may fail on systems with glibc versions not
+compatible with the one used in the default docker image (e.g., Oracle Linux 7.6 for x86).
+For example, they pass on Ubuntu 16.04 but fail on Ubuntu 18.04 if run like this on x86:
+
+    $ make run-test TEST="jtreg:test/hotspot/jtreg/containers/docker"
+
+To run these tests correctly, additional parameters for the correct docker image are
+required on Ubuntu 18.04 by using `JAVA_OPTIONS`.
+
+    $ make run-test TEST="jtreg:test/hotspot/jtreg/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest"
+
+### Client UI Tests
+
+Some Client UI tests use key sequences which may be reserved by the operating
+system. Usually that causes the test failure. So it is highly recommended to disable
+system key shortcuts prior testing. The steps to access and disable system key shortcuts
+for various platforms are provided below.
+
+#### MacOS
+Choose Apple menu; System Preferences, click Keyboard, then click Shortcuts;
+select or deselect desired shortcut.
+
+For example, test/jdk/javax/swing/TooltipManager/JMenuItemToolTipKeyBindingsTest/JMenuItemToolTipKeyBindingsTest.java fails
+on MacOS because it uses `CTRL + F1` key sequence to show or hide tooltip message
+but the key combination is reserved by the operating system. To run the test correctly
+the default global key shortcut should be disabled using the steps described above, and then deselect
+"Turn keyboard access on or off" option which is responsible for `CTRL + F1` combination.
+
+#### Linux
+Open the Activities overview and start typing Settings; Choose Settings, click Devices,
+then click Keyboard; set or override desired shortcut.
+
+#### Windows
+Type `gpedit` in the Search and then click Edit group policy; navigate to
+User Configuration -> Administrative Templates -> Windows Components -> File Explorer;
+in the right-side pane look for "Turn off Windows key hotkeys" and double click on it;
+enable or disable hotkeys.
+
+Note: restart is required to make the settings take effect.
+
 ---
 # Override some definitions in the global css file that are not optimal for
 # this document.

jb/project/docker/Dockerfile

@@ -1,9 +1,13 @@
+# jetbrains/runtime:jbr11dev8env
 FROM centos:7
-
-RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool gcc gcc-c++ libstdc++-devel alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel
-
+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 --no-check-certificate -q --no-cookies --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/11.0.1+13/90cf5d8f270a4347a95050320eef3fb7/jdk-11.0.1_linux-x64_bin.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 /jdk-11.0.1
-ENV PATH $JAVA_HOME/bin:$PATH
+ENV JAVA_HOME /jbrsdk
+ENV PATH $JAVA_HOME/bin:/opt/rh/devtoolset-8/root/usr/bin:$PATH
+RUN mkdir .git
+RUN git config user.email "builduser@jetbrains.com"
+RUN git config user.name "builduser"

jb/project/docker/Dockerfile.x86

@@ -0,0 +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

jb/project/hotspot-cmake/CMakeLists.txt

@@ -495,7 +495,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/cpu/aarch64/vtableStubs_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/relocInfo_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/vm_version_aarch64.hpp
-../../../src/hotspot/cpu/aarch64/cpustate_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/immediate_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/vmreg_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp
@@ -520,7 +519,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/templateTable_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/vmStructs_aarch64.hpp
-../../../src/hotspot/cpu/aarch64/decode_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/nativeInst_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/codeBuffer_aarch64.hpp
@@ -529,7 +527,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/cpu/aarch64/assembler_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/register_aarch64.cpp
 ../../../src/hotspot/cpu/aarch64/vm_version_ext_aarch64.cpp
-../../../src/hotspot/cpu/aarch64/aarch64_call.cpp
 ../../../src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/bytecodes_aarch64.hpp
 ../../../src/hotspot/cpu/aarch64/c1_MacroAssembler_aarch64.hpp
@@ -1175,13 +1172,11 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/jfr/recorder/stringpool/jfrStringPoolBuffer.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.hpp
-../../../src/hotspot/share/jfr/recorder/repository/jfrChunkSizeNotifier.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkState.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkState.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrRepository.hpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrChunkWriter.hpp
-../../../src/hotspot/share/jfr/recorder/repository/jfrChunkSizeNotifier.cpp
 ../../../src/hotspot/share/jfr/recorder/repository/jfrEmergencyDump.cpp
 ../../../src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointBlob.hpp
 ../../../src/hotspot/share/jfr/recorder/checkpoint/jfrCheckpointWriter.cpp
@@ -1254,7 +1249,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/jfr/leakprofiler/checkpoint/objectSampleDescription.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/leakProfiler.hpp
-../../../src/hotspot/share/jfr/leakprofiler/emitEventOperation.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/sampling/objectSample.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/sampling/objectSampler.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/sampling/sampleList.cpp
@@ -1270,7 +1264,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/jfr/leakprofiler/utilities/rootType.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/utilities/unifiedOop.hpp
 ../../../src/hotspot/share/jfr/leakprofiler/startOperation.hpp
-../../../src/hotspot/share/jfr/leakprofiler/emitEventOperation.cpp
 ../../../src/hotspot/share/jfr/leakprofiler/chains/edgeUtils.cpp
 ../../../src/hotspot/share/jfr/leakprofiler/chains/rootSetClosure.cpp
 ../../../src/hotspot/share/jfr/leakprofiler/chains/edge.hpp
@@ -1481,7 +1474,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/runtime/basicLock.hpp
 ../../../src/hotspot/share/runtime/compilationPolicy.cpp
 ../../../src/hotspot/share/runtime/java.hpp
-../../../src/hotspot/share/runtime/simpleThresholdPolicy.cpp
 ../../../src/hotspot/share/runtime/objectMonitor.inline.hpp
 ../../../src/hotspot/share/runtime/mutexLocker.cpp
 ../../../src/hotspot/share/runtime/serviceThread.cpp
@@ -1524,7 +1516,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/runtime/compilationPolicy.hpp
 ../../../src/hotspot/share/runtime/basicLock.cpp
 ../../../src/hotspot/share/runtime/java.cpp
-../../../src/hotspot/share/runtime/simpleThresholdPolicy.hpp
 ../../../src/hotspot/share/runtime/perfData.inline.hpp
 ../../../src/hotspot/share/runtime/statSampler.hpp
 ../../../src/hotspot/share/runtime/vm_operations.cpp
@@ -1557,7 +1548,6 @@ set(SOURCE_FILES
 ../../../src/hotspot/share/runtime/handshake.hpp
 ../../../src/hotspot/share/runtime/thread.inline.hpp
 ../../../src/hotspot/share/runtime/perfMemory.hpp
-../../../src/hotspot/share/runtime/simpleThresholdPolicy.inline.hpp
 ../../../src/hotspot/share/runtime/javaCalls.cpp
 ../../../src/hotspot/share/runtime/reflection.cpp
 ../../../src/hotspot/share/runtime/icache.cpp

jb/project/java-common.cmake

@@ -2,6 +2,7 @@
 set(CMAKE_CXX_STANDARD 98)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE -D_REENTRANT -DVM_LITTLE_ENDIAN -D_LP64 -DTARGET_ARCH_x86 ")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DINCLUDE_SUFFIX_CPU=_x86 -DAMD64 -DHOTSPOT_LIB_ARCH='amd64' -DCOMPILER1 -DCOMPILER2")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFT2_BUILD_LIBRARY")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTARGET_COMPILER_gcc")
@@ -16,15 +17,55 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_ALLBSD_SOURCE -DTARGET_OS_FAMILY_bsd")
 endif ()
 
-if ("${CMAKE_SYSTEM_NAME}" MATCHES "CYGWIN") #not shure about TARGET_COMPILER
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "CYGWIN") #not sure about TARGET_COMPILER
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTARGET_COMPILER_visCPP -DWIN64 -D_WINDOWS -DTARGET_OS_FAMILY_windows")
 endif ()
 
 add_custom_target(configure
-        COMMAND bash configure
+        COMMAND bash configure --disable-warnings-as-errors
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../)
 
-add_custom_target(build_images
-        COMMAND make COMPILER_WARNINGS_FATAL=false images
+add_custom_target(configure_debug
+        COMMAND bash configure --disable-warnings-as-errors --enable-debug
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../)
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  set(JDK_RELEASE_TARGET "linux-x86_64-normal-server-release")
+  set(JDK_DEBUG_TARGET "linux-x86_64-normal-server-fastdebug")
+endif ()
+
+if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    set(JDK_RELEASE_TARGET "macosx-x86_64-normal-server-release")
+    set(JDK_DEBUG_TARGET "macosx-x86_64-normal-server-fastdebug")
+    add_compile_definitions(MACOSX)
+endif ()
+
+add_custom_target(build
+        COMMAND make CONF=${JDK_RELEASE_TARGET}
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
-        DEPENDS ${SOURCE_FILES})
+        DEPENDS ${SOURCE_FILES})
+
+add_custom_target(build_images
+        COMMAND make images CONF=${JDK_RELEASE_TARGET}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
+        DEPENDS ${SOURCE_FILES})
+
+add_custom_target(build_debug
+        COMMAND make CONF=${JDK_DEBUG_TARGET}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
+        DEPENDS ${SOURCE_FILES})
+
+add_custom_target(build_images_debug
+        COMMAND make images CONF=${JDK_DEBUG_TARGET}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
+        DEPENDS ${SOURCE_FILES})
+
+add_custom_target(make_clean
+        COMMAND make clean CONF=${JDK_RELEASE_TARGET}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
+        DEPENDS ${SOURCE_FILES})
+
+add_custom_target(make_clean_debug
+        COMMAND make clean CONF=${JDK_DEBUG_TARGET}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../
+        DEPENDS ${SOURCE_FILES})

jb/project/java-gradle/build.gradle

@@ -10,7 +10,7 @@ def test_jvm = {
         file(jbsdkhome + (OperatingSystem.current().isWindows()?"/bin/java.exe" : "/bin/java")).absolutePath
     } else {
         if (OperatingSystem.current().isMacOsX()) {
-            file('../../../build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-11.0.3.jdk/Contents/Home/bin/java').absolutePath
+            file('../../../build/macosx-x86_64-normal-server-release/images/jdk-bundle/jdk-11.0.4.jdk/Contents/Home/bin/java').absolutePath
         } else if (OperatingSystem.current().isLinux()) {
             file('../../../build/linux-x86_64-normal-server-release/images/jdk/bin/java').absolutePath
         } else {

jb/project/jdk-cmake/.gitignore

@@ -0,0 +1,2 @@
+.idea
+cmake-build-*

jb/project/jdk-cmake/CMakeLists.txt

@@ -6,6 +6,7 @@ include(../java-common.cmake)
 include_directories(
         ../../../src/java.base/share/native/include
         ../../../src/java.base/share/native/libjava
+        ../../../src/java.base/share/native/libzip/zlib
         ../../../src/java.desktop/share/native/common
         ../../../src/java.desktop/share/native/common/awt/debug
         ../../../src/java.desktop/share/native/common/font
@@ -58,6 +59,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/common/font
             ../../../src/java.desktop/unix/native/common/java2d/opengl
             ../../../src/java.desktop/unix/native/common/java2d/opengl/J2D_GL
+            ../../../src/java.desktop/unix/native/common/java2d/x11
             ../../../src/java.desktop/unix/native/common
             ../../../src/java.desktop/unix/native/include
             ../../../src/java.desktop/unix/native/libawt/java2d
@@ -192,16 +194,19 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/fttypes.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftparams.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftmm.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/config
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftstdlib.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftheader.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftconfig.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftoption.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config/ftmodule.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftcolor.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftmodapi.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/fttrigon.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftbbox.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftgzip.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftdriver.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/sfnt.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/internal.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftdrv.h
@@ -216,13 +221,13 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/tttypes.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftvalid.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftobjs.h
-        ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpic.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/fttrace.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftmemory.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/fthash.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftgloadr.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftpsprop.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/ftserv.h
+        ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svprop.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svmm.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services/svcfftl.h
@@ -272,6 +277,8 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftbdf.h
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/ftrender.h
         ../../../src/java.desktop/share/native/libfreetype/include/ft2build.h
+        ../../../src/java.desktop/share/native/libfreetype/src
+        ../../../src/java.desktop/share/native/libfreetype/src/type1
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1objs.c
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1load.h
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1afm.h
@@ -286,40 +293,42 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1driver.c
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1parse.c
         ../../../src/java.desktop/share/native/libfreetype/src/type1/t1gload.h
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.h
-        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfntpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.c
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttload.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcmapc.h
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttkern.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttpost.c
-        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfntpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfobjs.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcmap.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttmtx.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/pngshim.c
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcolr.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttsbit.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sfdriver.h
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttload.c
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt/sferrors.h
+        ../../../src/java.desktop/share/native/libfreetype/src/sfnt/ttcpal.h
+        ../../../src/java.desktop/share/native/libfreetype/src/smooth
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.c
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.h
-        ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftspic.h
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftsmerrs.h
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftgrays.h
-        ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftspic.c
         ../../../src/java.desktop/share/native/libfreetype/src/smooth/ftsmooth.c
+        ../../../src/java.desktop/share/native/libfreetype/src/cff
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffload.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffgload.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffparse.h
-        ../../../src/java.desktop/share/native/libfreetype/src/cff/cffpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffcmap.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffparse.c
@@ -327,10 +336,10 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffobjs.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffgload.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffload.c
-        ../../../src/java.desktop/share/native/libfreetype/src/cff/cffpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffdrivr.h
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cffcmap.c
         ../../../src/java.desktop/share/native/libfreetype/src/cff/cfferrs.h
+        ../../../src/java.desktop/share/native/libfreetype/src/psaux
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psarrst.h
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psstack.h
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/cffdecode.h
@@ -367,6 +376,7 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/afmparse.c
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psauxmod.h
         ../../../src/java.desktop/share/native/libfreetype/src/psaux/psread.h
+        ../../../src/java.desktop/share/native/libfreetype/src/cid
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidtoken.h
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidriver.c
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidparse.c
@@ -379,11 +389,12 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidparse.h
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/cid/cidload.h
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afindic.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afdummy.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afmodule.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afwarp.c
-        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afpic.c
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afblue.cin
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afglobal.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afcover.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afwrtsys.h
@@ -396,10 +407,10 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afranges.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afcjk.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afstyles.h
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afblue.dat
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/aferrors.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afdummy.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afindic.c
-        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afglobal.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afwarp.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afmodule.c
@@ -409,64 +420,58 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/aftypes.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afcjk.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afranges.h
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afblue.hin
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afloader.c
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/aflatin.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afangles.h
         ../../../src/java.desktop/share/native/libfreetype/src/autofit/afhints.c
+        ../../../src/java.desktop/share/native/libfreetype/src/pshinter
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.h
-        ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshmod.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshnterr.h
-        ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshrec.c
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshalgo.h
         ../../../src/java.desktop/share/native/libfreetype/src/pshinter/pshglob.c
+        ../../../src/java.desktop/share/native/libfreetype/src/truetype
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpload.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttsubpix.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/tterrors.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.h
-        ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgload.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgxvar.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpload.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttinterp.h
-        ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttdriver.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttsubpix.c
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttobjs.h
         ../../../src/java.desktop/share/native/libfreetype/src/truetype/ttgload.c
+        ../../../src/java.desktop/share/native/libfreetype/src/raster
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftmisc.h
         ../../../src/java.desktop/share/native/libfreetype/src/raster/rasterrs.h
-        ../../../src/java.desktop/share/native/libfreetype/src/raster/rastpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftrend1.h
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftraster.h
-        ../../../src/java.desktop/share/native/libfreetype/src/raster/rastpic.h
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftraster.c
         ../../../src/java.desktop/share/native/libfreetype/src/raster/ftrend1.c
+        ../../../src/java.desktop/share/native/libfreetype/src/psnames
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/psnamerr.h
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/psmodule.c
-        ../../../src/java.desktop/share/native/libfreetype/src/psnames/pspic.h
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/pstables.h
         ../../../src/java.desktop/share/native/libfreetype/src/psnames/psmodule.h
-        ../../../src/java.desktop/share/native/libfreetype/src/psnames/pspic.c
+        ../../../src/java.desktop/share/native/libfreetype/src/base
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftobjs.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftfntfmt.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftinit.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/ftapi.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftdbgmem.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/fthash.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/basepic.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/ftpic.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftbitmap.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftpsprop.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftcid.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/md5.h
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftglyph.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftgloadr.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftsystem.c
@@ -480,11 +485,9 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftsnames.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftdebug.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftmm.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/basepic.h
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftbase.h
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftfstype.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/fttrigon.c
-        ../../../src/java.desktop/share/native/libfreetype/src/base/md5.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftbbox.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftstroke.c
         ../../../src/java.desktop/share/native/libfreetype/src/base/ftgasp.c
@@ -742,38 +745,214 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libjavajpeg/jidctred.c
         ../../../src/java.desktop/share/native/libjavajpeg/jpegint.h
         ../../../src/java.desktop/share/native/libjavajpeg/jdpostct.c
+        ../../../src/java.desktop/share/native/libfontmanager
         ../../../src/java.desktop/share/native/libfontmanager/DrawGlyphList.c
         ../../../src/java.desktop/share/native/libfontmanager/HBShaper.c
         ../../../src/java.desktop/share/native/libfontmanager/scriptMapping.c
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-fdsc-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-type.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-base-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-head-table.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-win1256.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-list.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-post-macroman.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-deprecated.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-version.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-stat-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-language.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-ltag-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat.h
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-cs-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-kern.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-default.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-coretext.h
-        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff1-table.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-just-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-colr-table.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-deprecated.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff1.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-kerx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-vorg-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic-table.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-kern-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-normalize.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-common.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-serialize.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-language.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gpos-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-avar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff-common.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-fallback-shape.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff1-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-face.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-string-array.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff1.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-lcar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-hvar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsubgpos.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-atomic.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-static.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.c
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn.h
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn/ucdn_db.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-morx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff2-interp-cs.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-thai.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hhea-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-mvar-table.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-plan.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-unicode-ranges.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-warning.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hdmx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-khmer.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gdef-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-glyf-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-fallback.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-map.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff2-table.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-font.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-sbix-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-unicode-emoji-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-feat-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-object.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-gasp-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-json.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-vector.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar-machine.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic-fallback.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-debug.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-tag-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-vowel-constraints.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-iter.hh
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-blob.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-face.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-trak-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff1-interp-cs.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-hmtx-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-ankr-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-cff-interp-dict-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-map.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-common.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-input.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cbdt-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-cpal-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff2.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-utf.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hebrew.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-var-fvar-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.h
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-jstf-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-mutex.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-os2-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-face.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-layout-gsub-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-input.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cmap-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-layout-bsln-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-aat-map.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-font.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-maxp-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-buffer-deserialize-text.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-map.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-cff2.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-array.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape-plan.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shape.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-hangul.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-null.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-cff2-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset-glyf.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-set-digest.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-indic.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-open-file.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-machinery.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-myanmar.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-subset.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-color-svg-table.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-dsalgs.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-use-table.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-math.cc
         ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ft.h
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-arabic.hh
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-shape-complex-vowel-constraints.cc
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-shaper-impl.hh
         ../../../src/java.desktop/share/native/libfontmanager/glyphblitting.h
         ../../../src/java.desktop/share/native/libfontmanager/hb-jdk.h
         ../../../src/java.desktop/share/native/libfontmanager/fontconfig.h
+        ../../../src/java.desktop/share/native/libfontmanager/hb-jdk-font.cc
         ../../../src/java.desktop/share/native/libfontmanager/freetypeScaler.c
         ../../../src/java.desktop/share/native/libfontmanager/scriptMapping.h
         ../../../src/java.desktop/share/native/libfontmanager/ColorGlyphSurfaceData.c
@@ -849,7 +1028,10 @@ set(SOURCE_FILES
         ../../../src/jdk.jdwp.agent/share/native/include/jdwpTransport.h
         ../../../src/hotspot/share/include/jmm.h
         ../../../src/java.base/share/native/include/jni.h
-        ../../../src/java.base/share/native/include/jvmticmlr.h)
+        ../../../src/java.base/share/native/include/jvmticmlr.h
+        ../../../src/java.base/share/native/libzip/zlib/zutil.c
+        ../../../src/java.base/share/native/libzip/zlib/inflate.c)
+
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(SOURCE_FILES
@@ -911,7 +1093,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h
-            ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m
@@ -1149,10 +1330,8 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt/awt/awt_Mlib.c
             ../../../src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c
             ../../../src/java.desktop/unix/native/libawt/awt/initIDs.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c
+            ../../../src/java.desktop/unix/native/libawt_xawt/awt
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/randr.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/list.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c
@@ -1167,8 +1346,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/list.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h
@@ -1176,24 +1353,15 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk3_interface.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/gtk_interface.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/canvas.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h
-            ../../../src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/awt_Desktop.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/awt_Taskbar.h
-            ../../../src/java.desktop/unix/native/libawt_xawt/xawt/XWindow.c
+            ../../../src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c
             ../../../src/java.desktop/unix/native/libfontmanager/X11FontScaler.c
             ../../../src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c
             ../../../src/java.desktop/unix/native/libsplashscreen/splashscreen_config.h

jb/project/tools/common.sh

@@ -0,0 +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}"

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

@@ -0,0 +1,86 @@
+#!/bin/bash -x
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+
+source jb/project/tools/common.sh
+
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+
+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 $?
+
+JBSDK=${JBRSDK_BASE_NAME}-linux-aarch64-b${build_number}
+BASE_DIR=build/linux-aarch64-normal-server-release/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 $?
+
+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-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 $?
+
+echo Modifying release info ...
+grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${BASE_DIR}/${JBR_BUNDLE}/release
+
+echo Creating $JBR.tar.gz ...
+tar -pcf $JBR.tar -C $BASE_DIR ${JBR_BUNDLE} || exit $?
+gzip $JBR.tar || exit $?
+
+JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-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

@@ -0,0 +1,147 @@
+#!/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
+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}
+
+source jb/project/tools/common.sh
+
+function create_jbr {
+
+  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" && exit 1
+    ;;
+  esac
+  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+
+  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
+
+  if [[ "$bundle_type" == *jcef* ]] || [[ "$bundle_type" == *dcevm* ]]; then
+    cp -R $BASE_DIR/$JBR_BUNDLE $BASE_DIR/jbr
+    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 ...
+  rm -rf ${BASE_DIR}/jbr
+  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
+  tar -pcf $JBR.tar -C $BASE_DIR jbr || exit $?
+  gzip $JBR.tar || exit $?
+  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+}
+
+JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=linux-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/exclude_jfx_module.patch
+    ;;
+  "dcevm")
+    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=""
+    ;;
+esac
+
+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 $?
+
+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
+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
+
+JBR_BUNDLE=jbr_${bundle_type}
+create_jbr ${bundle_type}
+
+if [ "$bundle_type" == "jfx_jcef" ]; then
+  make test-image || exit $?
+
+  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 || 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

@@ -0,0 +1,82 @@
+#!/bin/bash -x
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+
+source jb/project/tools/common.sh
+
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+
+linux32 bash 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-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 $?
+
+JBSDK=${JBRSDK_BASE_NAME}-linux-x86-b${build_number}
+BASE_DIR=build/linux-x86-normal-server-release/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 $?
+
+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-x86-b$build_number
+grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.x86
+echo Running jlink....
+${JSDK}/bin/jlink \
+  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+  --add-modules $(xargs < modules.list.x86 | sed s/" "//g | sed s/,$//g) --output ${BASE_DIR}/${JBR_BUNDLE} || exit $?
+
+echo Modifying release info ...
+grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${BASE_DIR}/${JBR_BUNDLE}/release
+
+echo Creating $JBR.tar.gz ...
+tar -pcf $JBR.tar -C $BASE_DIR $JBR_BUNDLE || exit $?
+gzip $JBR.tar || exit $?
+
+JBRSDK_TEST=$JBRSDK_BASE_NAME-linux-test-x86-b$build_number
+echo Creating $JBRSDK_TEST.tar.gz ...
+tar -pcf $JBRSDK_TEST.tar -C $BASE_DIR --exclude='test/jdk/demos' --exclude='test/hotspot/gtest' test || exit $?
+gzip $JBRSDK_TEST.tar || exit $?

jb/project/tools/mac/scripts/entitlements.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>com.apple.security.cs.allow-jit</key>
+        <true/>
+        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+        <true/>
+        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+        <true/>
+        <key>com.apple.security.cs.disable-library-validation</key>
+        <true/>
+        <key>com.apple.security.cs.disable-executable-page-protection</key>
+        <true/>
+    </dict>
+</plist>

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

@@ -0,0 +1,153 @@
+#!/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
+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_mac}
+
+source jb/project/tools/common.sh
+
+function create_jbr {
+
+  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" && exit 1
+    ;;
+  esac
+  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+
+  JRE_CONTENTS=${BASE_DIR}/${JBR_BUNDLE}/Contents
+  JRE_HOME=${JRE_CONTENTS}/Home
+  if [ -d "${JRE_CONTENTS}" ]; then
+    rm -rf ${JRE_CONTENTS}
+  fi
+  mkdir -p ${JRE_CONTENTS}
+
+  JBR=${JBR_BASE_NAME}-osx-x64-b${build_number}
+
+  ${BASE_DIR}/$JBRSDK_BUNDLE/Contents/Home/bin/jlink \
+      --module-path ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/jmods --no-man-pages --compress=2 \
+      --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JRE_HOME}  || exit $?
+  grep -v "^JAVA_VERSION" ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Home/release | grep -v "^MODULES" >> ${JRE_HOME}/release
+  cp -R ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/MacOS ${JRE_CONTENTS}
+  cp ${BASE_DIR}/${JBRSDK_BUNDLE}/Contents/Info.plist ${JRE_CONTENTS}
+
+  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 || exit $?
+  rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+}
+
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+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/exclude_jfx_module.patch
+    ;;
+  "dcevm")
+    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=""
+    ;;
+esac
+
+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 images CONF=$RELEASE_NAME || exit $?
+
+JSDK=build/$RELEASE_NAME/images/jdk-bundle
+JBSDK=${JBRSDK_BASE_NAME}-osx-x64-b${build_number}
+
+BASE_DIR=jre
+JBRSDK_BUNDLE=jbrsdk
+
+rm -rf $BASE_DIR
+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
+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
+
+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

@@ -0,0 +1,120 @@
+#!/bin/bash
+
+APP_DIRECTORY=$1
+APPL_USER=$2
+APPL_PASSWORD=$3
+APP_NAME=$4
+BUNDLE_ID=$5
+FAKE_ROOT="${6:-fake-root}"
+
+if [[ -z "$APP_DIRECTORY" ]] || [[ -z "$APPL_USER" ]] || [[ -z "$APPL_PASSWORD" ]]; then
+  echo "Usage: $0 AppDirectory Username Password"
+  exit 1
+fi
+if [[ ! -d "$APP_DIRECTORY" ]]; then
+  echo "AppDirectory '$APP_DIRECTORY' does not exist or not a directory"
+  exit 1
+fi
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+function publish-log() {
+  id=$1
+  file=$2
+  curl -T "$file" "$ARTIFACTORY_URL/$id" || true
+}
+
+function altool-upload() {
+  # Since altool uses same file for upload token we have to trick it into using different folders for token file location
+  # Also it copies zip into TMPDIR so we override it too, to simplify cleanup
+  OLD_HOME="$HOME"
+  export HOME="$FAKE_ROOT/home"
+  export TMPDIR="$FAKE_ROOT/tmp"
+  mkdir -p "$HOME"
+  mkdir -p "$TMPDIR"
+  export _JAVA_OPTIONS="-Duser.home=$HOME -Djava.io.tmpdir=$TMPDIR"
+  # Reduce amount of downloads, cache transporter libraries
+  shared_itmstransporter="$OLD_HOME/shared-itmstransporter"
+  if [[ -f "$shared_itmstransporter" ]]; then
+    cp -r "$shared_itmstransporter" "$HOME/.itmstransporter"
+  fi
+  # For some reason altool prints everything to stderr, not stdout
+  set +e
+  xcrun altool --notarize-app \
+    --username "$APPL_USER" --password "$APPL_PASSWORD" \
+    --primary-bundle-id "$BUNDLE_ID" \
+    --asc-provider JetBrainssro --file "$1" 2>&1 | tee "altool.init.out"
+  unset TMPDIR
+  export HOME="$OLD_HOME"
+  set -e
+}
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+file="$APP_NAME.zip"
+
+log "Zipping $file..."
+rm -rf "$file"
+ditto -c -k --sequesterRsrc --keepParent "$APP_DIRECTORY/Contents" "$file"
+
+log "Notarizing $file..."
+rm -rf "altool.init.out" "altool.check.out"
+altool-upload "$file"
+
+rm -rf "$file"
+
+notarization_info="$(grep -e "RequestUUID" "altool.init.out" | grep -oE '([0-9a-f-]{36})')"
+
+if [ -z "$notarization_info" ]; then
+  log "Faile to read RequestUUID from altool.init.out"
+  exit 10
+fi
+
+PATH="$PATH:/usr/local/bin/"
+
+log "Notarization request sent, awaiting response"
+spent=0
+
+while true; do
+  # For some reason altool prints everything to stderr, not stdout
+  xcrun altool --username "$APPL_USER" --notarization-info "$notarization_info" --password "$APPL_PASSWORD" >"altool.check.out" 2>&1 || true
+  status="$(grep -oe 'Status: .*' "altool.check.out" | cut -c 9- || true)"
+  log "Current status: $status"
+  if [ "$status" = "invalid" ]; then
+    log "Notarization failed"
+    ec=1
+  elif [ "$status" = "success" ]; then
+    log "Notarization succeeded"
+    ec=0
+  else
+    if [ "$status" != "in progress" ]; then
+      log "Unknown notarization status, waiting more, altool output:"
+      cat "altool.check.out"
+    fi
+    if [[ $spent -gt 60 ]]; then
+      log "Waiting time out (apx 60 minutes)"
+      ec=2
+      break
+    fi
+    sleep 60
+    ((spent += 1))
+    continue
+  fi
+  developer_log="developer_log.json"
+  log "Fetching $developer_log"
+  # TODO: Replace cut with trim or something better
+  url="$(grep -oe 'LogFileURL: .*' "altool.check.out" | cut -c 13-)"
+  wget "$url" -O "$developer_log" && cat "$developer_log" || true
+  if [ $ec != 0 ]; then
+    log "Publishing $developer_log"
+    publish-log "$notarization_info" "$developer_log"
+  fi
+  break
+done
+cat "altool.check.out"
+
+rm -rf "altool.init.out" "altool.check.out"
+exit $ec

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

@@ -0,0 +1,94 @@
+#!/bin/bash
+
+APP_DIRECTORY=$1
+JB_CERT=$2
+
+if [[ -z "$APP_DIRECTORY" ]] || [[ -z "$JB_CERT" ]]; then
+  echo "Usage: $0 AppDirectory CertificateID"
+  exit 1
+fi
+if [[ ! -d "$APP_DIRECTORY" ]]; then
+  echo "AppDirectory '$APP_DIRECTORY' does not exist or not a directory"
+  exit 1
+fi
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+# Cleanup files left from previous sign attempt (if any)
+find "$APP_DIRECTORY" -name '*.cstemp' -exec rm '{}' \;
+
+log "Signing libraries and executables..."
+# -perm +111 searches for executables
+for f in \
+   "Contents/Home/bin" \
+   "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 \
+      -v -s "$JB_CERT" --options=runtime \
+      --entitlements entitlements.xml {} \;
+  fi
+done
+
+log "Signing libraries in jars in $PWD"
+
+# todo: add set -euo pipefail; into the inner sh -c
+# `-e` prevents `grep -q && printf` loginc
+# with `-o pipefail` there's no input for 'while' loop
+find "$APP_DIRECTORY" -name '*.jar' \
+  -exec sh -c "set -u; unzip -l \"\$0\" | grep -q -e '\.dylib\$' -e '\.jnilib\$' -e '\.so\$' -e '^jattach\$' && printf \"\$0\0\" " {} \; |
+  while IFS= read -r -d $'\0' file; do
+    log "Processing libraries in $file"
+
+    rm -rf jarfolder jar.jar
+    mkdir jarfolder
+    filename="${file##*/}"
+    log "Filename: $filename"
+    cp "$file" jarfolder && (cd jarfolder && jar xf "$filename" && rm "$filename")
+
+    find jarfolder \
+      -type f \( -name "*.jnilib" -o -name "*.dylib" -o -name "*.so" -o -name "jattach" \) \
+      -exec codesign --timestamp \
+      -v -s "$JB_CERT" --options=runtime \
+      --entitlements entitlements.xml {} \;
+
+    (cd jarfolder; zip -q -r -o ../jar.jar .)
+    mv jar.jar "$file"
+  done
+
+rm -rf jarfolder jar.jar
+
+log "Signing other files..."
+for f in \
+  "Contents/MacOS"; 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 \
+      -v -s "$JB_CERT" --options=runtime \
+      --entitlements entitlements.xml {} \;
+  fi
+done
+
+#log "Signing executable..."
+#codesign --timestamp \
+#    -v -s "$JB_CERT" --options=runtime \
+#    --force \
+#    --entitlements entitlements.xml "$APP_DIRECTORY/Contents/MacOS/idea"
+
+log "Signing whole app..."
+codesign --timestamp \
+  -v -s "$JB_CERT" --options=runtime \
+  --force \
+  --entitlements entitlements.xml "$APP_DIRECTORY"
+
+log "Verifying java is not broken"
+find "$APP_DIRECTORY" \
+  -type f -name 'java' -perm +111 -exec {} -version \;

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

@@ -0,0 +1,132 @@
+#!/bin/bash
+
+#immediately exit script with an error if a command fails
+set -euo pipefail
+
+export COPY_EXTENDED_ATTRIBUTES_DISABLE=true
+export COPYFILE_DISABLE=true
+
+INPUT_FILE=$1
+EXPLODED=$2.exploded
+BACKUP_JMODS=$2.backup
+USERNAME=$3
+PASSWORD=$4
+CODESIGN_STRING=$5
+NOTARIZE=$6
+BUNDLE_ID=$7
+
+cd "$(dirname "$0")"
+
+function log() {
+  echo "$(date '+[%H:%M:%S]') $*"
+}
+
+log "Deleting $EXPLODED ..."
+if test -d "$EXPLODED"; then
+  find "$EXPLODED" -mindepth 1 -maxdepth 1 -exec chmod -R u+wx '{}' \;
+fi
+rm -rf "$EXPLODED"
+mkdir "$EXPLODED"
+rm -rf "$BACKUP_JMODS"
+mkdir "$BACKUP_JMODS"
+
+log "Unzipping $INPUT_FILE to $EXPLODED ..."
+tar -xzvf "$INPUT_FILE" --directory $EXPLODED
+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
+
+log "$INPUT_FILE extracted and removed"
+
+APPLICATION_PATH="$EXPLODED/$BUILD_NAME"
+
+find "$APPLICATION_PATH/Contents/Home/bin" \
+  -maxdepth 1 -type f -name '*.jnilib' -print0 |
+  while IFS= read -r -d $'\0' file; do
+    if [ -f "$file" ]; then
+      log "Linking $file"
+      b="$(basename "$file" .jnilib)"
+      ln -sf "$b.jnilib" "$(dirname "$file")/$b.dylib"
+    fi
+  done
+
+find "$APPLICATION_PATH/Contents/" \
+  -maxdepth 1 -type f -name '*.txt' -print0 |
+  while IFS= read -r -d $'\0' file; do
+    if [ -f "$file" ]; then
+      log "Moving $file"
+      mv "$file" "$APPLICATION_PATH/Contents/Resources"
+    fi
+  done
+
+non_plist=$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist' | wc -l)
+if [[ $non_plist -gt 0 ]]; then
+  log "Only Info.plist file is allowed in Contents directory but found $non_plist file(s):"
+  log "$(find "$APPLICATION_PATH/Contents/" -maxdepth 1 -type f -and -not -name 'Info.plist')"
+  exit 1
+fi
+
+log "Unlocking keychain..."
+# Make sure *.p12 is imported into local KeyChain
+security unlock-keychain -p "$PASSWORD" "/Users/$USERNAME/Library/Keychains/login.keychain"
+
+attempt=1
+limit=3
+set +e
+while [[ $attempt -le $limit ]]; do
+  log "Signing (attempt $attempt) $APPLICATION_PATH ..."
+  ./sign.sh "$APPLICATION_PATH" "$CODESIGN_STRING"
+  ec=$?
+  if [[ $ec -ne 0 ]]; then
+    ((attempt += 1))
+    if [ $attempt -eq $limit ]; then
+      set -e
+    fi
+    log "Signing failed, wait for 30 sec and try to sign again"
+    sleep 30
+  else
+    log "Signing done"
+    codesign -v "$APPLICATION_PATH" -vvvvv
+    log "Check sign done"
+    ((attempt += limit))
+  fi
+done
+
+set -e
+
+if [ "$NOTARIZE" = "yes" ]; then
+  log "Notarizing..."
+  # shellcheck disable=SC1090
+  source "$HOME/.notarize_token"
+  APP_NAME=$(echo ${INPUT_FILE} | awk -F"." '{ print $1 }')
+  # Since notarization tool uses same file for upload token we have to trick it into using different folders, hence fake root
+  # Also it leaves copy of zip file in TMPDIR, so notarize.sh overrides it and uses FAKE_ROOT as location for temp TMPDIR
+  FAKE_ROOT="$(pwd)/fake-root"
+  mkdir -p "$FAKE_ROOT"
+  echo "Notarization will use fake root: $FAKE_ROOT"
+  ./notarize.sh "$APPLICATION_PATH" "$APPLE_USERNAME" "$APPLE_PASSWORD" "$APP_NAME" "$BUNDLE_ID" "$FAKE_ROOT"
+  rm -rf "$FAKE_ROOT"
+
+  set +e
+  log "Stapling..."
+  xcrun stapler staple "$APPLICATION_PATH"
+else
+  log "Notarization disabled"
+  log "Stapling disabled"
+fi
+
+log "Zipping $BUILD_NAME to $INPUT_FILE ..."
+(
+  #cd "$EXPLODED"
+  #ditto -c -k --sequesterRsrc --keepParent "$BUILD_NAME" "../$INPUT_FILE"
+  if test -d $BACKUP_JMODS/jmods; then
+    mv $BACKUP_JMODS/jmods $EXPLODED/$BUILD_NAME/Contents/Home
+  fi
+
+  COPYFILE_DISABLE=1 tar -pczf $INPUT_FILE --exclude='*.dSYM' --exclude='man' -C $EXPLODED $BUILD_NAME
+  log "Finished zipping"
+)
+rm -rf "$EXPLODED"
+log "Done"

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/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-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/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/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/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-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-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/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/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/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/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/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-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/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-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-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-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/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/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/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/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-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-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-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)
+

jb/project/tools/patches/dcevm/0036-Access-com.sun.beans.util-HotswapAgent-patch.patch

@@ -0,0 +1,141 @@
+From 9f4b84339b55187b742682bd84fdb0e6e121917c Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sat, 16 May 2020 15:11:40 +0200
+Subject: [PATCH 36/50] Access com.sun.beans.util - HotswapAgent patch
+
+---
+ src/hotspot/share/runtime/arguments.cpp       |  2 ++
+ .../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 +++
+ 5 files changed, 83 insertions(+)
+ 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/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
+index 0cdd8c88315..72580b384dd 100644
+--- a/src/hotspot/share/runtime/arguments.cpp
++++ b/src/hotspot/share/runtime/arguments.cpp
+@@ -4333,5 +4333,7 @@ void Arguments::setup_hotswap_agent() {
+   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/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 f9cf021311f..e61ba7572cf 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.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0037-Skip-verifier-only-in-AllowEnhancedClassRedefinition.patch

@@ -0,0 +1,29 @@
+From 9a662b1367860920095efe79116ef9a2d53fc2c6 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sun, 17 May 2020 12:19:18 +0200
+Subject: [PATCH 37/50] Skip verifier only in AllowEnhancedClassRedefinition
+
+---
+ src/hotspot/share/oops/instanceKlass.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index c04bdf5abfc..e14aaee21c4 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -788,10 +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
++        // (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 (!newest_version()->is_redefining()) {
++        if (!AllowEnhancedClassRedefinition || !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/0038-Use-original-code-for-adjust_method_entries-in-stand.patch

@@ -0,0 +1,98 @@
+From a58ed678218bfb80af164cfe98cdf4a3ab74a682 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sun, 17 May 2020 18:18:52 +0200
+Subject: [PATCH 38/50] Use original code for adjust_method_entries in standard
+ redefinition
+
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    |  2 +-
+ .../share/prims/resolvedMethodTable.cpp       | 46 ++++++++++++++++++-
+ .../share/prims/resolvedMethodTable.hpp       |  1 +
+ 3 files changed, 47 insertions(+), 2 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 660bf3a2e97..0ca675e8ee6 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -506,7 +506,7 @@ void VM_EnhancedRedefineClasses::doit() {
+   // JSR-292 support
+   if (_any_class_has_resolved_methods) {
+     bool trace_name_printed = false;
+-    ResolvedMethodTable::adjust_method_entries(&trace_name_printed);
++    ResolvedMethodTable::adjust_method_entries_dcevm(&trace_name_printed);
+   }
+ 
+   ChangePointersOopClosure<StoreNoBarrier> oopClosureNoBarrier;
+diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
+index a9057893368..af2ec48c2e1 100644
+--- a/src/hotspot/share/prims/resolvedMethodTable.cpp
++++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
+@@ -197,8 +197,52 @@ void ResolvedMethodTable::print() {
+ #endif // PRODUCT
+ 
+ #if INCLUDE_JVMTI
+-// It is called at safepoint only for RedefineClasses
++
+ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
++  assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
++  // For each entry in RMT, change to new method
++  for (int i = 0; i < _the_table->table_size(); ++i) {
++    for (ResolvedMethodEntry* entry = _the_table->bucket(i);
++         entry != NULL;
++         entry = entry->next()) {
++
++      oop mem_name = entry->object_no_keepalive();
++      // except ones removed
++      if (mem_name == NULL) {
++        continue;
++      }
++      Method* old_method = (Method*)java_lang_invoke_ResolvedMethodName::vmtarget(mem_name);
++
++      if (old_method->is_old()) {
++
++        Method* new_method;
++        if (old_method->is_deleted()) {
++          new_method = Universe::throw_no_such_method_error();
++        } else {
++          InstanceKlass* holder = old_method->method_holder();
++          new_method = holder->method_with_idnum(old_method->orig_method_idnum());
++          assert(holder == new_method->method_holder(), "call after swapping redefined guts");
++          assert(new_method != NULL, "method_with_idnum() should not be NULL");
++          assert(old_method != new_method, "sanity check");
++        }
++
++        java_lang_invoke_ResolvedMethodName::set_vmtarget(mem_name, new_method);
++
++        ResourceMark rm;
++        if (!(*trace_name_printed)) {
++          log_info(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
++           *trace_name_printed = true;
++        }
++        log_debug(redefine, class, update, constantpool)
++          ("ResolvedMethod method update: %s(%s)",
++           new_method->name()->as_C_string(), new_method->signature()->as_C_string());
++      }
++    }
++  }
++}
++
++// (DCEVM) It is called at safepoint only for RedefineClasses
++void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed) {
+   assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
+   // For each entry in RMT, change to new method
+   GrowableArray<oop>* oops_to_add = new GrowableArray<oop>();
+diff --git a/src/hotspot/share/prims/resolvedMethodTable.hpp b/src/hotspot/share/prims/resolvedMethodTable.hpp
+index 841ae4ae585..543d4ffa485 100644
+--- a/src/hotspot/share/prims/resolvedMethodTable.hpp
++++ b/src/hotspot/share/prims/resolvedMethodTable.hpp
+@@ -93,6 +93,7 @@ public:
+ #if INCLUDE_JVMTI
+   // It is called at safepoint only for RedefineClasses
+   static void adjust_method_entries(bool * trace_name_printed);
++  static void adjust_method_entries_dcevm(bool * trace_name_printed);
+ #endif // INCLUDE_JVMTI
+ 
+   // Cleanup cleared entries
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0039-Revert-code-for-AllowEnhancedClassRedefinition.patch

@@ -0,0 +1,54 @@
+From c1e814f2f7d4f2b37abd667d0bec516474f2a119 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Tue, 19 May 2020 09:41:36 +0200
+Subject: [PATCH 39/50] Revert code for !AllowEnhancedClassRedefinition
+
+---
+ .../share/classfile/classLoaderData.cpp       | 23 ++++++++++---------
+ 1 file changed, 12 insertions(+), 11 deletions(-)
+
+diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
+index 25103fff2c0..f5b877b432b 100644
+--- a/src/hotspot/share/classfile/classLoaderData.cpp
++++ b/src/hotspot/share/classfile/classLoaderData.cpp
+@@ -1387,12 +1387,13 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+   // Klassesoto delete.
+ 
+   // FIXME: dcevm - block asserts in MetadataOnStackMark
+-  /*
+-  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);
+-  */
++  bool walk_all_metadata = false;
++  if (!AllowEnhancedClassRedefinition) {
++    walk_all_metadata = clean_previous_versions &&
++                             JvmtiExport::has_redefined_a_class() &&
++                             InstanceKlass::has_previous_versions_and_reset();
++    MetadataOnStackMark md_on_stack(walk_all_metadata);
++  }
+ 
+   // 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.
+@@ -1402,12 +1403,12 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+   while (data != NULL) {
+     if (data->is_alive()) {
+       // clean metaspace
+-      /*
+-      if (walk_all_metadata) {
+-        data->classes_do(InstanceKlass::purge_previous_versions);
++      if (!AllowEnhancedClassRedefinition) {
++        if (walk_all_metadata) {
++          data->classes_do(InstanceKlass::purge_previous_versions);
++        }
++        data->free_deallocate_list();
+       }
+-      data->free_deallocate_list();
+-      */
+       prev = data;
+       data = data->next();
+       loaders_processed++;
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -0,0 +1,278 @@
+From 5b36c4798869c5cd4d65f7765a8447b9cf09d76b Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Tue, 19 May 2020 09:29:39 +0200
+Subject: [PATCH 40/50] Code cleanup
+
+---
+ src/hotspot/share/classfile/classFileParser.cpp   |  4 +++-
+ src/hotspot/share/classfile/classFileParser.hpp   |  2 +-
+ src/hotspot/share/classfile/classLoaderData.cpp   |  2 ++
+ src/hotspot/share/classfile/dictionary.cpp        |  4 ++++
+ src/hotspot/share/classfile/dictionary.hpp        |  1 +
+ src/hotspot/share/classfile/loaderConstraints.cpp |  3 ++-
+ src/hotspot/share/classfile/systemDictionary.cpp  |  8 +++++---
+ src/hotspot/share/interpreter/linkResolver.cpp    |  1 +
+ src/hotspot/share/memory/universe.cpp             |  4 ++--
+ src/hotspot/share/oops/instanceKlass.cpp          | 13 ++++++++-----
+ 10 files changed, 29 insertions(+), 13 deletions(-)
+
+diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
+index ea150df9104..c2cd35da4e6 100644
+--- a/src/hotspot/share/classfile/classFileParser.cpp
++++ b/src/hotspot/share/classfile/classFileParser.cpp
+@@ -954,6 +954,7 @@ void ClassFileParser::parse_interfaces(const ClassFileStream* const stream,
+                                                   CHECK);
+       }
+ 
++      // (DCEVM) pick newest
+       interf = (Klass *) maybe_newest(interf);
+ 
+       if (!interf->is_interface()) {
+@@ -3749,6 +3750,7 @@ const InstanceKlass* ClassFileParser::parse_super_class(ConstantPool* const cp,
+     // However, make sure it is not an array type.
+     bool is_array = false;
+     if (cp->tag_at(super_class_index).is_klass()) {
++      // (DCEVM) pick newest
+       super_klass = InstanceKlass::cast(maybe_newest(cp->resolved_klass_at(super_class_index)));
+       if (need_verify)
+         is_array = super_klass->is_array_klass();
+@@ -4417,7 +4419,7 @@ void ClassFileParser::set_precomputed_flags(InstanceKlass* ik) {
+   if (!_has_empty_finalizer) {
+     if (_has_finalizer ||
+         (super != NULL && super->has_finalizer())) {
+-        // FIXME - condition from previous DCEVM version, however after reload new finelize() method is not active
++        // FIXME - (DCEVM) this is condition from previous DCEVM version, however after reload a new finalize() method is not active
+         if (ik->old_version() == NULL || ik->old_version()->has_finalizer()) {
+           ik->set_has_finalizer();
+         }
+diff --git a/src/hotspot/share/classfile/classFileParser.hpp b/src/hotspot/share/classfile/classFileParser.hpp
+index 3db14b678f3..93ed54d8f70 100644
+--- a/src/hotspot/share/classfile/classFileParser.hpp
++++ b/src/hotspot/share/classfile/classFileParser.hpp
+@@ -499,7 +499,7 @@ class ClassFileParser {
+                      FieldLayoutInfo* info,
+                      TRAPS);
+ 
+-  // Enhanced class redefinition
++  // (DCEVM) Enhanced class redefinition
+   inline const Klass* maybe_newest(const Klass* klass) const { return klass != NULL && _pick_newest ? klass->newest_version() : klass; }
+ 
+  public:
+diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
+index f5b877b432b..ab2615da0ed 100644
+--- a/src/hotspot/share/classfile/classLoaderData.cpp
++++ b/src/hotspot/share/classfile/classLoaderData.cpp
+@@ -1242,6 +1242,7 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
+   }
+ }
+ 
++// (DCEVM) - iterate over dict classes
+ void ClassLoaderDataGraph::dictionary_classes_do(KlassClosure* klass_closure) {
+   FOR_ALL_DICTIONARY(cld) {
+     cld->dictionary()->classes_do(klass_closure);
+@@ -1257,6 +1258,7 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS),
+   }
+ }
+ 
++// (DCEVM) rollback redefined classes
+ void ClassLoaderDataGraph::rollback_redefinition() {
+   FOR_ALL_DICTIONARY(cld) {
+     cld->dictionary()->rollback_redefinition();
+diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
+index 118730f1b83..dda5188c370 100644
+--- a/src/hotspot/share/classfile/dictionary.cpp
++++ b/src/hotspot/share/classfile/dictionary.cpp
+@@ -245,6 +245,8 @@ void Dictionary::classes_do(void f(InstanceKlass*)) {
+   }
+ }
+ 
++
++// (DCEVM) iterate over dict entry
+ void Dictionary::classes_do(KlassClosure* closure) {
+   for (int index = 0; index < table_size(); index++) {
+     for (DictionaryEntry* probe = bucket(index);
+@@ -342,6 +344,7 @@ DictionaryEntry* Dictionary::get_entry(int index, unsigned int hash,
+   return NULL;
+ }
+ 
++// (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) {
+   // 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;
+@@ -356,6 +359,7 @@ bool Dictionary::update_klass(unsigned int hash, Symbol* name, ClassLoaderData*
+   return found;
+ }
+ 
++// (DCEVM) rollback redefinition
+ void Dictionary::rollback_redefinition() {
+   for (int index = 0; index < table_size(); index++) {
+     for (DictionaryEntry* entry = bucket(index);
+diff --git a/src/hotspot/share/classfile/dictionary.hpp b/src/hotspot/share/classfile/dictionary.hpp
+index fd4b134d7a7..5eaa741d500 100644
+--- a/src/hotspot/share/classfile/dictionary.hpp
++++ b/src/hotspot/share/classfile/dictionary.hpp
+@@ -119,6 +119,7 @@ public:
+ 
+   void rollback_redefinition();
+ 
++  // (DCEVM) return old class if redefining in AllowEnhancedClassRedefinition, otherwise return "k"
+   static InstanceKlass* old_if_redefined(InstanceKlass* k) {
+     return (k != NULL && k->is_redefining()) ? ((InstanceKlass* )k->old_version()) : k;
+   }
+diff --git a/src/hotspot/share/classfile/loaderConstraints.cpp b/src/hotspot/share/classfile/loaderConstraints.cpp
+index e4a23e8a27c..bca73b5e0dc 100644
+--- a/src/hotspot/share/classfile/loaderConstraints.cpp
++++ b/src/hotspot/share/classfile/loaderConstraints.cpp
+@@ -4,7 +4,7 @@
+  *
+  * 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.
++ * published by the Free Software Foundation) replace old_class by new class in dictionary.
+  *
+  * This code is distributed in the hope that it will be useful, but WITHOUT
+  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+@@ -87,6 +87,7 @@ LoaderConstraintEntry** LoaderConstraintTable::find_loader_constraint(
+   return pp;
+ }
+ 
++// (DCEVM) update constraint entries to new classes, called from dcevm redefinition code only
+ void LoaderConstraintTable::update_after_redefinition() {
+   for (int index = 0; index < table_size(); index++) {
+     LoaderConstraintEntry** p = bucket_addr(index);
+diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
+index 9dbd6cc9c12..e70865109dd 100644
+--- a/src/hotspot/share/classfile/systemDictionary.cpp
++++ b/src/hotspot/share/classfile/systemDictionary.cpp
+@@ -876,7 +876,8 @@ Klass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
+     ClassLoaderData* loader_data = k->class_loader_data();
+     MutexLocker mu(SystemDictionary_lock, THREAD);
+     Klass* kk = find_class(name, loader_data);
+-    // FIXME: (kk == k() && !k->is_redefining()) || (k->is_redefining() && kk == k->old_version())
++    // FIXME: (DCEVM)
++    // assert(kk == k() && !k->is_redefining()) || (k->is_redefining() && kk == k->old_version())
+     assert(kk == k, "should be present in dictionary");
+   }
+ #endif
+@@ -1083,7 +1084,7 @@ InstanceKlass* SystemDictionary::resolve_from_stream(Symbol* class_name,
+  InstanceKlass* k = NULL;
+ 
+ #if INCLUDE_CDS
+-  // FIXME: what to do during redefinition?
++  // FIXME: (DCEVM) what to do during redefinition?
+   if (!DumpSharedSpaces) {
+     k = SystemDictionaryShared::lookup_from_stream(class_name,
+                                                    class_loader,
+@@ -1836,7 +1837,7 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
+   CodeCache::flush_dependents_on(k);
+ }
+ 
+-// Enhanced class redefinition
++// (DCEVM) - remove from klass hierarchy
+ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
+     assert(k != NULL, "just checking");
+ 
+@@ -1844,6 +1845,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
+   k->remove_from_sibling_list();
+ }
+ 
++// (DCEVM) 
+ void SystemDictionary::update_constraints_after_redefinition() {
+   constraints()->update_after_redefinition();
+ }
+diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
+index cb76d2ef50c..9dc184d02f5 100644
+--- a/src/hotspot/share/interpreter/linkResolver.cpp
++++ b/src/hotspot/share/interpreter/linkResolver.cpp
+@@ -1384,6 +1384,7 @@ void LinkResolver::runtime_resolve_virtual_method(CallInfo& result,
+       assert(resolved_method->can_be_statically_bound(), "cannot override this method");
+       selected_method = resolved_method;
+     } else {
++      // TODO: (DCEVM) explain
+       assert(recv_klass->is_subtype_of(resolved_method->method_holder()), "receiver and resolved method holder are inconsistent");
+       selected_method = methodHandle(THREAD, recv_klass->method_at_vtable(vtable_index));
+     }
+diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
+index 7ecb950b231..d0a6d665aa0 100644
+--- a/src/hotspot/share/memory/universe.cpp
++++ b/src/hotspot/share/memory/universe.cpp
+@@ -176,7 +176,7 @@ void Universe::basic_type_classes_do(void f(Klass*)) {
+   f(doubleArrayKlassObj());
+ }
+ 
+-// FIXME: This method should iterate all pointers that are not within heap objects.
++// FIXME: (DCEVM) This method should iterate all pointers that are not within heap objects.
+ void Universe::root_oops_do(OopClosure *oopClosure) {
+ 
+   class AlwaysTrueClosure: public BoolObjectClosure {
+@@ -203,7 +203,7 @@ void Universe::root_oops_do(OopClosure *oopClosure) {
+   CodeBlobToOopClosure blobClosure(oopClosure, CodeBlobToOopClosure::FixRelocations);
+   CodeCache::blobs_do(&blobClosure);
+   StringTable::oops_do(oopClosure);
+-  
++
+   // (DCEVM) TODO: Check if this is correct?
+   //CodeCache::scavenge_root_nmethods_oops_do(oopClosure);
+   //Management::oops_do(oopClosure);
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index e14aaee21c4..c860371d2fc 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -1139,6 +1139,7 @@ void InstanceKlass::init_implementor() {
+   }
+ }
+ 
++// (DCEVM) - init_implementor() for dcevm
+ void InstanceKlass::init_implementor_from_redefine() {
+   assert(is_interface(), "not interface");
+   Klass** addr = adr_implementor();
+@@ -1209,6 +1210,8 @@ bool InstanceKlass::implements_interface(Klass* k) const {
+   return false;
+ }
+ 
++
++// (DCEVM)
+ bool InstanceKlass::implements_interface_any_version(Klass* k) const {
+   k = k->newest_version();
+   if (this->newest_version() == k) return true;
+@@ -1491,10 +1494,8 @@ void InstanceKlass::methods_do(void f(Method* method)) {
+   }
+ }
+ 
+-/**
+-  Update information contains mapping of fields from old class to the new class.
+-  Info is stored on HEAP, you need to call clear_update_information to free the space.
+-*/
++//  (DCEVM) Update information contains mapping of fields from old class to the new class.
++//  Info is stored on HEAP, you need to call clear_update_information to free the space.
+ void InstanceKlass::store_update_information(GrowableArray<int> &values) {
+   int *arr = NEW_C_HEAP_ARRAY(int, values.length(), mtClass);
+   for (int i = 0; i < values.length(); i++) {
+@@ -2162,6 +2163,7 @@ void InstanceKlass::add_dependent_nmethod(nmethod* nm) {
+   dependencies().add_dependent_nmethod(nm);
+ }
+ 
++// DCEVM - update jmethod ids
+ bool InstanceKlass::update_jmethod_id(Method* method, jmethodID newMethodID) {
+   size_t idnum = (size_t)method->method_idnum();
+   jmethodID* jmeths = methods_jmethod_ids_acquire();
+@@ -2177,7 +2179,7 @@ bool InstanceKlass::update_jmethod_id(Method* method, jmethodID newMethodID) {
+ 
+ void InstanceKlass::remove_dependent_nmethod(nmethod* nm, bool delete_immediately) {
+   dependencies().remove_dependent_nmethod(nm, delete_immediately);
+-  // (DCEVM) Hack as dependencies get wrong version of Klass*
++  // FIXME: (DCEVM) Hack as dependencies get wrong version of Klass*
+ //  if (this->old_version() != NULL) {
+ //    InstanceKlass::cast(this->old_version())->remove_dependent_nmethod(nm, true);
+ //    return;
+@@ -3594,6 +3596,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");
+   }
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0041-Activate-cpCache-definition-asserts-for-dcevm.patch

@@ -0,0 +1,36 @@
+From 71f35c41b569f72a1674ccd57118c4fe76ba3d68 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Tue, 19 May 2020 10:31:15 +0200
+Subject: [PATCH 41/50] Activate cpCache definition asserts for !dcevm
+
+---
+ src/hotspot/share/oops/cpCache.cpp | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
+index 47040d51f0c..4318df227d1 100644
+--- a/src/hotspot/share/oops/cpCache.cpp
++++ b/src/hotspot/share/oops/cpCache.cpp
+@@ -436,8 +436,7 @@ void ConstantPoolCacheEntry::set_method_handle_common(const constantPoolHandle&
+   if (has_appendix) {
+     const int appendix_index = f2_as_index() + _indy_resolved_references_appendix_offset;
+     assert(appendix_index >= 0 && appendix_index < resolved_references->length(), "oob");
+-    // FIXME (DCEVM) relaxing for now...
+-    //assert(resolved_references->obj_at(appendix_index) == NULL, "init just once");
++    assert(AllowEnhancedClassRedefinition || resolved_references->obj_at(appendix_index) == NULL, "init just once");
+     resolved_references->obj_at_put(appendix_index, appendix());
+   }
+ 
+@@ -445,8 +444,7 @@ void ConstantPoolCacheEntry::set_method_handle_common(const constantPoolHandle&
+   if (has_method_type) {
+     const int method_type_index = f2_as_index() + _indy_resolved_references_method_type_offset;
+     assert(method_type_index >= 0 && method_type_index < resolved_references->length(), "oob");
+-    // FIXME (DCEVM) relaxing for now...
+-    //assert(resolved_references->obj_at(method_type_index) == NULL, "init just once");
++    assert(AllowEnhancedClassRedefinition || resolved_references->obj_at(method_type_index) == NULL, "init just once");
+     resolved_references->obj_at_put(method_type_index, method_type());
+   }
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0042-iterate-old-method-version-only-in-dcevm.patch

@@ -0,0 +1,29 @@
+From 961018a29ddb7eba96aca7fbc385f3c4f29e3a03 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Tue, 19 May 2020 10:54:38 +0200
+Subject: [PATCH 42/50] iterate old method version only in dcevm
+
+---
+ src/hotspot/share/prims/jvmtiImpl.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiImpl.cpp b/src/hotspot/share/prims/jvmtiImpl.cpp
+index 2a92ece916e..d2044541d38 100644
+--- a/src/hotspot/share/prims/jvmtiImpl.cpp
++++ b/src/hotspot/share/prims/jvmtiImpl.cpp
+@@ -294,8 +294,10 @@ void JvmtiBreakpoint::each_method_version_do(method_action meth_act) {
+   Symbol* m_signature = _method->signature();
+ 
+   // (DCEVM) Go through old versions of method
+-  for (Method* m = _method->old_version(); m != NULL; m = m->old_version()) {
+-    (m->*meth_act)(_bci);
++  if (AllowEnhancedClassRedefinition) {
++    for (Method* m = _method->old_version(); m != NULL; m = m->old_version()) {
++      (m->*meth_act)(_bci);
++    }
+   }
+ 
+   // search previous versions if they exist
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -0,0 +1,258 @@
+From 2ab70b495c43c4699ad402a714710566400de99d Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Fri, 22 May 2020 21:23:01 +0200
+Subject: [PATCH 43/50] 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 ab2615da0ed..1bc67adf5a7 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 7e357929971..00a84610b43 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 e70865109dd..cc9f1fa7831 100644
+--- a/src/hotspot/share/classfile/systemDictionary.cpp
++++ b/src/hotspot/share/classfile/systemDictionary.cpp
+@@ -971,12 +971,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
+@@ -1000,8 +1004,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)
+@@ -1845,7 +1853,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 717f34ce9a0..dc111846c12 100644
+--- a/src/hotspot/share/classfile/systemDictionary.hpp
++++ b/src/hotspot/share/classfile/systemDictionary.hpp
+@@ -301,6 +301,7 @@ public:
+                         protection_domain,
+                         st,
+                         NULL, // host klass
++                        NULL, // old class
+                         NULL, // cp_patches
+                         THREAD);
+   }
+@@ -309,6 +310,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 0ca675e8ee6..08fe42d5c28 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -503,6 +503,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;
+@@ -774,12 +776,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();
+ 
+@@ -1469,6 +1493,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];
+@@ -2018,7 +2066,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 ed44f0e27ce..7e2afd49650 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -119,6 +119,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 af2ec48c2e1..7741328979f 100644
+--- a/src/hotspot/share/prims/resolvedMethodTable.cpp
++++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
+@@ -200,7 +200,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;
+@@ -271,6 +271,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 2f14e01ce0d..d0e0367d8eb 100644
+--- a/src/hotspot/share/prims/unsafe.cpp
++++ b/src/hotspot/share/prims/unsafe.cpp
+@@ -818,6 +818,7 @@ Unsafe_DefineAnonymousClass_impl(JNIEnv *env,
+                                                 host_domain,
+                                                 &st,
+                                                 InstanceKlass::cast(host_klass),
++                                                NULL,
+                                                 cp_patches,
+                                                 CHECK_NULL);
+   if (anonk == NULL) {
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0044-Skip-GC-runs-for-redefinitions-without-instance-size.patch

@@ -0,0 +1,34 @@
+From 3f53bb48682b17cfbf4781d4fa47055be88baea0 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Fri, 22 May 2020 21:43:22 +0200
+Subject: [PATCH 44/50] Skip GC runs for redefinitions without instance size
+ change
+
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 08fe42d5c28..a785a43d352 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -578,14 +578,14 @@ void VM_EnhancedRedefineClasses::doit() {
+     }
+   }
+ 
+-//  if (objectClosure.needs_instance_update()) {
++  if (objectClosure.needs_instance_update()) {
+     // Do a full garbage collection to update the instance sizes accordingly
+     Universe::set_redefining_gc_run(true);
+     notify_gc_begin(true);
+     Universe::heap()->collect_as_vm_thread(GCCause::_heap_inspection);
+     notify_gc_end();
+     Universe::set_redefining_gc_run(false);
+-//  }
++  }
+ 
+   // Unmark Klass*s as "redefining"
+   for (int i = 0; i < _new_classes->length(); i++) {
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -0,0 +1,135 @@
+From d0d6602fe3d664cb2322d7066bf46fa7e20d5d4e 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 45/50] Fix "no original bytecode found" error if method with
+ bkp is missing
+
+Sometimes IDE can deploy class with erroneous method, such method has
+no 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 f367e658879..71bbd15a4f5 100644
+--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
++++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
+@@ -834,7 +834,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 bee69f9cec6..f1e22db70d6 100644
+--- a/src/hotspot/share/oops/method.cpp
++++ b/src/hotspot/share/oops/method.cpp
+@@ -1747,14 +1747,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);
+   }
+@@ -1900,7 +1900,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;
+ }
+ 
+@@ -1909,7 +1909,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 4533476ff8f..193e1845b23 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 a785a43d352..2321483dcbd 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -1389,14 +1389,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.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0046-Fix-comments-according-hotspot-formatting-convention.patch

@@ -0,0 +1,421 @@
+From 585f1cb56766be837a34114b1ee5c743aa4e6801 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sat, 23 May 2020 10:17:56 +0200
+Subject: [PATCH 46/50] Fix comments according hotspot formatting conventions
+
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 191 +++++++-----------
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |  41 ++--
+ 2 files changed, 90 insertions(+), 142 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 2321483dcbd..8d00203fd9a 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -67,21 +67,19 @@ int         VM_EnhancedRedefineClasses::_deleted_methods_length  = 0;
+ int         VM_EnhancedRedefineClasses::_added_methods_length    = 0;
+ Klass*      VM_EnhancedRedefineClasses::_the_class_oop = NULL;
+ 
+-/**
+- * Create new instance of enhanced class redefiner.
+- *
+- * This class implements VM_GC_Operation - the usual usage should be:
+- *     VM_EnhancedRedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_redefine);
+- *     VMThread::execute(&op);
+- * Which
+- *
+- * @param class_count size of class_defs
+- * @param class_defs class definition - either new class or redefined class
+- *               note that this is not the final array of classes to be redefined
+- *               we need to scan for all affected classes (e.g. subclasses) and
+- *               caculcate redefinition for them as well.
+- * @param class_load_kind always jvmti_class_load_kind_redefine
+- */
++//
++// Create new instance of enhanced class redefiner.
++//
++// This class implements VM_GC_Operation - the usual usage should be:
++//     VM_EnhancedRedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_redefine);
++//     VMThread::execute(&op);
++// Which
++//  - class_count size of class_defs
++//  - class_defs class definition - either new class or redefined class
++//               note that this is not the final array of classes to be redefined
++//               we need to scan for all affected classes (e.g. subclasses) and
++//               caculcate redefinition for them as well.
++// @param class_load_kind always jvmti_class_load_kind_redefine
+ VM_EnhancedRedefineClasses::VM_EnhancedRedefineClasses(jint class_count, const jvmtiClassDefinition *class_defs, JvmtiClassLoadKind class_load_kind) :
+         VM_GC_Operation(Universe::heap()->total_collections(), GCCause::_heap_inspection, Universe::heap()->total_full_collections(), true) {
+   _affected_klasses = NULL;
+@@ -97,12 +95,10 @@ static inline InstanceKlass* get_ik(jclass def) {
+   return InstanceKlass::cast(java_lang_Class::as_Klass(mirror));
+ }
+ 
+-/**
+- * Start the redefinition:
+- * - Load new class definitions - @see load_new_class_versions
+- * - Start mark&sweep GC.
+- * @return true if success, otherwise all chnages are rollbacked.
+- */
++// Start the redefinition:
++// - Load new class definitions - @see load_new_class_versions
++// - Start mark&sweep GC.
++// - true if success, otherwise all chnages are rollbacked.
+ bool VM_EnhancedRedefineClasses::doit_prologue() {
+ 
+   if (_class_count == 0) {
+@@ -175,9 +171,7 @@ bool VM_EnhancedRedefineClasses::doit_prologue() {
+   return true;
+ }
+ 
+-/**
+- * Closer for static fields - copy value from old class to the new class.
+- */
++// Closer for static fields - copy value from old class to the new class.
+ class FieldCopier : public FieldClosure {
+   public:
+   void do_field(fieldDescriptor* fd) {
+@@ -236,9 +230,7 @@ struct StoreNoBarrier {
+   template <class T> static void oop_store(T* p) { RawAccess<>::oop_store(p, oop(NULL)); }
+ };
+ 
+-/**
+-  Closure to scan all heap objects and update method handles
+-*/
++// Closure to scan all heap objects and update method handles
+ template <class S>
+ class ChangePointersOopClosure : public BasicOopIterateClosure {
+   // import java_lang_invoke_MemberName.*
+@@ -247,7 +239,6 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+     REFERENCE_KIND_MASK  = java_lang_invoke_MemberName::MN_REFERENCE_KIND_MASK,
+   };
+ 
+-
+   bool update_member_name(oop obj) {
+     int flags    =       java_lang_invoke_MemberName::flags(obj);
+     int ref_kind =       (flags >> REFERENCE_KIND_SHIFT) & REFERENCE_KIND_MASK;
+@@ -382,14 +373,12 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+   }
+ };
+ 
+-/**
+- * Closure to scan all objects on heap for objects of changed classes
+- *   - if the fields are compatible, only update class definition reference
+- *   - otherwise if the new object size is smaller then old size, reshufle
+- *          the fields and fill the gap with "dead_space"
+- *   - otherwise set the _needs_instance_update flag, we need to do full GC
+- *          and reshuffle object positions durring mark&sweep
+- */
++// Closure to scan all objects on heap for objects of changed classes
++//  - if the fields are compatible, only update class definition reference
++//  - otherwise if the new object size is smaller then old size, reshufle
++//         the fields and fill the gap with "dead_space"
++//  - otherwise set the _needs_instance_update flag, we need to do full GC
++//         and reshuffle object positions durring mark&sweep
+ class ChangePointersObjectClosure : public ObjectClosure {
+   private:
+ 
+@@ -451,19 +440,16 @@ public:
+ };
+ 
+ 
+-/**
+-  Main transformation method - runs in VM thread.
+-
+-  - UseSharedSpaces - TODO what does it mean?
+-  - for each sratch class call redefine_single_class
+-  - clear code cache (flush_dependent_code)
+-  - iterate the heap and update object defintions, check it old/new class fields
+-       are compatible. If new class size is smaller then old, it can be solved directly here.
+-  - iterate the heap and update method handles to new version
+-  - Swap marks to have same hashcodes
+-  - copy static fields
+-  - notify JVM of the modification
+-*/
++// Main transformation method - runs in VM thread.
++//  - UseSharedSpaces - TODO what does it mean?
++//  - for each sratch class call redefine_single_class
++//  - clear code cache (flush_dependent_code)
++//  - iterate the heap and update object defintions, check it old/new class fields
++//       are compatible. If new class size is smaller then old, it can be solved directly here.
++//  - iterate the heap and update method handles to new version
++//  - Swap marks to have same hashcodes
++//  - copy static fields
++//  - notify JVM of the modification
+ void VM_EnhancedRedefineClasses::doit() {
+   Thread *thread = Thread::current();
+ 
+@@ -634,11 +620,9 @@ void VM_EnhancedRedefineClasses::doit() {
+ 
+ }
+ 
+-/**
+- * Cleanup - runs in JVM thread
+- *  - free used memory
+- *  - end GC
+- */
++// Cleanup - runs in JVM thread
++//  - free used memory
++//  - end GC
+ void VM_EnhancedRedefineClasses::doit_epilogue() {
+   VM_GC_Operation::doit_epilogue();
+ 
+@@ -670,11 +654,9 @@ void VM_EnhancedRedefineClasses::doit_epilogue() {
+   }
+ }
+ 
+-/**
+- * Exclude java primitives and arrays from redefinition
+- * @param klass_mirror  pointer to the klass
+- * @return true if is modifiable
+- */
++// Exclude java primitives and arrays from redefinition
++//  - klass_mirror  pointer to the klass
++//  - true if is modifiable
+ bool VM_EnhancedRedefineClasses::is_modifiable_class(oop klass_mirror) {
+   // classes for primitives cannot be redefined
+   if (java_lang_Class::is_primitive(klass_mirror)) {
+@@ -693,17 +675,12 @@ bool VM_EnhancedRedefineClasses::is_modifiable_class(oop klass_mirror) {
+   return true;
+ }
+ 
+-/**
+-  Load and link new classes (either redefined or affected by redefinition - subclass, ...)
+-
+-  - find sorted affected classes
+-  - resolve new class
+-  - calculate redefine flags (field change, method change, supertype change, ...)
+-  - calculate modified fields and mapping to old fields
+-  - link new classes
+-
+-  The result is sotred in _affected_klasses(old definitions) and _new_classes(new definitions) arrays.
+-*/
++// Load and link new classes (either redefined or affected by redefinition - subclass, ...)
++//  - find sorted affected classes
++//  - resolve new class
++//  - calculate redefine flags (field change, method change, supertype change, ...)
++//  - calculate modified fields and mapping to old fields
++//  - link new classes
+ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+ 
+   _affected_klasses = new (ResourceObj::C_HEAP, mtInternal) GrowableArray<Klass*>(_class_count, true);
+@@ -898,9 +875,7 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+   return JVMTI_ERROR_NONE;
+ }
+ 
+-/**
+-  Calculated the difference between new and old class  (field change, method change, supertype change, ...).
+-*/
++ // 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());
+@@ -1183,14 +1158,11 @@ 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
+-  @param not_changed - new_class not available or same as current class
+-*/
++// Searches for the class bytecode of the given class and returns it as a byte array.
++//  - the_class definition of a class, either existing class or new_class
++//  - class_bytes - if the class is redefined, it contains new class definition, otherwise just original class bytecode.
++//  - class_byte_count - size of class_bytes
++//  - not_changed - new_class not available or same as current class
+ jvmtiError VM_EnhancedRedefineClasses::find_class_bytes(InstanceKlass* the_class, const unsigned char **class_bytes, jint *class_byte_count, jboolean *not_changed) {
+ 
+   *not_changed = false;
+@@ -1233,11 +1205,9 @@ jvmtiError VM_EnhancedRedefineClasses::find_class_bytes(InstanceKlass* the_class
+   return JVMTI_ERROR_NONE;
+ }
+ 
+-/**
+-  Calculate difference between non static fields of old and new class and store the info into new class:
+-     instanceKlass->store_update_information
+-     instanceKlass->copy_backwards
+-*/
++// Calculate difference between non static fields of old and new class and store the info into new class:
++//     instanceKlass->store_update_information
++//     instanceKlass->copy_backwards
+ void VM_EnhancedRedefineClasses::calculate_instance_update_information(Klass* new_version) {
+ 
+   class CalculateFieldUpdates : public FieldClosure {
+@@ -1348,9 +1318,7 @@ void VM_EnhancedRedefineClasses::calculate_instance_update_information(Klass* ne
+   }
+ }
+ 
+-/**
+-  Rollback all changes - clear new classes from the system dictionary, return old classes to directory, free memory.
+-*/
++// Rollback all changes - clear new classes from the system dictionary, return old classes to directory, free memory.
+ void VM_EnhancedRedefineClasses::rollback() {
+   log_info(redefine, class, load)("Rolling back redefinition, result=%d", _res);
+   ClassLoaderDataGraph::rollback_redefinition();
+@@ -1547,9 +1515,7 @@ void VM_EnhancedRedefineClasses::update_jmethod_ids() {
+   }
+ }
+ 
+-/**
+-  Set method as obsolete / old / deleted.
+-*/
++// Set method as obsolete / old / deleted.
+ void VM_EnhancedRedefineClasses::check_methods_and_mark_as_obsolete() {
+   for (int j = 0; j < _matching_methods_length; ++j/*, ++old_index*/) {
+     Method* old_method = _matching_old_methods[j];
+@@ -1771,12 +1737,9 @@ 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!
+-*/
++//  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() {
+   Method* old_method;
+   Method* new_method;
+@@ -1900,7 +1863,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+   }
+   */
+ 
+-
+   {
+     ResourceMark rm(THREAD);
+     // increment the classRedefinedCount field in the_class and in any
+@@ -1940,9 +1902,7 @@ void VM_EnhancedRedefineClasses::check_class(InstanceKlass* ik, TRAPS) {
+   }
+ }
+ 
+-/**
+- * Logging of all methods (old, new, changed, ...)
+- */
++// Logging of all methods (old, new, changed, ...)
+ void VM_EnhancedRedefineClasses::dump_methods() {
+   int j;
+   log_trace(redefine, class, dump)("_old_methods --");
+@@ -2002,9 +1962,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:
+    GrowableArray<Klass*>* _affected_klasses;
+@@ -2052,10 +2010,8 @@ 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.
+-*/
++// 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.
+ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
+   for (int i = 0; i < _class_count; i++) {
+     InstanceKlass* klass_handle = get_ik(_class_defs[i].klass);
+@@ -2086,9 +2042,7 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
+   return JVMTI_ERROR_NONE;
+ }
+ 
+-/**
+-  Pairs of class dependencies (for topological sort)
+-*/
++// Pairs of class dependencies (for topological sort)
+ struct KlassPair {
+   const Klass* _left;
+   const Klass* _right;
+@@ -2101,14 +2055,11 @@ static bool match_second(void* value, KlassPair elem) {
+   return elem._right == value;
+ }
+ 
+-/**
+- For each class to be redefined parse the bytecode and figure out the superclass and all interfaces.
+- First newly introduced classes (_class_defs) are scanned and then affected classed (_affected_klasses).
+- Affected flag is cleared (clear_redefinition_flag(Klass::MarkedAsAffected))
+- For each dependency create a KlassPair instance. Finnaly, affected classes (_affected_klasses) are sorted according to pairs.
+-
+- TODO - the class file is potentionally parsed multiple times - introduce a cache?
+-*/
++// For each 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?
+ jvmtiError VM_EnhancedRedefineClasses::do_topological_class_sorting(TRAPS) {
+   ResourceMark mark(THREAD);
+ 
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 7e2afd49650..d8a11b51fe9 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -35,17 +35,16 @@
+ #include "gc/shared/vmGCOperations.hpp"
+ #include "../../../java.base/unix/native/include/jni_md.h"
+ 
+-/**
+- * Enhanced class redefiner.
+- *
+- * This class implements VM_GC_Operation - the usual usage should be:
+- *     VM_EnhancedRedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_redefine);
+- *     VMThread::execute(&op);
+- * Which in turn runs:
+- *   - doit_prologue() - calculate all affected classes (add subclasses etc) and load new class versions
+- *   - doit() - main redefition, adjust existing objects on the heap, clear caches
+- *   - doit_epilogue() - cleanup
+-*/
++//
++// Enhanced class redefiner.
++//
++// This class implements VM_GC_Operation - the usual usage should be:
++//     VM_EnhancedRedefineClasses op(class_count, class_definitions, jvmti_class_load_kind_redefine);
++//     VMThread::execute(&op);
++// Which in turn runs:
++//   - doit_prologue() - calculate all affected classes (add subclasses etc) and load new class versions
++//   - doit() - main redefition, adjust existing objects on the heap, clear caches
++//   - doit_epilogue() - cleanup
+ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+  private:
+   // These static fields are needed by ClassLoaderDataGraph::classes_do()
+@@ -93,17 +92,15 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+ 
+   // These routines are roughly in call order unless otherwise noted.
+ 
+-  /**
+-    Load and link new classes (either redefined or affected by redefinition - subclass, ...)
+-
+-    - find sorted affected classes
+-    - resolve new class
+-    - calculate redefine flags (field change, method change, supertype change, ...)
+-    - calculate modified fields and mapping to old fields
+-    - link new classes
+-
+-    The result is sotred in _affected_klasses(old definitions) and _new_classes(new definitions) arrays.
+-  */
++  // Load and link new classes (either redefined or affected by redefinition - subclass, ...)
++  //
++  // - find sorted affected classes
++  // - resolve new class
++  // - calculate redefine flags (field change, method change, supertype change, ...)
++  // - calculate modified fields and mapping to old fields
++  // - link new classes
++  //
++  // The result is sotred in _affected_klasses(old definitions) and _new_classes(new definitions) arrays.
+   jvmtiError load_new_class_versions(TRAPS);
+ 
+   // Searches for all affected classes and performs a sorting such tha
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0047-Review-threads-cleanup.patch

@@ -0,0 +1,47 @@
+From 79c80c48da4d52f4616f1c6ef37e838d29be9be1 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sun, 24 May 2020 12:07:09 +0200
+Subject: [PATCH 47/50] Review threads, cleanup
+
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 8d00203fd9a..1fbba406087 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -253,7 +253,7 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+           // Note: we might set NULL at this point, which should force AbstractMethodError at runtime
+           Thread *thread = Thread::current();
+           CallInfo info(new_method, newest, thread);
+-          Handle objHandle(thread, obj);  // TODO : review thread
++          Handle objHandle(thread, obj);
+           MethodHandles::init_method_MemberName(objHandle, info);
+         } else {
+           java_lang_invoke_MemberName::set_method(obj, NULL);
+@@ -280,7 +280,7 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+           InstanceKlass* ik_new = InstanceKlass::cast(k->newest_version());
+           fieldDescriptor fd_new;
+           if (ik_new->find_local_field(fd.name(), fd.signature(), &fd_new)) {
+-            Handle objHandle(Thread::current(), obj);  // TODO : review thread
++            Handle objHandle(Thread::current(), obj);
+             MethodHandles::init_field_MemberName(objHandle, fd_new, MethodHandles::ref_kind_is_setter(ref_kind));
+           } else {
+             // Matching field is not found in new version, not much we can do here.
+@@ -441,10 +441,9 @@ public:
+ 
+ 
+ // Main transformation method - runs in VM thread.
+-//  - UseSharedSpaces - TODO what does it mean?
+-//  - for each sratch class call redefine_single_class
++//  - for each scratch class call redefine_single_class
+ //  - clear code cache (flush_dependent_code)
+-//  - iterate the heap and update object defintions, check it old/new class fields
++//  - iterate the heap and update object definitions, check it old/new class fields
+ //       are compatible. If new class size is smaller then old, it can be solved directly here.
+ //  - iterate the heap and update method handles to new version
+ //  - Swap marks to have same hashcodes
+-- 
+2.24.3 (Apple Git-128)
+

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

@@ -0,0 +1,57 @@
+From 8b79e673a3a9d12c97b8b7dd2f4d79c2d4cdd1d6 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 48/50] 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 7741328979f..06581643c3b 100644
+--- a/src/hotspot/share/prims/resolvedMethodTable.cpp
++++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
+@@ -261,25 +261,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.24.3 (Apple Git-128)
+

jb/project/tools/patches/dcevm/0050-G1-Heap-parallel-iterate-method-object_par_iterate-d.patch

@@ -0,0 +1,214 @@
+From 55e30de9a54b2f3bec995a2df42fe14b09d16f06 Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <lada.dvorak7@gmail.com>
+Date: Sun, 21 Jun 2020 13:38:45 +0200
+Subject: [PATCH 50/50] G1 Heap parallel iterate method "object_par_iterate" +
+ dcevm timers
+
+G1 Heap does not have parallel iterate method, that is usefull in dcevm
+iterate phase. According performance tests the parallel iteration is up
+~25% faster then serial iteration, ratio depends on the size of heap.
+Dcevm's timers did not make sense. Now, there are timers fo prologue,
+doit, gc itarate and full gc phases. Iterate+fullgc time make up most
+the total doit time.
+---
+ src/hotspot/share/gc/g1/g1CollectedHeap.cpp   | 20 ++++++++
+ src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |  2 +
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 46 +++++++++++++------
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |  5 +-
+ 4 files changed, 58 insertions(+), 15 deletions(-)
+
+diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+index dea8d9fdb0e..33664a30519 100644
+--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
++++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+@@ -2108,6 +2108,21 @@ public:
+   }
+ };
+ 
++class G1IterateObjectClosureTask : public AbstractGangTask {
++ private:
++  ObjectClosure* _cl;
++  G1CollectedHeap* _g1h;
++  HeapRegionClaimer _hrclaimer;
++ public:
++  G1IterateObjectClosureTask(ObjectClosure* cl, G1CollectedHeap* g1h) : AbstractGangTask("IterateObject Closure"),
++    _cl(cl), _g1h(g1h),  _hrclaimer(g1h->workers()->active_workers()) { }
++
++  virtual void work(uint worker_id) {
++    IterateObjectClosureRegionClosure blk(_cl);
++    _g1h->heap_region_par_iterate_from_worker_offset(&blk, &_hrclaimer, worker_id);
++  }
++};
++
+ void G1CollectedHeap::object_iterate(ObjectClosure* cl) {
+   IterateObjectClosureRegionClosure blk(cl);
+   heap_region_iterate(&blk);
+@@ -2117,6 +2132,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
+   _hrm.iterate(cl);
+ }
+ 
++void G1CollectedHeap::object_par_iterate(ObjectClosure* cl) {
++  G1IterateObjectClosureTask iocl_task(cl, this);
++  workers()->run_task(&iocl_task);
++}
++
+ void G1CollectedHeap::heap_region_par_iterate_from_worker_offset(HeapRegionClosure* cl,
+                                                                  HeapRegionClaimer *hrclaimer,
+                                                                  uint worker_id) const {
+diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+index 0735eef0da8..05a068bb2e0 100644
+--- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
++++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
+@@ -1117,6 +1117,8 @@ public:
+ 
+   // Iteration functions.
+ 
++  void object_par_iterate(ObjectClosure* cl);
++
+   // Iterate over all objects, calling "cl.do_object" on each.
+   virtual void object_iterate(ObjectClosure* cl);
+ 
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 32929b3d7a0..5be9bb74305 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -54,6 +54,7 @@
+ #include "utilities/events.hpp"
+ #include "oops/constantPool.inline.hpp"
+ #include "gc/cms/cmsHeap.hpp"
++#include "gc/g1/g1CollectedHeap.hpp"
+ #include "gc/shared/dcevmSharedGC.hpp"
+ 
+ Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
+@@ -459,6 +460,10 @@ public:
+ void VM_EnhancedRedefineClasses::doit() {
+   Thread *thread = Thread::current();
+ 
++  if (log_is_enabled(Info, redefine, class, timer)) {
++    _timer_vm_op_doit.start();
++  }
++
+ #if INCLUDE_CDS
+   if (UseSharedSpaces) {
+     // Sharing is enabled so we remap the shared readonly space to
+@@ -523,8 +528,22 @@ void VM_EnhancedRedefineClasses::doit() {
+     }
+ 
+     Universe::heap()->ensure_parsability(false);
+-    Universe::heap()->object_iterate(&objectClosure);
++    if (UseG1GC) {
++      if (log_is_enabled(Info, redefine, class, timer)) {
++        _timer_heap_iterate.start();
++      }
++      G1CollectedHeap::heap()->object_par_iterate(&objectClosure);
++      _timer_heap_iterate.stop();
++    } else {
++      if (log_is_enabled(Info, redefine, class, timer)) {
++        _timer_heap_iterate.start();
++      }
++      Universe::heap()->object_iterate(&objectClosure);
++      _timer_heap_iterate.stop();
++    }
++
+     Universe::root_oops_do(&oopClosureNoBarrier);
++
+   }
+   log_trace(redefine, class, obsolete, metadata)("After updating instances");
+ 
+@@ -577,12 +596,19 @@ void VM_EnhancedRedefineClasses::doit() {
+ 
+   if (objectClosure.needs_instance_update()) {
+     // Do a full garbage collection to update the instance sizes accordingly
++
++    if (log_is_enabled(Info, redefine, class, timer)) {
++      _timer_heap_full_gc.start();
++    }
++
+     Universe::set_redefining_gc_run(true);
+     notify_gc_begin(true);
+     // TODO: check _metadata_GC_clear_soft_refs with ScavengeRootsInCode
+     Universe::heap()->collect_as_vm_thread(GCCause::_heap_inspection);
+     notify_gc_end();
+     Universe::set_redefining_gc_run(false);
++
++    _timer_heap_full_gc.stop();
+   }
+ 
+   // Unmark Klass*s as "redefining"
+@@ -630,6 +656,7 @@ void VM_EnhancedRedefineClasses::doit() {
+   }
+ #endif
+ 
++  _timer_vm_op_doit.stop();
+ }
+ 
+ // Cleanup - runs in JVM thread
+@@ -653,16 +680,14 @@ void VM_EnhancedRedefineClasses::doit_epilogue() {
+   if (log_is_enabled(Info, redefine, class, timer)) {
+     // Used to have separate timers for "doit" and "all", but the timer
+     // overhead skewed the measurements.
+-    jlong doit_time = _timer_rsc_phase1.milliseconds() +
+-                      _timer_rsc_phase2.milliseconds();
+-    jlong all_time = _timer_vm_op_prologue.milliseconds() + doit_time;
++    jlong all_time = _timer_vm_op_prologue.milliseconds() + _timer_vm_op_doit.milliseconds();
+ 
+     log_info(redefine, class, timer)
+       ("vm_op: all=" JLONG_FORMAT "  prologue=" JLONG_FORMAT "  doit=" JLONG_FORMAT,
+-       all_time, _timer_vm_op_prologue.milliseconds(), doit_time);
++       all_time, _timer_vm_op_prologue.milliseconds(), _timer_vm_op_doit.milliseconds());
+     log_info(redefine, class, timer)
+-      ("redefine_single_class: phase1=" JLONG_FORMAT "  phase2=" JLONG_FORMAT,
+-       _timer_rsc_phase1.milliseconds(), _timer_rsc_phase2.milliseconds());
++      ("doit: heap iterate=" JLONG_FORMAT "  fullgc=" JLONG_FORMAT,
++       _timer_heap_iterate.milliseconds(), _timer_heap_full_gc.milliseconds());
+   }
+ }
+ 
+@@ -1411,7 +1436,7 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
+ // arrayKlassOops. See Open Issues in jvmtiRedefineClasses.hpp.
+ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+   if (!k->is_instance_klass()) {
+-	return;
++    return;
+   }
+ 
+   HandleMark hm(_thread);
+@@ -1829,10 +1854,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+ 
+   HandleMark hm(THREAD);   // make sure handles from this call are freed
+ 
+-  if (log_is_enabled(Info, redefine, class, timer)) {
+-    _timer_rsc_phase1.start();
+-  }
+-
+   InstanceKlass* new_class = new_class_oop;
+   InstanceKlass* the_class = InstanceKlass::cast(new_class_oop->old_version());
+   assert(the_class != NULL, "must have old version");
+@@ -1887,7 +1908,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+                              new_class->external_name(),
+                              java_lang_Class::classRedefinedCount(new_class->java_mirror()));
+   }
+-  _timer_rsc_phase2.stop();
+ } // end redefine_single_class()
+ 
+ 
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 030852b160a..9755944d70b 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -86,9 +86,10 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   // Performance measurement support. These timers do not cover all
+   // the work done for JVM/TI RedefineClasses() but they do cover
+   // the heavy lifting.
+-  elapsedTimer  _timer_rsc_phase1;
+-  elapsedTimer  _timer_rsc_phase2;
++  elapsedTimer  _timer_vm_op_doit;
+   elapsedTimer  _timer_vm_op_prologue;
++  elapsedTimer  _timer_heap_iterate;
++  elapsedTimer  _timer_heap_full_gc;
+ 
+   // These routines are roughly in call order unless otherwise noted.
+ 
+-- 
+2.24.3 (Apple Git-128)
+

jb/project/tools/patches/exclude_jcef_module.patch

@@ -0,0 +1,33 @@
+Index: src/java.desktop/share/classes/module-info.java
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- src/java.desktop/share/classes/module-info.java	(revision 5ae6630e3ebc71beb9f9df63b1b5bc19c9405d1f)
++++ src/java.desktop/share/classes/module-info.java	(date 1588168285537)
+@@ -109,10 +109,7 @@
+     // see make/GensrcModuleInfo.gmk
+     exports sun.awt to
+         jdk.accessibility,
+-        jdk.unsupported.desktop,
+-        jcef;
+-
+-    exports java.awt.peer to jcef;
++        jdk.unsupported.desktop;
+
+     exports java.awt.dnd.peer to jdk.unsupported.desktop;
+     exports sun.awt.dnd to jdk.unsupported.desktop;
+Index: modules.list
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- modules.list	(revision 5ae6630e3ebc71beb9f9df63b1b5bc19c9405d1f)
++++ modules.list	(date 1588168285505)
+@@ -61,5 +61,4 @@
+ jdk.unsupported,
+ jdk.xml.dom,
+ jdk.zipfs,
+-jdk.hotspot.agent,
+-jcef
++jdk.hotspot.agent

jb/project/tools/patches/exclude_jfx_module.patch

@@ -0,0 +1,21 @@
+Index: modules.list
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- modules.list	(revision ab073976c4f85f154ff1421b7ac888eee86b6595)
++++ modules.list	(date 1588171510146)
+@@ -20,13 +20,6 @@
+ java.transaction.xa,
+ java.xml,
+ java.xml.crypto,
+-javafx.base,
+-javafx.controls,
+-javafx.fxml,
+-javafx.graphics,
+-javafx.media,
+-javafx.swing,
+-javafx.web,
+ jdk.accessibility,
+ jdk.aot,
+ jdk.attach,

jb/project/tools/windows/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/windows/scripts
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jcef" || exit $?
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx" || exit $?
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "dcevm" || exit $?
+${script_dir}/mkimages_x64.sh $JBSDK_VERSION $JDK_BUILD_NUMBER $build_number "jfx_jcef" || exit $?

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

@@ -0,0 +1,122 @@
+#!/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_win_x64
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+bundle_type=$4
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=${WORK_DIR}/modular-sdk}"
+JCEF_PATH=${JCEF_PATH:=./jcef_win_x64}
+
+source jb/project/tools/common.sh
+
+function create_jbr {
+
+  case "$1" in
+  "${bundle_type}_lw")
+    grep -v "jdk.compiler\|jdk.hotspot.agent" modules.list > modules_tmp.list
+    ;;
+  "jfx" | "jcef" | "jfx_jcef" | "dcevm" | "nomod")
+    cat modules.list > modules_tmp.list
+    ;;
+  *)
+    echo "***ERR*** bundle was not specified" && exit 1
+    ;;
+  esac
+  rm -rf ${JBR_BUNDLE}
+
+  ${JSDK}/bin/jlink \
+    --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+    --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
+  if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]]
+  then
+    cp -R ${JCEF_PATH}/* ${JBR_BUNDLE}/bin
+  fi
+  echo Modifying release info ...
+  cat ${JSDK}/release | tr -d '\r' | grep -v 'JAVA_VERSION' | grep -v 'MODULES' >> ${JBR_BUNDLE}/release
+}
+
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+WORK_DIR=$(pwd)
+
+WITH_DEBUG_LEVEL="--with-debug-level=release"
+RELEASE_NAME=windows-x86_64-normal-server-release
+git checkout -- modules.list src/java.desktop/share/classes/module-info.java
+case "$bundle_type" in
+  "jfx")
+    echo "Excluding jcef modules"
+    git apply -p0 < jb/project/tools/patches/exclude_jcef_module.patch
+    ;;
+  "jcef")
+    echo "Excluding jfx modules"
+    git apply -p0 < jb/project/tools/patches/exclude_jfx_module.patch
+    ;;
+  "dcevm")
+    echo "Adding dcevm patches"
+    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=""
+    ;;
+esac
+
+PATH="/usr/local/bin:/usr/bin:${PATH}"
+./configure \
+  --disable-warnings-as-errors \
+  $WITH_DEBUG_LEVEL \
+  --with-target-bits=64 \
+  --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-toolchain-version=2015 \
+  --with-boot-jdk=${BOOT_JDK} \
+  --disable-ccache \
+  --enable-cds=yes || exit 1
+
+if [ "$bundle_type" == "jfx_jcef" ]; then
+  make LOG=info clean images CONF=$RELEASE_NAME test-image || exit 1
+else
+  make LOG=info clean images CONF=$RELEASE_NAME || exit 1
+fi
+
+JSDK=build/$RELEASE_NAME/images/jdk
+if [[ "$bundle_type" == *jcef* ]]; then
+  JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
+fi
+BASE_DIR=build/$RELEASE_NAME/images
+JBRSDK_BUNDLE=jbrsdk
+
+rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || exit 1
+cp -R ${JCEF_PATH}/* ${JBRSDK_BUNDLE}/bin
+sed 's/JBR/JBRSDK/g' ${JSDK}/release > release
+mv release ${JBRSDK_BUNDLE}/release
+
+JBR_BUNDLE=jbr_${bundle_type}
+create_jbr ${bundle_type}

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

@@ -0,0 +1,65 @@
+#!/bin/bash -x
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
+
+source jb/project/tools/common.sh
+
+JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
+WORK_DIR=$(pwd)
+
+PATH="/usr/local/bin:/usr/bin:${PATH}"
+./configure \
+  --disable-warnings-as-errors \
+  --disable-debug-symbols \
+  --with-target-bits=32 \
+  --with-vendor-name="${VENDOR_NAME}" \
+  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
+  --with-version-pre= \
+  --with-version-build=${JDK_BUILD_NUMBER} \
+  --with-version-opt=b${build_number} \
+  --with-toolchain-version=2015 \
+  --with-boot-jdk=${BOOT_JDK} \
+  --disable-ccache \
+  --enable-cds=yes || exit 1
+make clean CONF=windows-x86-normal-server-release || exit 1
+make LOG=info images CONF=windows-x86-normal-server-release test-image || exit 1
+
+JBSDK=${JBRSDK_BASE_NAME}-windows-x86-b${build_number}
+BASE_DIR=build/windows-x86-normal-server-release/images
+JSDK=${BASE_DIR}/jdk
+JBRSDK_BUNDLE=jbrsdk
+
+rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || exit 1
+sed 's/JBR/JBRSDK/g' ${JSDK}/release > release
+mv release ${JBRSDK_BUNDLE}/release
+
+JBR_BUNDLE=jbr
+rm -rf ${JBR_BUNDLE}
+grep -v javafx modules.list | grep -v "jdk.internal.vm\|jdk.aot\|jcef" > modules.list.x86
+${JSDK}/bin/jlink \
+  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
+  --add-modules $(xargs < modules.list.x86 | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
+
+echo Modifying release info ...
+#grep -v \"^JAVA_VERSION\" ${JSDK}/release | grep -v \"^MODULES\" >> ${JBR_BUNDLE}/release

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

@@ -0,0 +1,74 @@
+#!/bin/bash -x
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+bundle_type=$4
+
+function pack_jbr {
+
+  case "$1" in
+  "${bundle_type}_lw")
+    JBR_BASE_NAME=jbr_${bundle_type}_lw-${JBSDK_VERSION}
+    ;;
+  "jfx" | "jcef" | "dcevm" | "nomod")
+    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
+    ;;
+  "jfx_jcef")
+    JBR_BASE_NAME=jbr-${JBSDK_VERSION}
+    ;;
+  *)
+    echo "***ERR*** bundle was not specified" && exit 1
+    ;;
+  esac
+
+  JBR=$JBR_BASE_NAME-windows-x64-b$build_number
+  echo Creating $JBR.tar.gz ...
+  rm -rf ${BASE_DIR}/jbr
+  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
+
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || exit 1
+  #rm -rf ${BASE_DIR}/${JBR_BUNDLE}
+}
+
+RELEASE_NAME=windows-x86_64-normal-server-release
+
+JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+
+IMAGES_DIR=build/$RELEASE_NAME/images
+JSDK=$IMAGES_DIR/jdk
+JBSDK=$JBRSDK_BASE_NAME-windows-x64-b$build_number
+BASE_DIR=.
+
+if [ "$bundle_type" == "jfx_jcef" ]; then
+  JBRSDK_BUNDLE=jbrsdk
+  echo Creating $JBSDK.tar.gz ...
+  /usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
+fi
+
+JBR_BUNDLE=jbr_${bundle_type}
+pack_jbr $bundle_type
+
+if [ "$bundle_type" == "jfx_jcef" ]; then
+  JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x64-b$build_number
+  echo Creating $JBRSDK_TEST.tar.gz ...
+  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || exit 1
+fi

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

@@ -0,0 +1,45 @@
+#!/bin/bash -x
+
+# The following parameters must be specified:
+#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
+#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
+#   build_number     - specifies the number of JetBrainsRuntime build
+#   bundle_type      - specifies bundle to bu built; possible values:
+#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
+#                        jfx  - the bundle 1) jbr with javafx only will be created
+#
+# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
+#
+# $ ./java --version
+# openjdk 11.0.6 2020-01-14
+# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
+# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
+#
+
+JBSDK_VERSION=$1
+JDK_BUILD_NUMBER=$2
+build_number=$3
+
+JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
+JBR_BASE_NAME=jbr-$JBSDK_VERSION
+
+IMAGES_DIR=build/windows-x86-normal-server-release/images
+JSDK=$IMAGES_DIR/jdk
+JBSDK=$JBRSDK_BASE_NAME-windows-x86-b$build_number
+BASE_DIR=.
+
+JBRSDK_BUNDLE=jbrsdk
+echo Creating $JBSDK.tar.gz ...
+/usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || exit 1
+
+JBR_BUNDLE=jbr
+JBR_BASE_NAME=jbr-${JBSDK_VERSION}
+
+JBR=$JBR_BASE_NAME-windows-x86-b$build_number
+echo Creating $JBR.tar.gz ...
+/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR ${JBR_BUNDLE} || exit 1
+
+JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x86-b$build_number
+echo Creating $JBRSDK_TEST.tar.gz ...
+/usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || exit 1

jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/PressureEvent.java

@@ -23,28 +23,30 @@
  * questions.
  */
 
-#include "LWCToolkit.h"
-#include "GeomUtilities.h"
+package com.apple.eawt.event;
 
-#include "sun_awt_CGraphicsConfig.h"
-#import <JavaNativeFoundation/JavaNativeFoundation.h>
-
-/*
- * Class:     sun_awt_CGraphicsConfig
- * Method:    nativeGetBounds
- * Signature: (I)Ljava/awt/Rectangle;
+/**
+ * Event indicating a swipe was performed by the user.
+ *
+ * @see PressureListener
+ *
+ * @since Java for Mac OS X 10.10 Update 3, JDK 8
  */
-JNIEXPORT jobject JNICALL Java_sun_awt_CGraphicsConfig_nativeGetBounds
-(JNIEnv *env, jclass class, jint displayID)
-{
-    jobject jrect = NULL;
+public class PressureEvent extends GestureEvent {
 
-JNF_COCOA_ENTER(env);
+    public double getPressure() {
+        return pressure;
+    }
 
-    CGRect rect = CGDisplayBounds((CGDirectDisplayID)displayID);
-    jrect = CGToJavaRect(env, rect);
+    public double getStage() {
+        return stage;
+    }
 
-JNF_COCOA_EXIT(env);
+    private double pressure;
+    private double stage;
 
-    return jrect;
+    PressureEvent(double pressure, double stage) {
+        this.pressure = pressure;
+        this.stage = stage;
+    }
 }

jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/PressureListener.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2012, 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
@@ -22,18 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-#ifndef _ROBOT_COMMON_H
-#define _ROBOT_COMMON_H
 
-#include "java_awt_event_InputEvent.h"
+package com.apple.eawt.event;
 
-#include <X11/Xlib.h>
-#include "gdefs.h"
-
-int QueryColorMap(Display *disp,
-                  Colormap src_cmap,
-                  Visual *src_vis,
-                  XColor **src_colors,
-                  int *rShift, int *gShift, int *bShift);
-
-#endif /* _ROBOT_COMMON_H */
+/**
+ * Listener interface for receiving pressure events.
+ *
+ * @see PressureEvent
+ * @see GestureUtilities
+ *
+ * @since Java for Mac OS X 10.5 Update 7, Java for Mac OS X 10.6 Update 2
+ */
+public interface PressureListener extends GestureListener {
+    public void pressure(final PressureEvent e);
+}

make/Bundles.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -29,6 +29,7 @@ include $(SPEC)
 include MakeBase.gmk
 
 PRODUCT_TARGETS :=
+LEGACY_TARGETS :=
 TEST_TARGETS :=
 DOCS_TARGETS :=
 
@@ -49,6 +50,7 @@ $(eval $(call IncludeCustomExtension, Bundles-pre.gmk))
 #     files or directories may contain spaces.
 # BASE_DIRS : Base directories for the root dir in the bundle.
 # SUBDIR : Optional name of root dir in bundle.
+# OUTPUTDIR : Optionally override output dir
 SetupBundleFile = $(NamedParamsMacroTemplate)
 define SetupBundleFileBody
 
@@ -69,8 +71,11 @@ define SetupBundleFileBody
 
   $$(call SetIfEmpty, $1_UNZIP_DEBUGINFO, false)
 
-  $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
-        # If any of the files contain a space in the file name, CacheFind
+  $$(call SetIfEmpty, $1_OUTPUTDIR, $$(BUNDLES_OUTPUTDIR))
+
+  $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME): $$($1_FILES)
+	$$(call LogWarn, Creating $$($1_BUNDLE_NAME))
+        # If any of the files contain a space in the file name, FindFiles
         # will have replaced it with ?. Tar does not accept that so need to
         # switch it back.
 	$$(foreach d, $$($1_BASE_DIRS), \
@@ -120,6 +125,13 @@ define SetupBundleFileBody
 	    && $(TAR) cf - -$(TAR_INCLUDE_PARAM) $$($1_$$d_LIST_FILE) \
 	        $(TAR_IGNORE_EXIT_VALUE) ) \
 	    | ( $(CD) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) && $(TAR) xf - )$$(NEWLINE) )
+          # Rename stripped pdb files
+          ifeq ($(OPENJDK_TARGET_OS)+$(SHIP_DEBUG_SYMBOLS), windows+public)
+	    for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.stripped.pdb"`; do \
+	      $(ECHO) Renaming $$$${f} to $$$${f%stripped.pdb}pdb $(LOG_INFO); \
+	      $(MV) $$$${f} $$$${f%stripped.pdb}pdb; \
+	    done
+          endif
           # Unzip any zipped debuginfo files
           ifeq ($$($1_UNZIP_DEBUGINFO), true)
 	    for f in `$(FIND) $(SUPPORT_OUTPUTDIR)/bundles/$1/$$($1_SUBDIR) -name "*.diz"`; do \
@@ -136,7 +148,7 @@ define SetupBundleFileBody
           endif
         endif
 
-  $1 += $(BUNDLES_OUTPUTDIR)/$$($1_BUNDLE_NAME)
+  $1 += $$($1_OUTPUTDIR)/$$($1_BUNDLE_NAME)
 
 endef
 
@@ -146,31 +158,76 @@ endef
 # correct base directories.
 ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
   JDK_IMAGE_DIR := $(JDK_MACOSX_BUNDLE_DIR)
+  JRE_IMAGE_DIR := $(JRE_MACOSX_BUNDLE_DIR)
   JDK_IMAGE_HOMEDIR := $(JDK_MACOSX_CONTENTS_DIR)/Home
+  JRE_IMAGE_HOMEDIR := $(JRE_MACOSX_CONTENTS_DIR)/Home
   JDK_BUNDLE_SUBDIR :=
+  JRE_BUNDLE_SUBDIR :=
+  # In certain situations, the JDK_IMAGE_DIR points to an image without the
+  # the symbols and demos. If so, the symobls and demos can be found in a
+  # separate image. These variables allow for overriding from a custom makefile.
+  JDK_SYMBOLS_IMAGE_DIR ?= $(JDK_IMAGE_DIR)
+  JDK_DEMOS_IMAGE_DIR ?= $(JDK_IMAGE_DIR)
+  JDK_DEMOS_IMAGE_HOMEDIR ?= $(JDK_DEMOS_IMAGE_DIR)/$(JDK_MACOSX_CONTENTS_SUBDIR)/Home
 else
   JDK_IMAGE_HOMEDIR := $(JDK_IMAGE_DIR)
+  JRE_IMAGE_HOMEDIR := $(JRE_IMAGE_DIR)
   JDK_BUNDLE_SUBDIR := jdk-$(VERSION_NUMBER)
+  JRE_BUNDLE_SUBDIR := jre-$(VERSION_NUMBER)
   ifneq ($(DEBUG_LEVEL), release)
     JDK_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
+    JRE_BUNDLE_SUBDIR := $(JRE_BUNDLE_SUBDIR)/$(DEBUG_LEVEL)
   endif
+  # In certain situations, the JDK_IMAGE_DIR points to an image without the
+  # the symbols and demos. If so, the symobls and demos can be found in a
+  # separate image. These variables allow for overriding from a custom makefile.
+  JDK_SYMBOLS_IMAGE_DIR ?= $(JDK_IMAGE_DIR)
+  JDK_DEMOS_IMAGE_DIR ?= $(JDK_IMAGE_DIR)
+  JDK_DEMOS_IMAGE_HOMEDIR ?= $(JDK_DEMOS_IMAGE_DIR)
 endif
 
 ################################################################################
 
-ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
-  $(eval $(call FillCacheFind, $(IMAGES_OUTPUTDIR)))
+ifneq ($(filter product-bundles% legacy-bundles, $(MAKECMDGOALS)), )
 
-  SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.pdb %.map
+  SYMBOLS_EXCLUDE_PATTERN := %.debuginfo %.diz %.map
 
-  ALL_JDK_FILES := $(call CacheFind, $(JDK_IMAGE_DIR))
+  # There may be files with spaces in the names, so use ShellFindFiles
+  # explicitly.
+  ALL_JDK_FILES := $(call ShellFindFiles, $(JDK_IMAGE_DIR))
+  ifneq ($(JDK_IMAGE_DIR), $(JDK_SYMBOLS_IMAGE_DIR))
+    ALL_JDK_SYMBOLS_FILES := $(call ShellFindFiles, $(JDK_SYMBOLS_IMAGE_DIR))
+  else
+    ALL_JDK_SYMBOLS_FILES := $(ALL_JDK_FILES)
+  endif
+  ifneq ($(JDK_IMAGE_DIR), $(JDK_DEMOS_IMAGE_DIR))
+    ALL_JDK_DEMOS_FILES := $(call ShellFindFiles, $(JDK_DEMOS_IMAGE_DIR))
+  else
+    ALL_JDK_DEMOS_FILES := $(ALL_JDK_FILES)
+  endif
 
   # Create special filter rules when dealing with unzipped .dSYM directories on
   # macosx
   ifeq ($(OPENJDK_TARGET_OS), macosx)
     ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
       JDK_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
-          $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, $(ALL_JDK_FILES))))
+          $(call containing, .dSYM/, $(patsubst $(JDK_IMAGE_DIR)/%, %, \
+          $(ALL_JDK_SYMBOLS_FILES))))
+    endif
+  endif
+
+  # Create special filter rules when dealing with debug symbols on windows
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    ifeq ($(SHIP_DEBUG_SYMBOLS), )
+      JDK_SYMBOLS_EXCLUDE_PATTERN := %.pdb
+    else
+      ifeq ($(SHIP_DEBUG_SYMBOLS), public)
+        JDK_SYMBOLS_EXCLUDE_PATTERN := \
+            $(filter-out \
+                %.stripped.pdb, \
+                $(filter %.pdb, $(ALL_JDK_FILES)) \
+            )
+      endif
     endif
   endif
 
@@ -183,40 +240,156 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
           , \
           $(ALL_JDK_FILES) \
       )
+
   JDK_SYMBOLS_BUNDLE_FILES := \
       $(filter \
           $(JDK_SYMBOLS_EXCLUDE_PATTERN) \
           $(SYMBOLS_EXCLUDE_PATTERN) \
           , \
           $(filter-out \
-              $(JDK_IMAGE_HOMEDIR)/demo/% \
+              $(JDK_IMAGE_HOMEDIR)/demo/% %.stripped.pdb \
               , \
-              $(ALL_JDK_FILES) \
+              $(ALL_JDK_SYMBOLS_FILES) \
           ) \
       ) \
-      $(call CacheFind, $(SYMBOLS_IMAGE_DIR))
+      $(call FindFiles, $(SYMBOLS_IMAGE_DIR))
 
-  TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_IMAGE_HOMEDIR)/demo/%, $(ALL_JDK_FILES))
+  TEST_DEMOS_BUNDLE_FILES := $(filter $(JDK_DEMOS_IMAGE_HOMEDIR)/demo/%, \
+      $(ALL_JDK_DEMOS_FILES))
 
-  $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
-      BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
-      FILES := $(JDK_BUNDLE_FILES), \
-      SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \
-      BASE_DIRS := $(JDK_IMAGE_DIR), \
-      SUBDIR := $(JDK_BUNDLE_SUBDIR), \
-  ))
+  ALL_JRE_FILES := $(call ShellFindFiles, $(JRE_IMAGE_DIR))
 
-  PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
+  # Create special filter rules when dealing with unzipped .dSYM directories on
+  # macosx
+  ifeq ($(OPENJDK_TARGET_OS), macosx)
+    ifeq ($(ZIP_EXTERNAL_DEBUG_SYMBOLS), false)
+      JRE_SYMBOLS_EXCLUDE_PATTERN := $(addprefix %, \
+          $(call containing, .dSYM/, $(patsubst $(JRE_IMAGE_DIR)/%, %, $(ALL_JRE_FILES))))
+    endif
+  endif
 
-  $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
-      BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
-      FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
-      BASE_DIRS := $(JDK_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \
-      SUBDIR := $(JDK_BUNDLE_SUBDIR), \
-      UNZIP_DEBUGINFO := true, \
-  ))
+  # Create special filter rules when dealing with debug symbols on windows
+  ifeq ($(OPENJDK_TARGET_OS), windows)
+    ifeq ($(SHIP_DEBUG_SYMBOLS), )
+      JRE_SYMBOLS_EXCLUDE_PATTERN := %.pdb
+    else
+      ifeq ($(SHIP_DEBUG_SYMBOLS), public)
+        JRE_SYMBOLS_EXCLUDE_PATTERN := \
+            $(filter-out \
+                %.stripped.pdb, \
+                $(filter %.pdb, $(ALL_JRE_FILES)) \
+            )
+      endif
+    endif
+  endif
 
-  PRODUCT_TARGETS += $(BUILD_JDK_SYMBOLS_BUNDLE)
+  JRE_BUNDLE_FILES := $(filter-out \
+      $(JRE_SYMBOLS_EXCLUDE_PATTERN) \
+      $(SYMBOLS_EXCLUDE_PATTERN), \
+      $(ALL_JRE_FILES))
+
+  # On Macosx release builds, when there is a code signing certificate available,
+  # the final bundle layout can be signed.
+  SIGN_BUNDLE := false
+  ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
+    ifneq ($(CODESIGN), )
+      SIGN_BUNDLE := true
+    endif
+  endif
+
+  ifeq ($(SIGN_BUNDLE), true)
+    # Macosx release build and code signing available.
+
+    ################################################################################
+    # JDK bundle
+    $(eval $(call SetupCopyFiles, CREATE_JDK_BUNDLE_DIR_SIGNED, \
+        SRC := $(JDK_IMAGE_DIR), \
+        FILES := $(JDK_BUNDLE_FILES), \
+        DEST := $(JDK_MACOSX_BUNDLE_DIR_SIGNED), \
+    ))
+
+    JDK_SIGNED_CODE_RESOURCES := \
+        $(JDK_MACOSX_BUNDLE_DIR_SIGNED)/$(JDK_MACOSX_CONTENTS_SUBDIR)/_CodeSignature/CodeResources
+
+    $(JDK_SIGNED_CODE_RESOURCES): $(CREATE_JDK_BUNDLE_DIR_SIGNED)
+	$(call LogWarn, Signing $(JDK_BUNDLE_NAME))
+	$(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" \
+	    --timestamp --options runtime --deep --force \
+	    $(JDK_MACOSX_BUNDLE_DIR_SIGNED)/$(JDK_MACOSX_BUNDLE_TOP_DIR) $(LOG_DEBUG)
+	$(TOUCH) $@
+
+    $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
+        BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
+        FILES := \
+            $(CREATE_JDK_BUNDLE_DIR_SIGNED) \
+            $(JDK_SIGNED_CODE_RESOURCES), \
+        BASE_DIRS := $(JDK_MACOSX_BUNDLE_DIR_SIGNED), \
+        SUBDIR := $(JDK_BUNDLE_SUBDIR), \
+    ))
+
+    PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
+
+    ################################################################################
+    # JRE bundle
+    $(eval $(call SetupCopyFiles, CREATE_JRE_BUNDLE_DIR_SIGNED, \
+        SRC := $(JRE_IMAGE_DIR), \
+        FILES := $(JRE_BUNDLE_FILES), \
+        DEST := $(JRE_MACOSX_BUNDLE_DIR_SIGNED), \
+    ))
+
+    JRE_SIGNED_CODE_RESOURCES := \
+        $(JRE_MACOSX_BUNDLE_DIR_SIGNED)/$(JRE_MACOSX_CONTENTS_SUBDIR)/_CodeSignature/CodeResources
+
+    $(JRE_SIGNED_CODE_RESOURCES): $(CREATE_JRE_BUNDLE_DIR_SIGNED)
+	$(call LogWarn, Signing $(JRE_BUNDLE_NAME))
+	$(CODESIGN) -s "$(MACOSX_CODESIGN_IDENTITY)" \
+	    --timestamp --options runtime --deep --force \
+	    $(JRE_MACOSX_BUNDLE_DIR_SIGNED)/$(JRE_MACOSX_BUNDLE_TOP_DIR) $(LOG_DEBUG)
+	$(TOUCH) $@
+
+    $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
+        BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
+        FILES := \
+            $(CREATE_JRE_BUNDLE_DIR_SIGNED) \
+            $(JRE_SIGNED_CODE_RESOURCES), \
+        BASE_DIRS := $(JRE_MACOSX_BUNDLE_DIR_SIGNED), \
+        SUBDIR := $(JRE_BUNDLE_SUBDIR), \
+    ))
+
+    LEGACY_TARGETS += $(BUILD_JRE_BUNDLE)
+  else
+    # Not a Macosx release build or code signing not available.
+    $(eval $(call SetupBundleFile, BUILD_JDK_BUNDLE, \
+        BUNDLE_NAME := $(JDK_BUNDLE_NAME), \
+        FILES := $(JDK_BUNDLE_FILES), \
+        SPECIAL_INCLUDES := $(JDK_SPECIAL_INCLUDES), \
+        BASE_DIRS := $(JDK_IMAGE_DIR), \
+        SUBDIR := $(JDK_BUNDLE_SUBDIR), \
+    ))
+
+    PRODUCT_TARGETS += $(BUILD_JDK_BUNDLE)
+
+    $(eval $(call SetupBundleFile, BUILD_JRE_BUNDLE, \
+        BUNDLE_NAME := $(JRE_BUNDLE_NAME), \
+        FILES := $(JRE_BUNDLE_FILES), \
+        BASE_DIRS := $(JRE_IMAGE_DIR), \
+        SUBDIR := $(JRE_BUNDLE_SUBDIR), \
+    ))
+
+    LEGACY_TARGETS += $(BUILD_JRE_BUNDLE)
+  endif
+
+  ifeq ($(COPY_DEBUG_SYMBOLS), true)
+    $(eval $(call SetupBundleFile, BUILD_JDK_SYMBOLS_BUNDLE, \
+        BUNDLE_NAME := $(JDK_SYMBOLS_BUNDLE_NAME), \
+        FILES := $(JDK_SYMBOLS_BUNDLE_FILES), \
+        BASE_DIRS := $(JDK_SYMBOLS_IMAGE_DIR) $(wildcard $(SYMBOLS_IMAGE_DIR)), \
+        SUBDIR := $(JDK_BUNDLE_SUBDIR), \
+        UNZIP_DEBUGINFO := true, \
+    ))
+
+    PRODUCT_TARGETS += $(BUILD_JDK_SYMBOLS_BUNDLE)
+  endif
 
   # The demo bundle is only created to support client tests. Ideally it should
   # be built with the main test bundle, but since the prerequisites match
@@ -224,7 +397,7 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), )
   $(eval $(call SetupBundleFile, BUILD_TEST_DEMOS_BUNDLE, \
       BUNDLE_NAME := $(TEST_DEMOS_BUNDLE_NAME), \
       FILES := $(TEST_DEMOS_BUNDLE_FILES), \
-      BASE_DIRS := $(JDK_IMAGE_DIR), \
+      BASE_DIRS := $(JDK_DEMOS_IMAGE_DIR), \
       SUBDIR := $(JDK_BUNDLE_SUBDIR), \
   ))
 
@@ -234,7 +407,7 @@ endif
 ################################################################################
 
 ifneq ($(filter test-bundles, $(MAKECMDGOALS)), )
-  TEST_BUNDLE_FILES := $(call CacheFind, $(TEST_IMAGE_DIR))
+  TEST_BUNDLE_FILES := $(call FindFiles, $(TEST_IMAGE_DIR))
 
   $(eval $(call SetupBundleFile, BUILD_TEST_BUNDLE, \
       BUNDLE_NAME := $(TEST_BUNDLE_NAME), \
@@ -248,7 +421,7 @@ endif
 ################################################################################
 
 ifneq ($(filter docs-bundles, $(MAKECMDGOALS)), )
-  DOCS_BUNDLE_FILES := $(call CacheFind, $(DOCS_IMAGE_DIR))
+  DOCS_BUNDLE_FILES := $(call FindFiles, $(DOCS_IMAGE_DIR))
 
   $(eval $(call SetupBundleFile, BUILD_DOCS_BUNDLE, \
       BUNDLE_NAME := $(DOCS_BUNDLE_NAME), \
@@ -262,13 +435,37 @@ endif
 
 ################################################################################
 
+ifneq ($(filter static-libs-bundles, $(MAKECMDGOALS)), )
+  STATIC_LIBS_BUNDLE_FILES := $(call FindFiles, $(STATIC_LIBS_IMAGE_DIR))
+
+  ifeq ($(OPENJDK_TARGET_OS)-$(DEBUG_LEVEL), macosx-release)
+    STATIC_LIBS_BUNDLE_SUBDIR := $(JDK_MACOSX_CONTENTS_SUBDIR)/Home
+  else
+    STATIC_LIBS_BUNDLE_SUBDIR := $(JDK_BUNDLE_SUBDIR)
+  endif
+
+  $(eval $(call SetupBundleFile, BUILD_STATIC_LIBS_BUNDLE, \
+      BUNDLE_NAME := $(STATIC_LIBS_BUNDLE_NAME), \
+      FILES := $(STATIC_LIBS_BUNDLE_FILES), \
+      BASE_DIRS := $(STATIC_LIBS_IMAGE_DIR), \
+      SUBDIR := $(STATIC_LIBS_BUNDLE_SUBDIR), \
+  ))
+
+  STATIC_LIBS_TARGETS += $(BUILD_STATIC_LIBS_BUNDLE)
+endif
+
+################################################################################
+
 # Hook to include the corresponding custom file, if present.
 $(eval $(call IncludeCustomExtension, Bundles.gmk))
 
 ################################################################################
 
 product-bundles: $(PRODUCT_TARGETS)
+legacy-bundles: $(LEGACY_TARGETS)
 test-bundles: $(TEST_TARGETS)
 docs-bundles: $(DOCS_TARGETS)
+static-libs-bundles: $(STATIC_LIBS_TARGETS)
 
-.PHONY: all default product-bundles test-bundles docs-bundles
+.PHONY: all default product-bundles test-bundles docs-bundles \
+    static-libs-bundles

make/CompileCommands.gmk

@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+# When FIXPATH is set, let it process the file to make sure all paths are usable
+# by system native tools. The FIXPATH tool assumes arguments preceeded by an @
+# character points to a text file containing further arguments (similar to a
+# linker). It replaces any such arguments with a different temporary filename,
+# whose contents has been processed to make any paths native. To obtain a
+# properly processed compile_commands.json, FIXPATH is then made to invoke an
+# AWK script with the unprocessed json file as the only argument, prepended with
+# an @ character. The AWK script simply copies the contents of this processed
+# file.
+#
+# The sed command encloses the fragments inside brackets and removes the final
+# trailing comma.
+$(OUTPUTDIR)/compile_commands.json: $(wildcard $(MAKESUPPORT_OUTPUTDIR)/compile-commands/*.json)
+	$(call LogWarn, Updating compile_commands.json)
+	$(RM) $@
+	$(FIND) $(MAKESUPPORT_OUTPUTDIR)/compile-commands/ -name \*.json | \
+	    $(SORT) | $(XARGS) $(CAT) >> $@.tmp
+	$(if $(FIXPATH),$(FIXPATH) $(AWK) 'BEGIN { \
+	    tmpfile = substr(ARGV[2],2); \
+	    cmd = "$(CP) " "\047" tmpfile "\047" " $@.tmp"; \
+	    system(cmd); \
+	}' -- @$@.tmp)
+	$(SED) -e '1s/^/[\$(NEWLINE)/' -e '$(DOLLAR)s/,\s\{0,\}$(DOLLAR)/\$(NEWLINE)]/' $@.tmp > $@
+	$(RM) $@.tmp
+
+TARGETS += $(OUTPUTDIR)/compile_commands.json
+
+all: $(TARGETS)
+
+.PHONY: all

make/CompileDemos.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -43,7 +43,7 @@ $(eval $(call IncludeCustomExtension, CompileDemos-pre.gmk))
 # Prepare the find cache.
 DEMO_SRC_DIRS += $(TOPDIR)/src/demo
 
-$(eval $(call FillCacheFind, $(wildcard $(DEMO_SRC_DIRS))))
+$(call FillFindCache, $(DEMO_SRC_DIRS))
 
 # Append demo goals to this variable.
 TARGETS =
@@ -237,11 +237,11 @@ $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%: $(DEMO_SHARE_SRC)/nbproject/%
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
     $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
-    $(call CacheFind, $(DEMO_SHARE_SRC)/nbproject))
+    $(call FindFiles, $(DEMO_SHARE_SRC)/nbproject))
 else
   TARGETS += $(patsubst $(DEMO_SHARE_SRC)/nbproject/%, \
     $(SUPPORT_OUTPUTDIR)/demos/image/nbproject/%, \
-    $(call CacheFind, $(DEMO_SHARE_SRC)/nbproject))
+    $(call FindFiles, $(DEMO_SHARE_SRC)/nbproject))
 endif
 
 ################################################################################
@@ -250,7 +250,7 @@ ifneq ($(filter images, $(MAKECMDGOALS)), )
   $(eval $(call SetupCopyFiles, COPY_TO_TEST_IMAGE, \
       SRC := $(SUPPORT_OUTPUTDIR)/demos/image, \
       DEST := $(TEST_IMAGE_DIR)/jdk/demos, \
-      FILES := $(call CacheFind, $(SUPPORT_OUTPUTDIR)/demos/image), \
+      FILES := $(call FindFiles, $(SUPPORT_OUTPUTDIR)/demos/image), \
   ))
 
   IMAGES_TARGETS := $(COPY_TO_TEST_IMAGE)

make/CompileJavaModules.gmk

@@ -644,7 +644,7 @@ endif
 
 ifneq ($(wildcard $(IMPORT_MODULES_CLASSES)/$(MODULE)), )
   $(JDK_OUTPUTDIR)/modules/$(MODULE)/_imported.marker: \
-      $(call CacheFind, $(IMPORT_MODULES_CLASSES)/$(MODULE))
+      $(call FindFiles, $(IMPORT_MODULES_CLASSES)/$(MODULE))
 	$(call MakeDir, $(@D))
         # Do not delete marker and build meta data files
 	$(RM) -r $(filter-out $(@D)/_%, $(wildcard $(@D)/*))

make/CompileToolsJdk.gmk

@@ -40,6 +40,7 @@ $(eval $(call IncludeCustomExtension, CompileTools.gmk))
 BUILD_TOOLS_SRC_DIRS += \
     $(TOPDIR)/make/jdk/src/classes \
     $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes \
+    $(BUILDTOOLS_OUTPUTDIR)/interim_tzdb_classes \
     #
 
 $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \

make/CopyImportModules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -35,7 +35,7 @@ LIBS_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_LIBS)))
 CMDS_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_CMDS)))
 CONF_DIR := $(wildcard $(addsuffix /$(MODULE), $(IMPORT_MODULES_CONF)))
 
-$(eval $(call FillCacheFind, $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR)))
+$(call FillFindCache, $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR))
 
 ifneq ($(LIBS_DIR), )
   ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -45,21 +45,21 @@ ifneq ($(LIBS_DIR), )
         SRC := $(LIBS_DIR), \
         DEST := $(JDK_OUTPUTDIR)/bin, \
         FILES := $(filter $(TO_BIN_FILTER), \
-            $(call CacheFind, $(LIBS_DIR))) \
+            $(call FindFiles, $(LIBS_DIR))) \
     ))
 
     $(eval $(call SetupCopyFiles, COPY_LIBS_TO_LIB, \
         SRC := $(LIBS_DIR), \
         DEST := $(JDK_OUTPUTDIR)/lib, \
         FILES := $(filter-out $(TO_BIN_FILTER), \
-            $(call CacheFind, $(LIBS_DIR))) \
+            $(call FindFiles, $(LIBS_DIR))) \
     ))
     TARGETS += $(COPY_LIBS_TO_BIN) $(COPY_LIBS_TO_LIB)
   else
     $(eval $(call SetupCopyFiles, COPY_LIBS, \
         SRC := $(LIBS_DIR), \
         DEST := $(JDK_OUTPUTDIR)/lib, \
-        FILES := $(filter %$(SHARED_LIBRARY_SUFFIX), $(call CacheFind, $(LIBS_DIR))), \
+        FILES := $(filter %$(SHARED_LIBRARY_SUFFIX), $(call FindFiles, $(LIBS_DIR))), \
     ))
 
     # Use relative links if the import dir is inside the OUTPUTDIR, otherwise
@@ -75,7 +75,7 @@ ifneq ($(LIBS_DIR), )
     $(eval $(call SetupCopyFiles, LINK_LIBS, \
         SRC := $(LIBS_DIR), \
         DEST := $(JDK_OUTPUTDIR)/lib, \
-        FILES := $(filter-out %$(SHARED_LIBRARY_SUFFIX), $(call CacheFind, $(LIBS_DIR))), \
+        FILES := $(filter-out %$(SHARED_LIBRARY_SUFFIX), $(call FindFiles, $(LIBS_DIR))), \
         MACRO := $(LINK_MACRO), \
         LOG_ACTION := $(LOG_ACTION), \
     ))
@@ -87,7 +87,7 @@ ifneq ($(CMDS_DIR), )
   $(eval $(call SetupCopyFiles, COPY_CMDS, \
       SRC := $(CMDS_DIR), \
       DEST := $(JDK_OUTPUTDIR)/bin, \
-      FILES := $(call CacheFind, $(CMDS_DIR)), \
+      FILES := $(call FindFiles, $(CMDS_DIR)), \
   ))
   TARGETS += $(COPY_CMDS)
 endif
@@ -96,7 +96,7 @@ ifneq ($(CONF_DIR), )
   $(eval $(call SetupCopyFiles, COPY_CONF, \
       SRC := $(CONF_DIR), \
       DEST := $(JDK_OUTPUTDIR)/lib, \
-      FILES := $(call CacheFind, $(CONF_DIR)), \
+      FILES := $(call FindFiles, $(CONF_DIR)), \
   ))
   TARGETS += $(COPY_CONF)
 endif

make/CopyInterimTZDB.gmk

@@ -0,0 +1,50 @@
+#
+# Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+default: all
+
+include $(SPEC)
+include MakeBase.gmk
+
+##########################################################################################
+
+### TZDB tool needs files from java.time.zone package
+
+define tzdb_copyfiles
+	$(call MakeTargetDir)
+	$(RM) '$@'
+	$(SED) -e "s/package java.time.zone/package build.tools.tzdb/" \
+        < $(<) > $@
+endef
+
+$(eval $(call SetupCopyFiles,COPY_INTERIM_TZDB, \
+    SRC := $(TOPDIR)/src/java.base/share/classes/java/time/zone, \
+    DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_tzdb_classes/build/tools/tzdb, \
+    FILES := ZoneRules.java ZoneOffsetTransition.java ZoneOffsetTransitionRule.java Ser.java, \
+    MACRO := tzdb_copyfiles))
+
+##########################################################################################
+
+all: $(COPY_INTERIM_TZDB)

make/CreateBuildJdkCopy.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -39,7 +39,7 @@ MODULES_TO_COPY := $(sort \
 
 COPY_CLASSES_TARGET := $(BUILDJDK_OUTPUTDIR)/jdk/modules/java.base/_the.buildjdk-copy-marker
 
-$(COPY_CLASSES_TARGET): $(call CacheFind, $(wildcard \
+$(COPY_CLASSES_TARGET): $(call FindFiles, $(wildcard \
     $(addprefix $(JDK_OUTPUTDIR)/modules/, $(MODULES_TO_COPY))))
 	$(ECHO) $(LOG_INFO) "Copying java modules to buildjdk: $(MODULES_TO_COPY)"
 	$(RM) -r $(BUILDJDK_OUTPUTDIR)/jdk/modules
@@ -56,7 +56,7 @@ TARGETS += $(COPY_CLASSES_TARGET)
 $(eval $(call SetupCopyFiles, COPY_SUPPORT_HEADERS, \
     SRC := $(OUTPUTDIR), \
     DEST := $(BUILDJDK_OUTPUTDIR), \
-    FILES := $(call CacheFind, $(wildcard \
+    FILES := $(call FindFiles, $(wildcard \
         $(addprefix $(SUPPORT_OUTPUTDIR)/headers/, $(MODULES_TO_COPY)))), \
 ))
 

make/CreateJmods.gmk

@@ -1,4 +1,5 @@
-# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
+#
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -51,33 +52,79 @@ INCLUDE_HEADERS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
 MAN_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
     $(SUPPORT_OUTPUTDIR)/modules_man $(IMPORT_MODULES_MAN))))
 
-$(eval $(call FillCacheFind, \
+$(call FillFindCache, \
     $(LIBS_DIR) $(CMDS_DIR) $(CONF_DIR) $(CLASSES_DIR) \
-))
+)
 
 ifneq ($(LIBS_DIR), )
-  JMOD_FLAGS += --libs $(LIBS_DIR)
-  DEPS += $(call CacheFind, $(LIBS_DIR))
+  DEPS += $(call FindFiles, $(LIBS_DIR))
+  ifeq ($(OPENJDK_TARGET_OS)+$(SHIP_DEBUG_SYMBOLS), windows+public)
+    # For public debug symbols on Windows, we have to use stripped pdbs and rename them
+    rename_stripped = $(patsubst %.stripped.pdb,%.pdb,$1)
+    LIBS_DIR_FILTERED := $(subst modules_libs,modules_libs_filtered, $(LIBS_DIR))
+    FILES_LIBS := $(filter-out %.pdb, $(call FindFiles, $(LIBS_DIR))) \
+        $(filter %.stripped.pdb, $(call FindFiles, $(LIBS_DIR)))
+    $(eval $(call SetupCopyFiles, COPY_FILTERED_LIBS, \
+        SRC := $(LIBS_DIR), \
+        DEST := $(LIBS_DIR_FILTERED), \
+        FILES := $(FILES_LIBS), \
+        NAME_MACRO := rename_stripped, \
+    ))
+    DEPS += $(COPY_FILTERED_LIBS)
+    JMOD_FLAGS += --libs $(LIBS_DIR_FILTERED)
+  else
+    JMOD_FLAGS += --libs $(LIBS_DIR)
+  endif
 endif
 ifneq ($(CMDS_DIR), )
-  JMOD_FLAGS += --cmds $(CMDS_DIR)
-  DEPS += $(call CacheFind, $(CMDS_DIR))
+  DEPS += $(call FindFiles, $(CMDS_DIR))
+  ifeq ($(OPENJDK_TARGET_OS)+$(SHIP_DEBUG_SYMBOLS), windows+public)
+    # For public debug symbols on Windows, we have to use stripped pdbs, rename them
+    # and filter out a few launcher pdbs where there's a lib that goes by the same name
+    rename_stripped = $(patsubst %.stripped.pdb,%.pdb,$1)
+    CMDS_DIR_FILTERED := $(subst modules_cmds,modules_cmds_filtered, $(CMDS_DIR))
+    FILES_CMDS := $(filter-out %.pdb, $(call FindFiles, $(CMDS_DIR))) \
+        $(filter-out %jimage.stripped.pdb %jpackage.stripped.pdb %java.stripped.pdb, \
+            $(filter %.stripped.pdb, $(call FindFiles, $(CMDS_DIR))))
+    $(eval $(call SetupCopyFiles, COPY_FILTERED_CMDS, \
+        SRC := $(CMDS_DIR), \
+        DEST := $(CMDS_DIR_FILTERED), \
+        FILES := $(FILES_CMDS), \
+        NAME_MACRO := rename_stripped, \
+    ))
+    DEPS += $(COPY_FILTERED_CMDS)
+    JMOD_FLAGS += --cmds $(CMDS_DIR_FILTERED)
+  else ifeq ($(OPENJDK_TARGET_OS)+$(SHIP_DEBUG_SYMBOLS), windows+full)
+    # For full debug symbols on Windows, we have to filter out a few launcher pdbs
+    # where there's a lib that goes by the same name
+    CMDS_DIR_FILTERED := $(subst modules_cmds,modules_cmds_filtered, $(CMDS_DIR))
+    $(eval $(call SetupCopyFiles, COPY_FILTERED_CMDS, \
+        SRC := $(CMDS_DIR), \
+        DEST := $(CMDS_DIR_FILTERED), \
+        FILES := $(filter-out %jimage.pdb %jpackage.pdb %java.pdb, \
+            $(call FindFiles, $(CMDS_DIR))), \
+    ))
+    DEPS += $(COPY_FILTERED_CMDS)
+    JMOD_FLAGS += --cmds $(CMDS_DIR_FILTERED)
+  else
+    JMOD_FLAGS += --cmds $(CMDS_DIR)
+  endif
 endif
 ifneq ($(CONF_DIR), )
   JMOD_FLAGS += --config $(CONF_DIR)
-  DEPS += $(call CacheFind, $(CONF_DIR))
+  DEPS += $(call FindFiles, $(CONF_DIR))
 endif
 ifneq ($(CLASSES_DIR), )
   JMOD_FLAGS += --class-path $(CLASSES_DIR)
-  DEPS += $(call CacheFind, $(CLASSES_DIR))
+  DEPS += $(call FindFiles, $(CLASSES_DIR))
 endif
 ifneq ($(INCLUDE_HEADERS_DIR), )
   JMOD_FLAGS += --header-files $(INCLUDE_HEADERS_DIR)
-  DEPS += $(call CacheFind, $(INCLUDE_HEADERS_DIR))
+  DEPS += $(call FindFiles, $(INCLUDE_HEADERS_DIR))
 endif
 ifneq ($(MAN_DIR), )
   JMOD_FLAGS += --man-pages $(MAN_DIR)
-  DEPS += $(call CacheFind, $(MAN_DIR))
+  DEPS += $(call FindFiles, $(MAN_DIR))
 endif
 
 # If a specific modules_legal dir exists for this module, only pick up files
@@ -91,7 +138,7 @@ LEGAL_NOTICES := \
     )
 
 LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
-DEPS += $(call CacheFind, $(LEGAL_NOTICES))
+DEPS += $(call FindFiles, $(LEGAL_NOTICES))
 
 JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH)
 
@@ -145,7 +192,7 @@ endif
 # the actual command. Filter that out using wildcard before adding to DEPS.
 DEPS += $(wildcard $(JMOD_CMD))
 ifeq ($(EXTERNAL_BUILDJDK), false)
-  DEPS += $(call CacheFind, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod)
+  DEPS += $(call FindFiles, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod)
 endif
 
 # If creating interim versions of jmods, certain files need to be filtered out
@@ -154,7 +201,15 @@ ifeq ($(INTERIM_JMOD), true)
   DEPS := $(filter-out $(SUPPORT_OUTPUTDIR)/modules_libs/java.base/classlist, $(DEPS))
 endif
 
-JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM,*.pdb,*.map}'
+ifeq ($(OPENJDK_TARGET_OS), windows)
+  ifeq ($(SHIP_DEBUG_SYMBOLS), )
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.pdb,*.map}'
+  else
+    JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.map}'
+  endif
+else
+  JMOD_FLAGS += --exclude '**{_the.*,_*.marker,*.diz,*.debuginfo,*.dSYM/**,*.dSYM}'
+endif
 
 # Create jmods in a temp dir and then move them into place to keep the
 # module path in $(IMAGES_OUTPUTDIR)/jmods valid at all times.

make/Docs.gmk

@@ -341,7 +341,7 @@ define SetupApiDocsGenerationBody
       $$(SUPPORT_OUTPUTDIR)/docs/$1.vardeps)
 
   # Get a list of all files in all the source dirs for all included modules
-  $1_SOURCE_DEPS := $$(call CacheFind, $$(wildcard $$(foreach module, \
+  $1_SOURCE_DEPS := $$(call FindFiles, $$(wildcard $$(foreach module, \
       $$($1_ALL_MODULES), $$(call FindModuleSrcDirs, $$(module)))))
 
   # Javadoc creates a lot of files but use index.html as a marker
@@ -496,7 +496,7 @@ JDK_INDEX_TARGETS += $(JDK_INDEX_HTML)
 GLOBAL_SPECS_RESOURCES_DIR := $(TOPDIR)/make/data/docs-resources/
 $(eval $(call SetupCopyFiles, COPY_GLOBAL_RESOURCES, \
     SRC := $(GLOBAL_SPECS_RESOURCES_DIR), \
-    FILES := $(call CacheFind, $(GLOBAL_SPECS_RESOURCES_DIR)), \
+    FILES := $(call FindFiles, $(GLOBAL_SPECS_RESOURCES_DIR)), \
     DEST := $(DOCS_OUTPUTDIR), \
 ))
 JDK_INDEX_TARGETS += $(COPY_GLOBAL_RESOURCES)
@@ -521,10 +521,10 @@ COPY_SPEC_FILTER := %.html %.gif %.jpg %.mib %.css
 $(foreach m, $(ALL_MODULES), \
   $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
   $(foreach d, $(SPECS_$m), \
-    $(if $(filter $(COPY_SPEC_FILTER), $(call CacheFind, $d)), \
+    $(if $(filter $(COPY_SPEC_FILTER), $(call FindFiles, $d)), \
       $(eval $(call SetupCopyFiles, COPY_$m, \
           SRC := $d, \
-          FILES := $(filter $(COPY_SPEC_FILTER), $(call CacheFind, $d)), \
+          FILES := $(filter $(COPY_SPEC_FILTER), $(call FindFiles, $d)), \
           DEST := $(DOCS_OUTPUTDIR)/specs/, \
       )) \
       $(eval JDK_SPECS_TARGETS += $(COPY_$m)) \
@@ -541,11 +541,11 @@ ifeq ($(ENABLE_FULL_DOCS), true)
   $(foreach m, $(ALL_MODULES), \
     $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
     $(foreach d, $(SPECS_$m), \
-      $(if $(filter %.md, $(call CacheFind, $d)), \
+      $(if $(filter %.md, $(call FindFiles, $d)), \
         $(eval $m_$d_NAME := CONVERT_MARKDOWN_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
         $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \
             SRC := $d, \
-            FILES := $(filter %.md, $(call CacheFind, $d)), \
+            FILES := $(filter %.md, $(call FindFiles, $d)), \
             DEST := $(DOCS_OUTPUTDIR)/specs/, \
             CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
         )) \

make/ExplodedImageOptimize.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -38,7 +38,7 @@ ALL_MODULEINFO_CLASSES := $(wildcard $(JDK_OUTPUTDIR)/modules/*/module_info.clas
 
 $(PACKAGES_ATTRIBUTE_TARGET): $(ALL_MODULEINFO_CLASSES) $(BUILD_JIGSAW_CLASSES)
 	$(call LogInfo, Optimizing the exploded image)
-	$(TOOL_ADD_PACKAGES_ATTRIBUTE) $(JDK_OUTPUTDIR)
+	$(call ExecuteWithLog, $@, $(TOOL_ADD_PACKAGES_ATTRIBUTE) $(JDK_OUTPUTDIR))
 	$(TOUCH) $@
 
 TARGETS := $(PACKAGES_ATTRIBUTE_TARGET)