fix logging for MTLRenderer (disable by default)

because CAMetalLayer nextDrawable returns surface for the client area

.gitignore

@@ -1,14 +1,3 @@
-JTwork
-JTreport
-*.class
-.idea/workspace.xml
-.idea/misc.xml
-.idea/modules.xml
-.idea/shelf/
-JetBrainsRuntime.iml
-build/
-# Project exclude paths
-/jb/project/java-gradle/.gradle/
 /build/
 /dist/
 /.idea/

.hgtags

@@ -490,111 +490,62 @@ a11c1cb542bbd1671d25b85efe7d09b983c48525 jdk-11+15
 02934b0d661b82b7fe1052a04998d2091352e08d jdk-11+16
 64e4b1686141e57a681936a8283983341484676e jdk-11+17
 e1b3def126240d5433902f3cb0e91a4c27f6db50 jdk-11+18
-fb8b3f4672774e15654958295558a1af1b576919 jdk-11+19
-fb8b3f4672774e15654958295558a1af1b576919 jdk-11+19
 36ca515343e00b021dcfc902e986d26ec994a2e5 jdk-11+19
+95aad0c785e497f1bade3955c4e4a677b629fa9d jdk-12+0
 9816d7cc655e53ba081f938b656e31971b8f097a jdk-11+20
 14708e1acdc3974f4539027cbbcfa6d69f83cf51 jdk-11+21
+00b16d0457e43d23f6ca5ade6b243edce62750a0 jdk-12+1
 9937ef7499dcd7673714517fd5e450410c14ba4e jdk-11+22
+69b438908512d3dfef5852c6a843a5778333a309 jdk-12+2
 1edcf36fe15f79d6228d1a63eb680878e2386480 jdk-11+23
+990db216e7199b2ba9989d8fa20b657e0ca7d969 jdk-12+3
 ea900a7dc7d77dee30865c60eabd87fc24b1037c jdk-11+24
+499b873761d8e8a1cc4aa649daf04cbe98cbce77 jdk-12+4
 331888ea4a788df801b1edf8836646cd25fc758b jdk-11+25
+f8696e0ab9b795030429fc3374ec03e378fd9ed7 jdk-12+5
 945ba9278a272a5477ffb1b3ea1b04174fed8036 jdk-11+26
+7939b3c4e4088bf4f70ec5bbd8030393b653372f jdk-12+6
 9d7d74c6f2cbe522e39fa22dc557fdd3f79b32ad jdk-11+27
+ef57958c7c511162da8d9a75f0b977f0f7ac464e jdk-12+7
 76072a077ee1d815152d45d1692c4b36c53c5c49 jdk-11+28
-c01cc45790f871adec30acc90742b521d57a2fff jdk-11.0.1+0
-1353ec839c82de926bfacd2c7976b6b652d4afb0 jdk-11.0.1+1
-a285bd7cfedb40cb3086e61e17fc04c96b739d03 jdk-11.0.1+2
-a285bd7cfedb40cb3086e61e17fc04c96b739d03 jdk-11.0.1+2
-0000000000000000000000000000000000000000 jdk-11.0.1+2
-fc55f0667af5ea3b21e40a59e2a88b1b82e65e62 jdk-11.0.1+2
-781b5d8f2f75ae4dfdafc85630e5dbd31e324ed1 jdk-11.0.1+3
-b5b1dd7e6f9d86aedf7141e9279342fae257bd67 jdk-11.0.1+4
-d6efeebf554c918bfab50f89939eb11121e18432 jdk-11.0.1+5
-db768cfe2141b3eb9ef53d7104002a0532c8c977 jdk-11.0.1+6
-88a221c0bad0cee441767106776628550d660a82 jdk-11.0.1+7
-c2b23a17d3ff92235aed8e8d04642d7a6eaecf54 jdk-11.0.1+8
-adb9933aa8c68e6dec6b441133f3955fe7366206 jdk-11.0.1+9
-a86e14193fc8ea98835fd3e2f867447164c7af53 jdk-11.0.1+10
-0343f9aacae2d4a9e6df4e61087837166a6a477c jdk-11.0.1+11
-c0431cf9c38e5c56eedc680e007a94c4279a8f13 jdk-11.0.1+12
-8513ac27b65198d2e6562fb7da6e9c99b9fdcf51 jdk-11.0.1+13
-7da060835810b5fbd4a7493ea1c98e9a4338f30d jdk-11.0.2+0
-2be95a1bf50877cafba791c2f342953bd4a6412e jdk-11.0.2+1
-b4b16f510f48e2dd4bea007b60fddf69af0f6c10 jdk-11.0.2+2
-8a8606a3bdf2dbe0698bef375e6a4b47df0efb1a jdk-11.0.2+3
-0db90dec8c39bc38058afa11b7fda607ee259d01 jdk-11.0.2+4
-ff1f7723c4e88822fd60bcacd55824e1d3da6d36 jdk-11.0.2+5
-c6fd7ff3e96f3e6f4913d026a90c6c454a7a35c8 jdk-11.0.2+6
-a01e0cc0105972acc3b5e213dbe2b84acaee5be3 jdk-11.0.2+7
-a01e0cc0105972acc3b5e213dbe2b84acaee5be3 jdk-11.0.2-ga
-fe85e2f43a1c893cb410308106b0f31b814aebb8 jdk-11.0.2+8
-144d476b6efe527c5e9ebf19af93398913c5450f jdk-11.0.2+9
-a01e0cc0105972acc3b5e213dbe2b84acaee5be3 jdk-11.0.2-ga
-0000000000000000000000000000000000000000 jdk-11.0.2-ga
-144d476b6efe527c5e9ebf19af93398913c5450f jdk-11.0.2-ga
-98e7354165d3a2443a8b845a5a526cc55d1b0dd7 jdk-11.0.3+0
-cd1c042181e934a1a91f9ee59a0066f64c8bad7a jdk-11.0.3+1
-9de3f198995c6c384fd6431c97089c311ec6a7ff jdk-11.0.3+2
-d17a1764a0f318ab72beadb589c998d40951493a jdk-11.0.3+3
-43d6759c3b2e36c1118e9753a080372294e1f17a jdk-11.0.3+4
-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
+492b366f8e5784cc4927c2c98f9b8a3f16c067eb jdk-12+8
+31b159f30fb281016c5f0c103552809aeda84063 jdk-12+9
+8f594f75e0547d4ca16649cb3501659e3155e81b jdk-12+10
+f0f5d23449d31f1b3580c8a73313918cafeaefd7 jdk-12+11
+15094d12a632f452a2064318a4e416d0c7a9ce0c jdk-12+12
+511a9946f83e3e3c7b9dbe1840367063fb39b4e1 jdk-12+13
+8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14
+8897e41b327c0a5601c6ba2bba5d07f15a3ffc91 jdk-12+14
+6f04692c7d5137ee34a6bd94c0c8a6c9219cb127 jdk-12+14
+f8626bcc169813a4b2a15880386b952719d1d6d1 jdk-12+15
+199658d1ef860cdc17055b4fd3e94b057f292fe9 jdk-12+16
+eefa65e142af305923d2adcd596fab9c639723a1 jdk-12+17
+e38473506688e0995e701fc7f77d5a91b438ef93 jdk-12+18
+dc1f9dec2018a37fedba47d8a2aedef99faaec64 jdk-12+19
+40098289d5804c3b5e7074bc75501a81e70d9b0d jdk-12+20
+f8fb0c86f2b3d24294d39c5685a628e1beb14ba7 jdk-12+21
+732bec44c89e8b93a38296bf690f97b7230c5b6d jdk-12+22
+eef755718cb24813031a842bbfc716a6cea18e9a jdk-12+23
+cc4098b3bc10d1c390384289025fea7b0d4b9e93 jdk-13+0
+7d4397b43fa305806160785a4c7210600d59581a jdk-12+24
+11033c4ada542f9c9a873314b6ecf60af19e8256 jdk-13+1
+7496df94b3b79f3da53925d2d137317715f11d97 jdk-12+25
+50677f43ac3df9a8684222b8893543c60f3aa0bd jdk-13+2
+de9fd809bb475401aad188eab2264226788aad81 jdk-12+26
+642346a11059b9f283110dc301a24ed43b76a94e jdk-13+3
+f15d443f97318e9b40e6f451e327ff69ed4ec361 jdk-12+27
+a47b8125b7cc9ef59619745c163975fe935b57ed jdk-13+4
+659b004b6a1bd8c31e766cbdf328d8f8473fd4d7 jdk-12+28
+e3ed960609927b5fdfd0a797159835cd83a81a31 jdk-13+5
+44f41693631f9b5ac78ff4d2bfabd6734fe46df2 jdk-12+29
+b5f05fe4a6f8b3996a000c20078b356d991ca8ec jdk-13+6
+6c377af36a5c4203f16aed8a5e4c2ecc08fcd8bd jdk-12+30
+021917019cda1c0c5853255322274f37693a2431 jdk-13+7
+b5f7bb57de2f797be34f6c75d45c3245ad37ab97 jdk-12+31
+a535ba736cabc6886acdff36de3a096c46e5ddc5 jdk-13+8
+4ce47bc1fb92cf94c6e3d1f49d582f02dcb851ab jdk-12+32
+c081f3ea6b9300265a4a34e38f970b1e3ddaae9f jdk-13+9
+b67884871b5fff79c5ef3eb8ac74dd48d71ea9b1 jdk-12+33
+8e069f7b4fabfe05d9f500783e6d56cb0196d25c jdk-13+10
+21ea4076a275a0f498afa517e9ee1b94a9cf0255 jdk-13+11
+1d7aec80147a6d92b101a76aef92f3ddc88bedf4 jdk-13+12

.idea/codeStyles/Project.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.idea/copyright/JetBrains.xml

@@ -1,9 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="notice" value="Copyright 2000-&amp;#36;today.year JetBrains s.r.o.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
-    <option name="keyword" value="Copyright" />
-    <option name="allowReplaceKeyword" value="JetBrains" />
-    <option name="myName" value="JetBrains" />
-    <option name="myLocal" value="true" />
-  </copyright>
-</component>

.idea/copyright/profiles_settings.xml

@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="JetBrains" />
-</component>

.idea/vcs.xml

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

.jcheck/conf

@@ -1,2 +1,2 @@
-project=jdk10
+project=jdk
 bugids=dup

README.md

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

bin/idea.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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
@@ -49,7 +49,7 @@ do
       ;;
 
     -o | --output )
-      IDEA_OUTPUT=$2
+      IDEA_OUTPUT=$2/.idea
       shift
       ;;
 
@@ -64,28 +64,25 @@ do
   shift
 done
 
-mkdir $IDEA_OUTPUT || exit 1
+mkdir -p $IDEA_OUTPUT || exit 1
 cd $IDEA_OUTPUT; IDEA_OUTPUT=`pwd`
 
+if [ "x$TOPLEVEL_DIR" = "x" ] ; then
+    cd $SCRIPT_DIR/..
+    TOPLEVEL_DIR=`pwd`
+    cd $IDEA_OUTPUT
+fi
+
 MAKE_DIR="$SCRIPT_DIR/../make"
 IDEA_MAKE="$MAKE_DIR/idea"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 
 cp -r "$IDEA_TEMPLATE"/* "$IDEA_OUTPUT"
 
-#init template variables
-for file in `ls -p $IDEA_TEMPLATE | grep -v /`; do
-	VAR_SUFFIX=`echo $file | cut -d'.' -f1 | tr [:lower:] [:upper:]`
-    eval "$VAR_SUFFIX"_TEMPLATE="$IDEA_TEMPLATE"/$file
-	eval IDEA_"$VAR_SUFFIX"="$IDEA_OUTPUT"/$file
-done
-
-#override template variables
+#override template
 if [ -d "$TEMPLATES_OVERRIDE" ] ; then
     for file in `ls -p "$TEMPLATES_OVERRIDE" | grep -v /`; do
         cp "$TEMPLATES_OVERRIDE"/$file "$IDEA_OUTPUT"/
-    	VAR_SUFFIX=`echo $file | cut -d'.' -f1 | tr [:lower:] [:upper:]`
-        eval "$VAR_SUFFIX"_TEMPLATE="$TEMPLATES_OVERRIDE"/$file
     done
 fi
 
@@ -94,14 +91,6 @@ if [ "$VERBOSE" = "true" ] ; then
   echo "idea template dir: $IDEA_TEMPLATE"
 fi
 
-if [ ! -f "$JDK_TEMPLATE" ] ; then
-  echo "FATAL: cannot find $JDK_TEMPLATE" >&2; exit 1
-fi
-
-if [ ! -f "$ANT_TEMPLATE" ] ; then
-  echo "FATAL: cannot find $ANT_TEMPLATE" >&2; exit 1
-fi
-
 cd $TOP ; make -f "$IDEA_MAKE/idea.gmk" -I $MAKE_DIR/.. idea MAKEOVERRIDES= OUT=$IDEA_OUTPUT/env.cfg MODULES="$*" || exit 1
 cd $SCRIPT_DIR
 
@@ -124,94 +113,62 @@ if [ "x$SPEC" = "x" ] ; then
   echo "FATAL: SPEC is empty" >&2; exit 1
 fi
 
-SOURCE_FOLDER="      <sourceFolder url=\"file://\$MODULE_DIR\$/####\" isTestSource=\"false\" />"
-SOURCE_FOLDERS_DONE="false"
+### Replace template variables
 
-addSourceFolder() {
-  root=$@
-  relativePath="`echo "$root" | sed -e s@"$TOP/\(.*$\)"@"\1"@`"
-  folder="`echo "$SOURCE_FOLDER" | sed -e s@"\(.*/\)####\(.*\)"@"\1$relativePath\2"@`"
-  printf "%s\n" "$folder" >> $IDEA_JDK
+NUM_REPLACEMENTS=0
+
+replace_template_file() {
+    for i in $(seq 1 $NUM_REPLACEMENTS); do
+      eval "sed \"s|\${FROM${i}}|\${TO${i}}|g\" $1 > $1.tmp"
+      mv $1.tmp $1
+    done
 }
 
-### Generate project iml
+replace_template_dir() {
+    for f in `find $1 -type f` ; do
+        replace_template_file $f
+    done
+}
 
-rm -f $IDEA_JDK
-while IFS= read -r line
-do
-  if echo "$line" | egrep "^ .* <sourceFolder.*####" > /dev/null ; then
-    if [ "$SOURCE_FOLDERS_DONE" = "false" ] ; then
-      SOURCE_FOLDERS_DONE="true"
-      for root in $MODULE_ROOTS; do
-         addSourceFolder $root
-      done
+add_replacement() {
+    NUM_REPLACEMENTS=`expr $NUM_REPLACEMENTS + 1`
+    eval FROM$NUM_REPLACEMENTS='$1'
+    eval TO$NUM_REPLACEMENTS='$2'
+}
+
+add_replacement "###MODULE_NAMES###" "$MODULE_NAMES"
+SPEC_DIR=`dirname $SPEC`
+if [ "x$CYGPATH" = "x" ]; then
+    add_replacement "###BUILD_DIR###" "$SPEC_DIR"
+    add_replacement "###JTREG_HOME###" "$JT_HOME"
+    add_replacement "###IMAGES_DIR###" "$SPEC_DIR/images/jdk"
+    add_replacement "###ROOT_DIR###" "$TOPLEVEL_DIR"
+    add_replacement "###IDEA_DIR###" "$IDEA_OUTPUT"
+else
+    add_replacement "###BUILD_DIR###" "`cygpath -am $SPEC_DIR`"
+    add_replacement "###IMAGES_DIR###" "`cygpath -am $SPEC_DIR`/images/jdk"
+    add_replacement "###ROOT_DIR###" "`cygpath -am $TOPLEVEL_DIR`"
+    add_replacement "###IDEA_DIR###" "`cygpath -am $IDEA_OUTPUT`"
+    if [ "x$JT_HOME" = "x" ]; then
+      add_replacement "###JTREG_HOME###" ""
+    else
+      add_replacement "###JTREG_HOME###" "`cygpath -am $JT_HOME`"
     fi
-  else
-    printf "%s\n" "$line" >> $IDEA_JDK
-  fi
-done < "$JDK_TEMPLATE"
+fi
 
+SOURCE_PREFIX="<sourceFolder url=\"file://"
+SOURCE_POSTFIX="\" isTestSource=\"false\" />"
 
-MODULE_NAME="        <property name=\"module.name\" value=\"####\" />"
+for root in $MODULE_ROOTS; do
+    if [ "x$CYGPATH" != "x" ]; then
+    	root=`cygpath -am $root`
+    fi
+    SOURCES=$SOURCES" $SOURCE_PREFIX""$root""$SOURCE_POSTFIX"
+done
 
-addModuleName() {
-  mn="`echo "$MODULE_NAME" | sed -e s@"\(.*\)####\(.*\)"@"\1$MODULE_NAMES\2"@`"
-  printf "%s\n" "$mn" >> $IDEA_ANT
-}
+add_replacement "###SOURCE_ROOTS###" "$SOURCES"
 
-BUILD_DIR="        <property name=\"build.target.dir\" value=\"####\" />"
-
-addBuildDir() {
-  DIR=`dirname $SPEC`
-  mn="`echo "$BUILD_DIR" | sed -e s@"\(.*\)####\(.*\)"@"\1$DIR\2"@`"
-  printf "%s\n" "$mn" >> $IDEA_ANT
-}
-
-### Generate ant.xml
-
-rm -f $IDEA_ANT
-while IFS= read -r line
-do
-  if echo "$line" | egrep "^ .* <property name=\"module.name\"" > /dev/null ; then
-    addModuleName
-  elif echo "$line" | egrep "^ .* <property name=\"build.target.dir\"" > /dev/null ; then
-    addBuildDir
-  else
-    printf "%s\n" "$line" >> $IDEA_ANT
-  fi
-done < "$ANT_TEMPLATE"
-
-### Generate misc.xml
-
-rm -f $IDEA_MISC
-
-JTREG_HOME="    <path>####</path>"
-
-IMAGES_DIR="    <jre alt=\"true\" value=\"####\" />"
-
-addImagesDir() {
-  DIR=`dirname $SPEC`/images/jdk
-  mn="`echo "$IMAGES_DIR" | sed -e s@"\(.*\)####\(.*\)"@"\1$DIR\2"@`"
-  printf "%s\n" "$mn" >> $IDEA_MISC
-}
-
-addJtregHome() {
-  DIR=`dirname $SPEC`
-  mn="`echo "$JTREG_HOME" | sed -e s@"\(.*\)####\(.*\)"@"\1$JT_HOME\2"@`"
-  printf "%s\n" "$mn" >> $IDEA_MISC
-}
-
-rm -f $MISC_ANT
-while IFS= read -r line
-do
-  if echo "$line" | egrep "^ .*<path>jtreg_home</path>" > /dev/null ; then
-	addJtregHome
-  elif echo "$line" | egrep "^ .*<jre alt=\"true\" value=\"images_jdk\"" > /dev/null ; then
-    addImagesDir
-  else
-    printf "%s\n" "$line" >> $IDEA_MISC
-  fi
-done < "$MISC_TEMPLATE"
+replace_template_dir "$IDEA_OUTPUT"
 
 ### Compile the custom Logger
 

doc/building.html

@@ -1,19 +1,24 @@
 <!DOCTYPE html>
-<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">
+  <meta charset="utf-8" />
+  <meta name="generator" content="pandoc" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
   <title>Building the JDK</title>
-  <style type="text/css">code{white-space: pre;}</style>
-  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css">
+  <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]-->
   <style type="text/css">pre, code, tt { color: #1d6ae5; }</style>
 </head>
 <body>
-<header>
+<header id="title-block-header">
 <h1 class="title">Building the JDK</h1>
 </header>
 <nav id="TOC">
@@ -26,7 +31,8 @@
 <li><a href="#build-hardware-requirements">Build Hardware Requirements</a><ul>
 <li><a href="#building-on-x86">Building on x86</a></li>
 <li><a href="#building-on-sparc">Building on sparc</a></li>
-<li><a href="#building-on-armaarch64">Building on arm/aarch64</a></li>
+<li><a href="#building-on-aarch64">Building on aarch64</a></li>
+<li><a href="#building-on-32-bit-arm">Building on 32-bit arm</a></li>
 </ul></li>
 <li><a href="#operating-system-requirements">Operating System Requirements</a><ul>
 <li><a href="#windows">Windows</a></li>
@@ -68,10 +74,12 @@
 </ul></li>
 <li><a href="#running-tests">Running Tests</a></li>
 <li><a href="#cross-compiling">Cross-compiling</a><ul>
+<li><a href="#cross-compiling-the-easy-way-with-openjdk-devkits">Cross compiling the easy way with OpenJDK devkits</a></li>
 <li><a href="#boot-jdk-and-build-jdk">Boot JDK and Build JDK</a></li>
 <li><a href="#specifying-the-target-platform">Specifying the Target Platform</a></li>
 <li><a href="#toolchain-considerations">Toolchain Considerations</a></li>
 <li><a href="#native-libraries">Native Libraries</a></li>
+<li><a href="#creating-and-using-sysroots-with-qemu-deboostrap">Creating And Using Sysroots With qemu-deboostrap</a></li>
 <li><a href="#building-for-armaarch64">Building for ARM/aarch64</a></li>
 <li><a href="#verifying-the-build">Verifying the Build</a></li>
 </ul></li>
@@ -91,7 +99,7 @@
 <li><a href="#getting-help">Getting Help</a></li>
 </ul></li>
 <li><a href="#hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</a><ul>
-<li><a href="#setting-up-a-forest-for-pushing-changes-defpath">Setting Up a Forest for Pushing Changes (defpath)</a></li>
+<li><a href="#setting-up-a-repository-for-pushing-changes-defpath">Setting Up a Repository for Pushing Changes (defpath)</a></li>
 <li><a href="#bash-completion">Bash Completion</a></li>
 <li><a href="#using-multiple-configurations">Using Multiple Configurations</a></li>
 <li><a href="#handling-reconfigurations">Handling Reconfigurations</a></li>
@@ -129,7 +137,7 @@
 <p>The JDK is a complex software project. Building it requires a certain amount of technical expertise, a fair number of dependencies on external software, and reasonably powerful hardware.</p>
 <p>If you just want to use the JDK and not build it yourself, this document is not for you. See for instance <a href="http://openjdk.java.net/install">OpenJDK installation</a> for some methods of installing a prebuilt JDK.</p>
 <h2 id="getting-the-source-code">Getting the Source Code</h2>
-<p>Make sure you are getting the correct version. As of JDK 10, the source is no longer split into separate repositories so you only need to clone one single repository. At the <a href="http://hg.openjdk.java.net/">OpenJDK Mercurial server</a> you can see a list of all available forests. If you want to build an older version, e.g. JDK 8, it is recommended that you get the <code>jdk8u</code> forest, which contains incremental updates, instead of the <code>jdk8</code> forest, which was frozen at JDK 8 GA.</p>
+<p>Make sure you are getting the correct version. As of JDK 10, the source is no longer split into separate repositories so you only need to clone one single repository. At the <a href="http://hg.openjdk.java.net/">OpenJDK Mercurial server</a> you can see a list of all available repositories. If you want to build an older version, e.g. JDK 8, it is recommended that you get the <code>jdk8u</code> forest, which contains incremental updates, instead of the <code>jdk8</code> forest, which was frozen at JDK 8 GA.</p>
 <p>If you are new to Mercurial, a good place to start is the <a href="http://www.mercurial-scm.org/guide">Mercurial Beginner's Guide</a>. The rest of this document assumes a working knowledge of Mercurial.</p>
 <h3 id="special-considerations">Special Considerations</h3>
 <p>For a smooth building experience, it is recommended that you follow these rules on where and how to check out the source code.</p>
@@ -137,7 +145,7 @@
 <li><p>Do not check out the source code in a path which contains spaces. Chances are the build will not work. This is most likely to be an issue on Windows systems.</p></li>
 <li><p>Do not check out the source code in a path which has a very long name or is nested many levels deep. Chances are you will hit an OS limitation during the build.</p></li>
 <li><p>Put the source code on a local disk, not a network share. If possible, use an SSD. The build process is very disk intensive, and having slow disk access will significantly increase build times. If you need to use a network share for the source code, see below for suggestions on how to keep the build artifacts on a local disk.</p></li>
-<li><p>On Windows, extra care must be taken to make sure the <a href="#cygwin">Cygwin</a> environment is consistent. It is recommended that you follow this procedure:</p>
+<li><p>On Windows, if using <a href="#cygwin">Cygwin</a>, extra care must be taken to make sure the environment is consistent. It is recommended that you follow this procedure:</p>
 <ul>
 <li><p>Create the directory that is going to contain the top directory of the JDK clone by using the <code>mkdir</code> command in the Cygwin bash shell. That is, do <em>not</em> create it using Windows Explorer. This will ensure that it will have proper Cygwin attributes, and that it's children will inherit those attributes.</p></li>
 <li><p>Do not put the JDK clone in a path under your Cygwin home directory. This is especially important if your user name contains spaces and/or mixed upper and lower case letters.</p></li>
@@ -153,7 +161,10 @@
 <p>Even for 32-bit builds, it is recommended to use a 64-bit build machine, and instead create a 32-bit target using <code>--with-target-bits=32</code>.</p>
 <h3 id="building-on-sparc">Building on sparc</h3>
 <p>At a minimum, a machine with 4 cores is advisable, as well as 4 GB of RAM. (The more cores to use, the more memory you need.) At least 8 GB of free disk space is required.</p>
-<h3 id="building-on-armaarch64">Building on arm/aarch64</h3>
+<h3 id="building-on-aarch64">Building on aarch64</h3>
+<p>At a minimum, a machine with 8 cores is advisable, as well as 8 GB of RAM. (The more cores to use, the more memory you need.) At least 6 GB of free disk space is required.</p>
+<p>If you do not have access to sufficiently powerful hardware, it is also possible to use <a href="#cross-compiling">cross-compiling</a>.</p>
+<h3 id="building-on-32-bit-arm">Building on 32-bit arm</h3>
 <p>This is not recommended. Instead, see the section on <a href="#cross-compiling">Cross-compiling</a>.</p>
 <h2 id="operating-system-requirements">Operating System Requirements</h2>
 <p>The mainline JDK project supports Linux, Solaris, macOS, AIX and Windows. Support for other operating system, e.g. BSD, exists in separate &quot;port&quot; projects.</p>
@@ -190,12 +201,12 @@
 <h3 id="windows">Windows</h3>
 <p>Windows XP is not a supported platform, but all newer Windows should be able to build the JDK.</p>
 <p>On Windows, it is important that you pay attention to the instructions in the <a href="#special-considerations">Special Considerations</a>.</p>
-<p>Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layer is Cygwin. (Msys is no longer supported due to a too old bash; msys2 and the new Windows Subsystem for Linux (WSL) would likely be possible to support in a future version but that would require effort to implement.)</p>
+<p>Windows is the only non-POSIX OS supported by the JDK, and as such, requires some extra care. A POSIX support layer is required to build on Windows. Currently, the only supported such layers are Cygwin and Windows Subsystem for Linux (WSL). (Msys is no longer supported due to a too old bash; msys2 would likely be possible to support in a future version but that would require effort to implement.)</p>
 <p>Internally in the build system, all paths are represented as Unix-style paths, e.g. <code>/cygdrive/c/hg/jdk9/Makefile</code> rather than <code>C:\hg\jdk9\Makefile</code>. This rule also applies to input to the build system, e.g. in arguments to <code>configure</code>. So, use <code>--with-msvcr-dll=/cygdrive/c/msvcr100.dll</code> rather than <code>--with-msvcr-dll=c:\msvcr100.dll</code>. For details on this conversion, see the section on <a href="#fixpath">Fixpath</a>.</p>
 <h4 id="cygwin">Cygwin</h4>
-<p>A functioning <a href="http://www.cygwin.com/">Cygwin</a> environment is thus required for building the JDK on Windows. If you have a 64-bit OS, we strongly recommend using the 64-bit version of Cygwin.</p>
+<p>A functioning <a href="http://www.cygwin.com/">Cygwin</a> environment is required for building the JDK on Windows. If you have a 64-bit OS, we strongly recommend using the 64-bit version of Cygwin.</p>
 <p><strong>Note:</strong> Cygwin has a model of continuously updating all packages without any easy way to install or revert to a specific version of a package. This means that whenever you add or update a package in Cygwin, you might (inadvertently) update tools that are used by the JDK build process, and that can cause unexpected build problems.</p>
-<p>The JDK requires GNU Make 4.0 or greater on Windows. This is usually not a problem, since Cygwin currently only distributes GNU Make at a version above 4.0.</p>
+<p>The JDK requires GNU Make 4.0 or greater in Cygwin. This is usually not a problem, since Cygwin currently only distributes GNU Make at a version above 4.0.</p>
 <p>Apart from the basic Cygwin installation, the following packages must also be installed:</p>
 <ul>
 <li><code>autoconf</code></li>
@@ -206,6 +217,11 @@
 <p>Often, you can install these packages using the following command line:</p>
 <pre><code>&lt;path to Cygwin setup&gt;/setup-x86_64 -q -P autoconf -P make -P unzip -P zip</code></pre>
 <p>Unfortunately, Cygwin can be unreliable in certain circumstances. If you experience build tool crashes or strange issues when building on Windows, please check the Cygwin FAQ on the <a href="https://cygwin.com/faq/faq.html#faq.using.bloda">&quot;BLODA&quot; list</a> and the section on <a href="https://cygwin.com/faq/faq.html#faq.using.fixing-fork-failures">fork() failures</a>.</p>
+<h4 id="windows-subsystem-for-linux-wsl">Windows Subsystem for Linux (WSL)</h4>
+<p>Windows 10 1809 or newer is supported due to a dependency on the wslpath utility and support for environment variable sharing through WSLENV. Version 1803 can work but intermittent build failures have been observed.</p>
+<p>It's possible to build both Windows and Linux binaries from WSL. To build Windows binaries, you must use a Windows boot JDK (located in a Windows-accessible directory). To build Linux binaries, you must use a Linux boot JDK. The default behavior is to build for Windows. To build for Linux, pass <code>--build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu</code> to <code>configure</code>.</p>
+<p>If building Windows binaries, the source code must be located in a Windows- accessible directory. This is because Windows executables (such as Visual Studio and the boot JDK) must be able to access the source code. Also, the drive where the source is stored must be mounted as case-insensitive by changing either /etc/fstab or /etc/wsl.conf in WSL. Individual directories may be corrected using the fsutil tool in case the source was cloned before changing the mount options.</p>
+<p>Note that while it's possible to build on WSL, testing is still not fully supported.</p>
 <h3 id="solaris">Solaris</h3>
 <p>See <code>make/devkit/solaris11.1-package-list.txt</code> for a list of recommended packages to install when building on Solaris. The versions specified in this list is the versions used by the daily builds at Oracle, and is likely to work properly.</p>
 <p>Older versions of Solaris shipped a broken version of <code>objcopy</code>. At least version 2.21.1 is needed, which is provided by Solaris 11 Update 1. Objcopy is needed if you want to have external debug symbols. Please make sure you are using at least version 2.21.1 of objcopy, or that you disable external debug symbols.</p>
@@ -221,7 +237,7 @@
 <p>For rpm-based distributions (Fedora, Red Hat, etc), try this:</p>
 <pre><code>sudo yum groupinstall &quot;Development Tools&quot;</code></pre>
 <h3 id="aix">AIX</h3>
-<p>The regular builds by SAP is using AIX version 7.1, but AIX 5.3 is also supported. See the <a href="http://cr.openjdk.java.net/~simonis/ppc-aix-port">OpenJDK PowerPC Port Status Page</a> for details.</p>
+<p>Please consult the AIX section of the <a href="https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms">Supported Build Platforms</a> OpenJDK Build Wiki page for details about which versions of AIX are supported.</p>
 <h2 id="native-compiler-toolchain-requirements">Native Compiler (Toolchain) Requirements</h2>
 <p>Large portions of the JDK consists of native code, that needs to be compiled to be able to run on the target platform. In theory, toolchain and operating system should be independent factors, but in practice there's more or less a one-to-one correlation between target operating system and toolchain.</p>
 <table>
@@ -277,7 +293,7 @@
 </tr>
 <tr class="even">
 <td style="text-align: left;">Windows</td>
-<td style="text-align: left;">Microsoft Visual Studio 2017 update 15.9.16</td>
+<td style="text-align: left;">Microsoft Visual Studio 2017 update 15.5.5</td>
 </tr>
 </tbody>
 </table>
@@ -357,8 +373,7 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <p>If you have multiple versions of Visual Studio installed, <code>configure</code> will by default pick the latest. You can request a specific version to be used by setting <code>--with-toolchain-version</code>, e.g. <code>--with-toolchain-version=2015</code>.</p>
 <p>If you get <code>LINK: fatal error LNK1123: failure during conversion to COFF: file invalid</code> when building using Visual Studio 2010, you have encountered <a href="http://support.microsoft.com/kb/2757355">KB2757355</a>, a bug triggered by a specific installation order. However, the solution suggested by the KB article does not always resolve the problem. See <a href="https://stackoverflow.com/questions/10888391">this stackoverflow discussion</a> for other suggestions.</p>
 <h3 id="ibm-xl-cc">IBM XL C/C++</h3>
-<p>The regular builds by SAP is using version 12.1, described as <code>IBM XL C/C++ for AIX, V12.1 (5765-J02, 5725-C72) Version: 12.01.0000.0017</code>.</p>
-<p>See the <a href="http://cr.openjdk.java.net/~simonis/ppc-aix-port">OpenJDK PowerPC Port Status Page</a> for details.</p>
+<p>Please consult the AIX section of the <a href="https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms">Supported Build Platforms</a> OpenJDK Build Wiki page for details about which versions of XLC are supported.</p>
 <h2 id="boot-jdk-requirements">Boot JDK Requirements</h2>
 <p>Paradoxically, building the JDK requires a pre-existing JDK. This is called the &quot;boot JDK&quot;. The boot JDK does not, however, have to be a JDK built directly from the source code available in the OpenJDK Community. If you are porting the JDK to a new platform, chances are that there already exists another JDK for that platform that is usable as boot JDK.</p>
 <p>The rule of thumb is that the boot JDK for building JDK major version <em>N</em> should be a JDK of major version <em>N-1</em>, so for building JDK 9 a JDK 8 would be suitable as boot JDK. However, the JDK should be able to &quot;build itself&quot;, so an up-to-date build of the current JDK source is an acceptable alternative. If you are following the <em>N-1</em> rule, make sure you've got the latest update version, since JDK 8 GA might not be able to build JDK 9 on all platforms.</p>
@@ -369,10 +384,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 and 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 an 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>
@@ -390,9 +405,9 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <h3 id="x11">X11</h3>
 <p>Certain <a href="http://www.x.org/">X11</a> libraries and include files are required on Linux and Solaris.</p>
 <ul>
-<li>To install on an apt-based Linux, try running <code>sudo apt-get install libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev</code>.</li>
-<li>To install on an rpm-based Linux, try running <code>sudo yum install libXtst-devel libXt-devel libXrender-devel libXi-devel</code>.</li>
-<li>To install on Solaris, try running <code>pkg install x11/header/x11-protocols x11/library/libice x11/library/libpthread-stubs x11/library/libsm x11/library/libx11 x11/library/libxau x11/library/libxcb x11/library/libxdmcp x11/library/libxevie x11/library/libxext x11/library/libxrender x11/library/libxscrnsaver x11/library/libxtst x11/library/toolkit/libxt</code>.</li>
+<li>To install on an apt-based Linux, try running <code>sudo apt-get install libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev</code>.</li>
+<li>To install on an rpm-based Linux, try running <code>sudo yum install libXtst-devel libXt-devel libXrender-devel libXrandr-devel libXi-devel</code>.</li>
+<li>To install on Solaris, try running <code>pkg install x11/header/x11-protocols x11/library/libice x11/library/libpthread-stubs x11/library/libsm x11/library/libx11 x11/library/libxau x11/library/libxcb x11/library/libxdmcp x11/library/libxevie x11/library/libxext x11/library/libxrender x11/library/libxrandr x11/library/libxscrnsaver x11/library/libxtst x11/library/toolkit/libxt</code>.</li>
 </ul>
 <p>Use <code>--with-x=&lt;path&gt;</code> if <code>configure</code> does not properly locate your X11 files.</p>
 <h3 id="alsa">ALSA</h3>
@@ -433,7 +448,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-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-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><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>
@@ -458,6 +473,10 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <li><code>--with-jvm-features=&lt;feature&gt;[,&lt;feature&gt;...]</code> - Use the specified JVM features when building Hotspot. The list of features will be enabled on top of the default list. For the <code>custom</code> JVM variant, this default list is empty. A complete list of available JVM features can be found using <code>bash configure --help</code>.</li>
 <li><code>--with-target-bits=&lt;bits&gt;</code> - Create a target binary suitable for running on a <code>&lt;bits&gt;</code> platform. Use this to create 32-bit output on a 64-bit build platform, instead of doing a full cross-compile. (This is known as a <em>reduced</em> build.)</li>
 </ul>
+<p>On Linux, BSD and AIX, it is possible to override where Java by default searches for runtime/JNI libraries. This can be useful in situations where there is a special shared directory for system JNI libraries. This setting can in turn be overriden at runtime by setting the <code>java.library.path</code> property.</p>
+<ul>
+<li><code>--with-jni-libpath=&lt;path&gt;</code> - Use the specified path as a default when searching for runtime libraries.</li>
+</ul>
 <h4 id="configure-arguments-for-native-compilation">Configure Arguments for Native Compilation</h4>
 <ul>
 <li><code>--with-devkit=&lt;path&gt;</code> - Use this devkit for compilers, tools and resources</li>
@@ -565,6 +584,47 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <p>This requires a more complex setup and build procedure. This section assumes you are familiar with cross-compiling in general, and will only deal with the particularities of cross-compiling the JDK. If you are new to cross-compiling, please see the <a href="https://en.wikipedia.org/wiki/Cross_compiler#External_links">external links at Wikipedia</a> for a good start on reading materials.</p>
 <p>Cross-compiling the JDK requires you to be able to build both for the build platform and for the target platform. The reason for the former is that we need to build and execute tools during the build process, both native tools and Java tools.</p>
 <p>If all you want to do is to compile a 32-bit version, for the same OS, on a 64-bit machine, consider using <code>--with-target-bits=32</code> instead of doing a full-blown cross-compilation. (While this surely is possible, it's a lot more work and will take much longer to build.)</p>
+<h3 id="cross-compiling-the-easy-way-with-openjdk-devkits">Cross compiling the easy way with OpenJDK devkits</h3>
+<p>The OpenJDK build system provides out-of-the box support for creating and using so called devkits. A <code>devkit</code> is basically a collection of a cross-compiling toolchain and a sysroot environment which can easily be used together with the <code>--with-devkit</code> configure option to cross compile the OpenJDK. On Linux/x86_64, the following command:</p>
+<pre><code>bash configure --with-devkit=&lt;devkit-path&gt; --openjdk-target=ppc64-linux-gnu &amp;&amp; make</code></pre>
+<p>will configure and build OpenJDK for Linux/ppc64 assuming that <code>&lt;devkit-path&gt;</code> points to a Linux/x86_64 to Linux/ppc64 devkit.</p>
+<p>Devkits can be created from the <code>make/devkit</code> directory by executing:</p>
+<pre><code>make [ TARGETS=&quot;&lt;TARGET_TRIPLET&gt;+&quot; ] [ BASE_OS=&lt;OS&gt; ] [ BASE_OS_VERSION=&lt;VER&gt; ]</code></pre>
+<p>where <code>TARGETS</code> contains one or more <code>TARGET_TRIPLET</code>s of the form described in <a href="https://sourceware.org/autobook/autobook/autobook_17.html">section 3.4 of the GNU Autobook</a>. If no targets are given, a native toolchain for the current platform will be created. Currently, at least the following targets are known to work:</p>
+<table>
+<thead>
+<tr class="header">
+<th style="text-align: left;">Supported devkit targets</th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td style="text-align: left;">x86_64-linux-gnu</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">aarch64-linux-gnu</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">arm-linux-gnueabihf</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">ppc64-linux-gnu</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">ppc64le-linux-gnu</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">s390x-linux-gnu</td>
+</tr>
+</tbody>
+</table>
+<p><code>BASE_OS</code> must be one of &quot;OEL6&quot; for Oracle Enterprise Linux 6 or &quot;Fedora&quot; (if not specified &quot;OEL6&quot; will be the default). If the base OS is &quot;Fedora&quot; the corresponding Fedora release can be specified with the help of the <code>BASE_OS_VERSION</code> option (with &quot;27&quot; as default version). If the build is successful, the new devkits can be found in the <code>build/devkit/result</code> subdirectory:</p>
+<pre><code>cd make/devkit
+make TARGETS=&quot;ppc64le-linux-gnu aarch64-linux-gnu&quot; BASE_OS=Fedora BASE_OS_VERSION=21
+ls -1 ../../build/devkit/result/
+x86_64-linux-gnu-to-aarch64-linux-gnu
+x86_64-linux-gnu-to-ppc64le-linux-gnu</code></pre>
+<p>Notice that devkits are not only useful for targeting different build platforms. Because they contain the full build dependencies for a system (i.e. compiler and root file system), they can easily be used to build well-known, reliable and reproducible build environments. You can for example create and use a devkit with GCC 7.3 and a Fedora 12 sysroot environment (with glibc 2.11) on Ubuntu 14.04 (which doesn't have GCC 7.3 by default) to produce OpenJDK binaries which will run on all Linux systems with runtime libraries newer than the ones from Fedora 12 (e.g. Ubuntu 16.04, SLES 11 or RHEL 6).</p>
 <h3 id="boot-jdk-and-build-jdk">Boot JDK and Build JDK</h3>
 <p>When cross-compiling, make sure you use a boot JDK that runs on the <em>build</em> system, and not on the <em>target</em> system.</p>
 <p>To be able to build, we need a &quot;Build JDK&quot;, which is a JDK built from the current sources (that is, the same as the end result of the entire build process), but able to run on the <em>build</em> system, and not the <em>target</em> system. (In contrast, the Boot JDK should be from an older release, e.g. JDK 8 when building JDK 9.)</p>
@@ -589,11 +649,13 @@ CC: Sun C++ 5.13 SunOS_i386 151846-10 2015/10/30</code></pre>
 <p>Note that alsa is needed even if you only want to build a headless JDK.</p>
 <ul>
 <li><p>Go to <a href="https://www.debian.org/distrib/packages">Debian Package Search</a> and search for the <code>libasound2</code> and <code>libasound2-dev</code> packages for your <em>target</em> system. Download them to /tmp.</p></li>
-<li><p>Install the libraries into the cross-compilation toolchain. For instance:</p>
+<li>Install the libraries into the cross-compilation toolchain. For instance:</li>
+</ul>
 <pre><code>cd /tools/gcc-linaro-arm-linux-gnueabihf-raspbian-2012.09-20120921_linux/arm-linux-gnueabihf/libc
 dpkg-deb -x /tmp/libasound2_1.0.25-4_armhf.deb .
-dpkg-deb -x /tmp/libasound2-dev_1.0.25-4_armhf.deb .</code></pre></li>
-<li><p>If alsa is not properly detected by <code>configure</code>, you can point it out by <code>--with-alsa</code>.</p></li>
+dpkg-deb -x /tmp/libasound2-dev_1.0.25-4_armhf.deb .</code></pre>
+<ul>
+<li>If alsa is not properly detected by <code>configure</code>, you can point it out by <code>--with-alsa</code>.</li>
 </ul>
 <h4 id="x11-1">X11</h4>
 <p>You will need X11 libraries suitable for your <em>target</em> system. For most cases, using Debian's pre-built libraries work fine.</p>
@@ -611,6 +673,7 @@ dpkg-deb -x /tmp/libasound2-dev_1.0.25-4_armhf.deb .</code></pre></li>
 <li>libice-dev</li>
 <li>libxrender</li>
 <li>libxrender-dev</li>
+<li>libxrandr-dev</li>
 <li>libsm-dev</li>
 <li>libxt-dev</li>
 <li>libx11</li>
@@ -634,9 +697,78 @@ cp: cannot stat `arm-linux-gnueabihf/libSM.so&#39;: No such file or directory
 cp: cannot stat `arm-linux-gnueabihf/libXt.so&#39;: No such file or directory</code></pre></li>
 <li><p>If the X11 libraries are not properly detected by <code>configure</code>, you can point them out by <code>--with-x</code>.</p></li>
 </ul>
+<h3 id="creating-and-using-sysroots-with-qemu-deboostrap">Creating And Using Sysroots With qemu-deboostrap</h3>
+<p>Fortunately, you can create sysroots for foreign architectures with tools provided by your OS. On Debian/Ubuntu systems, one could use <code>qemu-deboostrap</code> to create the <em>target</em> system chroot, which would have the native libraries and headers specific to that <em>target</em> system. After that, we can use the cross-compiler on the <em>build</em> system, pointing into chroot to get the build dependencies right. This allows building for foreign architectures with native compilation speed.</p>
+<p>For example, cross-compiling to AArch64 from x86_64 could be done like this:</p>
+<ul>
+<li>Install cross-compiler on the <em>build</em> system:</li>
+</ul>
+<pre><code>apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu</code></pre>
+<ul>
+<li>Create chroot on the <em>build</em> system, configuring it for <em>target</em> system:</li>
+</ul>
+<pre><code>sudo qemu-debootstrap --arch=arm64 --verbose \
+       --include=fakeroot,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng12-dev \
+       --resolve-deps jessie /chroots/arm64 http://httpredir.debian.org/debian/</code></pre>
+<ul>
+<li>Configure and build with newly created chroot as sysroot/toolchain-path:</li>
+</ul>
+<pre><code>CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ sh ./configure --openjdk-target=aarch64-linux-gnu --with-sysroot=/chroots/arm64/ --with-toolchain-path=/chroots/arm64/
+make images
+ls build/linux-aarch64-normal-server-release/</code></pre>
+<p>The build does not create new files in that chroot, so it can be reused for multiple builds without additional cleanup.</p>
+<p>Architectures that are known to successfully cross-compile like this are:</p>
+<table>
+<thead>
+<tr class="header">
+<th style="text-align: left;">Target</th>
+<th style="text-align: left;"><code>CC</code></th>
+<th style="text-align: left;"><code>CXX</code></th>
+<th style="text-align: left;"><code>--arch=...</code></th>
+<th style="text-align: left;"><code>--openjdk-target=...</code></th>
+</tr>
+</thead>
+<tbody>
+<tr class="odd">
+<td style="text-align: left;">x86</td>
+<td style="text-align: left;">default</td>
+<td style="text-align: left;">default</td>
+<td style="text-align: left;">i386</td>
+<td style="text-align: left;">i386-linux-gnu</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">armhf</td>
+<td style="text-align: left;">gcc-arm-linux-gnueabihf</td>
+<td style="text-align: left;">g++-arm-linux-gnueabihf</td>
+<td style="text-align: left;">armhf</td>
+<td style="text-align: left;">arm-linux-gnueabihf</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">aarch64</td>
+<td style="text-align: left;">gcc-aarch64-linux-gnu</td>
+<td style="text-align: left;">g++-aarch64-linux-gnu</td>
+<td style="text-align: left;">arm64</td>
+<td style="text-align: left;">aarch64-linux-gnu</td>
+</tr>
+<tr class="even">
+<td style="text-align: left;">ppc64el</td>
+<td style="text-align: left;">gcc-powerpc64le-linux-gnu</td>
+<td style="text-align: left;">g++-powerpc64le-linux-gnu</td>
+<td style="text-align: left;">ppc64el</td>
+<td style="text-align: left;">powerpc64le-linux-gnu</td>
+</tr>
+<tr class="odd">
+<td style="text-align: left;">s390x</td>
+<td style="text-align: left;">gcc-s390x-linux-gnu</td>
+<td style="text-align: left;">g++-s390x-linux-gnu</td>
+<td style="text-align: left;">s390x</td>
+<td style="text-align: left;">s390x-linux-gnu</td>
+</tr>
+</tbody>
+</table>
+<p>Additional architectures might be supported by Debian/Ubuntu Ports.</p>
 <h3 id="building-for-armaarch64">Building for ARM/aarch64</h3>
 <p>A common cross-compilation target is the ARM CPU. When building for ARM, it is useful to set the ABI profile. A number of pre-defined ABI profiles are available using <code>--with-abi-profile</code>: arm-vfp-sflt, arm-vfp-hflt, arm-sflt, armv5-vfp-sflt, armv6-vfp-hflt. Note that soft-float ABIs are no longer properly supported by the JDK.</p>
-<p>The JDK contains two different ports for the aarch64 platform, one is the original aarch64 port from the <a href="http://openjdk.java.net/projects/aarch64-port">AArch64 Port Project</a> and one is a 64-bit version of the Oracle contributed ARM port. When targeting aarch64, by the default the original aarch64 port is used. To select the Oracle ARM 64 port, use <code>--with-cpu-port=arm64</code>. Also set the corresponding value (<code>aarch64</code> or <code>arm64</code>) to --with-abi-profile, to ensure a consistent build.</p>
 <h3 id="verifying-the-build">Verifying the Build</h3>
 <p>The build will end up in a directory named like <code>build/linux-arm-normal-server-release</code>.</p>
 <p>Inside this build output directory, the <code>images/jdk</code> will contain the newly built JDK, for your <em>target</em> system.</p>
@@ -710,11 +842,11 @@ Hint: If caused by a warning, try configure --disable-warnings-as-errors.</code>
 <p>Verify that the summary at the end looks correct. Are you indeed using the Boot JDK and native toolchain that you expect?</p>
 <p>By default, the JDK has a strict approach where warnings from the compiler is considered errors which fail the build. For very new or very old compiler versions, this can trigger new classes of warnings, which thus fails the build. Run <code>configure</code> with <code>--disable-warnings-as-errors</code> to turn of this behavior. (The warnings will still show, but not make the build fail.)</p>
 <h4 id="problems-with-incremental-rebuilds">Problems with Incremental Rebuilds</h4>
-<p>Incremental rebuilds mean that when you modify part of the product, only the affected parts get rebuilt. While this works great in most cases, and significantly speed up the development process, from time to time complex interdependencies will result in an incorrect build result. This is the most common cause for unexpected build problems, together with inconsistencies between the different Mercurial repositories in the forest.</p>
+<p>Incremental rebuilds mean that when you modify part of the product, only the affected parts get rebuilt. While this works great in most cases, and significantly speed up the development process, from time to time complex interdependencies will result in an incorrect build result. This is the most common cause for unexpected build problems.</p>
 <p>Here are a suggested list of things to try if you are having unexpected build problems. Each step requires more time than the one before, so try them in order. Most issues will be solved at step 1 or 2.</p>
 <ol type="1">
-<li><p>Make sure your forest is up-to-date</p>
-<p>Run <code>bash get_source.sh</code> to make sure you have the latest version of all repositories.</p></li>
+<li><p>Make sure your repository is up-to-date</p>
+<p>Run <code>hg pull -u</code> to make sure you have the latest changes.</p></li>
 <li><p>Clean build results</p>
 <p>The simplest way to fix incremental rebuild issues is to run <code>make clean</code>. This will remove all build results, but not the configuration or any build system support artifacts. In most cases, this will solve build errors resulting from incremental build mismatches.</p></li>
 <li><p>Completely clean the build directory.</p>
@@ -723,8 +855,8 @@ Hint: If caused by a warning, try configure --disable-warnings-as-errors.</code>
 make dist-clean
 bash configure $(cat current-configuration)
 make</code></pre></li>
-<li><p>Re-clone the Mercurial forest</p>
-<p>Sometimes the Mercurial repositories themselves gets in a state that causes the product to be un-buildable. In such a case, the simplest solution is often the &quot;sledgehammer approach&quot;: delete the entire forest, and re-clone it. If you have local changes, save them first to a different location using <code>hg export</code>.</p></li>
+<li><p>Re-clone the Mercurial repository</p>
+<p>Sometimes the Mercurial repository gets in a state that causes the product to be un-buildable. In such a case, the simplest solution is often the &quot;sledgehammer approach&quot;: delete the entire repository, and re-clone it. If you have local changes, save them first to a different location using <code>hg export</code>.</p></li>
 </ol>
 <h3 id="specific-build-issues">Specific Build Issues</h3>
 <h4 id="clock-skew">Clock Skew</h4>
@@ -746,7 +878,7 @@ spawn failed</code></pre>
 <p>If none of the suggestions in this document helps you, or if you find what you believe is a bug in the build system, please contact the Build Group by sending a mail to <a href="mailto:build-dev@openjdk.java.net">build-dev@openjdk.java.net</a>. Please include the relevant parts of the configure and/or build log.</p>
 <p>If you need general help or advice about developing for the JDK, you can also contact the Adoption Group. See the section on <a href="#contributing-to-openjdk">Contributing to OpenJDK</a> for more information.</p>
 <h2 id="hints-and-suggestions-for-advanced-users">Hints and Suggestions for Advanced Users</h2>
-<h3 id="setting-up-a-forest-for-pushing-changes-defpath">Setting Up a Forest for Pushing Changes (defpath)</h3>
+<h3 id="setting-up-a-repository-for-pushing-changes-defpath">Setting Up a Repository for Pushing Changes (defpath)</h3>
 <p>To help you prepare a proper push path for a Mercurial repository, there exists a useful tool known as <a href="http://openjdk.java.net/projects/code-tools/defpath">defpath</a>. It will help you setup a proper push path for pushing changes to the JDK.</p>
 <p>Install the extension by cloning <code>http://hg.openjdk.java.net/code-tools/defpath</code> and updating your <code>.hgrc</code> file. Here's one way to do this:</p>
 <pre><code>cd ~
@@ -759,7 +891,6 @@ defpath=~/hg-ext/defpath/defpath.py
 EOT</code></pre>
 <p>You can now setup a proper push path using:</p>
 <pre><code>hg defpath -d -u &lt;your OpenJDK username&gt;</code></pre>
-<p>If you also have the <code>trees</code> extension installed in Mercurial, you will automatically get a <code>tdefpath</code> command, which is even more useful. By running <code>hg tdefpath -du &lt;username&gt;</code> in the top repository of your forest, all repos will get setup automatically. This is the recommended usage.</p>
 <h3 id="bash-completion">Bash Completion</h3>
 <p>The <code>configure</code> and <code>make</code> commands tries to play nice with bash command-line completion (using <code>&lt;tab&gt;</code> or <code>&lt;tab&gt;&lt;tab&gt;</code>). To use this functionality, make sure you enable completion in your <code>~/.bashrc</code> (see instructions for bash in your operating system).</p>
 <p>Make completion will work out of the box, and will complete valid make targets. For instance, typing <code>make jdk-i&lt;tab&gt;</code> will complete to <code>make jdk-image</code>.</p>
@@ -777,10 +908,10 @@ chmod +x /tmp/configure
 sudo mv /tmp/configure /usr/local/bin</code></pre>
 <p>Now <code>configure --en&lt;tab&gt;-dt&lt;tab&gt;</code> will result in <code>configure --enable-dtrace</code>.</p>
 <h3 id="using-multiple-configurations">Using Multiple Configurations</h3>
-<p>You can have multiple configurations for a single source forest. When you create a new configuration, run <code>configure --with-conf-name=&lt;name&gt;</code> to create a configuration with the name <code>&lt;name&gt;</code>. Alternatively, you can create a directory under <code>build</code> and run <code>configure</code> from there, e.g. <code>mkdir build/&lt;name&gt; &amp;&amp; cd build/&lt;name&gt; &amp;&amp; bash ../../configure</code>.</p>
+<p>You can have multiple configurations for a single source repository. When you create a new configuration, run <code>configure --with-conf-name=&lt;name&gt;</code> to create a configuration with the name <code>&lt;name&gt;</code>. Alternatively, you can create a directory under <code>build</code> and run <code>configure</code> from there, e.g. <code>mkdir build/&lt;name&gt; &amp;&amp; cd build/&lt;name&gt; &amp;&amp; bash ../../configure</code>.</p>
 <p>Then you can build that configuration using <code>make CONF_NAME=&lt;name&gt;</code> or <code>make CONF=&lt;pattern&gt;</code>, where <code>&lt;pattern&gt;</code> is a substring matching one or several configurations, e.g. <code>CONF=debug</code>. The special empty pattern (<code>CONF=</code>) will match <em>all</em> available configuration, so <code>make CONF= hotspot</code> will build the <code>hotspot</code> target for all configurations. Alternatively, you can execute <code>make</code> in the configuration directory, e.g. <code>cd build/&lt;name&gt; &amp;&amp; make</code>.</p>
 <h3 id="handling-reconfigurations">Handling Reconfigurations</h3>
-<p>If you update the forest and part of the configure script has changed, the build system will force you to re-run <code>configure</code>.</p>
+<p>If you update the repository and part of the configure script has changed, the build system will force you to re-run <code>configure</code>.</p>
 <p>Most of the time, you will be fine by running <code>configure</code> again with the same arguments as the last time, which can easily be performed by <code>make reconfigure</code>. To simplify this, you can use the <code>CONF_CHECK</code> make control variable, either as <code>make CONF_CHECK=auto</code>, or by setting an environment variable. For instance, if you add <code>export CONF_CHECK=auto</code> to your <code>.bashrc</code> file, <code>make</code> will always run <code>reconfigure</code> automatically whenever the configure script has changed.</p>
 <p>You can also use <code>CONF_CHECK=ignore</code> to skip the check for a needed configure update. This might speed up the build, but comes at the risk of an incorrect build result. This is only recommended if you know what you're doing.</p>
 <p>From time to time, you will also need to modify the command line to <code>configure</code> due to changes. Use <code>make print-configure</code> to show the command line used for your current configuration.</p>

doc/building.md

@@ -48,7 +48,7 @@ JDK.
 Make sure you are getting the correct version. As of JDK 10, the source is no
 longer split into separate repositories so you only need to clone one single
 repository. At the [OpenJDK Mercurial server](http://hg.openjdk.java.net/) you
-can see a list of all available forests. If you want to build an older version,
+can see a list of all available repositories. If you want to build an older version,
 e.g. JDK 8, it is recommended that you get the `jdk8u` forest, which contains
 incremental updates, instead of the `jdk8` forest, which was frozen at JDK 8 GA.
 
@@ -75,8 +75,8 @@ on where and how to check out the source code.
     network share for the source code, see below for suggestions on how to keep
     the build artifacts on a local disk.
 
-  * On Windows, extra care must be taken to make sure the [Cygwin](#cygwin)
-    environment is consistent. It is recommended that you follow this
+  * On Windows, if using [Cygwin](#cygwin), extra care must be taken to make sure
+    the environment is consistent. It is recommended that you follow this
     procedure:
 
       * Create the directory that is going to contain the top directory of the
@@ -120,7 +120,16 @@ At a minimum, a machine with 4 cores is advisable, as well as 4 GB of RAM. (The
 more cores to use, the more memory you need.) At least 8 GB of free disk space
 is required.
 
-### Building on arm/aarch64
+### Building on aarch64
+
+At a minimum, a machine with 8 cores is advisable, as well as 8 GB of RAM.
+(The more cores to use, the more memory you need.) At least 6 GB of free disk
+space is required.
+
+If you do not have access to sufficiently powerful hardware, it is also
+possible to use [cross-compiling](#cross-compiling).
+
+### Building on 32-bit arm
 
 This is not recommended. Instead, see the section on [Cross-compiling](
 #cross-compiling).
@@ -165,10 +174,10 @@ On Windows, it is important that you pay attention to the instructions in the
 
 Windows is the only non-POSIX OS supported by the JDK, and as such, requires
 some extra care. A POSIX support layer is required to build on Windows.
-Currently, the only supported such layer is Cygwin. (Msys is no longer
-supported due to a too old bash; msys2 and the new Windows Subsystem for Linux
-(WSL) would likely be possible to support in a future version but that would
-require effort to implement.)
+Currently, the only supported such layers are Cygwin and Windows Subsystem for
+Linux (WSL). (Msys is no longer supported due to a too old bash; msys2 would
+likely be possible to support in a future version but that would require effort
+to implement.)
 
 Internally in the build system, all paths are represented as Unix-style paths,
 e.g. `/cygdrive/c/hg/jdk9/Makefile` rather than `C:\hg\jdk9\Makefile`. This
@@ -179,7 +188,7 @@ on [Fixpath](#fixpath).
 
 #### Cygwin
 
-A functioning [Cygwin](http://www.cygwin.com/) environment is thus required for
+A functioning [Cygwin](http://www.cygwin.com/) environment is required for
 building the JDK on Windows. If you have a 64-bit OS, we strongly recommend
 using the 64-bit version of Cygwin.
 
@@ -189,7 +198,7 @@ that whenever you add or update a package in Cygwin, you might (inadvertently)
 update tools that are used by the JDK build process, and that can cause
 unexpected build problems.
 
-The JDK requires GNU Make 4.0 or greater on Windows. This is usually not a
+The JDK requires GNU Make 4.0 or greater in Cygwin. This is usually not a
 problem, since Cygwin currently only distributes GNU Make at a version above
 4.0.
 
@@ -212,6 +221,30 @@ please check the Cygwin FAQ on the ["BLODA" list](
 https://cygwin.com/faq/faq.html#faq.using.bloda) and the section on [fork()
 failures](https://cygwin.com/faq/faq.html#faq.using.fixing-fork-failures).
 
+#### Windows Subsystem for Linux (WSL)
+
+Windows 10 1809 or newer is supported due to a dependency on the wslpath utility
+and support for environment variable sharing through WSLENV. Version 1803 can
+work but intermittent build failures have been observed.
+
+It's possible to build both Windows and Linux binaries from WSL. To build
+Windows binaries, you must use a Windows boot JDK (located in a
+Windows-accessible directory). To build Linux binaries, you must use a Linux
+boot JDK. The default behavior is to build for Windows. To build for Linux, pass
+`--build=x86_64-unknown-linux-gnu --host=x86_64-unknown-linux-gnu` to
+`configure`.
+
+If building Windows binaries, the source code must be located in a Windows-
+accessible directory. This is because Windows executables (such as Visual Studio
+and the boot JDK) must be able to access the source code. Also, the drive where
+the source is stored must be mounted as case-insensitive by changing either
+/etc/fstab or /etc/wsl.conf in WSL. Individual directories may be corrected
+using the fsutil tool in case the source was cloned before changing the mount
+options.
+
+Note that while it's possible to build on WSL, testing is still not fully
+supported.
+
 ### Solaris
 
 See `make/devkit/solaris11.1-package-list.txt` for a list of recommended
@@ -262,9 +295,9 @@ sudo yum groupinstall "Development Tools"
 
 ### AIX
 
-The regular builds by SAP is using AIX version 7.1, but AIX 5.3 is also
-supported. See the [OpenJDK PowerPC Port Status Page](
-http://cr.openjdk.java.net/~simonis/ppc-aix-port) for details.
+Please consult the AIX section of the [Supported Build Platforms](
+https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms) OpenJDK
+Build Wiki page for details about which versions of AIX are supported.
 
 ## Native Compiler (Toolchain) Requirements
 
@@ -293,7 +326,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.9.16
+ Windows            Microsoft Visual Studio 2017 update 15.5.5
 
 ### gcc
 
@@ -386,11 +419,10 @@ https://stackoverflow.com/questions/10888391) for other suggestions.
 
 ### IBM XL C/C++
 
-The regular builds by SAP is using version 12.1, described as `IBM XL C/C++ for
-AIX, V12.1 (5765-J02, 5725-C72) Version: 12.01.0000.0017`.
+Please consult the AIX section of the [Supported Build Platforms](
+https://wiki.openjdk.java.net/display/Build/Supported+Build+Platforms) OpenJDK
+Build Wiki page for details about which versions of XLC are supported.
 
-See the [OpenJDK PowerPC Port Status Page](
-http://cr.openjdk.java.net/~simonis/ppc-aix-port) for details.
 
 ## Boot JDK Requirements
 
@@ -436,8 +468,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 and library files to reside in a default
-hierarchy under this directory. In most cases, it works fine.
+but require the include files an 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 +479,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`.
@@ -479,15 +511,15 @@ Certain [X11](http://www.x.org/) libraries and include files are required on
 Linux and Solaris.
 
   * To install on an apt-based Linux, try running `sudo apt-get install
-    libx11-dev libxext-dev libxrender-dev libxtst-dev libxt-dev`.
+    libx11-dev libxext-dev libxrender-dev libxrandr-dev libxtst-dev libxt-dev`.
   * To install on an rpm-based Linux, try running `sudo yum install
-    libXtst-devel libXt-devel libXrender-devel libXi-devel`.
+    libXtst-devel libXt-devel libXrender-devel libXrandr-devel libXi-devel`.
   * To install on Solaris, try running `pkg install x11/header/x11-protocols
     x11/library/libice x11/library/libpthread-stubs x11/library/libsm
     x11/library/libx11 x11/library/libxau x11/library/libxcb
     x11/library/libxdmcp x11/library/libxevie x11/library/libxext
-    x11/library/libxrender x11/library/libxscrnsaver x11/library/libxtst
-    x11/library/toolkit/libxt`.
+    x11/library/libxrender x11/library/libxrandr x11/library/libxscrnsaver
+    x11/library/libxtst x11/library/toolkit/libxt`.
 
 Use `--with-x=<path>` if `configure` does not properly locate your X11 files.
 
@@ -586,8 +618,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-server-release`, but the actual name depends on your specific
-configuration. (It can also be set directly, see [Using Multiple
+`build/linux-x64-normal-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.
 
@@ -653,6 +685,14 @@ features, use `bash configure --help=short` instead.)
     platform, instead of doing a full cross-compile. (This is known as a
     *reduced* build.)
 
+On Linux, BSD and AIX, it is possible to override where Java by default
+searches for runtime/JNI libraries. This can be useful in situations where
+there is a special shared directory for system JNI libraries. This setting
+can in turn be overriden at runtime by setting the `java.library.path` property.
+
+  * `--with-jni-libpath=<path>` - Use the specified path as a default
+  when searching for runtime libraries.
+
 #### Configure Arguments for Native Compilation
 
   * `--with-devkit=<path>` - Use this devkit for compilers, tools and resources
@@ -875,6 +915,64 @@ If all you want to do is to compile a 32-bit version, for the same OS, on a
 full-blown cross-compilation. (While this surely is possible, it's a lot more
 work and will take much longer to build.)
 
+### Cross compiling the easy way with OpenJDK devkits
+
+The OpenJDK build system provides out-of-the box support for creating and using
+so called devkits. A `devkit` is basically a collection of a cross-compiling
+toolchain and a sysroot environment which can easily be used together with the
+`--with-devkit` configure option to cross compile the OpenJDK. On Linux/x86_64,
+the following command:
+```
+bash configure --with-devkit=<devkit-path> --openjdk-target=ppc64-linux-gnu && make
+```
+
+will configure and build OpenJDK for Linux/ppc64 assuming that `<devkit-path>`
+points to a Linux/x86_64 to Linux/ppc64 devkit.
+
+Devkits can be created from the `make/devkit` directory by executing:
+```
+make [ TARGETS="<TARGET_TRIPLET>+" ] [ BASE_OS=<OS> ] [ BASE_OS_VERSION=<VER> ]
+```
+
+where `TARGETS` contains one or more `TARGET_TRIPLET`s of the form
+described in [section 3.4 of the GNU Autobook](
+https://sourceware.org/autobook/autobook/autobook_17.html). If no
+targets are given, a native toolchain for the current platform will be
+created. Currently, at least the following targets are known to work:
+
+ Supported devkit targets
+ -------------------------
+ x86_64-linux-gnu
+ aarch64-linux-gnu
+ arm-linux-gnueabihf
+ ppc64-linux-gnu
+ ppc64le-linux-gnu
+ s390x-linux-gnu
+
+`BASE_OS` must be one of "OEL6" for Oracle Enterprise Linux 6 or
+"Fedora" (if not specified "OEL6" will be the default). If the base OS
+is "Fedora" the corresponding Fedora release can be specified with the
+help of the `BASE_OS_VERSION` option (with "27" as default version).
+If the build is successful, the new devkits can be found in the
+`build/devkit/result` subdirectory:
+```
+cd make/devkit
+make TARGETS="ppc64le-linux-gnu aarch64-linux-gnu" BASE_OS=Fedora BASE_OS_VERSION=21
+ls -1 ../../build/devkit/result/
+x86_64-linux-gnu-to-aarch64-linux-gnu
+x86_64-linux-gnu-to-ppc64le-linux-gnu
+```
+
+Notice that devkits are not only useful for targeting different build
+platforms. Because they contain the full build dependencies for a
+system (i.e. compiler and root file system), they can easily be used
+to build well-known, reliable and reproducible build environments. You
+can for example create and use a devkit with GCC 7.3 and a Fedora 12
+sysroot environment (with glibc 2.11) on Ubuntu 14.04 (which doesn't
+have GCC 7.3 by default) to produce OpenJDK binaries which will run on
+all Linux systems with runtime libraries newer than the ones from
+Fedora 12 (e.g. Ubuntu 16.04, SLES 11 or RHEL 6).
+
 ### Boot JDK and Build JDK
 
 When cross-compiling, make sure you use a boot JDK that runs on the *build*
@@ -987,6 +1085,7 @@ Note that X11 is needed even if you only want to build a headless JDK.
       * libice-dev
       * libxrender
       * libxrender-dev
+      * libxrandr-dev
       * libsm-dev
       * libxt-dev
       * libx11
@@ -1018,6 +1117,51 @@ Note that X11 is needed even if you only want to build a headless JDK.
   * If the X11 libraries are not properly detected by `configure`, you can
     point them out by `--with-x`.
 
+### Creating And Using Sysroots With qemu-deboostrap
+
+Fortunately, you can create sysroots for foreign architectures with tools
+provided by your OS. On Debian/Ubuntu systems, one could use `qemu-deboostrap` to
+create the *target* system chroot, which would have the native libraries and headers
+specific to that *target* system. After that, we can use the cross-compiler on the *build*
+system, pointing into chroot to get the build dependencies right. This allows building
+for foreign architectures with native compilation speed.
+
+For example, cross-compiling to AArch64 from x86_64 could be done like this:
+
+  * Install cross-compiler on the *build* system:
+```
+apt install g++-aarch64-linux-gnu gcc-aarch64-linux-gnu
+```
+
+  * Create chroot on the *build* system, configuring it for *target* system:
+```
+sudo qemu-debootstrap --arch=arm64 --verbose \
+       --include=fakeroot,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng12-dev \
+       --resolve-deps jessie /chroots/arm64 http://httpredir.debian.org/debian/
+```
+
+  * Configure and build with newly created chroot as sysroot/toolchain-path:
+```
+CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ sh ./configure --openjdk-target=aarch64-linux-gnu --with-sysroot=/chroots/arm64/ --with-toolchain-path=/chroots/arm64/
+make images
+ls build/linux-aarch64-normal-server-release/
+```
+
+The build does not create new files in that chroot, so it can be reused for multiple builds
+without additional cleanup.
+
+Architectures that are known to successfully cross-compile like this are:
+
+  Target        `CC`                      `CXX`                       `--arch=...`  `--openjdk-target=...`
+  ------------  ------------------------- --------------------------- ------------- -----------------------
+  x86           default                   default                     i386          i386-linux-gnu
+  armhf         gcc-arm-linux-gnueabihf   g++-arm-linux-gnueabihf     armhf         arm-linux-gnueabihf
+  aarch64       gcc-aarch64-linux-gnu     g++-aarch64-linux-gnu       arm64         aarch64-linux-gnu
+  ppc64el       gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu   ppc64el       powerpc64le-linux-gnu
+  s390x         gcc-s390x-linux-gnu       g++-s390x-linux-gnu         s390x         s390x-linux-gnu
+
+Additional architectures might be supported by Debian/Ubuntu Ports.
+
 ### Building for ARM/aarch64
 
 A common cross-compilation target is the ARM CPU. When building for ARM, it is
@@ -1026,14 +1170,6 @@ available using `--with-abi-profile`: arm-vfp-sflt, arm-vfp-hflt, arm-sflt,
 armv5-vfp-sflt, armv6-vfp-hflt. Note that soft-float ABIs are no longer
 properly supported by the JDK.
 
-The JDK contains two different ports for the aarch64 platform, one is the
-original aarch64 port from the [AArch64 Port Project](
-http://openjdk.java.net/projects/aarch64-port) and one is a 64-bit version of
-the Oracle contributed ARM port. When targeting aarch64, by the default the
-original aarch64 port is used. To select the Oracle ARM 64 port, use
-`--with-cpu-port=arm64`. Also set the corresponding value (`aarch64` or
-`arm64`) to --with-abi-profile, to ensure a consistent build.
-
 ### Verifying the Build
 
 The build will end up in a directory named like
@@ -1255,17 +1391,15 @@ Incremental rebuilds mean that when you modify part of the product, only the
 affected parts get rebuilt. While this works great in most cases, and
 significantly speed up the development process, from time to time complex
 interdependencies will result in an incorrect build result. This is the most
-common cause for unexpected build problems, together with inconsistencies
-between the different Mercurial repositories in the forest.
+common cause for unexpected build problems.
 
 Here are a suggested list of things to try if you are having unexpected build
 problems. Each step requires more time than the one before, so try them in
 order. Most issues will be solved at step 1 or 2.
 
- 1. Make sure your forest is up-to-date
+ 1. Make sure your repository is up-to-date
 
-    Run `bash get_source.sh` to make sure you have the latest version of all
-    repositories.
+    Run `hg pull -u` to make sure you have the latest changes.
 
  2. Clean build results
 
@@ -1290,13 +1424,13 @@ order. Most issues will be solved at step 1 or 2.
     make
     ```
 
- 4. Re-clone the Mercurial forest
+ 4. Re-clone the Mercurial repository
 
-    Sometimes the Mercurial repositories themselves gets in a state that causes
-    the product to be un-buildable. In such a case, the simplest solution is
-    often the "sledgehammer approach": delete the entire forest, and re-clone
-    it. If you have local changes, save them first to a different location
-    using `hg export`.
+    Sometimes the Mercurial repository gets in a state that causes the product
+    to be un-buildable. In such a case, the simplest solution is often the
+    "sledgehammer approach": delete the entire repository, and re-clone it.
+    If you have local changes, save them first to a different location using
+    `hg export`.
 
 ### Specific Build Issues
 
@@ -1347,7 +1481,7 @@ contact the Adoption Group. See the section on [Contributing to OpenJDK](
 
 ## Hints and Suggestions for Advanced Users
 
-### Setting Up a Forest for Pushing Changes (defpath)
+### Setting Up a Repository for Pushing Changes (defpath)
 
 To help you prepare a proper push path for a Mercurial repository, there exists
 a useful tool known as [defpath](
@@ -1374,11 +1508,6 @@ You can now setup a proper push path using:
 hg defpath -d -u <your OpenJDK username>
 ```
 
-If you also have the `trees` extension installed in Mercurial, you will
-automatically get a `tdefpath` command, which is even more useful. By running
-`hg tdefpath -du <username>` in the top repository of your forest, all repos
-will get setup automatically. This is the recommended usage.
-
 ### Bash Completion
 
 The `configure` and `make` commands tries to play nice with bash command-line
@@ -1413,7 +1542,7 @@ Now `configure --en<tab>-dt<tab>` will result in `configure --enable-dtrace`.
 
 ### Using Multiple Configurations
 
-You can have multiple configurations for a single source forest. When you
+You can have multiple configurations for a single source repository. When you
 create a new configuration, run `configure --with-conf-name=<name>` to create a
 configuration with the name `<name>`. Alternatively, you can create a directory
 under `build` and run `configure` from there, e.g. `mkdir build/<name> && cd
@@ -1428,7 +1557,7 @@ in the configuration directory, e.g. `cd build/<name> && make`.
 
 ### Handling Reconfigurations
 
-If you update the forest and part of the configure script has changed, the
+If you update the repository and part of the configure script has changed, the
 build system will force you to re-run `configure`.
 
 Most of the time, you will be fine by running `configure` again with the same

doc/ide.html

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

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

@@ -1,63 +1,60 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
+<html>
 <head>
-  <meta charset="utf-8" />
-  <meta name="generator" content="pandoc" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
+  <meta charset="utf-8">
+  <meta name="generator" content="pandoc">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
   <title>Testing 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" />
+  <style type="text/css">code{white-space: pre;}</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]-->
   <style type="text/css">pre, code, tt { color: #1d6ae5; }</style>
 </head>
 <body>
-<header id="title-block-header">
+<header>
 <h1 class="title">Testing the JDK</h1>
 </header>
 <nav id="TOC">
 <ul>
-<li><a href="#using-the-run-test-framework">Using the run-test framework</a><ul>
+<li><a href="#using-make-test-the-run-test-framework">Using &quot;make test&quot; (the run-test framework)</a><ul>
 <li><a href="#configuration">Configuration</a></li>
 </ul></li>
 <li><a href="#test-selection">Test selection</a><ul>
 <li><a href="#jtreg">JTReg</a></li>
 <li><a href="#gtest">Gtest</a></li>
+<li><a href="#microbenchmarks">Microbenchmarks</a></li>
+<li><a href="#special-tests">Special tests</a></li>
 </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>
+<li><a href="#microbenchmark-keywords">Microbenchmark keywords</a></li>
 </ul></li>
 </ul>
 </nav>
-<h2 id="using-the-run-test-framework">Using the run-test framework</h2>
+<h2 id="using-make-test-the-run-test-framework">Using &quot;make test&quot; (the run-test framework)</h2>
 <p>This new way of running tests is developer-centric. It assumes that you have built a JDK locally and want to test it. Running common test targets is simple, and more complex ad-hoc combination of tests is possible. The user interface is forgiving, and clearly report errors it cannot resolve.</p>
-<p>The main target “run-test” uses the jdk-image as the tested product. There is also an alternate target “exploded-run-test” that uses the exploded image instead. Not all tests will run successfully on the exploded image, but using this target can greatly improve rebuild times for certain workflows.</p>
+<p>The main target <code>test</code> uses the jdk-image as the tested product. There is also an alternate target <code>exploded-test</code> that uses the exploded image instead. Not all tests will run successfully on the exploded image, but using this target can greatly improve rebuild times for certain workflows.</p>
+<p>Previously, <code>make test</code> was used invoke an old system for running test, and <code>make run-test</code> was used for the new test framework. For backward compatibility with scripts and muscle memory, <code>run-test</code> (and variants like <code>exploded-run-test</code> or <code>run-test-tier1</code>) are kept as aliases. The old system can still be accessed for some time using <code>cd test &amp;&amp; make</code>.</p>
 <p>Some example command-lines:</p>
-<pre><code>$ make run-test-tier1
-$ make run-test-jdk_lang JTREG=&quot;JOBS=8&quot;
-$ make run-test TEST=jdk_lang
-$ make run-test-only TEST=&quot;gtest:LogTagSet gtest:LogTagSetDescriptions&quot; GTEST=&quot;REPEAT=-1&quot;
-$ make run-test TEST=&quot;hotspot:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
-$ make run-test TEST=&quot;jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java&quot;
-$ make exploded-run-test TEST=tier2</code></pre>
+<pre><code>$ make test-tier1
+$ make test-jdk_lang JTREG=&quot;JOBS=8&quot;
+$ make test TEST=jdk_lang
+$ make test-only TEST=&quot;gtest:LogTagSet gtest:LogTagSetDescriptions&quot; GTEST=&quot;REPEAT=-1&quot;
+$ make test TEST=&quot;hotspot:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
+$ make test TEST=&quot;jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java&quot;
+$ make test TEST=&quot;micro:java.lang.reflect&quot; MICRO=&quot;FORK=1;WARMUP_ITER=2&quot;
+$ make exploded-test TEST=tier2</code></pre>
 <h3 id="configuration">Configuration</h3>
-<p>To be able to run JTReg tests, <code>configure</code> needs to know where to find the JTReg test framework. If it is not picked up automatically by configure, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc. (An alternative is to set the <code>JT_HOME</code> environment variable to point to the JTReg home before running <code>configure</code>.)</p>
+<p>To be able to run JTReg tests, <code>configure</code> needs to know where to find the JTReg test framework. If it is not picked up automatically by configure, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc. (An alternative is to set the <code>JT_HOME</code> environment variable to point to the JTReg home before running <code>configure</code>.)</p>
+<p>To be able to run microbenchmarks, <code>configure</code> needs to know where to find the JMH dependency. Use <code>--with-jmh=&lt;path to JMH jars&gt;</code> to point to a directory containing the core JMH and transitive dependencies. The recommended dependencies can be retrieved by running <code>sh make/devkit/createJMHBundle.sh</code>, after which <code>--with-jmh=build/jmh/jars</code> should work.</p>
 <h2 id="test-selection">Test selection</h2>
-<p>All functionality is available using the run-test make target. In this use case, the test or tests to be executed is controlled using the <code>TEST</code> variable. To speed up subsequent test runs with no source code changes, run-test-only can be used instead, which do not depend on the source and test image build.</p>
-<p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make run-test-tier1</code> is equivalent to <code>make run-test TEST=&quot;tier1&quot;</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>run-test TEST=&quot;x&quot;</code> solution needs to be used.</p>
+<p>All functionality is available using the <code>test</code> make target. In this use case, the test or tests to be executed is controlled using the <code>TEST</code> variable. To speed up subsequent test runs with no source code changes, <code>test-only</code> can be used instead, which do not depend on the source and test image build.</p>
+<p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make test-tier1</code> is equivalent to <code>make test TEST=&quot;tier1&quot;</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>test TEST=&quot;x&quot;</code> solution needs to be used.</p>
 <p>The test specifications given in <code>TEST</code> is parsed into fully qualified test descriptors, which clearly and unambigously show which tests will be run. As an example, <code>:tier1</code> will expand to <code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1</code>. You can always submit a list of fully qualified test descriptors in the <code>TEST</code> variable if you want to shortcut the parser.</p>
 <h3 id="jtreg">JTReg</h3>
 <p>JTReg tests can be selected either by picking a JTReg test group, or a selection of files or directories containing JTReg tests.</p>
@@ -68,7 +65,17 @@ $ make exploded-run-test TEST=tier2</code></pre>
 <h3 id="gtest">Gtest</h3>
 <p>Since the Hotspot Gtest suite is so quick, the default is to run all tests. This is specified by just <code>gtest</code>, or as a fully qualified test descriptor <code>gtest:all</code>.</p>
 <p>If you want, you can single out an individual test or a group of tests, for instance <code>gtest:LogDecorations</code> or <code>gtest:LogDecorations.level_test_vm</code>. This can be particularly useful if you want to run a shaky test repeatedly.</p>
-<p>For Gtest, there is a separate test suite for each JVM variant. The JVM variant is defined by adding <code>/&lt;variant&gt;</code> to the test descriptor, e.g. <code>gtest:Log/client</code>. If you specify no variant, gtest will run once for each JVM variant present (e.g. server, client). So if you only have the server JVM present, then <code>gtest:all</code> will be equivalent to <code>gtest:all/server</code>.</p>
+<p>For Gtest, there is a separate test suite for each JVM variant. The JVM variant is defined by adding <code>/&lt;variant&gt;</code> to the test descriptor, e.g. <code>gtest:Log/client</code>. If you specify no variant, gtest will run once for each JVM variant present (e.g. server, client). So if you only have the server JVM present, then <code>gtest:all</code> will be equivalent to <code>gtest:all/server</code>.</p>
+<h3 id="microbenchmarks">Microbenchmarks</h3>
+<p>Which microbenchmarks to run is selected using a regular expression following the <code>micro:</code> test descriptor, e.g., <code>micro:java.lang.reflect</code>. This delegates the test selection to JMH, meaning package name, class name and even benchmark method names can be used to select tests.</p>
+<p>Using special characters like <code>|</code> in the regular expression is possible, but needs to be escaped multiple times: <code>micro:ArrayCopy\\\\\|reflect</code>.</p>
+<h3 id="special-tests">Special tests</h3>
+<p>A handful of odd tests that are not covered by any other testing framework are accessible using the <code>special:</code> test descriptor. Currently, this includes <code>failure-handler</code> and <code>make</code>.</p>
+<ul>
+<li><p>Failure handler testing is run using <code>special:failure-handler</code> or just <code>failure-handler</code> as test descriptor.</p></li>
+<li><p>Tests for the build system, including both makefiles and related functionality, is run using <code>special:make</code> or just <code>make</code> as test descriptor. This is equivalent to <code>special:make:all</code>.</p>
+<p>A specific make test can be run by supplying it as argument, e.g. <code>special:make:idea</code>. As a special syntax, this can also be expressed as <code>make-idea</code>, which allows for command lines as <code>make test-make-idea</code>.</p></li>
+</ul>
 <h2 id="test-results-and-summary">Test results and summary</h2>
 <p>At the end of the test run, a summary of all tests run will be presented. This will have a consistent look, regardless of what test suites were used. This is a sample summary:</p>
 <pre><code>==============================
@@ -82,17 +89,17 @@ Test summary
 TEST FAILURE</code></pre>
 <p>Tests where the number of TOTAL tests does not equal the number of PASSed tests will be considered a test failure. These are marked with the <code>&gt;&gt; ... &lt;&lt;</code> marker for easy identification.</p>
 <p>The classification of non-passed tests differs a bit between test suites. In the summary, ERROR is used as a catch-all for tests that neither passed nor are classified as failed by the framework. This might indicate test framework error, timeout or other problems.</p>
-<p>In case of test failures, <code>make run-test</code> will exit with a non-zero exit value.</p>
-<p>All tests have their result stored in <code>build/$BUILD/test-results/$TEST_ID</code>, where TEST_ID is a path-safe conversion from the fully qualified test descriptor, e.g. for <code>jtreg:jdk/test:tier1</code> the TEST_ID is <code>jtreg_jdk_test_tier1</code>. This path is also printed in the log at the end of the test run.</p>
+<p>In case of test failures, <code>make test</code> will exit with a non-zero exit value.</p>
+<p>All tests have their result stored in <code>build/$BUILD/test-results/$TEST_ID</code>, where TEST_ID is a path-safe conversion from the fully qualified test descriptor, e.g. for <code>jtreg:jdk/test:tier1</code> the TEST_ID is <code>jtreg_jdk_test_tier1</code>. This path is also printed in the log at the end of the test run.</p>
 <p>Additional work data is stored in <code>build/$BUILD/test-support/$TEST_ID</code>. For some frameworks, this directory might contain information that is useful in determining the cause of a failed test.</p>
 <h2 id="test-suite-control">Test suite control</h2>
 <p>It is possible to control various aspects of the test suites using make control variables.</p>
 <p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG=&quot;JOBS=1;TIMEOUT=8&quot;</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG=&quot;TMIEOUT=8&quot;</code> would give an error, while <code>JTREG_TMIEOUT=8</code> would just pass unnoticed.</p>
 <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>(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="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>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>
@@ -104,10 +111,15 @@ TEST FAILURE</code></pre>
 <p>Applies to JTReg, GTest and Micro.</p>
 <h4 id="aot_modules">AOT_MODULES</h4>
 <p>Applies to JTReg and GTest.</p>
+<h4 id="jcov">JCOV</h4>
+<p>This keywords applies globally to the test runner system. If set to <code>true</code>, it enables JCov coverage reporting for all tests run. To be useful, the JDK under test must be run with a JDK built with JCov instrumentation (<code>configure --with-jcov=&lt;path to directory containing lib/jcov.jar&gt;</code>, <code>make jcov-image</code>).</p>
+<p>The simplest way to run tests with JCov coverage report is to use the special target <code>jcov-test</code> instead of <code>test</code>, e.g. <code>make jcov-test TEST=jdk_lang</code>. This will make sure the JCov image is built, and that JCov reporting is enabled.</p>
+<p>The JCov report is stored in <code>build/$BUILD/test-results/jcov-output</code>.</p>
+<p>Please note that running with JCov reporting can be very memory intensive.</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>
+<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> (for sparc, if more than 16 cpus, then <em>number of CPU cores/5</em>, otherwise <em>number of CPU cores/4</em>), but never more than <em>memory size in GB/2</em>.</p>
 <h4 id="timeout_factor-1">TIMEOUT_FACTOR</h4>
 <p>The timeout factor (<code>-timeoutFactor</code>).</p>
 <p>Defaults to 4.</p>
@@ -151,21 +163,22 @@ TEST FAILURE</code></pre>
 <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>
+<h3 id="microbenchmark-keywords">Microbenchmark keywords</h3>
+<h4 id="fork">FORK</h4>
+<p>Override the number of benchmark forks to spawn. Same as specifying <code>-f &lt;num&gt;</code>.</p>
+<h4 id="iter">ITER</h4>
+<p>Number of measurement iterations per fork. Same as specifying <code>-i &lt;num&gt;</code>.</p>
+<h4 id="time">TIME</h4>
+<p>Amount of time to spend in each measurement iteration, in seconds. Same as specifying <code>-r &lt;num&gt;</code></p>
+<h4 id="warmup_iter">WARMUP_ITER</h4>
+<p>Number of warmup iterations to run before the measurement phase in each fork. Same as specifying <code>-wi &lt;num&gt;</code>.</p>
+<h4 id="warmup_time">WARMUP_TIME</h4>
+<p>Amount of time to spend in each warmup iteration. Same as specifying <code>-w &lt;num&gt;</code>.</p>
+<h4 id="results_format">RESULTS_FORMAT</h4>
+<p>Specify to have the test run save a log of the values. Accepts the same values as <code>-rff</code>, i.e., <code>text</code>, <code>csv</code>, <code>scsv</code>, <code>json</code>, or <code>latex</code>.</p>
+<h4 id="vm_options-2">VM_OPTIONS</h4>
+<p>Additional VM arguments to provide to forked off VMs. Same as <code>-jvmArgs &lt;args&gt;</code></p>
+<h4 id="options-2">OPTIONS</h4>
+<p>Additional arguments to send to JMH.</p>
 </body>
 </html>

doc/testing.md

@@ -1,26 +1,33 @@
 % Testing the JDK
 
-## Using the run-test framework
+## Using "make test" (the run-test framework)
 
 This new way of running tests is developer-centric. It assumes that you have
 built a JDK locally and want to test it. Running common test targets is simple,
 and more complex ad-hoc combination of tests is possible. The user interface is
 forgiving, and clearly report errors it cannot resolve.
 
-The main target "run-test" uses the jdk-image as the tested product. There is
-also an alternate target "exploded-run-test" that uses the exploded image
+The main target `test` uses the jdk-image as the tested product. There is
+also an alternate target `exploded-test` that uses the exploded image
 instead. Not all tests will run successfully on the exploded image, but using
 this target can greatly improve rebuild times for certain workflows.
 
+Previously, `make test` was used invoke an old system for running test, and
+`make run-test` was used for the new test framework. For backward compatibility
+with scripts and muscle memory, `run-test` (and variants like
+`exploded-run-test` or `run-test-tier1`) are kept as aliases. The old system
+can still be accessed for some time using `cd test && make`.
+
 Some example command-lines:
 
-    $ make run-test-tier1
-    $ make run-test-jdk_lang JTREG="JOBS=8"
-    $ make run-test TEST=jdk_lang
-    $ make run-test-only TEST="gtest:LogTagSet gtest:LogTagSetDescriptions" GTEST="REPEAT=-1"
-    $ make run-test TEST="hotspot:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"
-    $ make run-test TEST="jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java"
-    $ make exploded-run-test TEST=tier2
+    $ make test-tier1
+    $ make test-jdk_lang JTREG="JOBS=8"
+    $ make test TEST=jdk_lang
+    $ make test-only TEST="gtest:LogTagSet gtest:LogTagSetDescriptions" GTEST="REPEAT=-1"
+    $ make test TEST="hotspot:hotspot_gc" JTREG="JOBS=1;TIMEOUT=8;VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"
+    $ make test TEST="jtreg:test/hotspot:hotspot_gc test/hotspot/jtreg/native_sanity/JniVersion.java"
+    $ make test TEST="micro:java.lang.reflect" MICRO="FORK=1;WARMUP_ITER=2"
+    $ make exploded-test TEST=tier2
 
 ### Configuration
 
@@ -31,18 +38,24 @@ Note that this option should point to the JTReg home, i.e. the top directory,
 containing `lib/jtreg.jar` etc. (An alternative is to set the `JT_HOME`
 environment variable to point to the JTReg home before running `configure`.)
 
+To be able to run microbenchmarks, `configure` needs to know where to find
+the JMH dependency. Use `--with-jmh=<path to JMH jars>` to point to a directory
+containing the core JMH and transitive dependencies. The recommended dependencies
+can be retrieved by running `sh make/devkit/createJMHBundle.sh`, after which
+`--with-jmh=build/jmh/jars` should work.
+
 ## Test selection
 
-All functionality is available using the run-test make target. In this use
-case, the test or tests to be executed is controlled using the `TEST` variable.
-To speed up subsequent test runs with no source code changes, run-test-only can
-be used instead, which do not depend on the source and test image build.
+All functionality is available using the `test` make target. In this use case,
+the test or tests to be executed is controlled using the `TEST` variable. To
+speed up subsequent test runs with no source code changes, `test-only` can be
+used instead, which do not depend on the source and test image build.
 
 For some common top-level tests, direct make targets have been generated. This
 includes all JTReg test groups, the hotspot gtest, and custom tests (if
-present). This means that `make run-test-tier1` is equivalent to `make run-test
+present). This means that `make test-tier1` is equivalent to `make test
 TEST="tier1"`, but the latter is more tab-completion friendly. For more complex
-test runs, the `run-test TEST="x"` solution needs to be used.
+test runs, the `test TEST="x"` solution needs to be used.
 
 The test specifications given in `TEST` is parsed into fully qualified test
 descriptors, which clearly and unambigously show which tests will be run. As an
@@ -98,6 +111,33 @@ is defined by adding `/<variant>` to the test descriptor, e.g.
 variant present (e.g. server, client). So if you only have the server JVM
 present, then `gtest:all` will be equivalent to `gtest:all/server`.
 
+### Microbenchmarks
+
+Which microbenchmarks to run is selected using a regular expression
+following the `micro:` test descriptor, e.g., `micro:java.lang.reflect`. This
+delegates the test selection to JMH, meaning package name, class name and even
+benchmark method names can be used to select tests.
+
+Using special characters like `|` in the regular expression is possible, but
+needs to be escaped multiple times: `micro:ArrayCopy\\\\\|reflect`.
+
+### Special tests
+
+A handful of odd tests that are not covered by any other testing framework are
+accessible using the `special:` test descriptor. Currently, this includes
+`failure-handler` and `make`.
+
+  * Failure handler testing is run using `special:failure-handler` or just
+    `failure-handler` as test descriptor.
+
+  * Tests for the build system, including both makefiles and related
+    functionality, is run using `special:make` or just `make` as test
+    descriptor. This is equivalent to `special:make:all`.
+
+    A specific make test can be run by supplying it as argument, e.g.
+    `special:make:idea`. As a special syntax, this can also be expressed as
+    `make-idea`, which allows for command lines as `make test-make-idea`.
+
 ## Test results and summary
 
 At the end of the test run, a summary of all tests run will be presented. This
@@ -123,7 +163,7 @@ the summary, ERROR is used as a catch-all for tests that neither passed nor are
 classified as failed by the framework. This might indicate test framework
 error, timeout or other problems.
 
-In case of test failures, `make run-test` will exit with a non-zero exit value.
+In case of test failures, `make test` will exit with a non-zero exit value.
 
 All tests have their result stored in `build/$BUILD/test-results/$TEST_ID`,
 where TEST_ID is a path-safe conversion from the fully qualified test
@@ -191,14 +231,30 @@ Applies to JTReg, GTest and Micro.
 
 Applies to JTReg and GTest.
 
+#### JCOV
+
+This keywords applies globally to the test runner system. If set to `true`, it
+enables JCov coverage reporting for all tests run. To be useful, the JDK under
+test must be run with a JDK built with JCov instrumentation (`configure
+--with-jcov=<path to directory containing lib/jcov.jar>`, `make jcov-image`).
+
+The simplest way to run tests with JCov coverage report is to use the special
+target `jcov-test` instead of `test`, e.g. `make jcov-test TEST=jdk_lang`. This
+will make sure the JCov image is built, and that JCov reporting is enabled.
+
+The JCov report is stored in `build/$BUILD/test-results/jcov-output`.
+
+Please note that running with JCov reporting can be very memory intensive.
+
 ### JTReg keywords
 
 #### JOBS
 The test concurrency (`-concurrency`).
 
 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.
+JOBS, except for Hotspot, where the default is *number of CPU cores/2* (for
+sparc, if more than 16 cpus, then *number of CPU cores/5*, otherwise *number of
+CPU cores/4*), but never more than *memory size in GB/2*.
 
 #### TIMEOUT_FACTOR
 The timeout factor (`-timeoutFactor`).
@@ -289,49 +345,34 @@ 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
+### Microbenchmark keywords
 
-### Docker Tests
+#### FORK
+Override the number of benchmark forks to spawn. Same as specifying `-f <num>`.
 
-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:
+#### ITER
+Number of measurement iterations per fork. Same as specifying `-i <num>`.
 
-    $ make run-test TEST="jtreg:test/hotspot/jtreg/containers/docker"
+#### TIME
+Amount of time to spend in each measurement iteration, in seconds. Same as
+specifying `-r <num>`
 
-To run these tests correctly, additional parameters for the correct docker image are
-required on Ubuntu 18.04 by using `JAVA_OPTIONS`.
+#### WARMUP_ITER
+Number of warmup iterations to run before the measurement phase in each fork.
+Same as specifying `-wi <num>`.
 
-    $ 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"
+#### WARMUP_TIME
+Amount of time to spend in each warmup iteration. Same as specifying `-w <num>`.
 
-### Client UI Tests
+#### RESULTS_FORMAT
+Specify to have the test run save a log of the values. Accepts the same values
+as `-rff`, i.e., `text`, `csv`, `scsv`, `json`, or `latex`.
 
-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.
+#### VM_OPTIONS
+Additional VM arguments to provide to forked off VMs. Same as `-jvmArgs <args>`
 
-#### 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.
+#### OPTIONS
+Additional arguments to send to JMH.
 
 ---
 # Override some definitions in the global css file that are not optimal for

jb/project/docker/Dockerfile

@@ -1,13 +0,0 @@
-# jetbrains/runtime:jbr11dev8env
-FROM centos:7
-RUN yum -y install centos-release-scl
-RUN yum -y install devtoolset-8
-RUN yum -y install zip bzip2 unzip tar wget make autoconf automake libtool alsa-devel cups-devel xorg-x11-devel libjpeg62-devel giflib-devel freetype-devel file which libXtst-devel libXt-devel libXrender-devel alsa-lib-devel fontconfig-devel libXrandr-devel libXi-devel git
-# Install Java 11
-RUN wget https://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 /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

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

jb/project/hotspot-cmake/CMakeLists.txt

@@ -495,6 +495,7 @@ 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
@@ -519,6 +520,7 @@ 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
@@ -527,6 +529,7 @@ 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
@@ -1172,11 +1175,13 @@ 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
@@ -1249,6 +1254,7 @@ 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
@@ -1264,6 +1270,7 @@ 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
@@ -1474,6 +1481,7 @@ 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
@@ -1516,6 +1524,7 @@ 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
@@ -1548,6 +1557,7 @@ 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,7 +2,6 @@
 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")
@@ -17,55 +16,15 @@ 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 sure about TARGET_COMPILER
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "CYGWIN") #not shure 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 --disable-warnings-as-errors
+        COMMAND bash configure
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/../../../)
 
-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})
-
 add_custom_target(build_images
-        COMMAND make images CONF=${JDK_RELEASE_TARGET}
+        COMMAND make COMPILER_WARNINGS_FATAL=false images
         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})
+        DEPENDS ${SOURCE_FILES})

jb/project/java-gradle/build.gradle

@@ -10,11 +10,11 @@ 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.4.jdk/Contents/Home/bin/java').absolutePath
+            file('../../../build/macosx-x86_64-server-release/images/jdk-bundle/jdk-13.jdk/Contents/Home/bin/java').absolutePath
         } else if (OperatingSystem.current().isLinux()) {
-            file('../../../build/linux-x86_64-normal-server-release/images/jdk/bin/java').absolutePath
+            file('../../../build/linux-x86_64-server-release/images/jdk/bin/java').absolutePath
         } else {
-            file('../../../build/windows-x86_64-normal-server-release/images/jdk/bin/java.exe').absolutePath
+            file('../../../build/windows-x86_64-server-release/images/j2sdk-image/bin/java.exe').absolutePath
         }
     }
 }
@@ -87,7 +87,7 @@ test {
     outputs.upToDateWhen { false }
     executable = test_jvm()
 
-//  Enable async/dtrace profiler
+//  Enable async/dtrace profiler      
     jvmArgs  "-XX:+PreserveFramePointer"
 //  Enable native J2D logging (only in debug build)
 //  Can be turned on for J2D by adding "#define DEBUG 1" into jdk/src/share/native/sun/java2d/Trace.h
@@ -103,30 +103,24 @@ if (OperatingSystem.current().isWindows()) {
     if (cyg_make_cmd.exists()) make_cmd = cyg_make_cmd.absolutePath
 }
 def test_run = false
-task make_images {
-    doLast {
-        if (!test_run) {
-            def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "images")
-            def proc = pb.redirectErrorStream(true).start()
-            proc.inputStream.eachLine { println it }
-            assert proc.waitFor() == 0
-        }
-    }
-}
-
-task make_clean {
-    doLast {
-        def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "clean")
+task make_images << {
+    if (!test_run) {
+        def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "images")
         def proc = pb.redirectErrorStream(true).start()
         proc.inputStream.eachLine { println it }
         assert proc.waitFor() == 0
     }
 }
 
-task run_test {
-    doLast {
-        test_run = true
-    }
+task make_clean << {
+    def pb = new ProcessBuilder().command(make_cmd.toString(), "-C", buildDir.absolutePath, "clean")
+    def proc = pb.redirectErrorStream(true).start()
+    proc.inputStream.eachLine {println it}
+    assert proc.waitFor() == 0
+}
+
+task run_test << {
+    test_run = true
 }
 
 tasks.cleanTest.dependsOn tasks.run_test

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

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

jb/project/java-gradle/gradlew

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

jb/project/jdk-cmake/.gitignore

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

jb/project/jdk-cmake/CMakeLists.txt

@@ -6,65 +6,87 @@ 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
-        ../../../src/java.desktop/share/native/common/java2d/opengl
-        ../../../src/java.desktop/share/native/common/java2d/opengl/J2D_GL
-        ../../../src/java.desktop/share/native/include
-        ../../../src/java.desktop/share/native/libawt/awt/image
-        ../../../src/java.desktop/share/native/libawt/awt/image/cvutils
-        ../../../src/java.desktop/share/native/libawt/awt/medialib
-        ../../../src/java.desktop/share/native/libawt/java2d
-        ../../../src/java.desktop/share/native/libawt/java2d/loops
-        ../../../src/java.desktop/share/native/libawt/java2d/pipe
-        ../../../src/java.desktop/share/native/libfontmanager
-        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz
+        ../../../src/java.desktop/share/native
+        ../../../src/java.desktop/share/native/libjsound
+        ../../../src/java.desktop/share/native/libmlib_image
+        ../../../src/java.desktop/share/native/libfreetype
         ../../../src/java.desktop/share/native/libfreetype/include
         ../../../src/java.desktop/share/native/libfreetype/include/freetype
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/config
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal
         ../../../src/java.desktop/share/native/libfreetype/include/freetype/internal/services
-        ../../../src/java.desktop/share/native/libfreetype/src/autofit
-        ../../../src/java.desktop/share/native/libfreetype/src/base
-        ../../../src/java.desktop/share/native/libfreetype/src/cff
-        ../../../src/java.desktop/share/native/libfreetype/src/cid
-        ../../../src/java.desktop/share/native/libfreetype/src/psaux
-        ../../../src/java.desktop/share/native/libfreetype/src/pshinter
-        ../../../src/java.desktop/share/native/libfreetype/src/psnames
-        ../../../src/java.desktop/share/native/libfreetype/src/raster
+        ../../../src/java.desktop/share/native/libfreetype/src
+        ../../../src/java.desktop/share/native/libfreetype/src/type1
         ../../../src/java.desktop/share/native/libfreetype/src/sfnt
         ../../../src/java.desktop/share/native/libfreetype/src/smooth
+        ../../../src/java.desktop/share/native/libfreetype/src/cff
+        ../../../src/java.desktop/share/native/libfreetype/src/psaux
+        ../../../src/java.desktop/share/native/libfreetype/src/cid
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit
+        ../../../src/java.desktop/share/native/libfreetype/src/pshinter
         ../../../src/java.desktop/share/native/libfreetype/src/truetype
-        ../../../src/java.desktop/share/native/libfreetype/src/type1
+        ../../../src/java.desktop/share/native/libfreetype/src/raster
+        ../../../src/java.desktop/share/native/libfreetype/src/psnames
+        ../../../src/java.desktop/share/native/libfreetype/src/base
+        ../../../src/java.desktop/share/native/include
+        ../../../src/java.desktop/share/native/common
+        ../../../src/java.desktop/share/native/common/java2d
+        ../../../src/java.desktop/share/native/common/java2d/opengl
+        ../../../src/java.desktop/share/native/common/java2d/opengl/J2D_GL
+        ../../../src/java.desktop/share/native/common/awt
+        ../../../src/java.desktop/share/native/common/awt/medialib
+        ../../../src/java.desktop/share/native/common/awt/debug
+        ../../../src/java.desktop/share/native/common/awt/utility
+        ../../../src/java.desktop/share/native/common/font
+        ../../../src/java.desktop/share/native/libawt
+        ../../../src/java.desktop/share/native/libawt/java2d
+        ../../../src/java.desktop/share/native/libawt/java2d/pipe
+        ../../../src/java.desktop/share/native/libawt/java2d/loops
+        ../../../src/java.desktop/share/native/libawt/awt
+        ../../../src/java.desktop/share/native/libawt/awt/image
+        ../../../src/java.desktop/share/native/libawt/awt/image/cvutils
+        ../../../src/java.desktop/share/native/libawt/awt/image/gif
+        ../../../src/java.desktop/share/native/libawt/awt/medialib
         ../../../src/java.desktop/share/native/libjavajpeg
-        ../../../src/java.desktop/share/native/libjsound
+        ../../../src/java.desktop/share/native/libfontmanager
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz
+        ../../../src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ucdn
         ../../../src/java.desktop/share/native/liblcms
-        ../../../src/java.desktop/share/native/libmlib_image
         ../../../src/java.desktop/share/native/libsplashscreen
-        ../../../src/java.desktop/share/native/libsplashscreen/giflib
         ../../../src/java.desktop/share/native/libsplashscreen/libpng
-)
+        ../../../src/java.desktop/share/native/libsplashscreen/giflib)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     include_directories(
             ../../../src/hotspot/os/posix/include
             ../../../src/java.base/unix/native/include
             ../../../src/java.base/unix/native/libjava
-            ../../../src/java.desktop/unix/native/common/awt
-            ../../../src/java.desktop/unix/native/common/awt/medialib
-            ../../../src/java.desktop/unix/native/common/awt/systemscale
-            ../../../src/java.desktop/unix/native/common/awt/utility
-            ../../../src/java.desktop/unix/native/common/font
+            ../../../src/java.desktop/unix/native
+            ../../../src/java.desktop/unix/native/libawt_headless
+            ../../../src/java.desktop/unix/native/libawt_headless/awt
+            ../../../src/java.desktop/unix/native/libmlib_image
+            ../../../src/java.desktop/unix/native/include
+            ../../../src/java.desktop/unix/native/libjawt
+            ../../../src/java.desktop/unix/native/common
+            ../../../src/java.desktop/unix/native/common/java2d
+            ../../../src/java.desktop/unix/native/common/java2d/x11
             ../../../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/common/awt
+            ../../../src/java.desktop/unix/native/common/awt/systemscale
+            ../../../src/java.desktop/unix/native/common/awt/medialib
+            ../../../src/java.desktop/unix/native/common/awt/utility
+            ../../../src/java.desktop/unix/native/common/font
+            ../../../src/java.desktop/unix/native/libawt
             ../../../src/java.desktop/unix/native/libawt/java2d
             ../../../src/java.desktop/unix/native/libawt/java2d/loops
-            ../../../src/java.desktop/unix/native/libmlib_image
+            ../../../src/java.desktop/unix/native/libawt/awt
+            ../../../src/java.desktop/unix/native/libawt_xawt
+            ../../../src/java.desktop/unix/native/libawt_xawt/java2d
+            ../../../src/java.desktop/unix/native/libawt_xawt/java2d/x11
+            ../../../src/java.desktop/unix/native/libawt_xawt/awt
+            ../../../src/java.desktop/unix/native/libawt_xawt/xawt
+            ../../../src/java.desktop/unix/native/libfontmanager
             ../../../src/java.desktop/unix/native/libsplashscreen)
 endif()
 
@@ -73,7 +95,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     find_library(JAVA_NATIVE_FOUNDATION JavaNativeFoundation)
     include_directories(
             ../../../src/java.desktop/macosx/native/libosxapp
-            ../../../build//macosx-x86_64-normal-server-release//support/headers/java.desktop
+            ../../../build/macosx-x86_64-server-release/support/headers/java.desktop
     )
 
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -85,16 +107,22 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "CYGWIN")
             ../../../src/hotspot/os/windows/include
             ../../../src/java.base/windows/native/include
             ../../../src/java.base/windows/native/libjava
+            ../../../src/java.desktop/windows/native/
+            ../../../src/java.desktop/windows/native/libjsound
+            ../../../src/java.desktop/windows/native/include
+            ../../../src/java.desktop/windows/native/libjawt
+            ../../../src/java.desktop/windows/native/common
+            ../../../src/java.desktop/windows/native/common/awt
             ../../../src/java.desktop/windows/native/common/awt/systemscale
             ../../../src/java.desktop/windows/native/common/awt/utility
-            ../../../src/java.desktop/windows/native/include
+            ../../../src/java.desktop/windows/native/libawt
             ../../../src/java.desktop/windows/native/libawt/java2d
-            ../../../src/java.desktop/windows/native/libawt/java2d/d3d
+            ../../../src/java.desktop/windows/native/libawt/java2d/windows
             ../../../src/java.desktop/windows/native/libawt/java2d/opengl
             ../../../src/java.desktop/windows/native/libawt/java2d/opengl/J2D_GL
-            ../../../src/java.desktop/windows/native/libawt/java2d/windows
+            ../../../src/java.desktop/windows/native/libawt/java2d/d3d
             ../../../src/java.desktop/windows/native/libawt/windows
-            ../../../src/java.desktop/windows/native/libjsound
+            ../../../src/java.desktop/windows/native/libfontmanager
             ../../../src/java.desktop/windows/native/libsplashscreen)
 endif()
 
@@ -194,19 +222,16 @@ 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
@@ -221,13 +246,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
@@ -277,8 +302,6 @@ 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
@@ -293,42 +316,40 @@ 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
@@ -336,10 +357,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
@@ -376,7 +397,6 @@ 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
@@ -389,12 +409,11 @@ 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/afblue.cin
+        ../../../src/java.desktop/share/native/libfreetype/src/autofit/afpic.c
         ../../../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
@@ -407,10 +426,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
@@ -420,58 +439,64 @@ 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/base
+        ../../../src/java.desktop/share/native/libfreetype/src/psnames/pspic.c
         ../../../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
@@ -485,9 +510,11 @@ 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
@@ -745,217 +772,39 @@ 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-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-ot-tag.h
         ../../../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
         ../../../src/java.desktop/share/native/libfontmanager/sunFont.c
         ../../../src/java.desktop/share/native/libfontmanager/fontscaler.h
         ../../../src/java.desktop/share/native/liblcms/cmsps2.c
@@ -1022,21 +871,14 @@ set(SOURCE_FILES
         ../../../src/java.desktop/share/native/libsplashscreen/java_awt_SplashScreen.c
         ../../../src/java.desktop/share/native/libsplashscreen/splashscreen_gfx_impl.c
         ../../../src/java.desktop/share/native/libsplashscreen/splashscreen_impl.c
-
-
-        ../../../src/java.desktop/share/native/include/jawt.h
         ../../../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/libzip/zlib/zutil.c
-        ../../../src/java.base/share/native/libzip/zlib/inflate.c)
-
+        ../../../src/java.base/share/native/include/jvmticmlr.h)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(SOURCE_FILES
             ${SOURCE_FILES}
-            ../../../src/java.desktop/macosx/native/include/jawt_md.h
 
             ../../../src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiOut.c
             ../../../src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_Utils.cpp
@@ -1047,9 +889,41 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
             ../../../src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_PCM.cpp
             ../../../src/java.desktop/macosx/native/libjsound/PLATFORM_API_MacOSX_MidiUtils.c
             ../../../src/java.desktop/macosx/native/include/jawt_md.h
-            ../../../src/java.desktop/macosx/native/libosx/Dispatch.m
             ../../../src/java.desktop/macosx/native/libosx/CFileManager.m
             ../../../src/java.desktop/macosx/native/libjawt/jawt.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLBufImgOps.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLGraphicsConfig.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLContext.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLPaints.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLVertexCache.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderQueue.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLMaskFill.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLTextRenderer.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLBlitLoops.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLSurfaceData.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLFuncs.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderer.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLMaskBlit.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLVertexCache.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLLayer.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLPaints.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLContext.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLGraphicsConfig.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLBufImgOps.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLSurfaceDataBase.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderQueue.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLBlitLoops.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLTextRenderer.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLMaskFill.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLMaskBlit.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLRenderer.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLFuncs.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLSurfaceData.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLUtils.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLUtils.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLTexturePool.h
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/metal/MTLTexturePool.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLSurfaceData.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/J2D_GL/cglext.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/CGLGraphicsConfig.h
@@ -1108,6 +982,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m
+            ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/common.h
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m
             ../../../src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.h
@@ -1157,7 +1032,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
             ../../../src/java.desktop/macosx/native/libosxapp/QueuingApplicationDelegate.h
             ../../../src/java.desktop/macosx/native/libosxapp/PropertiesUtilities.h
             ../../../src/java.desktop/macosx/native/libosxapp/AWT_debug.h
-            ../../../src/java.desktop/macosx/native/libsplashscreen/libpng/zlibwrapper/zlib.h
             ../../../src/java.desktop/macosx/native/libsplashscreen/splashscreen_config.h
             ../../../src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m
             ../../../src/java.desktop/macosx/native/libosxui/JRSUIController.m
@@ -1330,7 +1204,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/awt
+            ../../../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/gtk2_interface.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/list.c
             ../../../src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c
@@ -1361,7 +1236,14 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR ${CMAKE_SYSTEM_NAME} MATCHES "Linux"
             ../../../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/java2d/x11/XRBackendNative.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/libfontmanager/X11FontScaler.c
             ../../../src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c
             ../../../src/java.desktop/unix/native/libsplashscreen/splashscreen_config.h
@@ -1385,7 +1267,6 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "CYGWIN")
             ../../../src/java.desktop/windows/native/libjsound/PLATFORM_API_WinOS_Ports.c
             ../../../src/java.desktop/windows/native/include/jawt_md.h
             ../../../src/java.desktop/windows/native/libjawt/jawt.cpp
-            ../../../src/java.desktop/windows/native/common/awt_makecube.cpp
             ../../../src/java.desktop/windows/native/common/awt/systemscale/systemScale.h
             ../../../src/java.desktop/windows/native/common/awt/systemscale/systemScale.cpp
             ../../../src/java.desktop/windows/native/common/awt/utility/rect.h
@@ -1592,7 +1473,6 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "CYGWIN")
             ../../../src/java.desktop/windows/native/libawt/windows/awt_Window.h
             ../../../src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp
             ../../../src/java.desktop/windows/native/libawt/windows/awt_Palette.cpp
-            ../../../src/java.desktop/windows/native/libfontmanager/lcdglyphDW.cpp
             ../../../src/java.desktop/windows/native/libfontmanager/fontpath.c
             ../../../src/java.desktop/windows/native/libfontmanager/lcdglyph.c
             ../../../src/java.desktop/windows/native/libsplashscreen/splashscreen_config.h

jb/project/tools/common.sh

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

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

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

@@ -1,86 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-
-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

@@ -1,147 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-# 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

@@ -1,90 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-# 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

@@ -1,82 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-
-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

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

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

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

@@ -1,153 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-# 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

@@ -1,99 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-# 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

@@ -1,120 +0,0 @@
-#!/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

@@ -1,94 +0,0 @@
-#!/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

@@ -1,132 +0,0 @@
-#!/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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,122 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-# 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_x64_fd.sh

@@ -1,76 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-# 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
-
-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
-
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-WORK_DIR=$(pwd)
-WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-RELEASE_NAME=windows-x86_64-normal-server-fastdebug
-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
-
-make LOG=info clean images CONF=$RELEASE_NAME || exit 1
-
-JSDK=build/$RELEASE_NAME/images/jdk
-JBSDK=${JBRSDK_BASE_NAME}-windows-x64-b${build_number}
-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
-JBR_BASE_NAME=jbr-$JBSDK_VERSION
-rm -rf ${JBR_BUNDLE}
-
-${JSDK}/bin/jlink \
-  --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
-  --add-modules $(xargs < modules.list | sed s/" "//g) --output ${JBR_BUNDLE} || exit $?
-cp -R ${JCEF_PATH}/* ${JBR_BUNDLE}/bin
-echo Modifying release info ...
-cat ${JSDK}/release | tr -d '\r' | grep -v 'JAVA_VERSION' | grep -v 'MODULES' >> ${JBR_BUNDLE}/release

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

@@ -1,65 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-
-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

@@ -1,74 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-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_x64_fd.sh

@@ -1,44 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-
-RELEASE_NAME=windows-x86_64-normal-server-fastdebug
-
-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-fastdebug-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-x64-fastdebug-b$build_number
-echo Creating $JBR.tar.gz ...
-cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-
-/usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || exit 1

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

@@ -1,45 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies the current version of OpenJDK e.g. 11_0_6
-#   JDK_BUILD_NUMBER - specifies the number of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to bu built; possible values:
-#                        jcef - the bundles 1) jbr with jcef+javafx, 2) jbrsdk and 3) test will be created
-#                        jfx  - the bundle 1) jbr with javafx only will be created
-#
-# jbrsdk-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-osx-x64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-
-JBRSDK_BASE_NAME=jbrsdk-$JBSDK_VERSION
-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