Add ExtendedGlyphCache and remove SampleJBRApi from JBR API

8262031: Create implementation for NSAccessibilityNavigableStaticText protocol
8264287: Create implementation for NSAccessibilityComboBox protocol peer
8264303: Create implementation for NSAccessibilityTabGroup protocol peer
8264292: Create implementation for NSAccessibilityList protocol peer
8267387: Create implementation for NSAccessibilityOutline protocol
8267388: Create implementation for NSAccessibilityTable protocol
8264286: Create implementation for NSAccessibilityColumn protocol peer
8264298: Create implementation for NSAccessibilityRow protocol peer
8264291: Create implementation for NSAccessibilityCell protocol peer

Reviewed-by: kizune, pbansal, serb

.github/workflows/submit.yml

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

README.md

@@ -5,14 +5,6 @@
 JetBrains Runtime is a fork of [OpenJDK](https://github.com/openjdk/jdk) available for Windows, Mac OS X, and Linux.
 It includes a number enhancements in font rendering, HiDPI support, ligatures, performance improvements, and bugfixes.
 
-> **_NOTE_**: This is a **development** branch that is periodically synhronized with 
-> the [OpenJDK master](https://github.com/openjdk/jdk/tree/master) branch.
-> 
-> Release builds are based on these branches:
-> * [master](https://github.com/JetBrains/JetBrainsRuntime/tree/master) (JDK 11)
-> * [master17](https://github.com/JetBrains/JetBrainsRuntime/tree/master17) (JDK 17)
-
-
 ## Contents
 - [Welcome to JetBrains Runtime](#jetbrains-runtime)
   - [Products Built on JetBrains Runtime](#products-built-on-jetbrains-runtime)
@@ -76,6 +68,7 @@ Run these commands in the new container:
 ```
 $ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
 # cd /JetBrainsRuntime
+# git checkout master17
 # sh ./configure
 # make images CONF=linux-x86_64-normal-server-release
 ```
@@ -84,14 +77,13 @@ $ docker run -v `pwd`../../../../:/JetBrainsRuntime -it 942ea9900054
 Install the necessary tools, libraries, and headers with:
 ```
 $ sudo apt-get install autoconf make build-essential libx11-dev libxext-dev libxrender-dev libxtst-dev \
-       libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev
+       libxt-dev libxrandr-dev libcups2-dev libfontconfig1-dev libasound2-dev \
+       java-16-amazon-corretto-jdk
 ```
-Get Java 17 (for instance, [Azul Zulu Builds of OpenJDK 17](https://www.azul.com/downloads/?version=java-17-ea&package=jdk)).
-
 Then run the following:
 ```
 $ cd JetBrainsRuntime
-$ git checkout jbr-dev
+$ git checkout master17
 $ sh ./configure
 $ make images
 ```
@@ -106,7 +98,7 @@ Install the following:
 * [Visual Studio compiler toolset](https://visualstudio.microsoft.com/downloads/).
   Install with the desktop development kit, which includes Windows SDK and compilers.
   Visual Studio 2019 is supported by default.
-* Java 17 (for instance, [Azul Zulu Builds of OpenJDK 17](https://www.azul.com/downloads/?version=java-17-ea&os=windows&architecture=x86-64-bit&package=jdk).
+* Java 16 (for instance, from [AdoptOpenJDK](https://adoptopenjdk.net/installation.html?variant=openjdk16&jvmVariant=hotspot#)).
   If you have problems while configuring, read [Java tips on Cygwin](http://horstmann.com/articles/cygwin-tips.html).
 
 From the command line: 
@@ -119,7 +111,7 @@ The first command sets up environment variables, the second starts a Cygwin shel
 In the Cygwin shell: 
 ```
 $ cd JetBrainsRuntime
-$ git checkout jbr-dev
+$ git checkout master17
 $ bash configure --with-toolchain-version=2019
 $ make images
 ```
@@ -127,13 +119,13 @@ This will build the release configuration under `./build/windows-x86_64-server-r
 
 ### macOS
 Install the following:
-* Xcode command line developer tools and `autoconf` via [Homebrew](https://brew.sh/).
-* Java 17 (for instance, [Azul Zulu Builds of OpenJDK 17](https://www.azul.com/downloads/?version=java-17-ea&package=jdk)).
+* Xcode command line developer tools and `autoconf` via [Homebrew](getDpiInfo).
+* Java 16 (for instance, from [AdoptOpenJDK](https://adoptopenjdk.net/installation.html?variant=openjdk16&jvmVariant=hotspot#)).
 
 From the command line:
 ```
 $ cd JetBrainsRuntime
-$ git checkout jbr-dev
+$ git checkout master17
 $ sh ./configure
 $ make images
 ```
@@ -172,3 +164,4 @@ Before you submit one, please sign our [Contributor License Agreement (CLA)](htt
 * [JetBrains Runtime on github](https://github.com/JetBrains/JetBrainsRuntime).
 * [OpenJDK build instructions](https://openjdk.java.net/groups/build/doc/building.html).
 * [OpenJDK test instructions](https://htmlpreview.github.io/?https://raw.githubusercontent.com/openjdk/jdk/master/doc/building.html#running-tests).
+* [How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).

doc/building.html

@@ -506,7 +506,7 @@
 </ul>
 <h2 id="running-tests">Running Tests</h2>
 <p>Most of the JDK tests are using the <a href="http://openjdk.java.net/jtreg">JTReg</a> test framework. Make sure that your configuration knows where to find your installation of JTReg. If this is not picked up automatically, 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.</p>
-<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
+<p>The <a href="https://wiki.openjdk.java.net/display/Adoption">Adoption Group</a> provides recent builds of jtreg <a href="https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact">here</a>. Download the latest <code>.tar.gz</code> file, unpack it, and point <code>--with-jtreg</code> to the <code>jtreg</code> directory that you just unpacked.</p>
 <p>Building of Hotspot Gtest suite requires the source code of Google Test framework. The top directory, which contains both <code>googletest</code> and <code>googlemock</code> directories, should be specified via <code>--with-gtest</code>. The supported version of Google Test is 1.8.1, whose source code can be obtained:</p>
 <ul>
 <li>by downloading and unpacking the source bundle from <a href="https://github.com/google/googletest/releases/tag/release-1.8.1">here</a></li>

doc/building.md

@@ -848,7 +848,7 @@ containing `lib/jtreg.jar` etc.
 
 The [Adoption Group](https://wiki.openjdk.java.net/display/Adoption) provides
 recent builds of jtreg [here](
-https://ci.adoptopenjdk.net/view/Dependencies/job/dependency_pipeline/lastSuccessfulBuild/artifact/jtreg/).
+https://ci.adoptopenjdk.net/view/Dependencies/job/jtreg/lastSuccessfulBuild/artifact).
 Download the latest `.tar.gz` file, unpack it, and point `--with-jtreg` to the
 `jtreg` directory that you just unpacked.
 

jb/jdkdiff.py

@@ -1,230 +0,0 @@
-#!/usr/bin/env python3
-
-import argparse
-import math
-import os.path
-import sys
-import subprocess
-
-
-def fatal(msg):
-    sys.stderr.write(f"[fatal] {msg}\n")
-    sys.exit(1)
-
-
-def verbose(options, *msg):
-    if options.verbose:
-        sys.stdout.write(f"[verbose] ")
-        sys.stdout.write(*msg)
-        sys.stdout.write('\n')
-
-
-def first_line(str):
-    return "" if not str else str.splitlines()[0]
-
-
-class Options:
-    def __init__(self):
-        ap = argparse.ArgumentParser(description="Show bugfixes differences between JBR and OpenJDK git repos",
-                                     epilog="Example: %(prog)s  --jdk ./jdk11u/ --jbr ./JetBrainsRuntime/ --path src/hotspot --limit 200")
-        ap.add_argument('--jdk', dest='jdkpath', help='path to OpenJDK git repo', required=True)
-        ap.add_argument('--jbr', dest='jbrpath', help='path to JBR git repo', required=True)
-        ap.add_argument('--path', dest='path', help='limit to changes in this path (relative to git root)')
-        ap.add_argument('--limit', dest='limit', help='limit to this many log entries in --jdk repo', type=int, default=-1)
-        ap.add_argument('-o', dest="output_dir", help="save patches to this directory (created if necessary)")
-        ap.add_argument('-v', dest='verbose', help="verbose output", default=False, action='store_true')
-        args = ap.parse_args()
-
-        if not os.path.isdir(args.jdkpath):
-            fatal(f"{args.jdkpath} not a directory")
-
-        if not os.path.isdir(args.jbrpath):
-            fatal(f"{args.jbrpath} not a directory")
-
-        if not git_is_available():
-            fatal("can't run git commands; make sure git is in PATH")
-
-        self.jdkpath = args.jdkpath
-        self.jbrpath = args.jbrpath
-        self.path = args.path
-        self.limit = args.limit
-        self.output_dir = args.output_dir
-        self.verbose = args.verbose
-
-
-class GitRepo:
-    def __init__(self, rootpath):
-        self.rootpath = rootpath
-
-    def run_git_cmd(self, git_args):
-        args = ["git", "-C", self.rootpath]
-        args.extend(git_args)
-        # print(f"Runnig git cmd '{' '.join(args)}'")
-        p = subprocess.run(args, capture_output=True, text=True)
-        if p.returncode != 0:
-            fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
-        return p.stdout
-
-    def save_git_cmd(self, fname, git_args):
-        args = ["git", "-C", self.rootpath]
-        args.extend(git_args)
-        # print(f"Runnig git cmd '{' '.join(args)}'")
-        with open(fname, "w") as stdout_file:
-            p = subprocess.run(args, stdout=stdout_file)
-            if p.returncode != 0:
-                fatal(f"git returned non-zero code in {self.rootpath} ({first_line(p.stderr)})")
-
-    def current_branch(self):
-        branch_name = self.run_git_cmd(["branch", "--show-current"]).strip()
-        return branch_name
-
-    def log(self, path=None, limit=None):
-        cmds = ["log", "--no-decorate"]
-        if limit:
-            cmds.extend(["-n", str(limit)])
-        if path:
-            cmds.append(path)
-        full_log = self.run_git_cmd(cmds)
-        return full_log
-
-
-class Commit:
-    def __init__(self, lines):
-        self.sha = lines[0].split()[1]
-        self.message = ""
-        self.bugid = None
-
-        # Commit message starts after one blank line
-        read_message = False
-        for l in lines:
-            if read_message:
-                self.message += l + "\n"
-            if not read_message and l == "":
-                read_message = True
-
-        if self.message and self.message != "" and ":" in self.message:
-            maybe_bugid = self.message.split(":")[0].strip()
-            if 10 >= len(maybe_bugid) >= 4:
-                self.bugid = maybe_bugid
-
-
-class History:
-    def __init__(self, log):
-        log_itr = iter(log.splitlines())
-        self.commits = []
-        commit_lines = []
-        for line in log_itr:
-            if line.startswith("commit ") and len(commit_lines) > 0:
-                commit = Commit(commit_lines)
-                self.commits.append(commit)
-                commit_lines = []
-            commit_lines.append(line)
-
-        if len(commit_lines) > 0:
-            commit = Commit(commit_lines)
-            self.commits.append(commit)
-
-    def contains(self, str):
-        return any(str in commit.message for commit in self.commits)
-
-    def size(self):
-        return len(self.commits)
-
-
-def print_explanation(options, jdk, jbr):
-    verbose(options, f"Reading history from '{jdk.rootpath}' on branch '{jdk.current_branch()}'")
-    if options.path:
-        verbose(options, f"\t(only under '{options.path}')")
-    verbose(options, f"Searching for same fixes in '{jbr.rootpath}' on branch '{jbr.current_branch()}'")
-
-
-def git_is_available():
-    p = None
-    try:
-        p = subprocess.run(["git", "--help"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-    except:
-        pass
-    return p is not None and p.returncode == 0
-
-
-def main():
-    check_python_min_requirements()
-
-    options = Options()
-
-    jdk = GitRepo(options.jdkpath)
-    jbr = GitRepo(options.jbrpath)
-
-    print_explanation(options, jdk, jbr)
-
-    commits_to_save = []
-    try:
-        jdk_log = jdk.log(options.path, options.limit)
-        jdk_history = History(jdk_log)
-
-        jbr_log = jbr.log(options.path)
-        jbr_history = History(jbr_log)
-
-        verbose(options, f"Read {jdk_history.size()} commits in JDK, {jbr_history.size()} in JBR")
-
-        for c in jdk_history.commits:
-            if c.bugid:
-                verbose(options, f"Looking for bugfix for {c.bugid}")
-                if not jbr_history.contains(c.bugid):
-                    commits_to_save.append(c)
-                    print(f"[note] Fix for {c.bugid} not found in JBR ({jbr.rootpath})")
-                    print(f"    commit {c.sha}")
-                    print(f"    {first_line(c.message).strip()}")
-    except KeyboardInterrupt:
-        fatal("Interrupted")
-
-    if len(commits_to_save) > 0 and options.output_dir:
-        print()
-        if not os.path.exists(options.output_dir):
-            verbose(options, f"Creating output directory {options.output_dir}")
-            os.makedirs(options.output_dir)
-        nzeroes = len(str(len(commits_to_save)))
-        for i, c in enumerate(reversed(commits_to_save)):
-            fname = os.path.join(options.output_dir, f"{str(i).zfill(nzeroes)}-{c.bugid}.patch")
-            print(f"[note] {c.bugid} saved as {fname}")
-            fname = os.path.abspath(fname)
-            jdk.save_git_cmd(fname, ["format-patch", "-1", c.sha, "--stdout"])
-
-        script_fname = os.path.join(options.output_dir, "apply.sh")
-        with open(script_fname, "w") as script_file:
-            print(apply_script_code.format(os.path.abspath(jbr.rootpath), os.path.abspath(options.output_dir)),
-                  file=script_file)
-            print(f"[note] Execute 'bash {script_fname}' to apply patches to {jbr.rootpath}")
-
-
-def check_python_min_requirements():
-    if sys.version_info < (3, 6):
-        fatal("Minimum version 3.6 is required to run this script")
-
-
-apply_script_code = """
-#!/bin/bash
-
-GITROOT={0}
-PATCHROOT={1}
-
-cd $PATCHROOT || exit 1
-PATCHES=$(find $PATCHROOT -name '*.patch' | sort -n)
-
-for P in $PATCHES; do
-    git -C $GITROOT am $P
-    if [ $? != 0 ]; then
-        mv "$P" "$P.failed"
-        echo "[ERROR] Patch $P did not apply cleanly. Try applying it manually."
-        echo "[NOTE]  Execute this script to apply the remaining patches."
-        exit 1
-    else
-        mv "$P" "$P.done"
-    fi
-done
-
-echo "[NOTE] Done applying patches; check $PATCHROOT for .patch and .patch.failed to see if all have been applied."
-"""
-
-if __name__ == '__main__':
-    main()

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

@@ -67,19 +67,19 @@ RELEASE_NAME=linux-x86_64-server-release
 
 case "$bundle_type" in
   "jcef")
-    do_reset_changes=0
+    do_reset_changes=1
     ;;
   "dcevm")
     HEAD_REVISION=$(git rev-parse HEAD)
     git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
-    do_reset_dcevm=0
-    do_reset_changes=0
+    do_reset_dcevm=1
+    do_reset_changes=1
     ;;
   "nomod" | "")
     bundle_type=""
     ;;
   "fd")
-    do_reset_changes=0
+    do_reset_changes=1
     WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
     RELEASE_NAME=linux-x86_64-server-fastdebug
     ;;
@@ -113,7 +113,6 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_t
   cp $JCEF_PATH/jmods/* $JSDK_MODS_DIR # $JSDK/jmods is not changed
 
   jbr_name_postfix="_${bundle_type}"
-  [ "$bundle_type" != "fd" ] && jbrsdk_name_postfix="_${bundle_type}"
 fi
 
 # create runtime image bundle

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

@@ -94,19 +94,19 @@ RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-release
 
 case "$bundle_type" in
   "jcef")
-    do_reset_changes=0
+    do_reset_changes=1
     ;;
   "dcevm")
     HEAD_REVISION=$(git rev-parse HEAD)
     git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
-    do_reset_dcevm=0
-    do_reset_changes=0
+    do_reset_dcevm=1
+    do_reset_changes=1
     ;;
   "nomod" | "")
     bundle_type=""
     ;;
   "fd")
-    do_reset_changes=0
+    do_reset_changes=1
     WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
     RELEASE_NAME=macosx-${CONF_ARCHITECTURE}-server-fastdebug
     JBSDK=macosx-${architecture}-server-release

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

@@ -1,7 +1,7 @@
-From 960dafbeeba190911955c208b611fecc15d66738 Mon Sep 17 00:00:00 2001
+From d937dae078891013a644c6a53eb17f8f5deb8ec8 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Wed, 11 Mar 2020 14:19:34 +0100
-Subject: [PATCH 03/34] Fix class cast exception on redefinition of class A,
+Subject: [PATCH 03/39] Fix class cast exception on redefinition of class A,
  that is superclass of B that has anonymous class C
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 03/34] Fix class cast exception on redefinition of class A,
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index 994fc8a3bc8..3be3a09ef8f 100644
+index 9327652d8fe..c18a5822939 100644
 --- a/src/hotspot/share/oops/instanceKlass.cpp
 +++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -953,7 +953,10 @@ bool InstanceKlass::link_class_impl(TRAPS) {
+@@ -908,7 +908,10 @@ bool InstanceKlass::link_class_impl(TRAPS) {
  
      if (!is_linked()) {
        if (!is_rewritten()) {

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

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

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

@@ -1,7 +1,7 @@
-From 5af1daedc86b5fec0f222cbdda3afbdf518985ea Mon Sep 17 00:00:00 2001
+From 7bb6ea77608cd43cb7ca8c1ea8d492ae07789a0f Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Sat, 23 May 2020 10:02:15 +0200
-Subject: [PATCH 06/34] Fix "no original bytecode found" error if method with
+Subject: [PATCH 05/39] Fix "no original bytecode found" error if method with
  bkp is missing
 
 Sometimes IDE can deploy class with erroneous method, such method has
@@ -15,7 +15,7 @@ n bytecode, but breakpoint position can still exist.
  5 files changed, 18 insertions(+), 16 deletions(-)
 
 diff --git a/src/hotspot/share/interpreter/bytecodes.cpp b/src/hotspot/share/interpreter/bytecodes.cpp
-index e377e36b88c..262ecc021b2 100644
+index 6711ba735db..4f0b655265a 100644
 --- a/src/hotspot/share/interpreter/bytecodes.cpp
 +++ b/src/hotspot/share/interpreter/bytecodes.cpp
 @@ -84,7 +84,7 @@ Bytecodes::Code Bytecodes::code_at(Method* method, int bci) {
@@ -28,20 +28,20 @@ index e377e36b88c..262ecc021b2 100644
  
  int Bytecodes::special_length_at(Bytecodes::Code code, address bcp, address end) {
 diff --git a/src/hotspot/share/interpreter/interpreterRuntime.cpp b/src/hotspot/share/interpreter/interpreterRuntime.cpp
-index ed3cc3eb6a2..504e59caf51 100644
+index d66ed24d862..9bfcd9eb479 100644
 --- a/src/hotspot/share/interpreter/interpreterRuntime.cpp
 +++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp
-@@ -814,7 +814,7 @@ JRT_END
+@@ -788,7 +788,7 @@ JRT_END
  // Invokes
  
- JRT_ENTRY(Bytecodes::Code, InterpreterRuntime::get_original_bytecode_at(JavaThread* thread, Method* method, address bcp))
+ JRT_ENTRY(Bytecodes::Code, InterpreterRuntime::get_original_bytecode_at(JavaThread* current, Method* method, address bcp))
 -  return method->orig_bytecode_at(method->bci_from(bcp));
 +  return method->orig_bytecode_at(method->bci_from(bcp), false);
  JRT_END
  
- JRT_ENTRY(void, InterpreterRuntime::set_original_bytecode_at(JavaThread* thread, Method* method, address bcp, Bytecodes::Code new_code))
+ JRT_ENTRY(void, InterpreterRuntime::set_original_bytecode_at(JavaThread* current, Method* method, address bcp, Bytecodes::Code new_code))
 diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index 516f2bb8f2f..1c88511a5fc 100644
+index 613c10a9d8c..a5a12599997 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
 @@ -1853,14 +1853,14 @@ bool CompressedLineNumberReadStream::read_pair() {
@@ -61,7 +61,7 @@ index 516f2bb8f2f..1c88511a5fc 100644
      ResourceMark rm;
      fatal("no original bytecode found in %s at bci %d", name_and_sig_as_C_string(), bci);
    }
-@@ -2006,7 +2006,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int bci) {
+@@ -1998,7 +1998,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int bci) {
    _signature_index = m->signature_index();
    _orig_bytecode = (Bytecodes::Code) *m->bcp_from(_bci);
    if (_orig_bytecode == Bytecodes::_breakpoint)
@@ -70,7 +70,7 @@ index 516f2bb8f2f..1c88511a5fc 100644
    _next = NULL;
  }
  
-@@ -2015,7 +2015,7 @@ void BreakpointInfo::set(Method* method) {
+@@ -2007,7 +2007,7 @@ void BreakpointInfo::set(Method* method) {
    {
      Bytecodes::Code code = (Bytecodes::Code) *method->bcp_from(_bci);
      if (code == Bytecodes::_breakpoint)
@@ -80,10 +80,10 @@ index 516f2bb8f2f..1c88511a5fc 100644
    }
  #endif
 diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
-index 83ed2d9c3c1..4d4cc6dc012 100644
+index 030ddd1f675..a8d6507ff6c 100644
 --- a/src/hotspot/share/oops/method.hpp
 +++ b/src/hotspot/share/oops/method.hpp
-@@ -230,7 +230,7 @@ class Method : public Metadata {
+@@ -226,7 +226,7 @@ class Method : public Metadata {
  
    // JVMTI breakpoints
  #if !INCLUDE_JVMTI
@@ -92,7 +92,7 @@ index 83ed2d9c3c1..4d4cc6dc012 100644
      ShouldNotReachHere();
      return Bytecodes::_shouldnotreachhere;
    }
-@@ -239,7 +239,7 @@ class Method : public Metadata {
+@@ -235,7 +235,7 @@ class Method : public Metadata {
    };
    u2   number_of_breakpoints() const {return 0;}
  #else // !INCLUDE_JVMTI
@@ -102,34 +102,34 @@ index 83ed2d9c3c1..4d4cc6dc012 100644
    void set_breakpoint(int bci);
    void clear_breakpoint(int bci);
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 8b765623dcd..a859b8e1162 100644
+index bf31819479d..07935bd0ada 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -1362,14 +1362,16 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
- 
-     if (code == Bytecodes::_breakpoint) {
-       int bci = method->bci_from(bcp);
--      code = method->orig_bytecode_at(bci);
--      java_code = Bytecodes::java_code(code);
--      if (code != java_code &&
--           (java_code == Bytecodes::_getfield ||
--            java_code == Bytecodes::_putfield ||
--            java_code == Bytecodes::_aload_0)) {
--        // Let breakpoint table handling unpatch bytecode
--        method->set_orig_bytecode_at(bci, java_code);
-+      code = method->orig_bytecode_at(bci, true);
-+      if (code != Bytecodes::_shouldnotreachhere) {
-+        java_code = Bytecodes::java_code(code);
-+        if (code != java_code &&
-+             (java_code == Bytecodes::_getfield ||
-+              java_code == Bytecodes::_putfield ||
-+              java_code == Bytecodes::_aload_0)) {
-+          // Let breakpoint table handling unpatch bytecode
-+          method->set_orig_bytecode_at(bci, java_code);
-+        }
-       }
-     } else {
-       java_code = Bytecodes::java_code(code);
+@@ -1360,14 +1360,16 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
+ 
+     if (code == Bytecodes::_breakpoint) {
+       int bci = method->bci_from(bcp);
+-      code = method->orig_bytecode_at(bci);
+-      java_code = Bytecodes::java_code(code);
+-      if (code != java_code &&
+-           (java_code == Bytecodes::_getfield ||
+-            java_code == Bytecodes::_putfield ||
+-            java_code == Bytecodes::_aload_0)) {
+-        // Let breakpoint table handling unpatch bytecode
+-        method->set_orig_bytecode_at(bci, java_code);
++      code = method->orig_bytecode_at(bci, true);
++      if (code != Bytecodes::_shouldnotreachhere) {
++        java_code = Bytecodes::java_code(code);
++        if (code != java_code &&
++             (java_code == Bytecodes::_getfield ||
++              java_code == Bytecodes::_putfield ||
++              java_code == Bytecodes::_aload_0)) {
++          // Let breakpoint table handling unpatch bytecode
++          method->set_orig_bytecode_at(bci, java_code);
++        }
+       }
+     } else {
+       java_code = Bytecodes::java_code(code);
 -- 
 2.23.0
 

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

@@ -1,18 +1,35 @@
-From 19d2274a5dff6e6b31474252b45e5e7484f0180b Mon Sep 17 00:00:00 2001
+From c40cd307310822e6e60c61931c14f97a8501f975 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Sun, 24 May 2020 12:07:42 +0200
-Subject: [PATCH 07/34] Replace deleted method with
+Subject: [PATCH 06/39] Replace deleted method with
  Universe::throw_no_such_method_error
 
++ Change log level in advanced redefinition
+- Change log level for "Comparing different class ver.." to debug
+- Fix adjust_method_entries_dcevm logging levels and severity
 ---
- .../share/prims/resolvedMethodTable.cpp       | 28 +++++++++----------
- 1 file changed, 14 insertions(+), 14 deletions(-)
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    |  2 +-
+ .../share/prims/resolvedMethodTable.cpp       | 30 +++++++++----------
+ 2 files changed, 16 insertions(+), 16 deletions(-)
 
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 07935bd0ada..3c86e8c68ac 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -881,7 +881,7 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+  // Calculated the difference between new and old class  (field change, method change, supertype change, ...).
+ int VM_EnhancedRedefineClasses::calculate_redefinition_flags(InstanceKlass* new_class) {
+   int result = Klass::NoRedefinition;
+-  log_info(redefine, class, load)("Comparing different class versions of class %s",new_class->name()->as_C_string());
++  log_debug(redefine, class, load)("Comparing different class versions of class %s",new_class->name()->as_C_string());
+ 
+   assert(new_class->old_version() != NULL, "must have old version");
+   InstanceKlass* the_class = InstanceKlass::cast(new_class->old_version());
 diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index 81b3aa96564..caf03ffe56d 100644
+index 8644937dbbb..b8d039adff6 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -404,25 +404,25 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -399,25 +399,25 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
  
        if (old_method->is_old()) {
  
@@ -33,7 +50,7 @@ index 81b3aa96564..caf03ffe56d 100644
 +          newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
  
 -        log_info(redefine, class, load, exceptions)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
-+          log_info(redefine, class, load, exceptions)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
++          log_debug(redefine, class, update)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
  
 -        assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
 -        assert(newer_method != NULL, "method_with_idnum() should not be NULL");
@@ -52,6 +69,15 @@ index 81b3aa96564..caf03ffe56d 100644
          }
  
          java_lang_invoke_ResolvedMethodName::set_vmtarget(mem_name, newer_method);
+@@ -428,7 +428,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+ 
+         ResourceMark rm;
+         if (!(*trace_name_printed)) {
+-          log_info(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
++          log_debug(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
+            *trace_name_printed = true;
+         }
+         log_debug(redefine, class, update, constantpool)
 -- 
 2.23.0
 

jb/project/tools/patches/dcevm/0007-Support-for-G1-gc.patch

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

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

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

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

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

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

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

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

@@ -1,46 +1,40 @@
-From 6ffac6e5064ec6633fdbeb8520333dca00bc6a62 Mon Sep 17 00:00:00 2001
+From 3b4788c779cb9ffe2751e996bba3b445b474eba7 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Fri, 23 Oct 2020 10:20:26 +0200
-Subject: [PATCH 15/34] Clear dcevm code separation
+Subject: [PATCH 10/39] Clear dcevm code separation
 
 ---
- src/hotspot/share/classfile/systemDictionary.cpp |  4 ++--
- src/hotspot/share/gc/serial/genMarkSweep.cpp     |  8 +++++---
- src/hotspot/share/interpreter/linkResolver.cpp   | 16 +++++++++++-----
- .../instrumentation/jfrEventClassTransformer.cpp |  2 +-
- src/hotspot/share/oops/instanceKlass.cpp         | 10 ++++++----
- src/hotspot/share/oops/method.cpp                |  2 +-
- .../share/prims/jvmtiGetLoadedClasses.cpp        |  2 +-
- src/hotspot/share/runtime/reflection.cpp         |  2 +-
- 8 files changed, 28 insertions(+), 18 deletions(-)
+ src/hotspot/share/classfile/systemDictionary.cpp   |  3 +--
+ src/hotspot/share/gc/serial/genMarkSweep.cpp       |  8 +++++---
+ src/hotspot/share/interpreter/linkResolver.cpp     | 14 ++++++++++----
+ .../instrumentation/jfrEventClassTransformer.cpp   |  2 +-
+ src/hotspot/share/oops/cpCache.hpp                 |  8 +++++---
+ src/hotspot/share/oops/instanceKlass.cpp           |  6 +++---
+ src/hotspot/share/oops/method.cpp                  |  2 +-
+ src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp  |  2 +-
+ src/hotspot/share/runtime/reflection.cpp           |  2 +-
+ 9 files changed, 28 insertions(+), 19 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 8f2b46add4d..9ac6ec96cb5 100644
+index cea614a574f..98e2541c79b 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -1241,7 +1241,7 @@ InstanceKlass* SystemDictionary::resolve_from_stream(Symbol* class_name,
-     MutexLocker mu(THREAD, SystemDictionary_lock);
+@@ -830,9 +830,8 @@ InstanceKlass* SystemDictionary::resolve_hidden_class_from_stream(
  
-     Klass* check = find_class(h_name, k->class_loader_data());
--    assert((check == k && !k->is_redefining()) || (k->is_redefining() && check == k->old_version()), "should be present in the dictionary");
-+    assert(check == k && !k->is_redefining() || k->is_redefining() && check == k->old_version(), "should be present in the dictionary");
-   } );
+   EventClassLoad class_load_start_event;
+   ClassLoaderData* loader_data;
+- 
++
+   bool is_redefining = (old_klass != NULL);
+-  
  
-   return k;
-@@ -2290,7 +2290,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
-       // also hold array classes.
- 
-       assert(check->is_instance_klass(), "noninstance in systemdictionary");
--      if ((defining == true) || ((k != check) && k->old_version() != check)) {
-+      if ((defining == true) || (k != check && (!AllowEnhancedClassRedefinition || k->old_version() != check))) {
-         throwException = true;
-         ss.print("loader %s", loader_data->loader_name_and_id());
-         ss.print(" attempted duplicate %s definition for %s. (%s)",
+   // - for hidden classes that are not strong: create a new CLD that has a class holder and
+   //                                           whose loader is the Lookup class's loader.
 diff --git a/src/hotspot/share/gc/serial/genMarkSweep.cpp b/src/hotspot/share/gc/serial/genMarkSweep.cpp
-index 1d13c647452..548df01e557 100644
+index bbb2c02f2b2..00b8e44078e 100644
 --- a/src/hotspot/share/gc/serial/genMarkSweep.cpp
 +++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp
-@@ -334,7 +334,9 @@ void GenMarkSweep::mark_sweep_phase4() {
+@@ -316,7 +316,9 @@ void GenMarkSweep::mark_sweep_phase4() {
  
    GenCompactClosure blk;
    gch->generation_iterate(&blk, true);
@@ -54,38 +48,37 @@ index 1d13c647452..548df01e557 100644
 +  }
  }
 diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
-index b6e9e0a308d..b2f24ddbeda 100644
+index 8fb336762df..74a6af13ea4 100644
 --- a/src/hotspot/share/interpreter/linkResolver.cpp
 +++ b/src/hotspot/share/interpreter/linkResolver.cpp
-@@ -282,9 +282,14 @@ void LinkResolver::check_klass_accessibility(Klass* ref_klass, Klass* sel_klass,
+@@ -287,9 +287,14 @@ void LinkResolver::check_klass_accessibility(Klass* ref_klass, Klass* sel_klass,
    if (!base_klass->is_instance_klass()) {
      return;  // no relevant check to do
    }
 -
--  Reflection::VerifyClassAccessResults vca_result =
--    Reflection::verify_class_access(ref_klass->newest_version(), InstanceKlass::cast(base_klass->newest_version()), true);
 +  Klass* refKlassNewest = ref_klass;
 +  Klass* baseKlassNewest = base_klass;
 +  if (AllowEnhancedClassRedefinition) {
 +    refKlassNewest = ref_klass->newest_version();
 +    baseKlassNewest = base_klass->newest_version();
 +  }
-+  Reflection::VerifyClassAccessResults vca_result = 
+   Reflection::VerifyClassAccessResults vca_result =
+-    Reflection::verify_class_access(ref_klass->newest_version(), InstanceKlass::cast(base_klass->newest_version()), true);
 +    Reflection::verify_class_access(refKlassNewest, InstanceKlass::cast(baseKlassNewest), true);
    if (vca_result != Reflection::ACCESS_OK) {
      ResourceMark rm(THREAD);
      char* msg = Reflection::verify_class_access_msg(ref_klass,
-@@ -566,7 +571,8 @@ void LinkResolver::check_method_accessability(Klass* ref_klass,
+@@ -551,7 +556,8 @@ void LinkResolver::check_method_accessability(Klass* ref_klass,
    // We'll check for the method name first, as that's most likely
    // to be false (so we'll short-circuit out of these tests).
    if (sel_method->name() == vmSymbols::clone_name() &&
--      sel_klass->newest_version() == SystemDictionary::Object_klass()->newest_version() &&
-+      ( !AllowEnhancedClassRedefinition && sel_klass == SystemDictionary::Object_klass() ||
-+      AllowEnhancedClassRedefinition && sel_klass->newest_version() == SystemDictionary::Object_klass()->newest_version()) &&
+-      sel_klass->newest_version() == vmClasses::Object_klass()->newest_version() &&
++      ( !AllowEnhancedClassRedefinition && sel_klass == vmClasses::Object_klass() ||
++      AllowEnhancedClassRedefinition && sel_klass->newest_version() == vmClasses::Object_klass()->newest_version()) &&
        resolved_klass->is_array_klass()) {
      // We need to change "protected" to "public".
      assert(flags.is_protected(), "clone not protected?");
-@@ -1011,7 +1017,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
+@@ -997,7 +1003,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
      //     or by the <init> method (in case of an instance field).
      if (is_put && fd.access_flags().is_final()) {
  
@@ -95,10 +88,10 @@ index b6e9e0a308d..b2f24ddbeda 100644
          stringStream ss;
          ss.print("Update to %s final field %s.%s attempted from a different class (%s) than the field's declaring class",
 diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
-index 96fc139bea3..f7284197c5a 100644
+index 88e520ec475..73832251f3f 100644
 --- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
 +++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
-@@ -1471,7 +1471,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
+@@ -1475,7 +1475,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
                               cld,
                               &cl_info,
                               ClassFileParser::INTERNAL, // internal visibility
@@ -107,40 +100,60 @@ index 96fc139bea3..f7284197c5a 100644
                               THREAD);
    if (HAS_PENDING_EXCEPTION) {
      log_pending_exception(PENDING_EXCEPTION);
+diff --git a/src/hotspot/share/oops/cpCache.hpp b/src/hotspot/share/oops/cpCache.hpp
+index b934302f422..d7ae5edc7b3 100644
+--- a/src/hotspot/share/oops/cpCache.hpp
++++ b/src/hotspot/share/oops/cpCache.hpp
+@@ -148,13 +148,13 @@ class ConstantPoolCacheEntry {
+   void set_bytecode_2(Bytecodes::Code code);
+   void set_f1(Metadata* f1) {
+     Metadata* existing_f1 = _f1; // read once
+-    //assert(existing_f1 == NULL || existing_f1 == f1, "illegal field change");
++    assert(AllowEnhancedClassRedefinition || existing_f1 == NULL || existing_f1 == f1, "illegal field change");
+     _f1 = f1;
+   }
+   void release_set_f1(Metadata* f1);
+   void set_f2(intx f2) {
+     intx existing_f2 = _f2; // read once
+-    //assert(existing_f2 == 0 || existing_f2 == f2, "illegal field change");
++    assert(AllowEnhancedClassRedefinition || existing_f2 == 0 || existing_f2 == f2, "illegal field change");
+     _f2 = f2;
+   }
+   void set_f2_as_vfinal_method(Method* f2) {
+@@ -215,7 +215,9 @@ class ConstantPoolCacheEntry {
+   void initialize_resolved_reference_index(int ref_index) {
+     assert(_f2 == 0, "set once");  // note: ref_index might be zero also
+     _f2 = ref_index;
+-    _flags = 1 << is_resolved_ref_shift;
++    if (AllowEnhancedClassRedefinition) {
++      _flags = 1 << is_resolved_ref_shift;
++    }
+   }
+ 
+   void set_field(                                // sets entry to resolved field state
 diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index 3be3a09ef8f..f8e60941046 100644
+index c18a5822939..994f6bf266f 100644
 --- a/src/hotspot/share/oops/instanceKlass.cpp
 +++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -199,7 +199,9 @@ bool InstanceKlass::has_nest_member(InstanceKlass* k, TRAPS) const {
-         // able to perform that loading but we can't exclude the compiler threads from
-         // executing this logic. But it should actually be impossible to trigger loading here.
-         Klass* k2 = _constants->klass_at(cp_index, THREAD);
--        k2 = k2->newest_version();
-+        if (AllowEnhancedClassRedefinition) {
-+          k2 = k2->newest_version();
-+        }
-         assert(!HAS_PENDING_EXCEPTION || PENDING_EXCEPTION->is_a(SystemDictionary::VirtualMachineError_klass()),
-                "Exceptions should not be possible here");
-         if (k2 == k) {
-@@ -1003,7 +1005,7 @@ bool InstanceKlass::link_class_impl(TRAPS) {
- #endif
-       set_init_state(linked);
+@@ -968,7 +968,7 @@ bool InstanceKlass::link_class_impl(TRAPS) {
+         set_init_state(linked);
+       }
        // (DCEVM) Must check for old version in order to prevent infinite loops.
 -      if (JvmtiExport::should_post_class_prepare() && old_version() == NULL /* JVMTI deadlock otherwise */) {
-+      if (JvmtiExport::should_post_class_prepare() && (!AllowEnhancedClassRedefinition || old_version() == NULL) /* JVMTI deadlock otherwise */) {
-         Thread *thread = THREAD;
-         assert(thread->is_Java_thread(), "thread->is_Java_thread()");
-         JvmtiExport::post_class_prepare((JavaThread *) thread, this);
-@@ -1084,7 +1086,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
++      if (JvmtiExport::should_post_class_prepare()  && (!AllowEnhancedClassRedefinition || old_version() == NULL /* JVMTI deadlock otherwise */) {
+         JvmtiExport::post_class_prepare(THREAD, this);
+       }
+     }
+@@ -1046,7 +1046,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
      // we might end up throwing IE from link/symbol resolution sites
      // that aren't expected to throw.  This would wreak havoc.  See 6320309.
-     while ((is_being_initialized() && !is_reentrant_initialization(jt)) 
+     while ((is_being_initialized() && !is_reentrant_initialization(jt))
 -            || (old_version() != NULL && InstanceKlass::cast(old_version())->is_being_initialized())) {
 +            || (AllowEnhancedClassRedefinition && old_version() != NULL && InstanceKlass::cast(old_version())->is_being_initialized())) {
        wait = true;
        jt->set_class_to_be_initialized(this);
        ol.wait_uninterruptibly(jt);
-@@ -3782,7 +3784,7 @@ void InstanceKlass::verify_on(outputStream* st) {
+@@ -3796,7 +3796,7 @@ void InstanceKlass::verify_on(outputStream* st) {
  
      guarantee(sib->is_klass(), "should be klass");
      // TODO: (DCEVM) explain
@@ -150,10 +163,10 @@ index 3be3a09ef8f..f8e60941046 100644
  
    // Verify local interfaces
 diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index ce940cf10a9..2d8e5b0256b 100644
+index a5a12599997..4426f03fd40 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
-@@ -2208,7 +2208,7 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
+@@ -2199,7 +2199,7 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
  // Add a method id to the jmethod_ids
  jmethodID Method::make_jmethod_id(ClassLoaderData* loader_data, Method* m) {
    // FIXME: (DCEVM) ???
@@ -163,10 +176,10 @@ index ce940cf10a9..2d8e5b0256b 100644
    }
    ClassLoaderData* cld = loader_data;
 diff --git a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-index 1c7677f270f..6c12ee64a6e 100644
+index 42e72c67879..c860ee24f80 100644
 --- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-@@ -75,7 +75,7 @@ public:
+@@ -76,7 +76,7 @@ public:
      //         the new version (SystemDictionary stores only new versions). But the LoadedClassesClosure's functionality was
      //         changed in java8  where jvmtiLoadedClasses collects all classes from all classloaders, therefore we
      //         must use new versions only.
@@ -176,10 +189,10 @@ index 1c7677f270f..6c12ee64a6e 100644
        if (_dictionary_walk) {
          // Collect array classes this way when walking the dictionary (because array classes are
 diff --git a/src/hotspot/share/runtime/reflection.cpp b/src/hotspot/share/runtime/reflection.cpp
-index 0e7722dba7d..d67457f02ac 100644
+index cc58f913ed5..21104c18423 100644
 --- a/src/hotspot/share/runtime/reflection.cpp
 +++ b/src/hotspot/share/runtime/reflection.cpp
-@@ -628,7 +628,7 @@ bool Reflection::verify_member_access(const Klass* current_class,
+@@ -608,7 +608,7 @@ bool Reflection::verify_member_access(const Klass* current_class,
                                        TRAPS) {
  
    // (DCEVM) Decide accessibility based on active version

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

@@ -1,7 +1,7 @@
-From dc675de6ac42819b8536827ea450fcad13a97448 Mon Sep 17 00:00:00 2001
+From bb8f91da24b2649507f2e200f1ff2bae2d2658bf Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Wed, 11 Nov 2020 18:45:15 +0100
-Subject: [PATCH 16/34] Fix LoadedClassesClosure - fixes problems with remote
+Subject: [PATCH 11/39] Fix LoadedClassesClosure - fixes problems with remote
  debugging
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 16/34] Fix LoadedClassesClosure - fixes problems with remote
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-index 6c12ee64a6e..2a469555dbd 100644
+index c860ee24f80..dfe0bb8d96a 100644
 --- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
-@@ -75,7 +75,7 @@ public:
+@@ -76,7 +76,7 @@ public:
      //         the new version (SystemDictionary stores only new versions). But the LoadedClassesClosure's functionality was
      //         changed in java8  where jvmtiLoadedClasses collects all classes from all classloaders, therefore we
      //         must use new versions only.

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

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

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

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

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

@@ -0,0 +1,43 @@
+From 9815ee603b27484953651bdc6d5705994a4d38aa Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 22 Nov 2020 19:51:46 +0100
+Subject: [PATCH 13/39] dcevm15 - add ClassLoaderDataGraph_lock on
+ ClassLoaderDataGraph::classes_do
+
+ClassLoaderDataGraph::classes_do and need safepoint or lock,
+find_sorted_affected_classes is not in safepoint therefore it must be
+locked
+ClassLoaderDataGraph::rollback_redefinition need safepoint too
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index efaf11e1666..9f42d14ce98 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -1380,7 +1380,9 @@ void VM_EnhancedRedefineClasses::calculate_instance_update_information(Klass* ne
+ // Rollback all changes - clear new classes from the system dictionary, return old classes to directory, free memory.
+ void VM_EnhancedRedefineClasses::rollback() {
+   log_info(redefine, class, load)("Rolling back redefinition, result=%d", _res);
++  ClassLoaderDataGraph_lock->lock();
+   ClassLoaderDataGraph::rollback_redefinition();
++  ClassLoaderDataGraph_lock->unlock();
+ 
+   for (int i = 0; i < _new_classes->length(); i++) {
+     SystemDictionary::remove_from_hierarchy(_new_classes->at(i));
+@@ -2063,7 +2065,10 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
+   AffectedKlassClosure closure(_affected_klasses);
+   // Updated in j10, from original SystemDictionary::classes_do
+ 
+-  ClassLoaderDataGraph::classes_do(&closure);
++  {
++    MutexLocker mcld(ClassLoaderDataGraph_lock);
++    ClassLoaderDataGraph::classes_do(&closure);
++  }
+   //ClassLoaderDataGraph::dictionary_classes_do(&closure);
+ 
+   log_trace(redefine, class, load)("%d classes affected", _affected_klasses->length());
+-- 
+2.23.0
+

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

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

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

@@ -1,33 +1,38 @@
-From 5379e56465d3d3930ec7ea91b1c64db2cdf70170 Mon Sep 17 00:00:00 2001
+From d3e5f8acd389021128bb8a899bb538294de353f6 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Sun, 22 Nov 2020 12:05:50 +0100
-Subject: [PATCH 23/34] dcevm15 - fix Universe::root_oops_do
+Subject: [PATCH 14/39] dcevm15 - fix Universe::root_oops_do
 
+Removed ClassLoaderDataGraph::cld_do was cause of crashes due multiple
+oop patching. ClassLoaderDataGraph::cld_do replaced in dcevm15
+previously used and removed SystemDictionary:oops_do
 ---
- src/hotspot/share/memory/universe.cpp | 38 +++++++++------------------
- 1 file changed, 12 insertions(+), 26 deletions(-)
+ src/hotspot/share/memory/universe.cpp | 45 +++++++++++----------------
+ 1 file changed, 19 insertions(+), 26 deletions(-)
 
 diff --git a/src/hotspot/share/memory/universe.cpp b/src/hotspot/share/memory/universe.cpp
-index f6e4253b5a5..8dad437bd51 100644
+index 9fcbb6c41b3..247f2b3e8c0 100644
 --- a/src/hotspot/share/memory/universe.cpp
 +++ b/src/hotspot/share/memory/universe.cpp
-@@ -39,6 +39,7 @@
- #include "gc/shared/gcConfig.hpp"
- #include "gc/shared/gcLogPrecious.hpp"
- #include "gc/shared/gcTraceTime.inline.hpp"
+@@ -44,6 +44,8 @@
+ #include "gc/shared/oopStorageSet.hpp"
+ #include "gc/shared/stringdedup/stringDedup.hpp"
+ #include "gc/shared/tlab_globals.hpp"
 +#include "gc/shared/weakProcessor.hpp"
- #include "interpreter/interpreter.hpp"
++#include "interpreter/interpreter.hpp"
  #include "logging/log.hpp"
  #include "logging/logStream.hpp"
-@@ -75,6 +76,7 @@
+ #include "memory/metadataFactory.hpp"
+@@ -71,6 +73,8 @@
+ #include "runtime/jniHandles.hpp"
  #include "runtime/thread.inline.hpp"
  #include "runtime/timerTrace.hpp"
- #include "runtime/vmOperations.hpp"
++#include "runtime/vmOperations.hpp"
 +#include "services/management.hpp"
  #include "services/memoryService.hpp"
  #include "utilities/align.hpp"
- #include "utilities/copy.hpp"
-@@ -180,45 +182,29 @@ void Universe::basic_type_classes_do(KlassClosure *closure) {
+ #include "utilities/autoRestore.hpp"
+@@ -209,45 +213,34 @@ void Universe::basic_type_classes_do(KlassClosure *closure) {
  
  // FIXME: (DCEVM) This method should iterate all pointers that are not within heap objects.
  void Universe::root_oops_do(OopClosure *oopClosure) {
@@ -50,21 +55,27 @@ index f6e4253b5a5..8dad437bd51 100644
 +  // (DCEVM) TODO: Check if this is correct?
 +  Management::oops_do(oopClosure);
 +  OopStorageSet::vm_global()->oops_do(oopClosure);
-+  CLDToOopClosure cld_closure(oopClosure, ClassLoaderData::_claim_none);
-+  ClassLoaderDataGraph::cld_do(&cld_closure);
++  // CLDToOopClosure cld_closure(oopClosure, ClassLoaderData::_claim_none);
++  // ClassLoaderDataGraph::cld_do(&cld_closure);
  
    // Now adjust pointers in remaining weak roots.  (All of which should
    // have been cleared if they pointed to non-surviving objects.)
    // Global (weak) JNI handles
 -  JNIHandles::weak_oops_do(&always_true, oopClosure);
 +  WeakProcessor::oops_do(oopClosure);
++
++  JvmtiExport::oops_do(oopClosure);
  
    CodeBlobToOopClosure blobClosure(oopClosure, CodeBlobToOopClosure::FixRelocations);
    CodeCache::blobs_do(&blobClosure);
 -  StringTable::oops_do(oopClosure);
++  
 +  AOT_ONLY(AOTLoader::oops_do(oopClosure);)
++  
 +  // StringTable::oops_do was removed in j15
 +  // StringTable::oops_do(oopClosure);
++
++  // OopStorageSet::vm_global()->oops_do(oopClosure);
  
 -  // (DCEVM) TODO: Check if this is correct?
 -  //CodeCache::scavenge_root_nmethods_oops_do(oopClosure);
@@ -79,7 +90,6 @@ index f6e4253b5a5..8dad437bd51 100644
 -#endif
 -  // SO_AllClasses
 -  SystemDictionary::oops_do(oopClosure);
-+  // PSScavenge::reference_processor()->weak_oops_do(oopClosure);
  }
  
  void Universe::oops_do(OopClosure* f) {

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

@@ -1,7 +1,7 @@
-From c6498946006879314bdc6218ee72da5d9c88f237 Mon Sep 17 00:00:00 2001
+From 574cddeb00c3d93bddbaf1845a7d9d3ffdced324 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Sat, 28 Nov 2020 19:29:42 +0100
-Subject: [PATCH 27/34] dcevm15 - check if has_nestmate_access_to has newest
+Subject: [PATCH 15/39] dcevm15 - check if has_nestmate_access_to has newest
  host class
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 27/34] dcevm15 - check if has_nestmate_access_to has newest
  1 file changed, 5 insertions(+)
 
 diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index 5e40d78a87e..1d9623f2446 100644
+index ef0091fe288..b4d09e92830 100644
 --- a/src/hotspot/share/oops/instanceKlass.cpp
 +++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -445,6 +445,11 @@ bool InstanceKlass::has_nestmate_access_to(InstanceKlass* k, TRAPS) {
+@@ -398,6 +398,11 @@ bool InstanceKlass::has_nestmate_access_to(InstanceKlass* k, TRAPS) {
      return false;
    }
  

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

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

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

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

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

@@ -1,7 +1,7 @@
-From 29920b076b4ad96d85adbce0a1d947e5022ba3ad Mon Sep 17 00:00:00 2001
+From 9983c44fe6903daba758ed0c43b8c86e738e0741 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Sun, 29 Nov 2020 20:08:57 +0100
-Subject: [PATCH 33/34] dcevm15 - DON'T clear F2 in CP cache after indy
+Subject: [PATCH 18/39] dcevm15 - DON'T clear F2 in CP cache after indy
  unevolving
 
 It's not clear why it was cleared in dcevm7-11
@@ -10,10 +10,10 @@ It's not clear why it was cleared in dcevm7-11
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/oops/cpCache.cpp b/src/hotspot/share/oops/cpCache.cpp
-index 79a38dbeff0..650e6fab42d 100644
+index 167cb274661..7e72641ec5a 100644
 --- a/src/hotspot/share/oops/cpCache.cpp
 +++ b/src/hotspot/share/oops/cpCache.cpp
-@@ -650,7 +650,7 @@ void ConstantPoolCacheEntry::clear_entry() {
+@@ -654,7 +654,7 @@ void ConstantPoolCacheEntry::clear_entry() {
  
    if (clearData) {
      if (!is_resolved_reference()) {

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

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

jb/project/tools/patches/dcevm/0019-Cleanup-and-review-comments.patch

@@ -1,20 +1,20 @@
-From c6ea68e66d37d70739f7b0ee74131322b4526a68 Mon Sep 17 00:00:00 2001
+From 3b09df69c007285ea6c258388532a8e5f9fe3d45 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Sun, 22 Nov 2020 12:03:32 +0100
-Subject: [PATCH 24/34] Cleanup dcevm comments
+Subject: [PATCH 19/39] Cleanup and review comments
 
 ---
  src/hotspot/share/classfile/classLoaderDataGraph.hpp     | 2 +-
- src/hotspot/share/classfile/systemDictionary.hpp         | 2 +-
  src/hotspot/share/gc/shared/gcConfig.cpp                 | 2 +-
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 1 +
  src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ 4 files changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/classLoaderDataGraph.hpp b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-index f380aa3fa34..8ce94cccb47 100644
+index 5f8913001b0..c3bcc7271e6 100644
 --- a/src/hotspot/share/classfile/classLoaderDataGraph.hpp
 +++ b/src/hotspot/share/classfile/classLoaderDataGraph.hpp
-@@ -104,7 +104,7 @@ class ClassLoaderDataGraph : public AllStatic {
+@@ -105,7 +105,7 @@ class ClassLoaderDataGraph : public AllStatic {
  
    static void dictionary_classes_do(KlassClosure* klass_closure);
  
@@ -23,24 +23,11 @@ index f380aa3fa34..8ce94cccb47 100644
    static void rollback_redefinition();
  
    // VM_CounterDecay iteration support
-diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
-index 931e655d631..1019dbd0d04 100644
---- a/src/hotspot/share/classfile/systemDictionary.hpp
-+++ b/src/hotspot/share/classfile/systemDictionary.hpp
-@@ -455,7 +455,7 @@ public:
-   static bool is_well_known_klass(Symbol* class_name);
- #endif
- 
--  // Enhanced class redefinition
-+  // (DCEVM) Enhanced class redefinition
-   static void remove_from_hierarchy(InstanceKlass* k);
-   static void update_constraints_after_redefinition();
- 
 diff --git a/src/hotspot/share/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
-index 5c1a09390f1..23fbf715378 100644
+index 26a2b67b8e9..8e78696bef5 100644
 --- a/src/hotspot/share/gc/shared/gcConfig.cpp
 +++ b/src/hotspot/share/gc/shared/gcConfig.cpp
-@@ -99,7 +99,7 @@ void GCConfig::fail_if_non_included_gc_is_selected() {
+@@ -97,7 +97,7 @@ void GCConfig::fail_if_non_included_gc_is_selected() {
  
  void GCConfig::select_gc_ergonomically() {
    if (AllowEnhancedClassRedefinition && !UseG1GC) {
@@ -49,19 +36,31 @@ index 5c1a09390f1..23fbf715378 100644
      FLAG_SET_ERGO(UseSerialGC, true);
    } else if (os::is_server_class_machine()) {
  #if INCLUDE_G1GC
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 590f7fdfafe..2a7dd35bdd1 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -842,6 +842,7 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+       k->class_loader_data()->exchange_holders(the_class->class_loader_data());
+ 
+       if (the_class->is_hidden()) {
++      // TODO: (DCEVM) review if is correct
+       // from jvm_lookup_define_class() (jvm.cpp):
+       // The hidden class loader data has been artificially been kept alive to
+       // this point. The mirror and any instances of this class have to keep
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 index bd5e7d153be..5de375fb888 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 @@ -78,7 +78,7 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
-   // have any entries.
-   bool _any_class_has_resolved_methods;
- 
--  // Enhanced class redefinition, affected klasses contain all classes which should be redefined
-+  // (DCEVM) Enhanced class redefinition, affected klasses contain all classes which should be redefined
-   // either because of redefine, class hierarchy or interface change
-   GrowableArray<Klass*>*      _affected_klasses;
- 
+   // have any entries.
+   bool _any_class_has_resolved_methods;
+ 
+-  // Enhanced class redefinition, affected klasses contain all classes which should be redefined
++  // (DCEVM) Enhanced class redefinition, affected klasses contain all classes which should be redefined
+   // either because of redefine, class hierarchy or interface change
+   GrowableArray<Klass*>*      _affected_klasses;
+ 
 -- 
 2.23.0
 

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

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

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

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

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

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

jb/project/tools/patches/dcevm/0021-dcevm17-fix-compilation-issues.patch

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

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

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

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

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

jb/project/tools/patches/dcevm/0023-Rename-confusing-method-name-old_if_redefined-to-old.patch

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

jb/project/tools/patches/dcevm/0032-Fix-compilation-problems.patch

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

jb/project/tools/patches/dcevm/0033-Fix-dcevm-issues-related-to-refactorization-of-Threa.patch

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

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

@@ -0,0 +1,142 @@
+From db2d7cd0cd956f297c58baa7500c1440092648bf Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Sun, 20 Jun 2021 19:42:51 +0200
+Subject: [PATCH 34/39] Fix init_method_MemberName after Thread to JavaThread
+ refactorization
+
+---
+ src/hotspot/share/interpreter/linkResolver.cpp    | 14 ++++++++++----
+ src/hotspot/share/interpreter/linkResolver.hpp    |  3 ++-
+ src/hotspot/share/oops/instanceKlass.cpp          | 15 ---------------
+ src/hotspot/share/oops/instanceKlass.hpp          |  1 -
+ .../share/prims/jvmtiEnhancedRedefineClasses.cpp  | 11 +++++++++--
+ 5 files changed, 21 insertions(+), 23 deletions(-)
+
+diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
+index 74a6af13ea4..78c9624a18b 100644
+--- a/src/hotspot/share/interpreter/linkResolver.cpp
++++ b/src/hotspot/share/interpreter/linkResolver.cpp
+@@ -131,14 +131,14 @@ void CallInfo::set_common(Klass* resolved_klass,
+ }
+ 
+ // utility query for unreflecting a method
+-CallInfo::CallInfo(Method* resolved_method, Klass* resolved_klass, TRAPS) {
++CallInfo::CallInfo(Method* resolved_method, Klass* resolved_klass, Thread* thread) {
+   Klass* resolved_method_holder = resolved_method->method_holder();
+   if (resolved_klass == NULL) { // 2nd argument defaults to holder of 1st
+     resolved_klass = resolved_method_holder;
+   }
+   _resolved_klass  = resolved_klass;
+-  _resolved_method = methodHandle(THREAD, resolved_method);
+-  _selected_method = methodHandle(THREAD, resolved_method);
++  _resolved_method = methodHandle(thread, resolved_method);
++  _selected_method = methodHandle(thread, resolved_method);
+   // classify:
+   CallKind kind = CallInfo::unknown_kind;
+   int index = resolved_method->vtable_index();
+@@ -179,7 +179,9 @@ CallInfo::CallInfo(Method* resolved_method, Klass* resolved_klass, TRAPS) {
+   _call_index = index;
+   _resolved_appendix = Handle();
+   // Find or create a ResolvedMethod instance for this Method*
+-  set_resolved_method_name(CHECK);
++  if (thread->is_Java_thread()) { // exclude DCEVM VM thread
++    set_resolved_method_name(thread->as_Java_thread());
++  }
+ 
+   DEBUG_ONLY(verify());
+ }
+@@ -190,6 +192,10 @@ void CallInfo::set_resolved_method_name(TRAPS) {
+   _resolved_method_name = Handle(THREAD, rmethod_name);
+ }
+ 
++void CallInfo::set_resolved_method_name_dcevm(oop rmethod_name, Thread* thread) {
++  _resolved_method_name = Handle(thread, rmethod_name);
++}
++
+ #ifdef ASSERT
+ void CallInfo::verify() {
+   switch (call_kind()) {  // the meaning and allowed value of index depends on kind
+diff --git a/src/hotspot/share/interpreter/linkResolver.hpp b/src/hotspot/share/interpreter/linkResolver.hpp
+index 9eeb10cc6fd..871eaab7464 100644
+--- a/src/hotspot/share/interpreter/linkResolver.hpp
++++ b/src/hotspot/share/interpreter/linkResolver.hpp
+@@ -91,7 +91,7 @@ class CallInfo : public StackObj {
+   // utility to extract an effective CallInfo from a method and an optional receiver limit
+   // does not queue the method for compilation.  This also creates a ResolvedMethodName
+   // object for the resolved_method.
+-  CallInfo(Method* resolved_method, Klass* resolved_klass, TRAPS);
++  CallInfo(Method* resolved_method, Klass* resolved_klass, Thread* thread);
+ 
+   Klass*  resolved_klass() const                 { return _resolved_klass; }
+   Method* resolved_method() const                { return _resolved_method(); }
+@@ -100,6 +100,7 @@ class CallInfo : public StackObj {
+   Handle       resolved_method_name() const      { return _resolved_method_name; }
+   // Materialize a java.lang.invoke.ResolvedMethodName for this resolved_method
+   void     set_resolved_method_name(TRAPS);
++  void     set_resolved_method_name_dcevm(oop rmethod_name, Thread* thread);
+ 
+   BasicType    result_type() const               { return selected_method()->result_type(); }
+   CallKind     call_kind() const                 { return _call_kind; }
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index c54b6b1bf46..8d259451032 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -1643,21 +1643,6 @@ void InstanceKlass::methods_do(void f(Method* method)) {
+   }
+ }
+ 
+-void InstanceKlass::methods_do(void f(Method* method, TRAPS), TRAPS) {
+-  // Methods aren't stable until they are loaded.  This can be read outside
+-  // a lock through the ClassLoaderData for profiling
+-  if (!is_loaded()) {
+-    return;
+-  }
+-
+-  int len = methods()->length();
+-  for (int index = 0; index < len; index++) {
+-    Method* m = methods()->at(index);
+-    assert(m->is_method(), "must be method");
+-    f(m, CHECK);
+-  }
+-}
+-
+ //  (DCEVM) Update information contains mapping of fields from old class to the new class.
+ //  Info is stored on HEAP, you need to call clear_update_information to free the space.
+ void InstanceKlass::store_update_information(GrowableArray<int> &values) {
+diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
+index 317a006a4ec..36587031fec 100644
+--- a/src/hotspot/share/oops/instanceKlass.hpp
++++ b/src/hotspot/share/oops/instanceKlass.hpp
+@@ -1017,7 +1017,6 @@ public:
+   void clear_update_information();
+ 
+   void methods_do(void f(Method* method));
+-  void methods_do(void f(Method* method, TRAPS), TRAPS);
+   void array_klasses_do(void f(Klass* k));
+   void array_klasses_do(void f(Klass* k, TRAPS), TRAPS);
+ 
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index b662976afcb..ff012383872 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -292,8 +292,15 @@ class ChangePointersOopClosure : public BasicOopIterateClosure {
+           // Note: we might set NULL at this point, which should force AbstractMethodError at runtime
+           Thread *thread = Thread::current();
+           CallInfo info(new_method, newest, thread);
+-          Handle objHandle(thread, obj);
+-          MethodHandles::init_method_MemberName(objHandle, info);
++          oop resolved_method = ResolvedMethodTable::find_method(info.resolved_method());
++          if (resolved_method != NULL) {
++            info.set_resolved_method_name_dcevm(resolved_method, thread);
++            Handle objHandle(thread, obj);
++            MethodHandles::init_method_MemberName(objHandle, info);
++          } else {
++            assert(0, "Must be resolved");
++            java_lang_invoke_MemberName::set_method(obj, NULL);
++          }
+         } else {
+           java_lang_invoke_MemberName::set_method(obj, NULL);
+         }
+-- 
+2.23.0
+

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

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

jb/project/tools/patches/dcevm/0035-Fix-implicit-conversion-of-NULL-constant-to-bool.patch

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

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

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

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

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

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

@@ -0,0 +1,27 @@
+From acad06204bc4f7e7a89e9a44ded6b9d27082327b Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Wed, 30 Jun 2021 18:58:47 +0200
+Subject: [PATCH 38/39] Fix compilation issue
+
+---
+ src/hotspot/share/interpreter/linkResolver.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
+index 78c9624a18b..28dccd0face 100644
+--- a/src/hotspot/share/interpreter/linkResolver.cpp
++++ b/src/hotspot/share/interpreter/linkResolver.cpp
+@@ -562,8 +562,8 @@ void LinkResolver::check_method_accessability(Klass* ref_klass,
+   // We'll check for the method name first, as that's most likely
+   // to be false (so we'll short-circuit out of these tests).
+   if (sel_method->name() == vmSymbols::clone_name() &&
+-      ( !AllowEnhancedClassRedefinition && sel_klass == vmClasses::Object_klass() ||
+-      AllowEnhancedClassRedefinition && sel_klass->newest_version() == vmClasses::Object_klass()->newest_version()) &&
++      ( (!AllowEnhancedClassRedefinition && sel_klass == vmClasses::Object_klass()) ||
++        (AllowEnhancedClassRedefinition && sel_klass->newest_version() == vmClasses::Object_klass()->newest_version()) ) &&
+       resolved_klass->is_array_klass()) {
+     // We need to change "protected" to "public".
+     assert(flags.is_protected(), "clone not protected?");
+-- 
+2.23.0
+

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

@@ -0,0 +1,171 @@
+From 563465b112da14e8b81ef32eefc06c79015a809b Mon Sep 17 00:00:00 2001
+From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
+Date: Tue, 27 Jul 2021 21:32:51 +0200
+Subject: [PATCH 39/39] Remove duplicated lambdaFormInvokers.cpp
+
+---
+ .../share/classfile/lambdaFormInvokers.cpp    | 152 ------------------
+ 1 file changed, 152 deletions(-)
+ delete mode 100644 src/hotspot/share/classfile/lambdaFormInvokers.cpp
+
+diff --git a/src/hotspot/share/classfile/lambdaFormInvokers.cpp b/src/hotspot/share/classfile/lambdaFormInvokers.cpp
+deleted file mode 100644
+index 281de58b482..00000000000
+--- a/src/hotspot/share/classfile/lambdaFormInvokers.cpp
++++ /dev/null
+@@ -1,152 +0,0 @@
+-/*
+- * Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+- * or visit www.oracle.com if you need additional information or have any
+- * questions.
+- *
+- */
+-
+-#include "precompiled.hpp"
+-#include "classfile/classLoadInfo.hpp"
+-#include "classfile/classFileStream.hpp"
+-#include "classfile/javaClasses.inline.hpp"
+-#include "classfile/klassFactory.hpp"
+-#include "classfile/lambdaFormInvokers.hpp"
+-#include "classfile/symbolTable.hpp"
+-#include "classfile/systemDictionary.hpp"
+-#include "classfile/systemDictionaryShared.hpp"
+-#include "classfile/vmClasses.hpp"
+-#include "classfile/vmSymbols.hpp"
+-#include "logging/log.hpp"
+-#include "memory/oopFactory.hpp"
+-#include "memory/metaspaceShared.hpp"
+-#include "memory/resourceArea.hpp"
+-#include "oops/instanceKlass.hpp"
+-#include "oops/klass.hpp"
+-#include "oops/objArrayKlass.hpp"
+-#include "oops/objArrayOop.hpp"
+-#include "oops/oop.inline.hpp"
+-#include "oops/typeArrayOop.inline.hpp"
+-#include "runtime/handles.inline.hpp"
+-#include "runtime/javaCalls.hpp"
+-
+-GrowableArray<char*>* LambdaFormInvokers::_lambdaform_lines = NULL;
+-
+-void LambdaFormInvokers::append(char* line) {
+-  if (_lambdaform_lines == NULL) {
+-    _lambdaform_lines = new GrowableArray<char*>(100);
+-  }
+-  _lambdaform_lines->append(line);
+-}
+-
+-void LambdaFormInvokers::regenerate_holder_classes(TRAPS) {
+-  assert(_lambdaform_lines != NULL, "Bad List");
+-  ResourceMark rm(THREAD);
+-
+-  Symbol* cds_name  = vmSymbols::jdk_internal_misc_CDS();
+-  Klass*  cds_klass = SystemDictionary::resolve_or_null(cds_name, THREAD);
+-  guarantee(cds_klass != NULL, "jdk/internal/misc/CDS must exist!");
+-
+-  int len = _lambdaform_lines->length();
+-  objArrayHandle list_lines = oopFactory::new_objArray_handle(vmClasses::String_klass(), len, CHECK);
+-  for (int i = 0; i < len; i++) {
+-    Handle h_line = java_lang_String::create_from_str(_lambdaform_lines->at(i), CHECK);
+-    list_lines->obj_at_put(i, h_line());
+-  }
+-
+-  //
+-  // Object[] CDS.generateLambdaFormHolderClasses(String[] lines)
+-  // the returned Object[] layout:
+-  //   name, byte[], name, byte[] ....
+-  Symbol* method = vmSymbols::generateLambdaFormHolderClasses();
+-  Symbol* signrs = vmSymbols::generateLambdaFormHolderClasses_signature();
+-
+-  JavaValue result(T_OBJECT);
+-  JavaCalls::call_static(&result, cds_klass, method, signrs, list_lines, THREAD);
+-
+-  if (HAS_PENDING_EXCEPTION) {
+-    log_info(cds)("%s: %s", THREAD->pending_exception()->klass()->external_name(),
+-                            java_lang_String::as_utf8_string(java_lang_Throwable::message(THREAD->pending_exception())));
+-    CLEAR_PENDING_EXCEPTION;
+-    return;
+-  }
+-
+-  objArrayHandle h_array(THREAD, (objArrayOop)result.get_oop());
+-  int sz = h_array->length();
+-  assert(sz % 2 == 0 && sz >= 2, "Must be even size of length");
+-  for (int i = 0; i < sz; i+= 2) {
+-    Handle h_name(THREAD, h_array->obj_at(i));
+-    typeArrayHandle h_bytes(THREAD, (typeArrayOop)h_array->obj_at(i+1));
+-    assert(h_name != NULL, "Class name is NULL");
+-    assert(h_bytes != NULL, "Class bytes is NULL");
+-
+-    char *class_name = java_lang_String::as_utf8_string(h_name());
+-    int len = h_bytes->length();
+-    // make a copy of class bytes so GC will not affect us.
+-    char *buf = resource_allocate_bytes(THREAD, len);
+-    memcpy(buf, (char*)h_bytes->byte_at_addr(0), len);
+-    ClassFileStream st((u1*)buf, len, NULL, ClassFileStream::verify);
+-
+-    reload_class(class_name, st, THREAD);
+-    // free buf
+-    resource_free_bytes(buf, len);
+-
+-    if (HAS_PENDING_EXCEPTION) {
+-      log_info(cds)("Exception happened: %s", PENDING_EXCEPTION->klass()->name()->as_C_string());
+-      log_info(cds)("Could not create InstanceKlass for class %s", class_name);
+-      CLEAR_PENDING_EXCEPTION;
+-      return;
+-    }
+-  }
+-}
+-
+-// class_handle - the class name, bytes_handle - the class bytes
+-void LambdaFormInvokers::reload_class(char* name, ClassFileStream& st, TRAPS) {
+-  Symbol* class_name = SymbolTable::new_symbol((const char*)name);
+-  // the class must exist
+-  Klass* klass = SystemDictionary::resolve_or_null(class_name, THREAD);
+-  if (klass == NULL) {
+-    log_info(cds)("Class %s not present, skip", name);
+-    return;
+-  }
+-  assert(klass->is_instance_klass(), "Should be");
+-
+-  ClassLoaderData* cld = ClassLoaderData::the_null_class_loader_data();
+-  Handle protection_domain;
+-  ClassLoadInfo cl_info(protection_domain);
+-
+-  InstanceKlass* result = KlassFactory::create_from_stream(&st,
+-                                                   class_name,
+-                                                   cld,
+-                                                   cl_info,
+-                                                   false,
+-                                                   CHECK);
+-
+-  {
+-    MutexLocker mu_r(THREAD, Compile_lock); // add_to_hierarchy asserts this.
+-    SystemDictionary::add_to_hierarchy(result);
+-  }
+-  // new class not linked yet.
+-  MetaspaceShared::try_link_class(THREAD, result);
+-  assert(!HAS_PENDING_EXCEPTION, "Invariant");
+-
+-  // exclude the existing class from dump
+-  SystemDictionaryShared::set_excluded(InstanceKlass::cast(klass));
+-  log_info(cds, lambda)("Replaced class %s, old: %p  new: %p", name, klass, result);
+-}
+-- 
+2.23.0
+

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

@@ -37,18 +37,18 @@ function create_image_bundle {
   __modules_path=$3
   __modules=$4
 
-  [ -d $__bundle_name ] && rm -rf $__bundle_name
+  [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
 
   echo Running jlink ...
   ${JSDK}/bin/jlink \
     --module-path $__modules_path --no-man-pages --compress=2 \
-    --add-modules $__modules --output $__bundle_name || do_exit $?
+    --add-modules $__modules --output $__arch_name || do_exit $?
 
-  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__bundle_name/release
+  grep -v "^JAVA_VERSION" "$JSDK"/release | grep -v "^MODULES" >> $__arch_name/release
   if [ "$__arch_name" == "$JBRSDK_BUNDLE" ]; then
-    sed 's/JBR/JBRSDK/g' $__bundle_name/release > release
-    mv release $__bundle_name/release
-    copy_jmods "$__modules" "$__modules_path" "$__bundle_name"/jmods
+    sed 's/JBR/JBRSDK/g' $__arch_name/release > release
+    mv release $__arch_name/release
+    copy_jmods "$__modules" "$__modules_path" "$__arch_name"/jmods
   fi
 }
 
@@ -99,11 +99,6 @@ JSDK=$IMAGES_DIR/jdk
 JSDK_MODS_DIR=$IMAGES_DIR/jmods
 JBRSDK_BUNDLE=jbrsdk
 
-where cygpath
-if [ $? -eq 0 ]; then
-  JCEF_PATH="$(cygpath -w $JCEF_PATH)"
-fi
-
 if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_type" == "fd" ]; then
   git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
   update_jsdk_mods "$JSDK" "$JCEF_PATH"/jmods "$JSDK"/jmods "$JSDK_MODS_DIR" || do_exit $?

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

@@ -31,9 +31,10 @@ function pack_jbr {
 
   [ "$bundle_type" == "fd" ] && [ "$__arch_name" == "$JBRSDK_BUNDLE" ] && __bundle_name=$__arch_name && fastdebug_infix="fastdebug-"
   JBR=${__bundle_name}-${JBSDK_VERSION}-windows-x64-${fastdebug_infix}b${build_number}
+
   echo Creating $JBR.tar.gz ...
 
-  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__bundle_name || do_exit $?
+  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR $__arch_name || do_exit $?
 }
 
 [ "$bundle_type" == "nomod" ] && bundle_type=""
@@ -48,8 +49,8 @@ if [ "$bundle_type" == "jcef" ] || [ "$bundle_type" == "dcevm" ] || [ "$bundle_t
   jbr_name_postfix="_${bundle_type}"
 fi
 
-pack_jbr jbr${jbr_name_postfix}
-pack_jbr jbrsdk${jbr_name_postfix}
+pack_jbr jbr${jbr_name_postfix} jbr
+pack_jbr jbrsdk${jbr_name_postfix} jbrsdk
 
 if [ -z "$bundle_type" ]; then
   JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-x64-b$build_number

make/GenerateLinkOptData.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -88,10 +88,7 @@ $(CLASSLIST_FILE): $(INTERIM_IMAGE_DIR)/bin/java$(EXECUTABLE_SUFFIX) $(CLASSLIST
 	        $(CAT) $(LINK_OPT_DIR)/stderr $(JLI_TRACE_FILE) ; \
 	        exit $$exitcode \
 	    )
-	$(GREP) -v HelloClasslist $@.raw.2 > $@.raw.3
-	$(FIXPATH) $(INTERIM_IMAGE_DIR)/bin/java \
-	    -cp $(SUPPORT_OUTPUTDIR)/classlist.jar \
-	    build.tools.classlist.SortClasslist $@.raw.3 > $@
+	$(GREP) -v HelloClasslist $@.raw.2 > $@
 
 # The jli trace is created by the same recipe as classlist. By declaring these
 # dependencies, make will correctly rebuild both jli trace and classlist

make/autoconf/boot-jdk.m4

@@ -298,28 +298,6 @@ AC_DEFUN([BOOTJDK_CHECK_TOOL_IN_BOOTJDK],
     ])
 ])
 
-# Setup CLASSPATH environment variable
-AC_DEFUN([BOOTJDK_SETUP_CLASSPATH],
-[
-  AC_ARG_WITH([classpath], [AS_HELP_STRING([--with-classpath],
-      [Optional classpath to set as CLASSPATH to all Java invocations @<:@none@:>@])])
-
-  if test "x$CLASSPATH" != x; then
-    AC_MSG_WARN([CLASSPATH is set in the environment. This will be ignored. Use --with-classpath instead.])
-  fi
-
-  CLASSPATH=
-
-  if test "x$with_classpath" != x && test "x$with_classpath" != xyes &&
-      test "x$with_classpath" != xno ; then
-    CLASSPATH="$with_classpath"
-    AC_MSG_CHECKING([for classpath to use for all Java invocations])
-    AC_MSG_RESULT([$CLASSPATH])
-  fi
-
-  AC_SUBST(CLASSPATH)
-])
-
 ###############################################################################
 #
 # We need a Boot JDK to bootstrap the build.
@@ -416,8 +394,6 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
     BOOTJDK_USE_LOCAL_CDS=false
     AC_MSG_RESULT([no, -XX:SharedArchiveFile not supported])
   fi
-
-  BOOTJDK_SETUP_CLASSPATH
 ])
 
 AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],

make/autoconf/build-aux/config.guess

@@ -102,15 +102,6 @@ if [ "x$OUT" = x ]; then
   fi
 fi
 
-# Test and fix LoongArch64.
-if [ "x$OUT" = x ]; then
-  if [ `uname -s` = Linux ]; then
-    if [ `uname -m` = loongarch64 ]; then
-      OUT=loongarch64-unknown-linux-gnu
-    fi
-  fi
-fi
-
 # Test and fix cpu on macos-aarch64, uname -p reports arm, buildsys expects aarch64
 echo $OUT | grep arm-apple-darwin > /dev/null 2> /dev/null
 if test $? != 0; then

make/autoconf/flags-cflags.m4

@@ -137,7 +137,7 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
       DISABLED_WARNINGS="4800"
       if test "x$TOOLCHAIN_VERSION" = x2017; then
         # VS2017 incorrectly triggers this warning for constexpr
-        DISABLED_WARNINGS="$DISABLED_WARNINGS 4307"
+        DISABLED_WARNINGS+=" 4307"
       fi
       ;;
 

make/autoconf/flags-other.m4

@@ -89,12 +89,11 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
 
     # Fix linker warning.
     # Code taken from make/autoconf/flags-cflags.m4 and adapted.
-    JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS \
-        -DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
+    JVM_BASIC_ASFLAGS+="-DMAC_OS_X_VERSION_MIN_REQUIRED=$MACOSX_VERSION_MIN_NODOTS \
         -mmacosx-version-min=$MACOSX_VERSION_MIN"
 
     if test -n "$MACOSX_VERSION_MAX"; then
-        JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS $OS_CFLAGS \
+        JVM_BASIC_ASFLAGS+="$OS_CFLAGS \
             -DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS"
     fi
   fi

make/autoconf/help.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -42,21 +42,21 @@ AC_DEFUN([HELP_MSG_MISSING_DEPENDENCY],
     PKGHANDLER_COMMAND=
 
     case $PKGHANDLER in
-      *apt-get)
+      apt-get)
         apt_help     $MISSING_DEPENDENCY ;;
-      *yum)
+      yum)
         yum_help     $MISSING_DEPENDENCY ;;
-      *brew)
+      brew)
         brew_help    $MISSING_DEPENDENCY ;;
-      *port)
+      port)
         port_help    $MISSING_DEPENDENCY ;;
-      *pkgutil)
+      pkgutil)
         pkgutil_help $MISSING_DEPENDENCY ;;
-      *pkgadd)
+      pkgadd)
         pkgadd_help  $MISSING_DEPENDENCY ;;
-      *zypper)
+      zypper)
         zypper_help  $MISSING_DEPENDENCY ;;
-      *pacman)
+      pacman)
         pacman_help  $MISSING_DEPENDENCY ;;
     esac
 
@@ -274,7 +274,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS],
 
   printf "\n"
   printf "Build performance summary:\n"
-  printf "* Build jobs:     $JOBS\n"
+  printf "* Cores to use:   $JOBS\n"
   printf "* Memory limit:   $MEMORY_SIZE MB\n"
   if test "x$CCACHE_STATUS" != "x"; then
     printf "* ccache status:  $CCACHE_STATUS\n"

make/autoconf/jdk-version.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -525,7 +525,7 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
     MACOSX_BUNDLE_BUILD_VERSION="$VERSION_BUILD"
     # If VERSION_OPT consists of only numbers and periods, add it.
     if [ [[ $VERSION_OPT =~ ^[0-9\.]+$ ]] ]; then
-      MACOSX_BUNDLE_BUILD_VERSION="$MACOSX_BUNDLE_BUILD_VERSION.$VERSION_OPT"
+      MACOSX_BUNDLE_BUILD_VERSION+=".$VERSION_OPT"
     fi
   fi
   AC_SUBST(MACOSX_BUNDLE_BUILD_VERSION)

make/autoconf/libraries.m4

@@ -43,9 +43,11 @@ AC_DEFUN_ONCE([LIB_DETERMINE_DEPENDENCIES],
   if test "x$OPENJDK_TARGET_OS" = xwindows || test "x$OPENJDK_TARGET_OS" = xmacosx; then
     # No X11 support on windows or macosx
     NEEDS_LIB_X11=false
+  elif test "x$ENABLE_HEADLESS_ONLY" = xtrue; then
+    # No X11 support needed when building headless only
+    NEEDS_LIB_X11=false
   else
-    # All other instances need X11, even if building headless only, libawt still
-    # needs X11 headers.
+    # All other instances need X11
     NEEDS_LIB_X11=true
   fi
 

make/autoconf/platform.m4

@@ -72,12 +72,6 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
       VAR_CPU_BITS=64
       VAR_CPU_ENDIAN=little
       ;;
-    loongarch64)
-      VAR_CPU=loongarch64
-      VAR_CPU_ARCH=loongarch
-      VAR_CPU_BITS=64
-      VAR_CPU_ENDIAN=little
-      ;;
     m68k)
       VAR_CPU=m68k
       VAR_CPU_ARCH=m68k

make/autoconf/spec.gmk.in

@@ -54,9 +54,6 @@ MAKE := @MAKE@
 # Make sure all shell commands are executed with the C locale
 export LC_ALL := C
 
-# Make sure we override any local CLASSPATH variable
-export CLASSPATH := @CLASSPATH@
-
 # The default make arguments
 MAKE_ARGS = $(MAKE_LOG_FLAGS) -r -R -I $(TOPDIR)/make/common SPEC=$(SPEC) \
     MAKE_LOG_FLAGS="$(MAKE_LOG_FLAGS)" $(MAKE_LOG_VARS)

make/autoconf/toolchain.m4

@@ -221,12 +221,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE],
   AC_ARG_WITH(toolchain-type, [AS_HELP_STRING([--with-toolchain-type],
       [the toolchain type (or family) to use, use '--help' to show possible values @<:@platform dependent@:>@])])
 
-  # Linux x86_64 needs higher binutils after 8265783
-  # (this really is a dependency on as version, but we take ld as a check for a general binutils version)
-  if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-    TOOLCHAIN_MINIMUM_LD_VERSION_gcc="2.25"
-  fi
-
   # Use indirect variable referencing
   toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS
   VALID_TOOLCHAINS=${!toolchain_var_name}
@@ -683,10 +677,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE],
   TOOLCHAIN_PREPARE_FOR_LD_VERSION_COMPARISONS
 
   if test "x$TOOLCHAIN_MINIMUM_LD_VERSION" != x; then
-    AC_MSG_NOTICE([comparing linker version to minimum version $TOOLCHAIN_MINIMUM_LD_VERSION])
     TOOLCHAIN_CHECK_LINKER_VERSION(VERSION: $TOOLCHAIN_MINIMUM_LD_VERSION,
         IF_OLDER_THAN: [
-          AC_MSG_ERROR([You are using a linker older than $TOOLCHAIN_MINIMUM_LD_VERSION. This is not a supported configuration.])
+          AC_MSG_WARN([You are using a linker older than $TOOLCHAIN_MINIMUM_LD_VERSION. This is not a supported configuration.])
         ]
     )
   fi

make/common/ProcessMarkdown.gmk

@@ -103,7 +103,7 @@ define ProcessMarkdown
 	$$(call LogInfo, Post-processing markdown file $2)
 	$$(call MakeDir, $$(SUPPORT_OUTPUTDIR)/markdown $$($1_$2_TARGET_DIR))
 	$$(call ExecuteWithLog, $$(SUPPORT_OUTPUTDIR)/markdown/$$($1_$2_MARKER)_post, \
-	    ( $$($1_POST_PROCESS) $$($1_$2_PANDOC_OUTPUT) > $$($1_$2_OUTPUT_FILE) ) )
+	    ( $$($1_POST_PROCESS) < $$($1_$2_PANDOC_OUTPUT) > $$($1_$2_OUTPUT_FILE) ) )
   endif
 
   $1 += $$($1_$2_OUTPUT_FILE)

make/conf/javadoc.conf

@@ -1,4 +1,4 @@
-# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -23,9 +23,9 @@
 #
 
 # URLs
-JAVADOC_BASE_URL=https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_FEATURE)&id=homepage
+JAVADOC_BASE_URL=https://docs.oracle.com/pls/topic/lookup?ctx=javase$(VERSION_NUMBER)&id=homepage
 BUG_SUBMIT_URL=https://bugreport.java.com/bugreport/
 COPYRIGHT_URL=legal/copyright.html
-LICENSE_URL=https://www.oracle.com/java/javase/terms/license/java$(VERSION_FEATURE)speclicense.html
+LICENSE_URL=https://www.oracle.com/java/javase/terms/license/java$(VERSION_NUMBER)speclicense.html
 REDISTRIBUTION_URL=https://www.oracle.com/technetwork/java/redist-137594.html
 OTHER_JDK_VERSIONS_URL=https://docs.oracle.com/en/java/javase/index.html

make/conf/jib-profiles.js

@@ -1164,7 +1164,7 @@ var getJibProfilesDependencies = function (input, common) {
             // build_number: "b07",
             // file: "bundles/jcov-3_0.zip",
             organization: common.organization,
-            revision: "3.0-9-jdk-asm+1.0",
+            revision: "3.0-7-jdk-asm+1.0",
             ext: "zip",
             environment_name: "JCOV_HOME",
         },

make/conf/version-numbers.conf

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -26,17 +26,17 @@
 # Default version, product, and vendor information to use,
 # unless overridden by configure
 
-DEFAULT_VERSION_FEATURE=18
+DEFAULT_VERSION_FEATURE=17
 DEFAULT_VERSION_INTERIM=0
 DEFAULT_VERSION_UPDATE=0
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2022-03-15
-DEFAULT_VERSION_CLASSFILE_MAJOR=62  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
+DEFAULT_VERSION_DATE=2021-09-14
+DEFAULT_VERSION_CLASSFILE_MAJOR=61  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_VERSION_DOCS_API_SINCE=11
-DEFAULT_ACCEPTABLE_BOOT_VERSIONS="16 17 18"
-DEFAULT_JDK_SOURCE_TARGET_VERSION=18
-DEFAULT_PROMOTED_VERSION_PRE=ea
+DEFAULT_ACCEPTABLE_BOOT_VERSIONS="16 17"
+DEFAULT_JDK_SOURCE_TARGET_VERSION=17
+DEFAULT_PROMOTED_VERSION_PRE=

make/data/cacerts/globalsignr2ca

@@ -0,0 +1,29 @@
+Owner: CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R2
+Issuer: CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R2
+Serial number: 400000000010f8626e60d
+Valid from: Fri Dec 15 08:00:00 GMT 2006 until: Wed Dec 15 08:00:00 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4G
+A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNp
+Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1
+MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMjETMBEG
+A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6ErPL
+v4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8
+eoLrvozps6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklq
+tTleiDTsvHgMCJiEbKjNS7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzd
+C9XZzPnqJworc5HGnRusyMvo4KD0L5CLTfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pa
+zq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6CygPCm48CAwEAAaOBnDCB
+mTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUm+IH
+V2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5n
+bG9iYWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG
+3lm0mi3f3BmGLjANBgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4Gs
+J0/WwbgcQ3izDJr86iw8bmEbTUsp9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO
+291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu01yiPqFbQfXf5WRDLenVOavS
+ot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG79G+dwfCMNYxd
+AfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----

make/data/cacerts/identrustdstx3

@@ -0,0 +1,27 @@
+Owner: CN=DST Root CA X3, O=Digital Signature Trust Co.
+Issuer: CN=DST Root CA X3, O=Digital Signature Trust Co.
+Serial number: 44afb080d6a327ba893039862ef8406b
+Valid from: Sat Sep 30 21:12:19 GMT 2000 until: Thu Sep 30 14:01:15 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVow
+PzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QgQ28uMRcwFQYDVQQD
+Ew5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmTrE4O
+rz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEq
+OLl5CjH9UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9b
+xiqKqy69cK3FCxolkHRyxXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw
+7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40dutolucbY38EVAjqr2m7xPi71XAicPNaD
+aeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQMA0GCSqG
+SIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69
+ikugdB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXr
+AvHRAosZy5Q6XkjEGB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZz
+R8srzJmwN0jP41ZL9c8PDHIyh8bwRLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5
+JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubSfZGL+T0yjWW06XyxV3bqxbYo
+Ob8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----

make/data/charsetmapping/charsets

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -49,6 +49,7 @@ charset US-ASCII US_ASCII
     alias   IBM367
     alias   cp367
     alias   csASCII
+    alias   default
                                         # Other aliases
     alias   646                         # Solaris POSIX locale
     alias   iso_646.irv:1983

make/data/currency/CurrencyData.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -317,8 +317,6 @@ KI=AUD
 KP=KPW
 # KOREA (THE REPUBLIC OF)
 KR=KRW
-# KOSOVO - Not in ISO 3166/4217
-XK=EUR
 # KUWAIT
 KW=KWD
 # KYRGYZSTAN

make/data/symbols/java.base-H.sym.txt

@@ -1,930 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-module name java.base
-header exports java/io,java/lang,java/lang/annotation,java/lang/constant,java/lang/invoke,java/lang/module,java/lang/ref,java/lang/reflect,java/lang/runtime,java/math,java/net,java/net/spi,java/nio,java/nio/channels,java/nio/channels/spi,java/nio/charset,java/nio/charset/spi,java/nio/file,java/nio/file/attribute,java/nio/file/spi,java/security,java/security/cert,java/security/interfaces,java/security/spec,java/text,java/text/spi,java/time,java/time/chrono,java/time/format,java/time/temporal,java/time/zone,java/util,java/util/concurrent,java/util/concurrent/atomic,java/util/concurrent/locks,java/util/function,java/util/jar,java/util/random,java/util/regex,java/util/spi,java/util/stream,java/util/zip,javax/crypto,javax/crypto/interfaces,javax/crypto/spec,javax/net,javax/net/ssl,javax/security/auth,javax/security/auth/callback,javax/security/auth/login,javax/security/auth/spi,javax/security/auth/x500,javax/security/cert uses java/lang/System$LoggerFinder,java/net/ContentHandlerFactory,java/net/spi/URLStreamHandlerProvider,java/nio/channels/spi/AsynchronousChannelProvider,java/nio/channels/spi/SelectorProvider,java/nio/charset/spi/CharsetProvider,java/nio/file/spi/FileSystemProvider,java/nio/file/spi/FileTypeDetector,java/security/Provider,java/text/spi/BreakIteratorProvider,java/text/spi/CollatorProvider,java/text/spi/DateFormatProvider,java/text/spi/DateFormatSymbolsProvider,java/text/spi/DecimalFormatSymbolsProvider,java/text/spi/NumberFormatProvider,java/time/chrono/AbstractChronology,java/time/chrono/Chronology,java/time/zone/ZoneRulesProvider,java/util/random/RandomGenerator,java/util/spi/CalendarDataProvider,java/util/spi/CalendarNameProvider,java/util/spi/CurrencyNameProvider,java/util/spi/LocaleNameProvider,java/util/spi/ResourceBundleControlProvider,java/util/spi/ResourceBundleProvider,java/util/spi/TimeZoneNameProvider,java/util/spi/ToolProvider,javax/security/auth/spi/LoginModule,jdk/internal/logger/DefaultLoggerFinder,sun/text/spi/JavaTimeDateTimePatternProvider,sun/util/locale/provider/LocaleDataMetaInfo,sun/util/resources/LocaleData$CommonResourceBundleProvider,sun/util/resources/LocaleData$SupplementaryResourceBundleProvider,sun/util/spi/CalendarProvider provides interface\u0020;java/nio/file/spi/FileSystemProvider\u0020;impls\u0020;jdk/internal/jrtfs/JrtFileSystemProvider,interface\u0020;java/util/random/RandomGenerator\u0020;impls\u0020;java/security/SecureRandom\u005C;u002C;java/util/Random\u005C;u002C;java/util/SplittableRandom target linux-amd64 flags 8000
-
-class name java/io/CharArrayReader
-method name read descriptor (Ljava/nio/CharBuffer;)I thrownTypes java/io/IOException flags 1
-
-class name java/io/Console
-method name charset descriptor ()Ljava/nio/charset/Charset; flags 1
-
-class name java/io/FileInputStream
-method name readAllBytes descriptor ()[B thrownTypes java/io/IOException flags 1
-method name readNBytes descriptor (I)[B thrownTypes java/io/IOException flags 1
-
-class name java/io/InputStreamReader
-method name read descriptor (Ljava/nio/CharBuffer;)I thrownTypes java/io/IOException flags 1
-
-class name java/io/ObjectInputFilter
-method name allowFilter descriptor (Ljava/util/function/Predicate;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter; flags 9 signature (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter;
-method name rejectFilter descriptor (Ljava/util/function/Predicate;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter; flags 9 signature (Ljava/util/function/Predicate<Ljava/lang/Class<*>;>;Ljava/io/ObjectInputFilter$Status;)Ljava/io/ObjectInputFilter;
-method name merge descriptor (Ljava/io/ObjectInputFilter;Ljava/io/ObjectInputFilter;)Ljava/io/ObjectInputFilter; flags 9
-method name rejectUndecidedClass descriptor (Ljava/io/ObjectInputFilter;)Ljava/io/ObjectInputFilter; flags 9
-
-class name java/io/ObjectInputFilter$Config
-method name getSerialFilterFactory descriptor ()Ljava/util/function/BinaryOperator; flags 9 signature ()Ljava/util/function/BinaryOperator<Ljava/io/ObjectInputFilter;>;
-method name setSerialFilterFactory descriptor (Ljava/util/function/BinaryOperator;)V flags 9 signature (Ljava/util/function/BinaryOperator<Ljava/io/ObjectInputFilter;>;)V
-
-class name java/io/PrintStream
-header extends java/io/FilterOutputStream implements java/lang/Appendable,java/io/Closeable flags 21
-innerclass innerClass java/util/Locale$Category outerClass java/util/Locale innerClassName Category flags 4019
-
-class name java/io/WriteAbortedException
--field name detail descriptor Ljava/lang/Exception;
-field name detail descriptor Ljava/lang/Exception; flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-
-class name java/lang/AbstractStringBuilder
-header extends java/lang/Object implements java/lang/Appendable,java/lang/CharSequence flags 420
-innerclass innerClass java/util/Spliterator$OfInt outerClass java/util/Spliterator innerClassName OfInt flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/Class
--method name isSealed descriptor ()Z
--method name getPermittedSubclasses descriptor ()[Ljava/lang/Class;
-method name getPermittedSubclasses descriptor ()[Ljava/lang/Class; flags 1 signature ()[Ljava/lang/Class<*>; runtimeAnnotations @Ljdk/internal/reflect/CallerSensitive;
-method name isSealed descriptor ()Z flags 1
-
-class name java/lang/Compiler
-header extends java/lang/Object flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="9")
-
-class name java/lang/Deprecated
-header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;CONSTRUCTOR;eLjava/lang/annotation/ElementType;FIELD;eLjava/lang/annotation/ElementType;LOCAL_VARIABLE;eLjava/lang/annotation/ElementType;METHOD;eLjava/lang/annotation/ElementType;PACKAGE;eLjava/lang/annotation/ElementType;MODULE;eLjava/lang/annotation/ElementType;PARAMETER;eLjava/lang/annotation/ElementType;TYPE;})
-
-class name java/lang/IllegalCallerException
-header extends java/lang/RuntimeException flags 21
-
-class name java/lang/LayerInstantiationException
-header extends java/lang/RuntimeException flags 21
-
-class name java/lang/NamedPackage
-header extends java/lang/Object flags 20
-
-class name java/lang/Process
-method name inputReader descriptor ()Ljava/io/BufferedReader; flags 11
-method name inputReader descriptor (Ljava/nio/charset/Charset;)Ljava/io/BufferedReader; flags 11
-method name errorReader descriptor ()Ljava/io/BufferedReader; flags 11
-method name errorReader descriptor (Ljava/nio/charset/Charset;)Ljava/io/BufferedReader; flags 11
-method name outputWriter descriptor ()Ljava/io/BufferedWriter; flags 11
-method name outputWriter descriptor (Ljava/nio/charset/Charset;)Ljava/io/BufferedWriter; flags 11
-
-class name java/lang/SecurityManager
-header extends java/lang/Object flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-innerclass innerClass java/lang/module/ModuleDescriptor$Opens outerClass java/lang/module/ModuleDescriptor innerClassName Opens flags 19
-innerclass innerClass java/lang/module/ModuleDescriptor$Exports outerClass java/lang/module/ModuleDescriptor innerClassName Exports flags 19
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
--method name checkMulticast descriptor (Ljava/net/InetAddress;B)V
-method name checkMulticast descriptor (Ljava/net/InetAddress;B)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="1.4")
-
-class name java/lang/StrictMath
--method name toRadians descriptor (D)D
--method name toDegrees descriptor (D)D
-method name toRadians descriptor (D)D flags 9
-method name toDegrees descriptor (D)D flags 9
-
-class name java/lang/SuppressWarnings
-header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;TYPE;eLjava/lang/annotation/ElementType;FIELD;eLjava/lang/annotation/ElementType;METHOD;eLjava/lang/annotation/ElementType;PARAMETER;eLjava/lang/annotation/ElementType;CONSTRUCTOR;eLjava/lang/annotation/ElementType;LOCAL_VARIABLE;eLjava/lang/annotation/ElementType;MODULE;})@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;SOURCE;)
-
-class name java/lang/System
--method name setSecurityManager descriptor (Ljava/lang/SecurityManager;)V
--method name getSecurityManager descriptor ()Ljava/lang/SecurityManager;
-method name getSecurityManager descriptor ()Ljava/lang/SecurityManager; flags 9 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-method name setSecurityManager descriptor (Ljava/lang/SecurityManager;)V flags 9 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")@Ljdk/internal/reflect/CallerSensitive;
-
-class name java/lang/Thread
--method name checkAccess descriptor ()V
-method name checkAccess descriptor ()V flags 11 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-
-class name java/lang/ThreadGroup
--method name checkAccess descriptor ()V
-method name checkAccess descriptor ()V flags 11 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-
-class name java/lang/constant/ClassDesc
-header extends java/lang/Object implements java/lang/constant/ConstantDesc,java/lang/invoke/TypeDescriptor$OfField sealed true flags 601 signature Ljava/lang/Object;Ljava/lang/constant/ConstantDesc;Ljava/lang/invoke/TypeDescriptor$OfField<Ljava/lang/constant/ClassDesc;>;
-innerclass innerClass java/lang/invoke/TypeDescriptor$OfField outerClass java/lang/invoke/TypeDescriptor innerClassName OfField flags 609
-
-class name java/lang/constant/ConstantDesc
-header extends java/lang/Object sealed true flags 601
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/constant/DirectMethodHandleDesc
-header extends java/lang/Object implements java/lang/constant/MethodHandleDesc nestMembers java/lang/constant/DirectMethodHandleDesc$Kind sealed true flags 601
-innerclass innerClass java/lang/constant/DirectMethodHandleDesc$Kind outerClass java/lang/constant/DirectMethodHandleDesc innerClassName Kind flags 4019
-
-class name java/lang/constant/DynamicConstantDesc
-header extends java/lang/Object implements java/lang/constant/ConstantDesc flags 421 signature <T:Ljava/lang/Object;>Ljava/lang/Object;Ljava/lang/constant/ConstantDesc;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-innerclass innerClass java/lang/Enum$EnumDesc outerClass java/lang/Enum innerClassName EnumDesc flags 19
-innerclass innerClass java/lang/invoke/VarHandle$VarHandleDesc outerClass java/lang/invoke/VarHandle innerClassName VarHandleDesc flags 19
-
-class name java/lang/constant/MethodHandleDesc
-header extends java/lang/Object implements java/lang/constant/ConstantDesc sealed true flags 601
-innerclass innerClass java/lang/constant/DirectMethodHandleDesc$Kind outerClass java/lang/constant/DirectMethodHandleDesc innerClassName Kind flags 4019
-
-class name java/lang/constant/MethodTypeDesc
-header extends java/lang/Object implements java/lang/constant/ConstantDesc,java/lang/invoke/TypeDescriptor$OfMethod sealed true flags 601 signature Ljava/lang/Object;Ljava/lang/constant/ConstantDesc;Ljava/lang/invoke/TypeDescriptor$OfMethod<Ljava/lang/constant/ClassDesc;Ljava/lang/constant/MethodTypeDesc;>;
-innerclass innerClass java/lang/invoke/TypeDescriptor$OfMethod outerClass java/lang/invoke/TypeDescriptor innerClassName OfMethod flags 609
-innerclass innerClass java/lang/invoke/TypeDescriptor$OfField outerClass java/lang/invoke/TypeDescriptor innerClassName OfField flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/invoke/CallSite
-header extends java/lang/Object flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/invoke/LambdaMetafactory
-header extends java/lang/Object flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/invoke/MethodHandles
-method name tableSwitch descriptor (Ljava/lang/invoke/MethodHandle;[Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle; flags 89
-
-class name java/lang/invoke/StringConcatException
-header extends java/lang/Exception flags 21
-
-class name java/lang/module/Configuration
-header extends java/lang/Object flags 31
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/module/FindException
-header extends java/lang/RuntimeException flags 21
-
-class name java/lang/module/InvalidModuleDescriptorException
-header extends java/lang/RuntimeException flags 21
-
-class name java/lang/module/ModuleReader
-header extends java/lang/Object implements java/io/Closeable flags 601
-
-class name java/lang/module/ModuleReference
-header extends java/lang/Object flags 421
-
-class name java/lang/module/ResolutionException
-header extends java/lang/RuntimeException flags 21
-
-class name java/lang/module/ResolvedModule
-header extends java/lang/Object flags 31
-
-class name java/lang/reflect/AccessibleObject
-header extends java/lang/Object implements java/lang/reflect/AnnotatedElement flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
--method name <init> descriptor ()V
-method name <init> descriptor ()V flags 4 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-
-class name java/lang/reflect/AnnotatedElement
-header extends java/lang/Object flags 601
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/reflect/Executable
-header extends java/lang/reflect/AccessibleObject implements java/lang/reflect/Member,java/lang/reflect/GenericDeclaration sealed true flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/reflect/InaccessibleObjectException
-header extends java/lang/RuntimeException flags 21
-
-class name java/lang/runtime/SwitchBootstraps
-header extends java/lang/Object flags 21 classAnnotations @Ljdk/internal/javac/PreviewFeature;(feature=eLjdk/internal/javac/PreviewFeature$Feature;SWITCH_PATTERN_MATCHING;)
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-method name typeSwitch descriptor (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite; flags 89
-method name enumSwitch descriptor (Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite; flags 89
-
-class name java/net/DatagramSocket
--method name setDatagramSocketImplFactory descriptor (Ljava/net/DatagramSocketImplFactory;)V
-method name setDatagramSocketImplFactory descriptor (Ljava/net/DatagramSocketImplFactory;)V thrownTypes java/io/IOException flags 29 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-method name joinGroup descriptor (Ljava/net/SocketAddress;Ljava/net/NetworkInterface;)V thrownTypes java/io/IOException flags 1
-method name leaveGroup descriptor (Ljava/net/SocketAddress;Ljava/net/NetworkInterface;)V thrownTypes java/io/IOException flags 1
-
-class name java/net/ServerSocket
--method name setSocketFactory descriptor (Ljava/net/SocketImplFactory;)V
-method name setSocketFactory descriptor (Ljava/net/SocketImplFactory;)V thrownTypes java/io/IOException flags 29 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-
-class name java/net/Socket
--method name setSocketImplFactory descriptor (Ljava/net/SocketImplFactory;)V
-method name setSocketImplFactory descriptor (Ljava/net/SocketImplFactory;)V thrownTypes java/io/IOException flags 29 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-
-class name java/net/URLDecoder
--method name <init> descriptor ()V
-
-class name java/net/URLStreamHandler
--method name getHostAddress descriptor (Ljava/net/URL;)Ljava/net/InetAddress;
-method name getHostAddress descriptor (Ljava/net/URL;)Ljava/net/InetAddress; flags 4
-
-class name java/net/spi/URLStreamHandlerProvider
-header extends java/lang/Object implements java/net/URLStreamHandlerFactory flags 421
-
-class name java/nio/CharBuffer
-header extends java/nio/Buffer implements java/lang/Comparable,java/lang/Appendable,java/lang/CharSequence,java/lang/Readable flags 421 signature Ljava/nio/Buffer;Ljava/lang/Comparable<Ljava/nio/CharBuffer;>;Ljava/lang/Appendable;Ljava/lang/CharSequence;Ljava/lang/Readable;
-innerclass innerClass java/util/Spliterator$OfInt outerClass java/util/Spliterator innerClassName OfInt flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/nio/MappedByteBuffer
-method name slice descriptor ()Ljava/nio/MappedByteBuffer; flags 401
-method name slice descriptor (II)Ljava/nio/MappedByteBuffer; flags 401
-method name duplicate descriptor ()Ljava/nio/MappedByteBuffer; flags 401
-method name compact descriptor ()Ljava/nio/MappedByteBuffer; flags 401
-method name compact descriptor ()Ljava/nio/ByteBuffer; flags 1041
-method name duplicate descriptor ()Ljava/nio/ByteBuffer; flags 1041
-method name slice descriptor (II)Ljava/nio/ByteBuffer; flags 1041
-method name slice descriptor ()Ljava/nio/ByteBuffer; flags 1041
-method name duplicate descriptor ()Ljava/nio/Buffer; flags 1041
-method name slice descriptor (II)Ljava/nio/Buffer; flags 1041
-method name slice descriptor ()Ljava/nio/Buffer; flags 1041
-
-class name java/security/AccessControlContext
-header extends java/lang/Object flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-
-class name java/security/AccessControlException
-header extends java/lang/SecurityException flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-
-class name java/security/AccessController
-header extends java/lang/Object flags 31 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-
-class name java/security/Certificate
-header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="1.2")
-
-class name java/security/DomainCombiner
-header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-
-class name java/security/Identity
-header extends java/lang/Object implements java/security/Principal,java/io/Serializable flags 421 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="1.2")
-
-class name java/security/Policy
-header extends java/lang/Object nestMembers java/security/Policy$Parameters flags 421 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-innerclass innerClass java/security/Policy$Parameters outerClass java/security/Policy innerClassName Parameters flags 609
-
-class name java/security/Policy$Parameters
-header extends java/lang/Object nestHost java/security/Policy flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-innerclass innerClass java/security/Policy$Parameters outerClass java/security/Policy innerClassName Parameters flags 609
-
-class name java/security/PolicySpi
-header extends java/lang/Object flags 421 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-
-class name java/security/SecureRandom
-header extends java/util/Random flags 21 runtimeAnnotations @Ljdk/internal/util/random/RandomSupport$RandomGeneratorProperties;(name="SecureRandom",isStochastic=Ztrue)
-innerclass innerClass java/security/Provider$Service outerClass java/security/Provider innerClassName Service flags 9
-
-class name java/security/SecureRandomParameters
-header extends java/lang/Object flags 601
-
-class name java/security/SignedObject
-header extends java/lang/Object implements java/io/Serializable flags 31
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-
-class name java/security/cert/CertificateRevokedException
-header extends java/security/cert/CertificateException flags 21
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-
-class name java/security/cert/URICertStoreParameters
-header extends java/lang/Object implements java/security/cert/CertStoreParameters flags 31
-
-class name java/security/interfaces/RSAKey
--method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
-
-class name java/security/spec/MGF1ParameterSpec
--field name SHA512_224 descriptor Ljava/security/spec/MGF1ParameterSpec;
--field name SHA512_256 descriptor Ljava/security/spec/MGF1ParameterSpec;
-field name SHA512_224 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
-field name SHA512_256 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
-
-class name java/security/spec/PSSParameterSpec
--field name TRAILER_FIELD_BC descriptor I
-field name TRAILER_FIELD_BC descriptor I constantValue 1 flags 19
--method name toString descriptor ()Ljava/lang/String;
-method name toString descriptor ()Ljava/lang/String; flags 1
-
-class name java/security/spec/RSAKeyGenParameterSpec
--method name <init> descriptor (ILjava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
--method name getKeyParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-method name <init> descriptor (ILjava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
-method name getKeyParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
-
-class name java/security/spec/RSAMultiPrimePrivateCrtKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;[Ljava/security/spec/RSAOtherPrimeInfo;Ljava/security/spec/AlgorithmParameterSpec;)V
-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;[Ljava/security/spec/RSAOtherPrimeInfo;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
-
-class name java/security/spec/RSAPrivateCrtKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
-
-class name java/security/spec/RSAPrivateKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
--method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
-
-class name java/security/spec/RSAPublicKeySpec
--method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
--method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
-
-class name java/text/DateFormatSymbols
-header extends java/lang/Object implements java/io/Serializable,java/lang/Cloneable flags 21
-innerclass innerClass java/util/Locale$Category outerClass java/util/Locale innerClassName Category flags 4019
-
-class name java/text/RuleBasedCollator
-header extends java/text/Collator flags 21
-innerclass innerClass java/text/Normalizer$Form outerClass java/text/Normalizer innerClassName Form flags 4019
-
-class name java/time/Clock
-header extends java/lang/Object implements java/time/InstantSource flags 421
-
-class name java/time/InstantSource
-header extends java/lang/Object flags 601
-method name system descriptor ()Ljava/time/InstantSource; flags 9
-method name tick descriptor (Ljava/time/InstantSource;Ljava/time/Duration;)Ljava/time/InstantSource; flags 9
-method name fixed descriptor (Ljava/time/Instant;)Ljava/time/InstantSource; flags 9
-method name offset descriptor (Ljava/time/InstantSource;Ljava/time/Duration;)Ljava/time/InstantSource; flags 9
-method name instant descriptor ()Ljava/time/Instant; flags 401
-method name millis descriptor ()J flags 1
-method name withZone descriptor (Ljava/time/ZoneId;)Ljava/time/Clock; flags 1
-
-class name java/time/chrono/ChronoLocalDate
-header extends java/lang/Object implements java/time/temporal/Temporal,java/time/temporal/TemporalAdjuster,java/lang/Comparable flags 601 signature Ljava/lang/Object;Ljava/time/temporal/Temporal;Ljava/time/temporal/TemporalAdjuster;Ljava/lang/Comparable<Ljava/time/chrono/ChronoLocalDate;>;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/time/chrono/ChronoLocalDateTime
-header extends java/lang/Object implements java/time/temporal/Temporal,java/time/temporal/TemporalAdjuster,java/lang/Comparable flags 601 signature <D::Ljava/time/chrono/ChronoLocalDate;>Ljava/lang/Object;Ljava/time/temporal/Temporal;Ljava/time/temporal/TemporalAdjuster;Ljava/lang/Comparable<Ljava/time/chrono/ChronoLocalDateTime<*>;>;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/time/format/DecimalStyle
-header extends java/lang/Object flags 31
-innerclass innerClass java/util/Locale$Category outerClass java/util/Locale innerClassName Category flags 4019
-
-class name java/time/temporal/TemporalAdjusters
-header extends java/lang/Object flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/Comparator
-header extends java/lang/Object flags 601 signature <T:Ljava/lang/Object;>Ljava/lang/Object; runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/DoubleSummaryStatistics
-header extends java/lang/Object implements java/util/function/DoubleConsumer flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/GregorianCalendar
-header extends java/util/Calendar flags 21
-innerclass innerClass java/util/Locale$Category outerClass java/util/Locale innerClassName Category flags 4019
-
-class name java/util/HashSet
-header extends java/util/AbstractSet implements java/util/Set,java/lang/Cloneable,java/io/Serializable flags 21 signature <E:Ljava/lang/Object;>Ljava/util/AbstractSet<TE;>;Ljava/util/Set<TE;>;Ljava/lang/Cloneable;Ljava/io/Serializable;
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-
-class name java/util/HexFormat
-header extends java/lang/Object flags 31
-method name of descriptor ()Ljava/util/HexFormat; flags 9
-method name ofDelimiter descriptor (Ljava/lang/String;)Ljava/util/HexFormat; flags 9
-method name withDelimiter descriptor (Ljava/lang/String;)Ljava/util/HexFormat; flags 1
-method name withPrefix descriptor (Ljava/lang/String;)Ljava/util/HexFormat; flags 1
-method name withSuffix descriptor (Ljava/lang/String;)Ljava/util/HexFormat; flags 1
-method name withUpperCase descriptor ()Ljava/util/HexFormat; flags 1
-method name withLowerCase descriptor ()Ljava/util/HexFormat; flags 1
-method name delimiter descriptor ()Ljava/lang/String; flags 1
-method name prefix descriptor ()Ljava/lang/String; flags 1
-method name suffix descriptor ()Ljava/lang/String; flags 1
-method name isUpperCase descriptor ()Z flags 1
-method name formatHex descriptor ([B)Ljava/lang/String; flags 1
-method name formatHex descriptor ([BII)Ljava/lang/String; flags 1
-method name formatHex descriptor (Ljava/lang/Appendable;[B)Ljava/lang/Appendable; flags 1 signature <A::Ljava/lang/Appendable;>(TA;[B)TA;
-method name formatHex descriptor (Ljava/lang/Appendable;[BII)Ljava/lang/Appendable; flags 1 signature <A::Ljava/lang/Appendable;>(TA;[BII)TA;
-method name parseHex descriptor (Ljava/lang/CharSequence;)[B flags 1
-method name parseHex descriptor (Ljava/lang/CharSequence;II)[B flags 1
-method name parseHex descriptor ([CII)[B flags 1
-method name toLowHexDigit descriptor (I)C flags 1
-method name toHighHexDigit descriptor (I)C flags 1
-method name toHexDigits descriptor (Ljava/lang/Appendable;B)Ljava/lang/Appendable; flags 1 signature <A::Ljava/lang/Appendable;>(TA;B)TA;
-method name toHexDigits descriptor (B)Ljava/lang/String; flags 1
-method name toHexDigits descriptor (C)Ljava/lang/String; flags 1
-method name toHexDigits descriptor (S)Ljava/lang/String; flags 1
-method name toHexDigits descriptor (I)Ljava/lang/String; flags 1
-method name toHexDigits descriptor (J)Ljava/lang/String; flags 1
-method name toHexDigits descriptor (JI)Ljava/lang/String; flags 1
-method name isHexDigit descriptor (I)Z flags 9
-method name fromHexDigit descriptor (I)I flags 9
-method name fromHexDigits descriptor (Ljava/lang/CharSequence;)I flags 9
-method name fromHexDigits descriptor (Ljava/lang/CharSequence;II)I flags 9
-method name fromHexDigitsToLong descriptor (Ljava/lang/CharSequence;)J flags 9
-method name fromHexDigitsToLong descriptor (Ljava/lang/CharSequence;II)J flags 9
-method name equals descriptor (Ljava/lang/Object;)Z flags 1
-method name hashCode descriptor ()I flags 1
-method name toString descriptor ()Ljava/lang/String; flags 1
-
-class name java/util/Locale$IsoCountryCode
-header extends java/lang/Enum nestHost java/util/Locale sealed true flags 4421 signature Ljava/lang/Enum<Ljava/util/Locale$IsoCountryCode;>;
-innerclass innerClass java/util/Locale$IsoCountryCode outerClass java/util/Locale innerClassName IsoCountryCode flags 4409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/Map$Entry
-method name copyOf descriptor (Ljava/util/Map$Entry;)Ljava/util/Map$Entry; flags 9 signature <K:Ljava/lang/Object;V:Ljava/lang/Object;>(Ljava/util/Map$Entry<+TK;+TV;>;)Ljava/util/Map$Entry<TK;TV;>;
-
-class name java/util/Observable
-header extends java/lang/Object flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
-
-class name java/util/Observer
-header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
-
-class name java/util/Random
-header extends java/lang/Object implements java/util/random/RandomGenerator,java/io/Serializable flags 21 runtimeAnnotations @Ljdk/internal/util/random/RandomSupport$RandomGeneratorProperties;(name="Random",i=I48,j=I0,k=I0,equidistribution=I0)
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-
-class name java/util/SplittableRandom
-header extends java/lang/Object implements java/util/random/RandomGenerator,java/util/random/RandomGenerator$SplittableGenerator flags 31 runtimeAnnotations @Ljdk/internal/util/random/RandomSupport$RandomGeneratorProperties;(name="SplittableRandom",i=I64,j=I0,k=I0,equidistribution=I1)
-innerclass innerClass java/util/random/RandomGenerator$SplittableGenerator outerClass java/util/random/RandomGenerator innerClassName SplittableGenerator flags 609
--method name nextInt descriptor (I)I
--method name nextInt descriptor (II)I
--method name nextLong descriptor (J)J
--method name nextLong descriptor (JJ)J
--method name nextDouble descriptor ()D
--method name nextDouble descriptor (D)D
--method name nextDouble descriptor (DD)D
--method name nextBoolean descriptor ()Z
-method name split descriptor (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/SplittableRandom; flags 1
-method name splits descriptor ()Ljava/util/stream/Stream; flags 1 signature ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
-method name splits descriptor (J)Ljava/util/stream/Stream; flags 1 signature (J)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
-method name splits descriptor (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/stream/Stream; flags 1 signature (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
-method name splits descriptor (JLjava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/stream/Stream; flags 1 signature (JLjava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
-method name split descriptor ()Ljava/util/random/RandomGenerator$SplittableGenerator; flags 1041
-method name split descriptor (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/random/RandomGenerator$SplittableGenerator; flags 1041
-
-class name java/util/TimeZone
-header extends java/lang/Object implements java/io/Serializable,java/lang/Cloneable flags 421
-innerclass innerClass java/util/Locale$Category outerClass java/util/Locale innerClassName Category flags 4019
-
-class name java/util/Timer
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/ref/Cleaner$Cleanable outerClass java/lang/ref/Cleaner innerClassName Cleanable flags 609
-
-class name java/util/TreeSet
-header extends java/util/AbstractSet implements java/util/NavigableSet,java/lang/Cloneable,java/io/Serializable flags 21 signature <E:Ljava/lang/Object;>Ljava/util/AbstractSet<TE;>;Ljava/util/NavigableSet<TE;>;Ljava/lang/Cloneable;Ljava/io/Serializable;
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-
-class name java/util/concurrent/ConcurrentMap
-header extends java/lang/Object implements java/util/Map flags 601 signature <K:Ljava/lang/Object;V:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/Map<TK;TV;>;
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/concurrent/ConcurrentSkipListSet
-header extends java/util/AbstractSet implements java/util/NavigableSet,java/lang/Cloneable,java/io/Serializable flags 21 signature <E:Ljava/lang/Object;>Ljava/util/AbstractSet<TE;>;Ljava/util/NavigableSet<TE;>;Ljava/lang/Cloneable;Ljava/io/Serializable;
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/concurrent/CountedCompleter
-header extends java/util/concurrent/ForkJoinTask flags 421 signature <T:Ljava/lang/Object;>Ljava/util/concurrent/ForkJoinTask<TT;>;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/concurrent/Executors
--method name privilegedThreadFactory descriptor ()Ljava/util/concurrent/ThreadFactory;
--method name privilegedCallable descriptor (Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Callable;
--method name privilegedCallableUsingCurrentClassLoader descriptor (Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Callable;
-method name privilegedThreadFactory descriptor ()Ljava/util/concurrent/ThreadFactory; flags 9 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-method name privilegedCallable descriptor (Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Callable; flags 9 deprecated true signature <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Callable<TT;>; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-method name privilegedCallableUsingCurrentClassLoader descriptor (Ljava/util/concurrent/Callable;)Ljava/util/concurrent/Callable; flags 9 deprecated true signature <T:Ljava/lang/Object;>(Ljava/util/concurrent/Callable<TT;>;)Ljava/util/concurrent/Callable<TT;>; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-
-class name java/util/concurrent/ForkJoinPool
-header extends java/util/concurrent/AbstractExecutorService nestMembers java/util/concurrent/ForkJoinPool$ManagedBlocker,java/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory flags 21
-innerclass innerClass java/util/concurrent/ForkJoinPool$ForkJoinWorkerThreadFactory outerClass java/util/concurrent/ForkJoinPool innerClassName ForkJoinWorkerThreadFactory flags 609
-innerclass innerClass java/util/concurrent/ForkJoinPool$ManagedBlocker outerClass java/util/concurrent/ForkJoinPool innerClassName ManagedBlocker flags 609
-innerclass innerClass java/lang/Thread$UncaughtExceptionHandler outerClass java/lang/Thread innerClassName UncaughtExceptionHandler flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-method name invokeAll descriptor (Ljava/util/Collection;JLjava/util/concurrent/TimeUnit;)Ljava/util/List; thrownTypes java/lang/InterruptedException flags 1 signature <T:Ljava/lang/Object;>(Ljava/util/Collection<+Ljava/util/concurrent/Callable<TT;>;>;JLjava/util/concurrent/TimeUnit;)Ljava/util/List<Ljava/util/concurrent/Future<TT;>;>;
-method name invokeAny descriptor (Ljava/util/Collection;)Ljava/lang/Object; thrownTypes java/lang/InterruptedException,java/util/concurrent/ExecutionException flags 1 signature <T:Ljava/lang/Object;>(Ljava/util/Collection<+Ljava/util/concurrent/Callable<TT;>;>;)TT;
-method name invokeAny descriptor (Ljava/util/Collection;JLjava/util/concurrent/TimeUnit;)Ljava/lang/Object; thrownTypes java/lang/InterruptedException,java/util/concurrent/ExecutionException,java/util/concurrent/TimeoutException flags 1 signature <T:Ljava/lang/Object;>(Ljava/util/Collection<+Ljava/util/concurrent/Callable<TT;>;>;JLjava/util/concurrent/TimeUnit;)TT;
-
-class name java/util/concurrent/ForkJoinWorkerThread
-header extends java/lang/Thread flags 21
-innerclass innerClass java/lang/Thread$UncaughtExceptionHandler outerClass java/lang/Thread innerClassName UncaughtExceptionHandler flags 609
-
-class name java/util/concurrent/LinkedTransferQueue
-header extends java/util/AbstractQueue implements java/util/concurrent/TransferQueue,java/io/Serializable flags 21 signature <E:Ljava/lang/Object;>Ljava/util/AbstractQueue<TE;>;Ljava/util/concurrent/TransferQueue<TE;>;Ljava/io/Serializable;
-innerclass innerClass java/util/concurrent/ForkJoinPool$ManagedBlocker outerClass java/util/concurrent/ForkJoinPool innerClassName ManagedBlocker flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/concurrent/ThreadLocalRandom
-header extends java/util/Random flags 21 runtimeAnnotations @Ljdk/internal/util/random/RandomSupport$RandomGeneratorProperties;(name="ThreadLocalRandom",i=I64,j=I0,k=I0,equidistribution=I1)
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
--method name nextGaussian descriptor ()D
-method name nextFloat descriptor (F)F flags 1
-method name nextFloat descriptor (FF)F flags 1
-
-class name java/util/concurrent/atomic/AtomicBoolean
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/concurrent/atomic/AtomicReference
-header extends java/lang/Object implements java/io/Serializable flags 21 signature <V:Ljava/lang/Object;>Ljava/lang/Object;Ljava/io/Serializable;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/concurrent/atomic/AtomicReferenceArray
-header extends java/lang/Object implements java/io/Serializable flags 21 signature <E:Ljava/lang/Object;>Ljava/lang/Object;Ljava/io/Serializable;
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/concurrent/locks/StampedLock
-header extends java/lang/Object implements java/io/Serializable flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
--method name tryWriteLock descriptor ()J
--method name writeLockInterruptibly descriptor ()J
--method name tryReadLock descriptor ()J
--method name tryReadLock descriptor (JLjava/util/concurrent/TimeUnit;)J
--method name readLockInterruptibly descriptor ()J
--method name unlock descriptor (J)V
-method name tryWriteLock descriptor ()J flags 1
-method name writeLockInterruptibly descriptor ()J thrownTypes java/lang/InterruptedException flags 1
-method name tryReadLock descriptor ()J flags 1
-method name tryReadLock descriptor (JLjava/util/concurrent/TimeUnit;)J thrownTypes java/lang/InterruptedException flags 1
-method name readLockInterruptibly descriptor ()J thrownTypes java/lang/InterruptedException flags 1
-method name unlock descriptor (J)V flags 1
-
-class name java/util/function/BiConsumer
-header extends java/lang/Object flags 601 signature <T:Ljava/lang/Object;U:Ljava/lang/Object;>Ljava/lang/Object; runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/BiFunction
-header extends java/lang/Object flags 601 signature <T:Ljava/lang/Object;U:Ljava/lang/Object;R:Ljava/lang/Object;>Ljava/lang/Object; runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/BiPredicate
-header extends java/lang/Object flags 601 signature <T:Ljava/lang/Object;U:Ljava/lang/Object;>Ljava/lang/Object; runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/BinaryOperator
-header extends java/lang/Object implements java/util/function/BiFunction flags 601 signature <T:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/function/BiFunction<TT;TT;TT;>; runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/Consumer
-header extends java/lang/Object flags 601 signature <T:Ljava/lang/Object;>Ljava/lang/Object; runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/DoubleConsumer
-header extends java/lang/Object flags 601 runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/DoublePredicate
-header extends java/lang/Object flags 601 runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/DoubleUnaryOperator
-header extends java/lang/Object flags 601 runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/Function
-header extends java/lang/Object flags 601 signature <T:Ljava/lang/Object;R:Ljava/lang/Object;>Ljava/lang/Object; runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/IntConsumer
-header extends java/lang/Object flags 601 runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/IntPredicate
-header extends java/lang/Object flags 601 runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/IntUnaryOperator
-header extends java/lang/Object flags 601 runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/LongConsumer
-header extends java/lang/Object flags 601 runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/LongPredicate
-header extends java/lang/Object flags 601 runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/LongUnaryOperator
-header extends java/lang/Object flags 601 runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/Predicate
-header extends java/lang/Object flags 601 signature <T:Ljava/lang/Object;>Ljava/lang/Object; runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/function/UnaryOperator
-header extends java/lang/Object implements java/util/function/Function flags 601 signature <T:Ljava/lang/Object;>Ljava/lang/Object;Ljava/util/function/Function<TT;TT;>; runtimeAnnotations @Ljava/lang/FunctionalInterface;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/random/RandomGenerator
-header extends java/lang/Object nestMembers java/util/random/RandomGenerator$ArbitrarilyJumpableGenerator,java/util/random/RandomGenerator$LeapableGenerator,java/util/random/RandomGenerator$JumpableGenerator,java/util/random/RandomGenerator$SplittableGenerator,java/util/random/RandomGenerator$StreamableGenerator flags 601
-innerclass innerClass java/util/random/RandomGenerator$ArbitrarilyJumpableGenerator outerClass java/util/random/RandomGenerator innerClassName ArbitrarilyJumpableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$LeapableGenerator outerClass java/util/random/RandomGenerator innerClassName LeapableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$JumpableGenerator outerClass java/util/random/RandomGenerator innerClassName JumpableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$SplittableGenerator outerClass java/util/random/RandomGenerator innerClassName SplittableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$StreamableGenerator outerClass java/util/random/RandomGenerator innerClassName StreamableGenerator flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-method name of descriptor (Ljava/lang/String;)Ljava/util/random/RandomGenerator; flags 9
-method name getDefault descriptor ()Ljava/util/random/RandomGenerator; flags 9
-method name isDeprecated descriptor ()Z flags 1
-method name doubles descriptor ()Ljava/util/stream/DoubleStream; flags 1
-method name doubles descriptor (DD)Ljava/util/stream/DoubleStream; flags 1
-method name doubles descriptor (J)Ljava/util/stream/DoubleStream; flags 1
-method name doubles descriptor (JDD)Ljava/util/stream/DoubleStream; flags 1
-method name ints descriptor ()Ljava/util/stream/IntStream; flags 1
-method name ints descriptor (II)Ljava/util/stream/IntStream; flags 1
-method name ints descriptor (J)Ljava/util/stream/IntStream; flags 1
-method name ints descriptor (JII)Ljava/util/stream/IntStream; flags 1
-method name longs descriptor ()Ljava/util/stream/LongStream; flags 1
-method name longs descriptor (JJ)Ljava/util/stream/LongStream; flags 1
-method name longs descriptor (J)Ljava/util/stream/LongStream; flags 1
-method name longs descriptor (JJJ)Ljava/util/stream/LongStream; flags 1
-method name nextBoolean descriptor ()Z flags 1
-method name nextBytes descriptor ([B)V flags 1
-method name nextFloat descriptor ()F flags 1
-method name nextFloat descriptor (F)F flags 1
-method name nextFloat descriptor (FF)F flags 1
-method name nextDouble descriptor ()D flags 1
-method name nextDouble descriptor (D)D flags 1
-method name nextDouble descriptor (DD)D flags 1
-method name nextInt descriptor ()I flags 1
-method name nextInt descriptor (I)I flags 1
-method name nextInt descriptor (II)I flags 1
-method name nextLong descriptor ()J flags 401
-method name nextLong descriptor (J)J flags 1
-method name nextLong descriptor (JJ)J flags 1
-method name nextGaussian descriptor ()D flags 1
-method name nextGaussian descriptor (DD)D flags 1
-method name nextExponential descriptor ()D flags 1
-
-class name java/util/random/RandomGenerator$ArbitrarilyJumpableGenerator
-header extends java/lang/Object implements java/util/random/RandomGenerator$LeapableGenerator nestHost java/util/random/RandomGenerator flags 601
-innerclass innerClass java/util/random/RandomGenerator$ArbitrarilyJumpableGenerator outerClass java/util/random/RandomGenerator innerClassName ArbitrarilyJumpableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$LeapableGenerator outerClass java/util/random/RandomGenerator innerClassName LeapableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$JumpableGenerator outerClass java/util/random/RandomGenerator innerClassName JumpableGenerator flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-method name of descriptor (Ljava/lang/String;)Ljava/util/random/RandomGenerator$ArbitrarilyJumpableGenerator; flags 9
-method name copy descriptor ()Ljava/util/random/RandomGenerator$ArbitrarilyJumpableGenerator; flags 401
-method name jumpPowerOfTwo descriptor (I)V flags 401
-method name jump descriptor (D)V flags 401
-method name jump descriptor ()V flags 1
-method name jumps descriptor (D)Ljava/util/stream/Stream; flags 1 signature (D)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$ArbitrarilyJumpableGenerator;>;
-method name jumps descriptor (JD)Ljava/util/stream/Stream; flags 1 signature (JD)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$ArbitrarilyJumpableGenerator;>;
-method name leap descriptor ()V flags 1
-method name copyAndJump descriptor (D)Ljava/util/random/RandomGenerator$ArbitrarilyJumpableGenerator; flags 1
-method name copy descriptor ()Ljava/util/random/RandomGenerator$LeapableGenerator; flags 1041
-method name copy descriptor ()Ljava/util/random/RandomGenerator$JumpableGenerator; flags 1041
-
-class name java/util/random/RandomGenerator$JumpableGenerator
-header extends java/lang/Object implements java/util/random/RandomGenerator$StreamableGenerator nestHost java/util/random/RandomGenerator flags 601
-innerclass innerClass java/util/random/RandomGenerator$JumpableGenerator outerClass java/util/random/RandomGenerator innerClassName JumpableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$StreamableGenerator outerClass java/util/random/RandomGenerator innerClassName StreamableGenerator flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-method name of descriptor (Ljava/lang/String;)Ljava/util/random/RandomGenerator$JumpableGenerator; flags 9
-method name copy descriptor ()Ljava/util/random/RandomGenerator$JumpableGenerator; flags 401
-method name jump descriptor ()V flags 401
-method name jumpDistance descriptor ()D flags 401
-method name jumps descriptor ()Ljava/util/stream/Stream; flags 1 signature ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator;>;
-method name jumps descriptor (J)Ljava/util/stream/Stream; flags 1 signature (J)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator;>;
-method name rngs descriptor ()Ljava/util/stream/Stream; flags 1 signature ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator;>;
-method name rngs descriptor (J)Ljava/util/stream/Stream; flags 1 signature (J)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator;>;
-method name copyAndJump descriptor ()Ljava/util/random/RandomGenerator; flags 1
-
-class name java/util/random/RandomGenerator$LeapableGenerator
-header extends java/lang/Object implements java/util/random/RandomGenerator$JumpableGenerator nestHost java/util/random/RandomGenerator flags 601
-innerclass innerClass java/util/random/RandomGenerator$LeapableGenerator outerClass java/util/random/RandomGenerator innerClassName LeapableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$JumpableGenerator outerClass java/util/random/RandomGenerator innerClassName JumpableGenerator flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-method name of descriptor (Ljava/lang/String;)Ljava/util/random/RandomGenerator$LeapableGenerator; flags 9
-method name copy descriptor ()Ljava/util/random/RandomGenerator$LeapableGenerator; flags 401
-method name leap descriptor ()V flags 401
-method name leapDistance descriptor ()D flags 401
-method name leaps descriptor ()Ljava/util/stream/Stream; flags 1 signature ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$JumpableGenerator;>;
-method name leaps descriptor (J)Ljava/util/stream/Stream; flags 1 signature (J)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$JumpableGenerator;>;
-method name copyAndLeap descriptor ()Ljava/util/random/RandomGenerator$JumpableGenerator; flags 1
-method name copy descriptor ()Ljava/util/random/RandomGenerator$JumpableGenerator; flags 1041
-
-class name java/util/random/RandomGenerator$SplittableGenerator
-header extends java/lang/Object implements java/util/random/RandomGenerator$StreamableGenerator nestHost java/util/random/RandomGenerator flags 601
-innerclass innerClass java/util/random/RandomGenerator$SplittableGenerator outerClass java/util/random/RandomGenerator innerClassName SplittableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$StreamableGenerator outerClass java/util/random/RandomGenerator innerClassName StreamableGenerator flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-method name of descriptor (Ljava/lang/String;)Ljava/util/random/RandomGenerator$SplittableGenerator; flags 9
-method name split descriptor ()Ljava/util/random/RandomGenerator$SplittableGenerator; flags 401
-method name split descriptor (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/random/RandomGenerator$SplittableGenerator; flags 401
-method name splits descriptor ()Ljava/util/stream/Stream; flags 1 signature ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
-method name splits descriptor (J)Ljava/util/stream/Stream; flags 401 signature (J)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
-method name splits descriptor (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/stream/Stream; flags 401 signature (Ljava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
-method name splits descriptor (JLjava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/stream/Stream; flags 401 signature (JLjava/util/random/RandomGenerator$SplittableGenerator;)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator$SplittableGenerator;>;
-method name rngs descriptor ()Ljava/util/stream/Stream; flags 1 signature ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator;>;
-method name rngs descriptor (J)Ljava/util/stream/Stream; flags 1 signature (J)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator;>;
-
-class name java/util/random/RandomGenerator$StreamableGenerator
-header extends java/lang/Object implements java/util/random/RandomGenerator nestHost java/util/random/RandomGenerator flags 601
-innerclass innerClass java/util/random/RandomGenerator$StreamableGenerator outerClass java/util/random/RandomGenerator innerClassName StreamableGenerator flags 609
-method name of descriptor (Ljava/lang/String;)Ljava/util/random/RandomGenerator$StreamableGenerator; flags 9
-method name rngs descriptor ()Ljava/util/stream/Stream; flags 401 signature ()Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator;>;
-method name rngs descriptor (J)Ljava/util/stream/Stream; flags 1 signature (J)Ljava/util/stream/Stream<Ljava/util/random/RandomGenerator;>;
-
-class name java/util/random/RandomGeneratorFactory
-header extends java/lang/Object flags 31 signature <T::Ljava/util/random/RandomGenerator;>Ljava/lang/Object;
-innerclass innerClass java/util/ServiceLoader$Provider outerClass java/util/ServiceLoader innerClassName Provider flags 609
-innerclass innerClass java/util/random/RandomGenerator$ArbitrarilyJumpableGenerator outerClass java/util/random/RandomGenerator innerClassName ArbitrarilyJumpableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$JumpableGenerator outerClass java/util/random/RandomGenerator innerClassName JumpableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$LeapableGenerator outerClass java/util/random/RandomGenerator innerClassName LeapableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$SplittableGenerator outerClass java/util/random/RandomGenerator innerClassName SplittableGenerator flags 609
-innerclass innerClass java/util/random/RandomGenerator$StreamableGenerator outerClass java/util/random/RandomGenerator innerClassName StreamableGenerator flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-method name of descriptor (Ljava/lang/String;)Ljava/util/random/RandomGeneratorFactory; flags 9 signature <T::Ljava/util/random/RandomGenerator;>(Ljava/lang/String;)Ljava/util/random/RandomGeneratorFactory<TT;>;
-method name getDefault descriptor ()Ljava/util/random/RandomGeneratorFactory; flags 9 signature ()Ljava/util/random/RandomGeneratorFactory<Ljava/util/random/RandomGenerator;>;
-method name all descriptor ()Ljava/util/stream/Stream; flags 9 signature ()Ljava/util/stream/Stream<Ljava/util/random/RandomGeneratorFactory<Ljava/util/random/RandomGenerator;>;>;
-method name name descriptor ()Ljava/lang/String; flags 1
-method name group descriptor ()Ljava/lang/String; flags 1
-method name stateBits descriptor ()I flags 1
-method name equidistribution descriptor ()I flags 1
-method name period descriptor ()Ljava/math/BigInteger; flags 1
-method name isStatistical descriptor ()Z flags 1
-method name isStochastic descriptor ()Z flags 1
-method name isHardware descriptor ()Z flags 1
-method name isArbitrarilyJumpable descriptor ()Z flags 1
-method name isJumpable descriptor ()Z flags 1
-method name isLeapable descriptor ()Z flags 1
-method name isSplittable descriptor ()Z flags 1
-method name isStreamable descriptor ()Z flags 1
-method name isDeprecated descriptor ()Z flags 1
-method name create descriptor ()Ljava/util/random/RandomGenerator; flags 1 signature ()TT;
-method name create descriptor (J)Ljava/util/random/RandomGenerator; flags 1 signature (J)TT;
-method name create descriptor ([B)Ljava/util/random/RandomGenerator; flags 1 signature ([B)TT;
-
-class name java/util/spi/AbstractResourceBundleProvider
-header extends java/lang/Object implements java/util/spi/ResourceBundleProvider flags 421
-innerclass innerClass java/util/ResourceBundle$Control outerClass java/util/ResourceBundle innerClassName Control flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/spi/CurrencyNameProvider
-header extends java/util/spi/LocaleServiceProvider flags 421
-innerclass innerClass java/util/ResourceBundle$Control outerClass java/util/ResourceBundle innerClassName Control flags 9
-
-class name java/util/spi/ResourceBundleProvider
-header extends java/lang/Object flags 601
-
-class name java/util/spi/ToolProvider
-header extends java/lang/Object flags 601
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/zip/CRC32C
-header extends java/lang/Object implements java/util/zip/Checksum flags 31
-
-class name javax/crypto/AEADBadTagException
-header extends javax/crypto/BadPaddingException flags 21
-
-class name javax/crypto/BadPaddingException
-header extends java/security/GeneralSecurityException flags 21
-
-class name javax/crypto/CipherInputStream
-header extends java/io/FilterInputStream flags 21
-
-class name javax/crypto/CipherOutputStream
-header extends java/io/FilterOutputStream flags 21
-
-class name javax/crypto/CipherSpi
-header extends java/lang/Object flags 421
-
-class name javax/crypto/EncryptedPrivateKeyInfo
-header extends java/lang/Object flags 21
-
-class name javax/crypto/ExemptionMechanism
-header extends java/lang/Object flags 21
-
-class name javax/crypto/ExemptionMechanismException
-header extends java/security/GeneralSecurityException flags 21
-
-class name javax/crypto/ExemptionMechanismSpi
-header extends java/lang/Object flags 421
-
-class name javax/crypto/IllegalBlockSizeException
-header extends java/security/GeneralSecurityException flags 21
-
-class name javax/crypto/KeyAgreement
-header extends java/lang/Object flags 21
-innerclass innerClass java/security/Provider$Service outerClass java/security/Provider innerClassName Service flags 9
-
-class name javax/crypto/KeyAgreementSpi
-header extends java/lang/Object flags 421
-
-class name javax/crypto/KeyGenerator
-header extends java/lang/Object flags 21
-innerclass innerClass java/security/Provider$Service outerClass java/security/Provider innerClassName Service flags 9
-
-class name javax/crypto/KeyGeneratorSpi
-header extends java/lang/Object flags 421
-
-class name javax/crypto/Mac
-header extends java/lang/Object implements java/lang/Cloneable flags 21
-innerclass innerClass java/security/Provider$Service outerClass java/security/Provider innerClassName Service flags 9
-
-class name javax/crypto/MacSpi
-header extends java/lang/Object flags 421
-
-class name javax/crypto/NoSuchPaddingException
-header extends java/security/GeneralSecurityException flags 21
-
-class name javax/crypto/NullCipher
-header extends javax/crypto/Cipher flags 21
-
-class name javax/crypto/SealedObject
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/crypto/SecretKey
-header extends java/lang/Object implements java/security/Key,javax/security/auth/Destroyable flags 601
-
-class name javax/crypto/SecretKeyFactory
-header extends java/lang/Object flags 21
-innerclass innerClass java/security/Provider$Service outerClass java/security/Provider innerClassName Service flags 9
-
-class name javax/crypto/SecretKeyFactorySpi
-header extends java/lang/Object flags 421
-
-class name javax/crypto/ShortBufferException
-header extends java/security/GeneralSecurityException flags 21
-
-class name javax/crypto/interfaces/DHKey
-header extends java/lang/Object flags 601
-
-class name javax/crypto/interfaces/DHPrivateKey
-header extends java/lang/Object implements javax/crypto/interfaces/DHKey,java/security/PrivateKey flags 601
-
-class name javax/crypto/interfaces/DHPublicKey
-header extends java/lang/Object implements javax/crypto/interfaces/DHKey,java/security/PublicKey flags 601
-
-class name javax/crypto/interfaces/PBEKey
-header extends java/lang/Object implements javax/crypto/SecretKey flags 601
-
-class name javax/crypto/spec/DESKeySpec
-header extends java/lang/Object implements java/security/spec/KeySpec flags 21
-
-class name javax/crypto/spec/DESedeKeySpec
-header extends java/lang/Object implements java/security/spec/KeySpec flags 21
-
-class name javax/crypto/spec/DHGenParameterSpec
-header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21
-
-class name javax/crypto/spec/DHParameterSpec
-header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21
-
-class name javax/crypto/spec/DHPrivateKeySpec
-header extends java/lang/Object implements java/security/spec/KeySpec flags 21
-
-class name javax/crypto/spec/DHPublicKeySpec
-header extends java/lang/Object implements java/security/spec/KeySpec flags 21
-
-class name javax/crypto/spec/GCMParameterSpec
-header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21
-
-class name javax/crypto/spec/IvParameterSpec
-header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21
-
-class name javax/crypto/spec/OAEPParameterSpec
-header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21
-innerclass innerClass javax/crypto/spec/PSource$PSpecified outerClass javax/crypto/spec/PSource innerClassName PSpecified flags 19
-
-class name javax/crypto/spec/PBEKeySpec
-header extends java/lang/Object implements java/security/spec/KeySpec flags 21
-
-class name javax/crypto/spec/PBEParameterSpec
-header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21
-
-class name javax/crypto/spec/RC2ParameterSpec
-header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21
-
-class name javax/crypto/spec/RC5ParameterSpec
-header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21
-
-class name javax/crypto/spec/SecretKeySpec
-header extends java/lang/Object implements java/security/spec/KeySpec,javax/crypto/SecretKey flags 21
-
-class name javax/security/auth/Subject
--method name getSubject descriptor (Ljava/security/AccessControlContext;)Ljavax/security/auth/Subject;
--method name doAsPrivileged descriptor (Ljavax/security/auth/Subject;Ljava/security/PrivilegedAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;
--method name doAsPrivileged descriptor (Ljavax/security/auth/Subject;Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;)Ljava/lang/Object;
-method name getSubject descriptor (Ljava/security/AccessControlContext;)Ljavax/security/auth/Subject; flags 9 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-method name doAsPrivileged descriptor (Ljavax/security/auth/Subject;Ljava/security/PrivilegedAction;Ljava/security/AccessControlContext;)Ljava/lang/Object; flags 9 deprecated true signature <T:Ljava/lang/Object;>(Ljavax/security/auth/Subject;Ljava/security/PrivilegedAction<TT;>;Ljava/security/AccessControlContext;)TT; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-method name doAsPrivileged descriptor (Ljavax/security/auth/Subject;Ljava/security/PrivilegedExceptionAction;Ljava/security/AccessControlContext;)Ljava/lang/Object; thrownTypes java/security/PrivilegedActionException flags 9 deprecated true signature <T:Ljava/lang/Object;>(Ljavax/security/auth/Subject;Ljava/security/PrivilegedExceptionAction<TT;>;Ljava/security/AccessControlContext;)TT; runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-
-class name javax/security/auth/SubjectDomainCombiner
-header extends java/lang/Object implements java/security/DomainCombiner flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-

make/data/symbols/java.compiler-H.sym.txt

@@ -1,123 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name javax/annotation/processing/AbstractProcessor
-header extends java/lang/Object implements javax/annotation/processing/Processor flags 421
-innerclass innerClass javax/tools/Diagnostic$Kind outerClass javax/tools/Diagnostic innerClassName Kind flags 4019
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/annotation/processing/Generated
-header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;SOURCE;)@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;PACKAGE;eLjava/lang/annotation/ElementType;TYPE;eLjava/lang/annotation/ElementType;METHOD;eLjava/lang/annotation/ElementType;CONSTRUCTOR;eLjava/lang/annotation/ElementType;FIELD;eLjava/lang/annotation/ElementType;LOCAL_VARIABLE;eLjava/lang/annotation/ElementType;PARAMETER;})
-
-class name javax/lang/model/SourceVersion
-field name RELEASE_17 descriptor Ljavax/lang/model/SourceVersion; flags 4019
-
-class name javax/lang/model/element/Modifier
-header extends java/lang/Enum sealed true flags 4021 signature Ljava/lang/Enum<Ljavax/lang/model/element/Modifier;>;
--field name SEALED descriptor Ljavax/lang/model/element/Modifier;
--field name NON_SEALED descriptor Ljavax/lang/model/element/Modifier;
-field name SEALED descriptor Ljavax/lang/model/element/Modifier; flags 4019
-field name NON_SEALED descriptor Ljavax/lang/model/element/Modifier; flags 4019
-
-class name javax/lang/model/element/TypeElement
--method name getPermittedSubclasses descriptor ()Ljava/util/List;
-method name getPermittedSubclasses descriptor ()Ljava/util/List; flags 1 signature ()Ljava/util/List<+Ljavax/lang/model/type/TypeMirror;>;
-
-class name javax/lang/model/element/UnknownAnnotationValueException
-header extends javax/lang/model/UnknownEntityException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/lang/model/element/UnknownDirectiveException
-header extends javax/lang/model/UnknownEntityException flags 21
-innerclass innerClass javax/lang/model/element/ModuleElement$Directive outerClass javax/lang/model/element/ModuleElement innerClassName Directive flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/lang/model/element/UnknownElementException
-header extends javax/lang/model/UnknownEntityException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/lang/model/type/MirroredTypeException
-header extends javax/lang/model/type/MirroredTypesException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/lang/model/type/MirroredTypesException
-header extends java/lang/RuntimeException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/lang/model/type/UnknownTypeException
-header extends javax/lang/model/UnknownEntityException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/lang/model/util/AbstractAnnotationValueVisitor14
-header extends javax/lang/model/util/AbstractAnnotationValueVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractAnnotationValueVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)
-
-class name javax/lang/model/util/AbstractElementVisitor14
-header extends javax/lang/model/util/AbstractElementVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractElementVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)
-
-class name javax/lang/model/util/AbstractTypeVisitor14
-header extends javax/lang/model/util/AbstractTypeVisitor9 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)
-
-class name javax/lang/model/util/AbstractTypeVisitor6
-header extends java/lang/Object implements javax/lang/model/type/TypeVisitor flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljava/lang/Object;Ljavax/lang/model/type/TypeVisitor<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_6;)
-
-class name javax/lang/model/util/AbstractTypeVisitor7
-header extends javax/lang/model/util/AbstractTypeVisitor6 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor6<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_7;)
-
-class name javax/lang/model/util/AbstractTypeVisitor8
-header extends javax/lang/model/util/AbstractTypeVisitor7 flags 421 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/AbstractTypeVisitor7<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_8;)
-
-class name javax/lang/model/util/ElementKindVisitor14
-header extends javax/lang/model/util/ElementKindVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/ElementKindVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)
-
-class name javax/lang/model/util/ElementScanner14
-header extends javax/lang/model/util/ElementScanner9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/ElementScanner9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)
-
-class name javax/lang/model/util/Elements
-method name isAutomaticModule descriptor (Ljavax/lang/model/element/ModuleElement;)Z flags 1
-
-class name javax/lang/model/util/SimpleAnnotationValueVisitor14
-header extends javax/lang/model/util/SimpleAnnotationValueVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleAnnotationValueVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)
-
-class name javax/lang/model/util/SimpleElementVisitor14
-header extends javax/lang/model/util/SimpleElementVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleElementVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)
-
-class name javax/lang/model/util/SimpleTypeVisitor14
-header extends javax/lang/model/util/SimpleTypeVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/SimpleTypeVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)
-
-class name javax/lang/model/util/TypeKindVisitor14
-header extends javax/lang/model/util/TypeKindVisitor9 flags 21 signature <R:Ljava/lang/Object;P:Ljava/lang/Object;>Ljavax/lang/model/util/TypeKindVisitor9<TR;TP;>; runtimeAnnotations @Ljavax/annotation/processing/SupportedSourceVersion;(value=eLjavax/lang/model/SourceVersion;RELEASE_17;)
-
-class name javax/tools/SimpleJavaFileObject
-header extends java/lang/Object implements javax/tools/JavaFileObject flags 21
-innerclass innerClass javax/tools/JavaFileObject$Kind outerClass javax/tools/JavaFileObject innerClassName Kind flags 4019
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/tools/ToolProvider
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-

make/data/symbols/java.datatransfer-H.sym.txt

@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name java/awt/datatransfer/Clipboard
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/datatransfer/DataFlavor
-header extends java/lang/Object implements java/io/Externalizable,java/lang/Cloneable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
--field name selectionHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor;
--field name fragmentHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor;
--field name allHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor;
-field name selectionHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor; flags 19
-field name fragmentHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor; flags 19
-field name allHtmlFlavor descriptor Ljava/awt/datatransfer/DataFlavor; flags 19
-

make/data/symbols/java.desktop-H.sym.txt

@@ -1,902 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name java/applet/Applet
-header extends java/awt/Panel nestMembers java/applet/Applet$AccessibleApplet flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="9")
-innerclass innerClass java/applet/Applet$AccessibleApplet outerClass java/applet/Applet innerClassName AccessibleApplet flags 4
-
-class name java/applet/AppletContext
-header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="9")
-
-class name java/applet/AppletStub
-header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="9")
-
-class name java/applet/AudioClip
-header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="9")
-
-class name java/awt/AWTKeyStroke
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/AttributeValue
-header extends java/lang/Object flags 420
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/BorderLayout
-header extends java/lang/Object implements java/awt/LayoutManager2,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/CheckboxGroup
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/Color
-header extends java/lang/Object implements java/awt/Paint,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/ContainerOrderFocusTraversalPolicy
-header extends java/awt/FocusTraversalPolicy implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/Dimension
-header extends java/awt/geom/Dimension2D implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/DisplayMode
-header extends java/lang/Object flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/Event
-header extends java/lang/Object implements java/io/Serializable flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/FlowLayout
-header extends java/lang/Object implements java/awt/LayoutManager,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/FontMetrics
-header extends java/lang/Object implements java/io/Serializable flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/Graphics
-header extends java/lang/Object flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/GridBagLayoutInfo
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/awt/Component$BaselineResizeBehavior outerClass java/awt/Component innerClassName BaselineResizeBehavior flags 4019
-
-class name java/awt/GridLayout
-header extends java/lang/Object implements java/awt/LayoutManager,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/HeadlessException
-header extends java/lang/UnsupportedOperationException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/Insets
-header extends java/lang/Object implements java/lang/Cloneable,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/MenuShortcut
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/Point
-header extends java/awt/geom/Point2D implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/Rectangle
-header extends java/awt/geom/Rectangle2D implements java/awt/Shape,java/io/Serializable flags 21
-innerclass innerClass java/awt/geom/Rectangle2D$Double outerClass java/awt/geom/Rectangle2D innerClassName Double flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/SystemColor
-header extends java/awt/Color implements java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/TexturePaint
-header extends java/lang/Object implements java/awt/Paint flags 21
-innerclass innerClass java/awt/geom/Rectangle2D$Double outerClass java/awt/geom/Rectangle2D innerClassName Double flags 9
-
-class name java/awt/color/ColorSpace
-header extends java/lang/Object implements java/io/Serializable flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/color/ICC_ColorSpace
-header extends java/awt/color/ColorSpace flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
-
-class name java/awt/desktop/AboutEvent
-header extends java/awt/desktop/AppEvent flags 31
-
-class name java/awt/desktop/AboutHandler
-header extends java/lang/Object flags 601
-
-class name java/awt/desktop/AppEvent
-header extends java/util/EventObject flags 21
-
-class name java/awt/desktop/AppForegroundEvent
-header extends java/awt/desktop/AppEvent flags 31
-
-class name java/awt/desktop/AppForegroundListener
-header extends java/lang/Object implements java/awt/desktop/SystemEventListener flags 601
-
-class name java/awt/desktop/AppHiddenEvent
-header extends java/awt/desktop/AppEvent flags 31
-
-class name java/awt/desktop/AppHiddenListener
-header extends java/lang/Object implements java/awt/desktop/SystemEventListener flags 601
-
-class name java/awt/desktop/AppReopenedEvent
-header extends java/awt/desktop/AppEvent flags 31
-
-class name java/awt/desktop/AppReopenedListener
-header extends java/lang/Object implements java/awt/desktop/SystemEventListener flags 601
-
-class name java/awt/desktop/FilesEvent
-header extends java/awt/desktop/AppEvent flags 21
-
-class name java/awt/desktop/OpenFilesEvent
-header extends java/awt/desktop/FilesEvent flags 31
-
-class name java/awt/desktop/OpenFilesHandler
-header extends java/lang/Object flags 601
-
-class name java/awt/desktop/OpenURIEvent
-header extends java/awt/desktop/AppEvent flags 31
-
-class name java/awt/desktop/OpenURIHandler
-header extends java/lang/Object flags 601
-
-class name java/awt/desktop/PreferencesEvent
-header extends java/awt/desktop/AppEvent flags 31
-
-class name java/awt/desktop/PreferencesHandler
-header extends java/lang/Object flags 601
-
-class name java/awt/desktop/PrintFilesEvent
-header extends java/awt/desktop/FilesEvent flags 31
-
-class name java/awt/desktop/PrintFilesHandler
-header extends java/lang/Object flags 601
-
-class name java/awt/desktop/QuitEvent
-header extends java/awt/desktop/AppEvent flags 31
-
-class name java/awt/desktop/QuitHandler
-header extends java/lang/Object flags 601
-
-class name java/awt/desktop/QuitResponse
-header extends java/lang/Object flags 601
-
-class name java/awt/desktop/QuitStrategy
-header extends java/lang/Enum flags 4031 signature Ljava/lang/Enum<Ljava/awt/desktop/QuitStrategy;>;
-
-class name java/awt/desktop/ScreenSleepEvent
-header extends java/awt/desktop/AppEvent flags 31
-
-class name java/awt/desktop/ScreenSleepListener
-header extends java/lang/Object implements java/awt/desktop/SystemEventListener flags 601
-
-class name java/awt/desktop/SystemEventListener
-header extends java/lang/Object implements java/util/EventListener flags 601
-
-class name java/awt/desktop/SystemSleepEvent
-header extends java/awt/desktop/AppEvent flags 31
-
-class name java/awt/desktop/SystemSleepListener
-header extends java/lang/Object implements java/awt/desktop/SystemEventListener flags 601
-
-class name java/awt/desktop/UserSessionListener
-header extends java/lang/Object implements java/awt/desktop/SystemEventListener flags 601
-
-class name java/awt/dnd/DragGestureEvent
-header extends java/util/EventObject flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-
-class name java/awt/dnd/DragGestureRecognizer
-header extends java/lang/Object implements java/io/Serializable flags 421
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-
-class name java/awt/dnd/DragSource
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/dnd/DropTargetDragEvent
-header extends java/awt/dnd/DropTargetEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/dnd/DropTargetDropEvent
-header extends java/awt/dnd/DropTargetEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/event/ActionEvent
-header extends java/awt/AWTEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/event/AdjustmentEvent
-header extends java/awt/AWTEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/event/ComponentEvent
-header extends java/awt/AWTEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/event/ContainerEvent
-header extends java/awt/event/ComponentEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/event/HierarchyEvent
-header extends java/awt/AWTEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/event/InputMethodEvent
-header extends java/awt/AWTEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/event/ItemEvent
-header extends java/awt/AWTEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/event/MouseWheelEvent
-header extends java/awt/event/MouseEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/event/PaintEvent
-header extends java/awt/event/ComponentEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/event/WindowEvent
-header extends java/awt/event/ComponentEvent flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/font/FontRenderContext
-header extends java/lang/Object flags 21
-innerclass innerClass java/awt/RenderingHints$Key outerClass java/awt/RenderingHints innerClassName Key flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/font/GraphicAttribute
-header extends java/lang/Object flags 421
-innerclass innerClass java/awt/geom/Rectangle2D$Float outerClass java/awt/geom/Rectangle2D innerClassName Float flags 9
-
-class name java/awt/font/ImageGraphicAttribute
-header extends java/awt/font/GraphicAttribute flags 31
-innerclass innerClass java/awt/geom/Rectangle2D$Float outerClass java/awt/geom/Rectangle2D innerClassName Float flags 9
-
-class name java/awt/font/NumericShaper$Range
-header extends java/lang/Enum nestHost java/awt/font/NumericShaper sealed true flags 4021 signature Ljava/lang/Enum<Ljava/awt/font/NumericShaper$Range;>;
-innerclass innerClass java/awt/font/NumericShaper$Range outerClass java/awt/font/NumericShaper innerClassName Range flags 4009
-
-class name java/awt/font/ShapeGraphicAttribute
-header extends java/awt/font/GraphicAttribute flags 31
-innerclass innerClass java/awt/geom/Rectangle2D$Float outerClass java/awt/geom/Rectangle2D innerClassName Float flags 9
-
-class name java/awt/font/TextHitInfo
-header extends java/lang/Object flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/font/TextMeasurer
-header extends java/lang/Object implements java/lang/Cloneable flags 31
-innerclass innerClass java/text/AttributedCharacterIterator$Attribute outerClass java/text/AttributedCharacterIterator innerClassName Attribute flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/geom/AffineTransform
-header extends java/lang/Object implements java/lang/Cloneable,java/io/Serializable flags 21
-innerclass innerClass java/awt/geom/Point2D$Double outerClass java/awt/geom/Point2D innerClassName Double flags 9
-innerclass innerClass java/awt/geom/Point2D$Float outerClass java/awt/geom/Point2D innerClassName Float flags 9
-innerclass innerClass java/awt/geom/Path2D$Double outerClass java/awt/geom/Path2D innerClassName Double flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/geom/Area
-header extends java/lang/Object implements java/awt/Shape,java/lang/Cloneable flags 21
-innerclass innerClass java/awt/geom/Rectangle2D$Double outerClass java/awt/geom/Rectangle2D innerClassName Double flags 9
-
-class name java/awt/geom/RectangularShape
-header extends java/lang/Object implements java/awt/Shape,java/lang/Cloneable flags 421
-innerclass innerClass java/awt/geom/Rectangle2D$Double outerClass java/awt/geom/Rectangle2D innerClassName Double flags 9
-
-class name java/awt/image/AbstractMultiResolutionImage
-header extends java/awt/Image implements java/awt/image/MultiResolutionImage flags 421
-
-class name java/awt/image/BandCombineOp
-header extends java/lang/Object implements java/awt/image/RasterOp flags 21
-innerclass innerClass java/awt/geom/Point2D$Float outerClass java/awt/geom/Point2D innerClassName Float flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/BandedSampleModel
-header extends java/awt/image/ComponentSampleModel flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/BaseMultiResolutionImage
-header extends java/awt/image/AbstractMultiResolutionImage flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/BufferedImageFilter
-header extends java/awt/image/ImageFilter implements java/lang/Cloneable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/ByteLookupTable
-header extends java/awt/image/LookupTable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/ColorConvertOp
-header extends java/lang/Object implements java/awt/image/BufferedImageOp,java/awt/image/RasterOp flags 21
-innerclass innerClass java/awt/geom/Point2D$Float outerClass java/awt/geom/Point2D innerClassName Float flags 9
-
-class name java/awt/image/ComponentColorModel
-header extends java/awt/image/ColorModel flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/ComponentSampleModel
-header extends java/awt/image/SampleModel flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/ConvolveOp
-header extends java/lang/Object implements java/awt/image/BufferedImageOp,java/awt/image/RasterOp flags 21
-innerclass innerClass java/awt/geom/Point2D$Float outerClass java/awt/geom/Point2D innerClassName Float flags 9
-
-class name java/awt/image/DataBufferUShort
-header extends java/awt/image/DataBuffer flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/DirectColorModel
-header extends java/awt/image/PackedColorModel flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/ImageFilter
-header extends java/lang/Object implements java/awt/image/ImageConsumer,java/lang/Cloneable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/IndexColorModel
-header extends java/awt/image/ColorModel flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/Kernel
-header extends java/lang/Object implements java/lang/Cloneable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/LookupOp
-header extends java/lang/Object implements java/awt/image/BufferedImageOp,java/awt/image/RasterOp flags 21
-innerclass innerClass java/awt/geom/Point2D$Float outerClass java/awt/geom/Point2D innerClassName Float flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/MultiPixelPackedSampleModel
-header extends java/awt/image/SampleModel flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/MultiResolutionImage
-header extends java/lang/Object flags 601
-
-class name java/awt/image/PackedColorModel
-header extends java/awt/image/ColorModel flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/Raster
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/ReplicateScaleFilter
-header extends java/awt/image/ImageFilter flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/RescaleOp
-header extends java/lang/Object implements java/awt/image/BufferedImageOp,java/awt/image/RasterOp flags 21
-innerclass innerClass java/awt/geom/Point2D$Float outerClass java/awt/geom/Point2D innerClassName Float flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/SampleModel
-header extends java/lang/Object flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/ShortLookupTable
-header extends java/awt/image/LookupTable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/image/SinglePixelPackedSampleModel
-header extends java/awt/image/SampleModel flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/awt/print/Paper
-header extends java/lang/Object implements java/lang/Cloneable flags 21
-innerclass innerClass java/awt/geom/Rectangle2D$Double outerClass java/awt/geom/Rectangle2D innerClassName Double flags 9
-
-class name java/beans/AppletInitializer
-header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="9")
-
-class name java/beans/BeanProperty
-header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;METHOD;})@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)
-
-class name java/beans/Beans
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
--method name instantiate descriptor (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/beans/beancontext/BeanContext;Ljava/beans/AppletInitializer;)Ljava/lang/Object;
-method name instantiate descriptor (Ljava/lang/ClassLoader;Ljava/lang/String;Ljava/beans/beancontext/BeanContext;Ljava/beans/AppletInitializer;)Ljava/lang/Object; thrownTypes java/io/IOException,java/lang/ClassNotFoundException flags 9 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="9")
-
-class name java/beans/DefaultPersistenceDelegate
-header extends java/beans/PersistenceDelegate flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/beans/Encoder
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/beans/EventSetDescriptor
-header extends java/beans/FeatureDescriptor flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/beans/Expression
-header extends java/beans/Statement flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/beans/FeatureDescriptor
-header extends java/lang/Object flags 21
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-
-class name java/beans/IndexedPropertyDescriptor
-header extends java/beans/PropertyDescriptor flags 21
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/beans/JavaBean
-header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;TYPE;})@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)
-
-class name java/beans/PropertyDescriptor
-header extends java/beans/FeatureDescriptor flags 21
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/beans/SimpleBeanInfo
-header extends java/lang/Object implements java/beans/BeanInfo flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/accessibility/AccessibilityProvider
-header extends java/lang/Object flags 421
-
-class name javax/accessibility/AccessibleBundle
-header extends java/lang/Object flags 421 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
-
-class name javax/accessibility/AccessibleRelationSet
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/accessibility/AccessibleStateSet
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/imageio/metadata/IIOMetadata
-header extends java/lang/Object flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/imageio/plugins/jpeg/JPEGHuffmanTable
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/imageio/plugins/jpeg/JPEGQTable
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/imageio/plugins/tiff/TIFFDirectory
-header extends java/lang/Object implements java/lang/Cloneable flags 21
-
-class name javax/imageio/plugins/tiff/TIFFField
-header extends java/lang/Object implements java/lang/Cloneable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/imageio/plugins/tiff/TIFFImageReadParam
-header extends javax/imageio/ImageReadParam flags 31
-
-class name javax/imageio/plugins/tiff/TIFFTag
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/imageio/plugins/tiff/TIFFTagSet
-header extends java/lang/Object flags 21
-
-class name javax/imageio/spi/ImageReaderWriterSpi
-header extends javax/imageio/spi/IIOServiceProvider flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/print/attribute/DateTimeSyntax
-header extends java/lang/Object implements java/io/Serializable,java/lang/Cloneable flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/print/attribute/EnumSyntax
-header extends java/lang/Object implements java/io/Serializable,java/lang/Cloneable flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/print/attribute/IntegerSyntax
-header extends java/lang/Object implements java/io/Serializable,java/lang/Cloneable flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/print/attribute/standard/MediaPrintableArea
-header extends java/lang/Object implements javax/print/attribute/DocAttribute,javax/print/attribute/PrintRequestAttribute,javax/print/attribute/PrintJobAttribute flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/print/event/PrintEvent
-header extends java/util/EventObject flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sound/midi/MetaMessage
-header extends javax/sound/midi/MidiMessage flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sound/midi/MidiMessage
-header extends java/lang/Object implements java/lang/Cloneable flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sound/midi/Sequence
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sound/midi/ShortMessage
-header extends javax/sound/midi/MidiMessage flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sound/midi/SysexMessage
-header extends javax/sound/midi/MidiMessage flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sound/sampled/ReverbType
-header extends java/lang/Object flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)
-
-class name javax/sound/sampled/spi/FormatConversionProvider
-header extends java/lang/Object flags 421
-innerclass innerClass javax/sound/sampled/AudioFormat$Encoding outerClass javax/sound/sampled/AudioFormat innerClassName Encoding flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/BoxLayout
-header extends java/lang/Object implements java/awt/LayoutManager2,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/DebugGraphics
-header extends java/awt/Graphics flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/DefaultBoundedRangeModel
-header extends java/lang/Object implements javax/swing/BoundedRangeModel,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/DefaultListSelectionModel
-header extends java/lang/Object implements javax/swing/ListSelectionModel,java/lang/Cloneable,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/GrayFilter
-header extends java/awt/image/RGBImageFilter flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/JApplet
-header extends java/applet/Applet implements javax/accessibility/Accessible,javax/swing/RootPaneContainer,javax/swing/TransferHandler$HasGetTransferHandler nestMembers javax/swing/JApplet$AccessibleJApplet flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="9")@Ljava/beans/JavaBean;(defaultProperty="JMenuBar",description="Swing's\u005C;u0020;Applet\u005C;u0020;subclass.")@Ljavax/swing/SwingContainer;(delegate="getContentPane")
-innerclass innerClass javax/swing/JApplet$AccessibleJApplet outerClass javax/swing/JApplet innerClassName AccessibleJApplet flags 4
-innerclass innerClass javax/swing/TransferHandler$HasGetTransferHandler outerClass javax/swing/TransferHandler innerClassName HasGetTransferHandler flags 608
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/JList$AccessibleJList$AccessibleJListChild
--method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction;
-method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction; flags 1
-
-class name javax/swing/JSlider$AccessibleJSlider
-header extends javax/swing/JComponent$AccessibleJComponent implements javax/accessibility/AccessibleValue,javax/swing/event/ChangeListener,javax/accessibility/AccessibleAction nestHost javax/swing/JSlider flags 21
-innerclass innerClass javax/swing/JSlider$AccessibleJSlider outerClass javax/swing/JSlider innerClassName AccessibleJSlider flags 4
-innerclass innerClass javax/swing/JComponent$AccessibleJComponent outerClass javax/swing/JComponent innerClassName AccessibleJComponent flags 401
-method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction; flags 1
-method name getAccessibleActionCount descriptor ()I flags 1
-method name getAccessibleActionDescription descriptor (I)Ljava/lang/String; flags 1
-method name doAccessibleAction descriptor (I)Z flags 1
-
-class name javax/swing/JTextPane
-header extends javax/swing/JEditorPane flags 21 runtimeAnnotations @Ljava/beans/JavaBean;(description="A\u005C;u0020;text\u005C;u0020;component\u005C;u0020;that\u005C;u0020;can\u005C;u0020;be\u005C;u0020;marked\u005C;u0020;up\u005C;u0020;with\u005C;u0020;attributes\u005C;u0020;that\u005C;u0020;are\u005C;u0020;graphically\u005C;u0020;represented.")@Ljavax/swing/SwingContainer;
-
-class name javax/swing/LookAndFeel
-header extends java/lang/Object flags 421
-innerclass innerClass javax/swing/text/JTextComponent$KeyBinding outerClass javax/swing/text/JTextComponent innerClassName KeyBinding flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/MenuSelectionManager
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/RepaintManager
--method name addDirtyRegion descriptor (Ljava/applet/Applet;IIII)V
-method name addDirtyRegion descriptor (Ljava/applet/Applet;IIII)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="9")
-
-class name javax/swing/SizeRequirements
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/SortingFocusTraversalPolicy
-header extends javax/swing/InternalFrameFocusTraversalPolicy flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/SwingContainer
-header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;TYPE;})@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)
-
-class name javax/swing/UIClientPropertyKey
-header extends java/lang/Object flags 601
-
-class name javax/swing/border/LineBorder
-header extends javax/swing/border/AbstractBorder flags 21
-innerclass innerClass java/awt/geom/RoundRectangle2D$Float outerClass java/awt/geom/RoundRectangle2D innerClassName Float flags 9
-innerclass innerClass java/awt/geom/Rectangle2D$Float outerClass java/awt/geom/Rectangle2D innerClassName Float flags 9
-innerclass innerClass java/awt/geom/Path2D$Float outerClass java/awt/geom/Path2D innerClassName Float flags 9
-
-class name javax/swing/event/EventListenerList
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/event/ListDataEvent
-header extends java/util/EventObject flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/event/ListSelectionEvent
-header extends java/util/EventObject flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/event/TreeModelEvent
-header extends java/util/EventObject flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/filechooser/FileNameExtensionFilter
-header extends javax/swing/filechooser/FileFilter flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/filechooser/FileSystemView
-method name getSystemIcon descriptor (Ljava/io/File;II)Ljavax/swing/Icon; flags 1
-
-class name javax/swing/plaf/basic/BasicArrowButton
-header extends javax/swing/JButton implements javax/swing/SwingConstants flags 21
-innerclass innerClass java/awt/geom/Path2D$Double outerClass java/awt/geom/Path2D innerClassName Double flags 9
-
-class name javax/swing/plaf/basic/BasicButtonUI
-header extends javax/swing/plaf/ButtonUI flags 21
-innerclass innerClass java/awt/Component$BaselineResizeBehavior outerClass java/awt/Component innerClassName BaselineResizeBehavior flags 4019
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/basic/BasicDirectoryModel
--method name intervalAdded descriptor (Ljavax/swing/event/ListDataEvent;)V
--method name intervalRemoved descriptor (Ljavax/swing/event/ListDataEvent;)V
--method name lt descriptor (Ljava/io/File;Ljava/io/File;)Z
-method name intervalAdded descriptor (Ljavax/swing/event/ListDataEvent;)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-method name intervalRemoved descriptor (Ljavax/swing/event/ListDataEvent;)V flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-method name lt descriptor (Ljava/io/File;Ljava/io/File;)Z flags 4 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-
-class name javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler
-header extends java/lang/Object implements javax/swing/event/MouseInputListener nestHost javax/swing/plaf/basic/BasicMenuItemUI flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-innerclass innerClass javax/swing/plaf/basic/BasicMenuItemUI$MouseInputHandler outerClass javax/swing/plaf/basic/BasicMenuItemUI innerClassName MouseInputHandler flags 4
-
-class name javax/swing/plaf/basic/BasicPasswordFieldUI
-header extends javax/swing/plaf/basic/BasicTextFieldUI flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener
-header extends java/lang/Object implements javax/swing/event/ChangeListener nestHost javax/swing/plaf/basic/BasicScrollPaneUI flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-innerclass innerClass javax/swing/plaf/basic/BasicScrollPaneUI$HSBChangeListener outerClass javax/swing/plaf/basic/BasicScrollPaneUI innerClassName HSBChangeListener flags 1
-
-class name javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler
-header extends java/lang/Object implements java/beans/PropertyChangeListener nestHost javax/swing/plaf/basic/BasicScrollPaneUI flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-innerclass innerClass javax/swing/plaf/basic/BasicScrollPaneUI$PropertyChangeHandler outerClass javax/swing/plaf/basic/BasicScrollPaneUI innerClassName PropertyChangeHandler flags 1
-
-class name javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener
-header extends java/lang/Object implements javax/swing/event/ChangeListener nestHost javax/swing/plaf/basic/BasicScrollPaneUI flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-innerclass innerClass javax/swing/plaf/basic/BasicScrollPaneUI$VSBChangeListener outerClass javax/swing/plaf/basic/BasicScrollPaneUI innerClassName VSBChangeListener flags 1
-
-class name javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler
-header extends java/lang/Object implements javax/swing/event/ChangeListener nestHost javax/swing/plaf/basic/BasicScrollPaneUI flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-innerclass innerClass javax/swing/plaf/basic/BasicScrollPaneUI$ViewportChangeHandler outerClass javax/swing/plaf/basic/BasicScrollPaneUI innerClassName ViewportChangeHandler flags 1
-
-class name javax/swing/plaf/basic/BasicToolBarSeparatorUI
-header extends javax/swing/plaf/basic/BasicSeparatorUI flags 21
-innerclass innerClass javax/swing/JToolBar$Separator outerClass javax/swing/JToolBar innerClassName Separator flags 9
-
-class name javax/swing/plaf/basic/BasicToolBarUI
--method name createFloatingFrame descriptor (Ljavax/swing/JToolBar;)Ljavax/swing/JFrame;
-method name createFloatingFrame descriptor (Ljavax/swing/JToolBar;)Ljavax/swing/JFrame; flags 4 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="17")
-
-class name javax/swing/plaf/metal/MetalButtonUI
-header extends javax/swing/plaf/basic/BasicButtonUI flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/metal/MetalCheckBoxUI
-header extends javax/swing/plaf/metal/MetalRadioButtonUI flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/metal/MetalRadioButtonUI
-header extends javax/swing/plaf/basic/BasicRadioButtonUI flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/metal/MetalToggleButtonUI
-header extends javax/swing/plaf/basic/BasicToggleButtonUI flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/metal/MetalToolTipUI
-header extends javax/swing/plaf/basic/BasicToolTipUI flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/multi/MultiLookAndFeel
-header extends javax/swing/LookAndFeel flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/synth/SynthButtonUI
-header extends javax/swing/plaf/basic/BasicButtonUI implements java/beans/PropertyChangeListener,javax/swing/plaf/synth/SynthUI flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/synth/SynthIcon
-header extends java/lang/Object implements javax/swing/Icon flags 601
-
-class name javax/swing/plaf/synth/SynthMenuItemUI
-header extends javax/swing/plaf/basic/BasicMenuItemUI implements java/beans/PropertyChangeListener,javax/swing/plaf/synth/SynthUI flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/synth/SynthMenuUI
-header extends javax/swing/plaf/basic/BasicMenuUI implements java/beans/PropertyChangeListener,javax/swing/plaf/synth/SynthUI flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/plaf/synth/SynthSeparatorUI
-header extends javax/swing/plaf/SeparatorUI implements java/beans/PropertyChangeListener,javax/swing/plaf/synth/SynthUI flags 21
-innerclass innerClass javax/swing/JToolBar$Separator outerClass javax/swing/JToolBar innerClassName Separator flags 9
-
-class name javax/swing/plaf/synth/SynthStyle
-header extends java/lang/Object flags 421
-innerclass innerClass javax/swing/UIDefaults$LazyInputMap outerClass javax/swing/UIDefaults innerClassName LazyInputMap flags 9
-innerclass innerClass javax/swing/UIDefaults$LazyValue outerClass javax/swing/UIDefaults innerClassName LazyValue flags 609
-
-class name javax/swing/table/AbstractTableModel
-header extends java/lang/Object implements javax/swing/table/TableModel,java/io/Serializable flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/AbstractWriter
-header extends java/lang/Object flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/BoxView
-header extends javax/swing/text/CompositeView flags 21
-innerclass innerClass javax/swing/event/DocumentEvent$ElementChange outerClass javax/swing/event/DocumentEvent innerClassName ElementChange flags 609
-innerclass innerClass javax/swing/text/Position$Bias outerClass javax/swing/text/Position innerClassName Bias flags 19
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/CompositeView
-header extends javax/swing/text/View flags 421
-innerclass innerClass javax/swing/text/Position$Bias outerClass javax/swing/text/Position innerClassName Bias flags 19
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/DateFormatter
-header extends javax/swing/text/InternationalFormatter flags 21
-innerclass innerClass java/text/DateFormat$Field outerClass java/text/DateFormat innerClassName Field flags 9
-
-class name javax/swing/text/IconView
-header extends javax/swing/text/View flags 21
-innerclass innerClass javax/swing/text/Position$Bias outerClass javax/swing/text/Position innerClassName Bias flags 19
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/LayoutQueue
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/NumberFormatter
-header extends javax/swing/text/InternationalFormatter flags 21
-innerclass innerClass java/text/NumberFormat$Field outerClass java/text/NumberFormat innerClassName Field flags 9
-innerclass innerClass javax/swing/text/DocumentFilter$FilterBypass outerClass javax/swing/text/DocumentFilter innerClassName FilterBypass flags 409
-innerclass innerClass java/text/AttributedCharacterIterator$Attribute outerClass java/text/AttributedCharacterIterator innerClassName Attribute flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/Segment
-header extends java/lang/Object implements java/lang/Cloneable,java/text/CharacterIterator,java/lang/CharSequence flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/TabSet
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/TabStop
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/View
-header extends java/lang/Object implements javax/swing/SwingConstants flags 421
-innerclass innerClass javax/swing/text/Position$Bias outerClass javax/swing/text/Position innerClassName Bias flags 19
-innerclass innerClass javax/swing/event/DocumentEvent$ElementChange outerClass javax/swing/event/DocumentEvent innerClassName ElementChange flags 609
-innerclass innerClass javax/swing/event/DocumentEvent$EventType outerClass javax/swing/event/DocumentEvent innerClassName EventType flags 19
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/html/InlineView
-header extends javax/swing/text/LabelView flags 21
-innerclass innerClass javax/swing/text/html/CSS$Attribute outerClass javax/swing/text/html/CSS innerClassName Attribute flags 19
-
-class name javax/swing/text/html/ListView
-header extends javax/swing/text/html/BlockView flags 21
-innerclass innerClass javax/swing/text/html/StyleSheet$ListPainter outerClass javax/swing/text/html/StyleSheet innerClassName ListPainter flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/html/MinimalHTMLWriter
-header extends javax/swing/text/AbstractWriter flags 21
-innerclass innerClass javax/swing/text/StyleConstants$ParagraphConstants outerClass javax/swing/text/StyleConstants innerClassName ParagraphConstants flags 9
-innerclass innerClass javax/swing/text/StyleConstants$CharacterConstants outerClass javax/swing/text/StyleConstants innerClassName CharacterConstants flags 9
-innerclass innerClass javax/swing/text/StyleConstants$FontConstants outerClass javax/swing/text/StyleConstants innerClassName FontConstants flags 9
-innerclass innerClass javax/swing/text/StyleConstants$ColorConstants outerClass javax/swing/text/StyleConstants innerClassName ColorConstants flags 9
-innerclass innerClass javax/swing/text/AbstractDocument$BranchElement outerClass javax/swing/text/AbstractDocument innerClassName BranchElement flags 1
-innerclass innerClass javax/swing/text/StyleContext$NamedStyle outerClass javax/swing/text/StyleContext innerClassName NamedStyle flags 1
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/html/ObjectView
-header extends javax/swing/text/ComponentView flags 21
-innerclass innerClass javax/swing/text/html/HTML$Attribute outerClass javax/swing/text/html/HTML innerClassName Attribute flags 19
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/html/Option
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass javax/swing/text/html/HTML$Attribute outerClass javax/swing/text/html/HTML innerClassName Attribute flags 19
-
-class name javax/swing/text/html/ParagraphView
-header extends javax/swing/text/ParagraphView flags 21
-innerclass innerClass javax/swing/text/html/StyleSheet$BoxPainter outerClass javax/swing/text/html/StyleSheet innerClassName BoxPainter flags 9
-innerclass innerClass javax/swing/text/html/CSS$Attribute outerClass javax/swing/text/html/CSS innerClassName Attribute flags 19
-
-class name javax/swing/text/html/parser/ContentModel
-header extends java/lang/Object implements java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/html/parser/DocumentParser
-header extends javax/swing/text/html/parser/Parser flags 21
-innerclass innerClass javax/swing/text/html/HTMLEditorKit$ParserCallback outerClass javax/swing/text/html/HTMLEditorKit innerClassName ParserCallback flags 9
-innerclass innerClass javax/swing/text/html/HTML$Tag outerClass javax/swing/text/html/HTML innerClassName Tag flags 9
-innerclass innerClass javax/swing/text/html/HTML$Attribute outerClass javax/swing/text/html/HTML innerClassName Attribute flags 19
-
-class name javax/swing/text/html/parser/Parser
-header extends java/lang/Object implements javax/swing/text/html/parser/DTDConstants flags 21
-innerclass innerClass javax/swing/text/html/HTML$Attribute outerClass javax/swing/text/html/HTML innerClassName Attribute flags 19
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/text/html/parser/TagElement
-header extends java/lang/Object flags 21
-innerclass innerClass javax/swing/text/html/HTML$Tag outerClass javax/swing/text/html/HTML innerClassName Tag flags 9
-innerclass innerClass javax/swing/text/html/HTML$UnknownTag outerClass javax/swing/text/html/HTML innerClassName UnknownTag flags 9
-
-class name javax/swing/tree/DefaultTreeModel
-header extends java/lang/Object implements java/io/Serializable,javax/swing/tree/TreeModel flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-
-class name javax/swing/tree/DefaultTreeSelectionModel
-header extends java/lang/Object implements java/lang/Cloneable,java/io/Serializable,javax/swing/tree/TreeSelectionModel flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/tree/TreePath
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/undo/AbstractUndoableEdit
-header extends java/lang/Object implements javax/swing/undo/UndoableEdit,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/undo/CompoundEdit
-header extends javax/swing/undo/AbstractUndoableEdit flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/swing/undo/UndoableEditSupport
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-

make/data/symbols/java.instrument-H.sym.txt

@@ -1,31 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name java/lang/instrument/UnmodifiableModuleException
-header extends java/lang/RuntimeException flags 21
-

make/data/symbols/java.logging-H.sym.txt

@@ -1,59 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name java/util/logging/ErrorManager
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/logging/LogManager
--method name checkAccess descriptor ()V
-method name checkAccess descriptor ()V thrownTypes java/lang/SecurityException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="17")
-
-class name java/util/logging/LoggingMXBean
-header extends java/lang/Object flags 601 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
-
-class name java/util/logging/LoggingPermission
-header extends java/security/BasicPermission flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/logging/MemoryHandler
-header extends java/util/logging/Handler flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/logging/SimpleFormatter
-header extends java/util/logging/Formatter flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/logging/SocketHandler
-header extends java/util/logging/StreamHandler flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/util/logging/XMLFormatter
-header extends java/util/logging/Formatter flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-

make/data/symbols/java.management-H.sym.txt

@@ -1,265 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name java/lang/management/LockInfo
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/management/ManagementPermission
-header extends java/security/BasicPermission flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/management/MemoryUsage
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/management/MonitorInfo
-header extends java/lang/management/LockInfo flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/lang/management/RuntimeMXBean
-header extends java/lang/Object implements java/lang/management/PlatformManagedObject flags 601
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/Attribute
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/AttributeList
-header extends java/util/ArrayList flags 21 signature Ljava/util/ArrayList<Ljava/lang/Object;>;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/BadAttributeValueExpException
-header extends java/lang/Exception flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/BadBinaryOpValueExpException
-header extends java/lang/Exception flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/BadStringOperationException
-header extends java/lang/Exception flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/ConstructorParameters
-header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601 runtimeAnnotations @Ljava/lang/annotation/Documented;@Ljava/lang/annotation/Target;(value={eLjava/lang/annotation/ElementType;CONSTRUCTOR;})@Ljava/lang/annotation/Retention;(value=eLjava/lang/annotation/RetentionPolicy;RUNTIME;)
-
-class name javax/management/ImmutableDescriptor
-header extends java/lang/Object implements javax/management/Descriptor flags 21
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanAttributeInfo
-header extends javax/management/MBeanFeatureInfo implements java/lang/Cloneable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanConstructorInfo
-header extends javax/management/MBeanFeatureInfo implements java/lang/Cloneable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanNotificationInfo
-header extends javax/management/MBeanFeatureInfo implements java/lang/Cloneable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanOperationInfo
-header extends javax/management/MBeanFeatureInfo implements java/lang/Cloneable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanParameterInfo
-header extends javax/management/MBeanFeatureInfo implements java/lang/Cloneable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanPermission
-header extends java/security/Permission flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanServerDelegate
-header extends java/lang/Object implements javax/management/MBeanServerDelegateMBean,javax/management/NotificationEmitter flags 21
-innerclass innerClass java/lang/System$Logger outerClass java/lang/System innerClassName Logger flags 609
-innerclass innerClass java/lang/System$Logger$Level outerClass java/lang/System$Logger innerClassName Level flags 4019
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanServerFactory
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/System$Logger outerClass java/lang/System innerClassName Logger flags 609
-innerclass innerClass java/lang/System$Logger$Level outerClass java/lang/System$Logger innerClassName Level flags 4019
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanServerInvocationHandler
-header extends java/lang/Object implements java/lang/reflect/InvocationHandler flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanServerNotification
-header extends javax/management/Notification flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanServerPermission
-header extends java/security/BasicPermission flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/MBeanTrustPermission
-header extends java/security/BasicPermission flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/Notification
-header extends java/util/EventObject flags 21
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/ObjectInstance
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/Query
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/StandardEmitterMBean
-header extends javax/management/StandardMBean implements javax/management/NotificationEmitter flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/StringValueExp
-header extends java/lang/Object implements javax/management/ValueExp flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/loading/DefaultLoaderRepository
-header extends java/lang/Object flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
-innerclass innerClass java/lang/System$Logger outerClass java/lang/System innerClassName Logger flags 609
-innerclass innerClass java/lang/System$Logger$Level outerClass java/lang/System$Logger innerClassName Level flags 4019
-
-class name javax/management/loading/MLetContent
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/modelmbean/InvalidTargetObjectTypeException
-header extends java/lang/Exception flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/modelmbean/XMLParseException
-header extends java/lang/Exception flags 21
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/openmbean/ArrayType
-header extends javax/management/openmbean/OpenType flags 21 signature <T:Ljava/lang/Object;>Ljavax/management/openmbean/OpenType<TT;>;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/openmbean/CompositeDataInvocationHandler
-header extends java/lang/Object implements java/lang/reflect/InvocationHandler flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/openmbean/CompositeDataSupport
-header extends java/lang/Object implements javax/management/openmbean/CompositeData,java/io/Serializable flags 21
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/openmbean/CompositeType
-header extends javax/management/openmbean/OpenType flags 21 signature Ljavax/management/openmbean/OpenType<Ljavax/management/openmbean/CompositeData;>;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/openmbean/OpenMBeanAttributeInfoSupport
-header extends javax/management/MBeanAttributeInfo implements javax/management/openmbean/OpenMBeanAttributeInfo flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/openmbean/OpenMBeanOperationInfoSupport
-header extends javax/management/MBeanOperationInfo implements javax/management/openmbean/OpenMBeanOperationInfo flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/openmbean/SimpleType
-header extends javax/management/openmbean/OpenType flags 31 signature <T:Ljava/lang/Object;>Ljavax/management/openmbean/OpenType<TT;>;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/openmbean/TabularDataSupport
-header extends java/lang/Object implements javax/management/openmbean/TabularData,java/util/Map,java/lang/Cloneable,java/io/Serializable flags 21 signature Ljava/lang/Object;Ljavax/management/openmbean/TabularData;Ljava/util/Map<Ljava/lang/Object;Ljava/lang/Object;>;Ljava/lang/Cloneable;Ljava/io/Serializable;
-innerclass innerClass java/util/Map$Entry outerClass java/util/Map innerClassName Entry flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/openmbean/TabularType
-header extends javax/management/openmbean/OpenType flags 21 signature Ljavax/management/openmbean/OpenType<Ljavax/management/openmbean/TabularData;>;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/relation/RelationNotification
-header extends javax/management/Notification flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-
-class name javax/management/relation/RelationSupport
-header extends java/lang/Object implements javax/management/relation/RelationSupportMBean,javax/management/MBeanRegistration flags 21
-innerclass innerClass java/lang/System$Logger outerClass java/lang/System innerClassName Logger flags 609
-innerclass innerClass java/lang/System$Logger$Level outerClass java/lang/System$Logger innerClassName Level flags 4019
-
-class name javax/management/relation/Role
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/relation/RoleInfo
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/relation/RoleResult
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-
-class name javax/management/relation/RoleUnresolved
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/remote/JMXConnectorServerFactory
-header extends java/lang/Object flags 21
-innerclass innerClass java/util/ServiceLoader$Provider outerClass java/util/ServiceLoader innerClassName Provider flags 609
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/remote/JMXPrincipal
-header extends java/lang/Object implements java/security/Principal,java/io/Serializable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/remote/JMXServiceURL
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/remote/NotificationResult
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/remote/TargetedNotification
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-

make/data/symbols/java.management.rmi-H.sym.txt

@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name javax/management/remote/rmi/RMIConnectorServer
-header extends javax/management/remote/JMXConnectorServer flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/management/remote/rmi/RMIIIOPServerImpl
-header extends javax/management/remote/rmi/RMIServerImpl flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
-
-class name javax/management/remote/rmi/RMIServerImpl
-header extends java/lang/Object implements java/io/Closeable,javax/management/remote/rmi/RMIServer flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-

make/data/symbols/java.naming-H.sym.txt

@@ -1,80 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name javax/naming/BinaryRefAddr
-header extends javax/naming/RefAddr flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/Binding
-header extends javax/naming/NameClassPair flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/CompositeName
-header extends java/lang/Object implements javax/naming/Name flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/CompoundName
-header extends java/lang/Object implements javax/naming/Name flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/Context
--field name APPLET descriptor Ljava/lang/String;
-field name APPLET descriptor Ljava/lang/String; constantValue java.naming.applet flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="9")
-
-class name javax/naming/LinkException
-header extends javax/naming/NamingException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/NameClassPair
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/NamingException
-header extends java/lang/Exception flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/RefAddr
-header extends java/lang/Object implements java/io/Serializable flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/Reference
-header extends java/lang/Object implements java/lang/Cloneable,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/directory/AttributeModificationException
-header extends javax/naming/NamingException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/directory/ModificationItem
-header extends java/lang/Object implements java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/naming/directory/SearchResult
-header extends javax/naming/Binding flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-

make/data/symbols/java.rmi-H.sym.txt

@@ -1,90 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-module name java.rmi
-header exports java/rmi,java/rmi/dgc,java/rmi/registry,java/rmi/server,javax/rmi/ssl requires name\u0020;java.base\u0020;flags\u0020;8000,name\u0020;java.logging\u0020;flags\u0020;0 uses java/rmi/server/RMIClassLoaderSpi target linux-amd64 flags 8000
-
-class name java/rmi/RMISecurityManager
-header extends java/lang/SecurityManager flags 21 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(forRemoval=Ztrue,since="1.8")
-
-class name java/rmi/RemoteException
-header extends java/io/IOException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
--class name java/rmi/activation/Activatable
-
--class name java/rmi/activation/ActivateFailedException
-
--class name java/rmi/activation/ActivationDesc
-
--class name java/rmi/activation/ActivationException
-
--class name java/rmi/activation/ActivationGroup
-
--class name java/rmi/activation/ActivationGroupDesc
-
--class name java/rmi/activation/ActivationGroupDesc$CommandEnvironment
-
--class name java/rmi/activation/ActivationGroupID
-
--class name java/rmi/activation/ActivationGroup_Stub
-
--class name java/rmi/activation/ActivationID
-
--class name java/rmi/activation/ActivationInstantiator
-
--class name java/rmi/activation/ActivationMonitor
-
--class name java/rmi/activation/ActivationSystem
-
--class name java/rmi/activation/Activator
-
--class name java/rmi/activation/UnknownGroupException
-
--class name java/rmi/activation/UnknownObjectException
-
-class name java/rmi/dgc/VMID
-header extends java/lang/Object implements java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/rmi/server/ObjID
-header extends java/lang/Object implements java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/rmi/server/RemoteObject
-header extends java/lang/Object implements java/rmi/Remote,java/io/Serializable flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/rmi/server/ServerCloneException
-header extends java/lang/CloneNotSupportedException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/rmi/server/UID
-header extends java/lang/Object implements java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-

make/data/symbols/java.scripting-H.sym.txt

@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name javax/script/ScriptException
-header extends java/lang/Exception flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-

make/data/symbols/java.security.jgss-H.sym.txt

@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name javax/security/auth/kerberos/DelegationPermission
-header extends java/security/BasicPermission implements java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/security/auth/kerberos/EncryptionKey
-header extends java/lang/Object implements javax/crypto/SecretKey flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/security/auth/kerberos/KerberosCredMessage
-header extends java/lang/Object implements javax/security/auth/Destroyable flags 31
-innerclass innerClass java/util/Base64$Encoder outerClass java/util/Base64 innerClassName Encoder flags 9
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/security/auth/kerberos/KerberosKey
-header extends java/lang/Object implements javax/crypto/SecretKey flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/security/auth/kerberos/KerberosPrincipal
-header extends java/lang/Object implements java/security/Principal,java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/security/auth/kerberos/KerberosTicket
-header extends java/lang/Object implements javax/security/auth/Destroyable,javax/security/auth/Refreshable,java/io/Serializable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/security/auth/kerberos/KeyTab
-header extends java/lang/Object flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/security/auth/kerberos/ServicePermission
-header extends java/security/Permission implements java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name org/ietf/jgss/GSSException
-header extends java/lang/Exception flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name org/ietf/jgss/Oid
-header extends java/lang/Object flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-

make/data/symbols/java.security.sasl-H.sym.txt

@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name javax/security/sasl/SaslException
-header extends java/io/IOException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-

make/data/symbols/java.smartcardio-H.sym.txt

@@ -1,62 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name javax/smartcardio/ATR
-header extends java/lang/Object implements java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/smartcardio/Card
-header extends java/lang/Object flags 421
-
-class name javax/smartcardio/CardChannel
-header extends java/lang/Object flags 421
-
-class name javax/smartcardio/CardException
-header extends java/lang/Exception flags 21
-
-class name javax/smartcardio/CardNotPresentException
-header extends javax/smartcardio/CardException flags 21
-
-class name javax/smartcardio/CardPermission
-header extends java/security/Permission flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/smartcardio/CardTerminal
-header extends java/lang/Object flags 421
-
-class name javax/smartcardio/CommandAPDU
-header extends java/lang/Object implements java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/smartcardio/ResponseAPDU
-header extends java/lang/Object implements java/io/Serializable flags 31
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/smartcardio/TerminalFactorySpi
-header extends java/lang/Object flags 421
-

make/data/symbols/java.sql-H.sym.txt

@@ -1,60 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name java/sql/BatchUpdateException
-header extends java/sql/SQLException flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-
-class name java/sql/ConnectionBuilder
-header extends java/lang/Object flags 601
-
-class name java/sql/JDBCType
-header extends java/lang/Enum implements java/sql/SQLType flags 4031 signature Ljava/lang/Enum<Ljava/sql/JDBCType;>;Ljava/sql/SQLType;
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/sql/SQLWarning
-header extends java/sql/SQLException flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name java/sql/ShardingKey
-header extends java/lang/Object flags 601
-
-class name java/sql/ShardingKeyBuilder
-header extends java/lang/Object flags 601
-
-class name java/sql/Statement
-header extends java/lang/Object implements java/sql/Wrapper,java/lang/AutoCloseable flags 601
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sql/PooledConnectionBuilder
-header extends java/lang/Object flags 601
-
-class name javax/sql/XAConnectionBuilder
-header extends java/lang/Object flags 601
-

make/data/symbols/java.sql.rowset-H.sym.txt

@@ -1,69 +0,0 @@
-#
-# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  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.
-#
-# ##########################################################
-# ### THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. ###
-# ##########################################################
-#
-class name javax/sql/rowset/BaseRowSet
-header extends java/lang/Object implements java/io/Serializable,java/lang/Cloneable flags 421
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sql/rowset/serial/SerialArray
-header extends java/lang/Object implements java/sql/Array,java/io/Serializable,java/lang/Cloneable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-
-class name javax/sql/rowset/serial/SerialBlob
-header extends java/lang/Object implements java/sql/Blob,java/io/Serializable,java/lang/Cloneable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-
-class name javax/sql/rowset/serial/SerialClob
-header extends java/lang/Object implements java/sql/Clob,java/io/Serializable,java/lang/Cloneable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sql/rowset/serial/SerialDatalink
-header extends java/lang/Object implements java/io/Serializable,java/lang/Cloneable flags 21
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sql/rowset/serial/SerialJavaObject
-header extends java/lang/Object implements java/io/Serializable,java/lang/Cloneable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-
-class name javax/sql/rowset/serial/SerialRef
-header extends java/lang/Object implements java/sql/Ref,java/io/Serializable,java/lang/Cloneable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-
-class name javax/sql/rowset/serial/SerialStruct
-header extends java/lang/Object implements java/sql/Struct,java/io/Serializable,java/lang/Cloneable flags 21
-innerclass innerClass java/io/ObjectInputStream$GetField outerClass java/io/ObjectInputStream innerClassName GetField flags 409
-innerclass innerClass java/io/ObjectOutputStream$PutField outerClass java/io/ObjectOutputStream innerClassName PutField flags 409
-innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-