JBR-3640 java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java: window Open button lost focus when it should not

(cherry picked from commit a7d486ca3d)

.gitattributes

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

.hgtags

@@ -633,11 +633,3 @@ e41ae00add1d76a8f25adb558933382947ea840d jdk-11.0.11+6
 9f0347b029d3a0349f23befcfb68ee02d85d9034 jdk-11.0.11+8
 15862747ee15445292b4b9949b4f0f4badba4812 jdk-11.0.11+9
 15862747ee15445292b4b9949b4f0f4badba4812 jdk-11.0.11-ga
-5720ffa08f8514b9f0ea8b3a49e05a872c9c0efe jdk-11.0.12+1
-70a4031a8bef3e693f34864fdd482429c73dc76a jdk-11.0.12+2
-873a691b1ae4fa8b55ca5d08fa21aca3a4904fb8 jdk-11.0.12+3
-40d1e784e1937aaea696a9654cc2d944d3d78996 jdk-11.0.12+4
-6aa6f6860508fca3a97aea1de7a36574498d22bf jdk-11.0.12+5
-91e81ac088545abdc3eaaa707853d31a6cf99af3 jdk-11.0.12+6
-f412f2537f1502a9697a9684c77bea8d848db1ab jdk-11.0.12+7
-f412f2537f1502a9697a9684c77bea8d848db1ab jdk-11.0.12-ga

README.md

@@ -11,10 +11,9 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
 
 | IDE Version | Latest JBR | Date Released |
 |  ---        | ---        | ---           |
-| 2021.3      | [11_0_12-b1692.9](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jbr11_0_12b1692.9) | 28-Sep-2021 |
-| 2021.2      | [11_0_12-b1504.40](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jb11_0_12-b1504.40) | 28-Sep-2021 |
-| 2021.1      | [11.0.11+9-b1341.60](https://confluence.jetbrains.com/pages/viewpage.action?pageId=218857477) | 15-Jun-2021 |
-| 2020.3      | [11_0_11-b1145.115](https://confluence.jetbrains.com/pages/viewpage.action?pageId=219349001) | 21-Jun-2021 |
+| 2021.2      | [11_0_11-b1504.13](https://github.com/JetBrains/JetBrainsRuntime/releases/tag/jb11_0_11-b1504.13)   | 19-Jul-2021 |
+| 2021.1      | [11.0.11+9-b1341.60](https://confluence.jetbrains.com/pages/viewpage.action?pageId=218857477)     | 15-Jun-2021 |
+| 2020.3      | [11_0_11-b1145.115](https://confluence.jetbrains.com/pages/viewpage.action?pageId=219349001)    | 21-Jun-2021 |
 
 ## Contents
 - [Welcome to JetBrains Runtime](#jetbrains-runtime)
@@ -27,7 +26,6 @@ can be found on the [releases page](https://github.com/JetBrains/JetBrainsRuntim
     - [Ubuntu Linux](#ubuntu-linux)
     - [Windows](#build-windows)
     - [macOS](#macos)
-  - [Developing](#developing)
   - [Contributing](#contributing)
   - [Resources](#resources)
 
@@ -111,8 +109,8 @@ Install the following:
 
 From the command line: 
 ```
-"c:\Program Files (x86)\Microsoft Visual Studio 15.0\VC\vcvarsall.bat" amd64
-c:\cygwin64\bin\mintty.exe /usr/bin/bash -l
+"c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+"c:\Program_Files\cygwin64\bin\mintty.exe" /bin/bash -l
 ```
 The first command sets up environment variables, the second starts a Cygwin shell with the proper environment.  
 
@@ -136,30 +134,6 @@ $ sh ./configure --prefix=$(pwd)/build  --disable-warnings-as-errors
 $ make images
 ```
 
-## Developing
-You can use  [CLion](https://www.jetbrains.com/clion/) to develop native parts of the JetBrains Runtime and
-[IntelliJ IDEA](https://www.jetbrains.com/idea/) for the parts written in Java.
-Both require projects to be created.
-
-### CLion
-Run
-```
-$ make compile-commands
-```
-in the git root and open the resulting `build/.../compile_commands.json` file as a project.
-Then use `Tools | Compilation Database | Change Project Root` to point to git root of this repository.
-
-See also this detailed step-by-step tutorial for all platforms:
-[How to develop OpenJDK with CLion](https://blog.jetbrains.com/clion/2020/03/openjdk-with-clion/).
-
-### IDEA
-Run
-```
-$ sh ./bin/idea.sh
-```
-in the git root to generate project files (add `--help` for options). Then open the git root directory
-as a project in IDEA.
-
 ## Contributing
 We are happy to receive your pull requests! 
 Before you submit one, please sign our [Contributor License Agreement (CLA)](https://www.jetbrains.com/agreements/cla/).

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

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

jb/project/tools/patches/dcevm/0001-Apply-basic-dcevm11-patch.patch

@@ -1,7 +1,7 @@
-From c8fc7efc8a4ea802125d086e46a43baea7a64a28 Mon Sep 17 00:00:00 2001
+From 07373a8bd65d7c2663024709f0d5b7e0e41aba40 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:09:39 +0100
-Subject: [PATCH 01/30] Apply basic dcevm11 patch
+Subject: [PATCH 01/28] Apply basic dcevm11 patch
 
 ---
  src/hotspot/share/ci/ciObjectFactory.cpp      |   25 +
@@ -126,7 +126,7 @@ index 1063c9853e1..3e9d48c4cdc 100644
  
  #endif // SHARE_VM_CI_CIOBJECTFACTORY_HPP
 diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
-index 154dab55e43..0c6c3a86965 100644
+index 6d65cca2101..e2b8c5793d0 100644
 --- a/src/hotspot/share/classfile/classFileParser.cpp
 +++ b/src/hotspot/share/classfile/classFileParser.cpp
 @@ -954,6 +954,8 @@ void ClassFileParser::parse_interfaces(const ClassFileStream* const stream,
@@ -236,10 +236,10 @@ index 3bdfd34e39f..d792ab4bb3f 100644
    ReferenceType reference_type() const { return _rt; }
    AccessFlags access_flags() const { return _access_flags; }
 diff --git a/src/hotspot/share/classfile/classLoader.cpp b/src/hotspot/share/classfile/classLoader.cpp
-index e10d32ea7b7..079558bb244 100644
+index 78eb096458a..368c59e2cbf 100644
 --- a/src/hotspot/share/classfile/classLoader.cpp
 +++ b/src/hotspot/share/classfile/classLoader.cpp
-@@ -1502,6 +1502,7 @@ InstanceKlass* ClassLoader::load_class(Symbol* name, bool search_append_only, TR
+@@ -1505,6 +1505,7 @@ InstanceKlass* ClassLoader::load_class(Symbol* name, bool search_append_only, TR
                                                             protection_domain,
                                                             NULL, // host_klass
                                                             NULL, // cp_patches
@@ -248,10 +248,10 @@ index e10d32ea7b7..079558bb244 100644
    if (HAS_PENDING_EXCEPTION) {
      if (DumpSharedSpaces) {
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 5d9ac0009aa..e2754d5f5be 100644
+index c58026ae192..25103fff2c0 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1245,6 +1245,12 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
+@@ -1242,6 +1242,12 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
    }
  }
  
@@ -264,7 +264,7 @@ index 5d9ac0009aa..e2754d5f5be 100644
  // Only walks the classes defined in this class loader.
  void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS), TRAPS) {
    Thread* thread = Thread::current();
-@@ -1254,6 +1260,12 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS),
+@@ -1251,6 +1257,12 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS),
    }
  }
  
@@ -277,7 +277,7 @@ index 5d9ac0009aa..e2754d5f5be 100644
  // Walks all entries in the dictionary including entries initiated by this class loader.
  void ClassLoaderDataGraph::dictionary_all_entries_do(void f(InstanceKlass*, ClassLoaderData*)) {
    Thread* thread = Thread::current();
-@@ -1375,11 +1387,15 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1372,11 +1384,15 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    // Mark metadata seen on the stack only so we can delete unneeded entries.
    // Only walk all metadata, including the expensive code cache walk, for Full GC
    // and only if class redefinition and if there's previous versions of
@@ -294,7 +294,7 @@ index 5d9ac0009aa..e2754d5f5be 100644
  
    // Save previous _unloading pointer for CMS which may add to unloading list before
    // purging and we don't want to rewalk the previously unloaded class loader data.
-@@ -1389,10 +1405,12 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1386,10 +1402,12 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    while (data != NULL) {
      if (data->is_alive()) {
        // clean metaspace
@@ -336,7 +336,7 @@ index f5157e07c76..e9e52f00e8a 100644
  
    if (HAS_PENDING_EXCEPTION) {
 diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index b949bac8de6..5bd048d8627 100644
+index 3ac1ca69ae5..118730f1b83 100644
 --- a/src/hotspot/share/classfile/dictionary.cpp
 +++ b/src/hotspot/share/classfile/dictionary.cpp
 @@ -245,6 +245,19 @@ void Dictionary::classes_do(void f(InstanceKlass*)) {
@@ -449,7 +449,7 @@ index d26f1f11fb4..fd4b134d7a7 100644
  
  // An entry in the class loader data dictionaries, this describes a class as
 diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
-index 559d90339be..b86f8320d70 100644
+index e4f1b934afc..ef4011c1292 100644
 --- a/src/hotspot/share/classfile/javaClasses.cpp
 +++ b/src/hotspot/share/classfile/javaClasses.cpp
 @@ -2428,6 +2428,8 @@ void java_lang_Throwable::fill_in_stack_trace(Handle throwable, const methodHand
@@ -537,7 +537,7 @@ index 559d90339be..b86f8320d70 100644
    // lookup ResolvedMethod oop in the table, or create a new one and intern it
    oop resolved_method = ResolvedMethodTable::find_method(m());
 diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
-index 97df4a0bdea..2e121e19f19 100644
+index 910bb084b63..89a46264553 100644
 --- a/src/hotspot/share/classfile/javaClasses.hpp
 +++ b/src/hotspot/share/classfile/javaClasses.hpp
 @@ -67,6 +67,8 @@
@@ -732,7 +732,7 @@ index 8a7a1248e62..611e18aaf85 100644
    bool add_entry(Symbol* name, InstanceKlass* klass1, Handle loader1,
                                      InstanceKlass* klass2, Handle loader2);
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 4509025cf70..1ab9b99b435 100644
+index bfd67334f82..5a745b6fca6 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
 @@ -201,6 +201,7 @@ Klass* SystemDictionary::resolve_or_fail(Symbol* class_name, Handle class_loader
@@ -824,7 +824,7 @@ index 4509025cf70..1ab9b99b435 100644
    } );
  
    return k;
-@@ -1555,11 +1568,12 @@ static void post_class_define_event(InstanceKlass* k, const ClassLoaderData* def
+@@ -1553,11 +1566,12 @@ static void post_class_define_event(InstanceKlass* k, const ClassLoaderData* def
    }
  }
  
@@ -838,7 +838,7 @@ index 4509025cf70..1ab9b99b435 100644
  
   // for bootstrap and other parallel classloaders don't acquire lock,
   // use placeholder token
-@@ -1584,7 +1598,11 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
+@@ -1582,7 +1596,11 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
    Symbol*  name_h = k->name();
    Dictionary* dictionary = loader_data->dictionary();
    unsigned int d_hash = dictionary->compute_hash(name_h);
@@ -851,7 +851,7 @@ index 4509025cf70..1ab9b99b435 100644
  
    // Register class just loaded with class loader (placed in Vector)
    // Note we do this before updating the dictionary, as this can
-@@ -1618,7 +1636,7 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
+@@ -1616,7 +1634,7 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, TRAPS) {
    k->eager_initialize(THREAD);
  
    // notify jvmti
@@ -860,7 +860,7 @@ index 4509025cf70..1ab9b99b435 100644
        assert(THREAD->is_Java_thread(), "thread->is_Java_thread()");
        JvmtiExport::post_class_load((JavaThread *) THREAD, k);
  
-@@ -1696,7 +1714,7 @@ InstanceKlass* SystemDictionary::find_or_define_instance_class(Symbol* class_nam
+@@ -1694,7 +1712,7 @@ InstanceKlass* SystemDictionary::find_or_define_instance_class(Symbol* class_nam
      }
    }
  
@@ -869,7 +869,7 @@ index 4509025cf70..1ab9b99b435 100644
  
    Handle linkage_exception = Handle(); // null handle
  
-@@ -1819,6 +1837,18 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
+@@ -1817,6 +1835,18 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
    CodeCache::flush_dependents_on(k);
  }
  
@@ -888,7 +888,7 @@ index 4509025cf70..1ab9b99b435 100644
  // ----------------------------------------------------------------------------
  // GC support
  
-@@ -2115,7 +2145,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
+@@ -2113,7 +2143,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
        // also hold array classes.
  
        assert(check->is_instance_klass(), "noninstance in systemdictionary");
@@ -898,7 +898,7 @@ index 4509025cf70..1ab9b99b435 100644
          ss.print("loader %s", loader_data->loader_name_and_id());
          ss.print(" attempted duplicate %s definition for %s. (%s)",
 diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
-index a14728df757..b956c6a7519 100644
+index 649b321a6a4..06f6c869d63 100644
 --- a/src/hotspot/share/classfile/systemDictionary.hpp
 +++ b/src/hotspot/share/classfile/systemDictionary.hpp
 @@ -161,6 +161,8 @@ class OopStorage;
@@ -910,7 +910,7 @@ index a14728df757..b956c6a7519 100644
    do_klass(MethodHandle_klass,                          java_lang_invoke_MethodHandle,             Pre                 ) \
    do_klass(VarHandle_klass,                             java_lang_invoke_VarHandle,                Pre                 ) \
    do_klass(MemberName_klass,                            java_lang_invoke_MemberName,               Pre                 ) \
-@@ -321,6 +323,7 @@ public:
+@@ -318,6 +320,7 @@ public:
                                              Handle class_loader,
                                              Handle protection_domain,
                                              ClassFileStream* st,
@@ -918,7 +918,7 @@ index a14728df757..b956c6a7519 100644
                                              TRAPS);
  
    // Lookup an already loaded class. If not found NULL is returned.
-@@ -465,6 +468,10 @@ public:
+@@ -462,6 +465,10 @@ public:
    static bool is_well_known_klass(Symbol* class_name);
  #endif
  
@@ -929,7 +929,7 @@ index a14728df757..b956c6a7519 100644
  protected:
    // Returns the class loader data to be used when looking up/updating the
    // system dictionary.
-@@ -658,7 +665,7 @@ protected:
+@@ -655,7 +662,7 @@ protected:
    // after waiting, but before reentering SystemDictionary_lock
    // to preserve lock order semantics.
    static void double_lock_wait(Handle lockObject, TRAPS);
@@ -977,10 +977,10 @@ index 05239c57866..c1357bde0ed 100644
    methodHandle        _method; // current method being verified
    VerificationType    _this_type; // the verification type of the current class
 diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
-index cef3f530cbc..17f7e720c95 100644
+index 8955dd0b366..26ff6ee9853 100644
 --- a/src/hotspot/share/classfile/vmSymbols.hpp
 +++ b/src/hotspot/share/classfile/vmSymbols.hpp
-@@ -287,6 +287,8 @@
+@@ -286,6 +286,8 @@
    template(java_lang_invoke_CallSite,                 "java/lang/invoke/CallSite")                \
    template(java_lang_invoke_ConstantCallSite,         "java/lang/invoke/ConstantCallSite")        \
    template(java_lang_invoke_DirectMethodHandle,       "java/lang/invoke/DirectMethodHandle")      \
@@ -989,7 +989,7 @@ index cef3f530cbc..17f7e720c95 100644
    template(java_lang_invoke_MutableCallSite,          "java/lang/invoke/MutableCallSite")         \
    template(java_lang_invoke_VolatileCallSite,         "java/lang/invoke/VolatileCallSite")        \
    template(java_lang_invoke_MethodHandle,             "java/lang/invoke/MethodHandle")            \
-@@ -447,6 +449,12 @@
+@@ -446,6 +448,12 @@
    template(module_entry_name,                         "module_entry")                             \
    template(resolved_references_name,                  "<resolved_references>")                    \
    template(init_lock_name,                            "<init_lock>")                              \
@@ -2186,10 +2186,10 @@ index b77a19deb38..5573b10f021 100644
    // Compiler support
    static ByteSize super_offset()                 { return in_ByteSize(offset_of(Klass, _super)); }
 diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index 576da96ed32..e47dd223f92 100644
+index 916772c0b10..ed6f769bf1b 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
-@@ -1447,6 +1447,8 @@ methodHandle Method::clone_with_new_data(const methodHandle& m, u_char* new_code
+@@ -1402,6 +1402,8 @@ methodHandle Method::clone_with_new_data(const methodHandle& m, u_char* new_code
  
    // Reset correct method/const method, method size, and parameter info
    newm->set_constMethod(newcm);
@@ -2198,7 +2198,7 @@ index 576da96ed32..e47dd223f92 100644
    newm->constMethod()->set_code_size(new_code_length);
    newm->constMethod()->set_constMethod_size(new_const_method_size);
    assert(newm->code_size() == new_code_length, "check");
-@@ -2141,6 +2143,10 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
+@@ -2096,6 +2098,10 @@ 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) {
@@ -2210,7 +2210,7 @@ index 576da96ed32..e47dd223f92 100644
  
    if (!SafepointSynchronize::is_at_safepoint()) {
 diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
-index da8468dead4..4ac3e6e80de 100644
+index 18c706187df..4533476ff8f 100644
 --- a/src/hotspot/share/oops/method.hpp
 +++ b/src/hotspot/share/oops/method.hpp
 @@ -78,6 +78,9 @@ class Method : public Metadata {
@@ -2248,7 +2248,7 @@ index da8468dead4..4ac3e6e80de 100644
    Symbol* signature() const                      { return constants()->symbol_at(signature_index()); }
    int signature_index() const                    { return constMethod()->signature_index();         }
 diff --git a/src/hotspot/share/prims/jni.cpp b/src/hotspot/share/prims/jni.cpp
-index f5db74f4225..7f88297aa10 100644
+index 21e7f652652..e9cc3de9652 100644
 --- a/src/hotspot/share/prims/jni.cpp
 +++ b/src/hotspot/share/prims/jni.cpp
 @@ -353,6 +353,7 @@ JNI_ENTRY(jclass, jni_DefineClass(JNIEnv *env, const char *name, jobject loaderR
@@ -2260,7 +2260,7 @@ index f5db74f4225..7f88297aa10 100644
  
    if (log_is_enabled(Debug, class, resolve) && k != NULL) {
 diff --git a/src/hotspot/share/prims/jvm.cpp b/src/hotspot/share/prims/jvm.cpp
-index 147beffc814..129b71bf0f5 100644
+index 0d686d85fc7..70b525533cd 100644
 --- a/src/hotspot/share/prims/jvm.cpp
 +++ b/src/hotspot/share/prims/jvm.cpp
 @@ -936,6 +936,7 @@ static jclass jvm_define_class_common(JNIEnv *env, const char *name,
@@ -2273,7 +2273,7 @@ index 147beffc814..129b71bf0f5 100644
    if (log_is_enabled(Debug, class, resolve) && k != NULL) {
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 new file mode 100644
-index 00000000000..80c31135487
+index 00000000000..83c0952de37
 --- /dev/null
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -0,0 +1,2255 @@
@@ -4534,7 +4534,7 @@ index 00000000000..80c31135487
 +}
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 new file mode 100644
-index 00000000000..3f95cf42645
+index 00000000000..b712d69a193
 --- /dev/null
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 @@ -0,0 +1,202 @@
@@ -4806,10 +4806,10 @@ index f54c9b713be..54617f05b5a 100644
    VMThread::execute(&op);
    return (op.check_error());
 diff --git a/src/hotspot/share/prims/jvmtiExport.cpp b/src/hotspot/share/prims/jvmtiExport.cpp
-index a63b0f67423..9e70e3bc3f8 100644
+index 6600848e2d3..9337b6ab585 100644
 --- a/src/hotspot/share/prims/jvmtiExport.cpp
 +++ b/src/hotspot/share/prims/jvmtiExport.cpp
-@@ -2783,7 +2783,7 @@ JvmtiDynamicCodeEventCollector::JvmtiDynamicCodeEventCollector() : _code_blobs(N
+@@ -2780,7 +2780,7 @@ JvmtiDynamicCodeEventCollector::JvmtiDynamicCodeEventCollector() : _code_blobs(N
  // iterate over any code blob descriptors collected and post a
  // DYNAMIC_CODE_GENERATED event to the profiler.
  JvmtiDynamicCodeEventCollector::~JvmtiDynamicCodeEventCollector() {
@@ -4866,10 +4866,10 @@ index a0a6a6cbd18..39953a71244 100644
    for (InstanceKlass* pv_node = ik->previous_versions();
         pv_node != NULL;
 diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index 5c1ed782b8f..5bca664c7c0 100644
+index c071e0641d4..a9057893368 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -202,6 +202,8 @@ void ResolvedMethodTable::print() {
+@@ -201,6 +201,8 @@ void ResolvedMethodTable::print() {
  void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
    assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
    // For each entry in RMT, change to new method
@@ -4878,7 +4878,7 @@ index 5c1ed782b8f..5bca664c7c0 100644
    for (int i = 0; i < _the_table->table_size(); ++i) {
      for (ResolvedMethodEntry* entry = _the_table->bucket(i);
           entry != NULL;
-@@ -216,18 +218,30 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
+@@ -215,18 +217,30 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
  
        if (old_method->is_old()) {
  
@@ -4918,7 +4918,7 @@ index 5c1ed782b8f..5bca664c7c0 100644
  
          ResourceMark rm;
          if (!(*trace_name_printed)) {
-@@ -236,9 +250,14 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
+@@ -235,9 +249,14 @@ void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
          }
          log_debug(redefine, class, update, constantpool)
            ("ResolvedMethod method update: %s(%s)",
@@ -4997,10 +4997,10 @@ index bd439aab073..cc7f71a4404 100644
    static size_t max_heap_for_compressed_oops();
  
 diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 5c389505417..194242e4c4b 100644
+index 4a53ecb37a8..a6c33744760 100644
 --- a/src/hotspot/share/runtime/globals.hpp
 +++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2680,7 +2680,11 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
+@@ -2674,7 +2674,11 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
            "Start flight recording with options"))                           \
                                                                              \
    experimental(bool, UseFastUnorderedTimeStamps, false,                     \
@@ -5043,7 +5043,7 @@ index 563ffdbd446..55f06eadcc2 100644
    _result   = result;
  
 diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
-index 42f1fa9626f..16e91c85fd1 100644
+index d504ef00f90..982ba1b69d5 100644
 --- a/src/hotspot/share/runtime/mutexLocker.cpp
 +++ b/src/hotspot/share/runtime/mutexLocker.cpp
 @@ -5,7 +5,7 @@
@@ -5064,7 +5064,7 @@ index 42f1fa9626f..16e91c85fd1 100644
  Monitor* GCTaskManager_lock           = NULL;
  
  Mutex*   Management_lock              = NULL;
-@@ -291,6 +293,7 @@ void mutex_init() {
+@@ -285,6 +287,7 @@ void mutex_init() {
    def(JNIGlobalActive_lock         , PaddedMutex  , nonleaf-1,   true,  Monitor::_safepoint_check_never);
    def(JNIWeakAlloc_lock            , PaddedMutex  , nonleaf,     true,  Monitor::_safepoint_check_never);
    def(JNIWeakActive_lock           , PaddedMutex  , nonleaf-1,   true,  Monitor::_safepoint_check_never);
@@ -5073,10 +5073,10 @@ index 42f1fa9626f..16e91c85fd1 100644
    def(AdapterHandlerLibrary_lock   , PaddedMutex  , nonleaf,     true,  Monitor::_safepoint_check_always);
  
 diff --git a/src/hotspot/share/runtime/mutexLocker.hpp b/src/hotspot/share/runtime/mutexLocker.hpp
-index 0d263ca55ba..b41abcb82ae 100644
+index 12366c7ead1..70aeb1bd0c1 100644
 --- a/src/hotspot/share/runtime/mutexLocker.hpp
 +++ b/src/hotspot/share/runtime/mutexLocker.hpp
-@@ -124,6 +124,8 @@ extern Mutex*   PerfDataManager_lock;            // a long on access to PerfData
+@@ -123,6 +123,8 @@ extern Mutex*   PerfDataManager_lock;            // a long on access to PerfData
  extern Mutex*   ParkerFreeList_lock;
  extern Mutex*   OopMapCacheAlloc_lock;           // protects allocation of oop_map caches
  

jb/project/tools/patches/dcevm/0002-dcevm11-fixes.patch

@@ -1,7 +1,7 @@
-From 9e44570dfadf7a506c6f6a788ec1077cda9cb04f Mon Sep 17 00:00:00 2001
+From 41093b9513718c3122f3ff36da7fc2eeca224a10 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:18:22 +0100
-Subject: [PATCH 02/30] dcevm11 fixes
+Subject: [PATCH 02/28] dcevm11 fixes
 
 1. We need to set classRedefinitionCount on new class, not old class.
 
@@ -82,7 +82,7 @@ dmh
  19 files changed, 324 insertions(+), 415 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/classFileParser.cpp b/src/hotspot/share/classfile/classFileParser.cpp
-index 0c6c3a86965..b03272da179 100644
+index e2b8c5793d0..5e1c740a3d2 100644
 --- a/src/hotspot/share/classfile/classFileParser.cpp
 +++ b/src/hotspot/share/classfile/classFileParser.cpp
 @@ -954,6 +954,7 @@ void ClassFileParser::parse_interfaces(const ClassFileStream* const stream,
@@ -124,10 +124,10 @@ index d792ab4bb3f..de48092bde8 100644
  
   public:
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index e2754d5f5be..1c0d5b0a8f2 100644
+index 25103fff2c0..ab2615da0ed 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1245,6 +1245,7 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
+@@ -1242,6 +1242,7 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*)) {
    }
  }
  
@@ -135,7 +135,7 @@ index e2754d5f5be..1c0d5b0a8f2 100644
  void ClassLoaderDataGraph::dictionary_classes_do(KlassClosure* klass_closure) {
    FOR_ALL_DICTIONARY(cld) {
      cld->dictionary()->classes_do(klass_closure);
-@@ -1260,6 +1261,7 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS),
+@@ -1257,6 +1258,7 @@ void ClassLoaderDataGraph::dictionary_classes_do(void f(InstanceKlass*, TRAPS),
    }
  }
  
@@ -143,7 +143,7 @@ index e2754d5f5be..1c0d5b0a8f2 100644
  void ClassLoaderDataGraph::rollback_redefinition() {
    FOR_ALL_DICTIONARY(cld) {
      cld->dictionary()->rollback_redefinition();
-@@ -1390,12 +1392,13 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1387,12 +1389,13 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    // Klassesoto delete.
  
    // FIXME: dcevm - block asserts in MetadataOnStackMark
@@ -163,7 +163,7 @@ index e2754d5f5be..1c0d5b0a8f2 100644
  
    // Save previous _unloading pointer for CMS which may add to unloading list before
    // purging and we don't want to rewalk the previously unloaded class loader data.
-@@ -1405,12 +1408,12 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1402,12 +1405,12 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    while (data != NULL) {
      if (data->is_alive()) {
        // clean metaspace
@@ -182,7 +182,7 @@ index e2754d5f5be..1c0d5b0a8f2 100644
        data = data->next();
        loaders_processed++;
 diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index 5bd048d8627..a97b48fe5bb 100644
+index 118730f1b83..dda5188c370 100644
 --- a/src/hotspot/share/classfile/dictionary.cpp
 +++ b/src/hotspot/share/classfile/dictionary.cpp
 @@ -245,6 +245,8 @@ void Dictionary::classes_do(void f(InstanceKlass*)) {
@@ -244,7 +244,7 @@ index a26b9d1cb55..3d5a59a04ff 100644
    for (int index = 0; index < table_size(); index++) {
      LoaderConstraintEntry** p = bucket_addr(index);
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 1ab9b99b435..52b6ed22b5d 100644
+index 5a745b6fca6..19bc8d9899a 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
 @@ -876,7 +876,8 @@ Klass* SystemDictionary::resolve_instance_class_or_null(Symbol* name,
@@ -266,7 +266,7 @@ index 1ab9b99b435..52b6ed22b5d 100644
    if (!DumpSharedSpaces) {
      k = SystemDictionaryShared::lookup_from_stream(class_name,
                                                     class_loader,
-@@ -1837,7 +1838,7 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
+@@ -1835,7 +1836,7 @@ void SystemDictionary::add_to_hierarchy(InstanceKlass* k, TRAPS) {
    CodeCache::flush_dependents_on(k);
  }
  
@@ -275,7 +275,7 @@ index 1ab9b99b435..52b6ed22b5d 100644
  void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
      assert(k != NULL, "just checking");
  
-@@ -1845,6 +1846,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
+@@ -1843,6 +1844,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
    k->remove_from_sibling_list();
  }
  
@@ -463,7 +463,7 @@ index 2cc98b636f1..e8107a39813 100644
    // link this class into the implementors list of every interface it implements
    void process_interfaces(Thread *thread);
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 80c31135487..43d761cdbb2 100644
+index 83c0952de37..92ce6c27b8a 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -1,4 +1,4 @@
@@ -1394,7 +1394,7 @@ index 80c31135487..43d761cdbb2 100644
    ResourceMark mark(THREAD);
  
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index 3f95cf42645..a48e07e3a6a 100644
+index b712d69a193..60b62c3170a 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 @@ -16,6 +16,8 @@
@@ -1528,10 +1528,10 @@ index 39953a71244..b59d3046b88 100644
  
    // search previous versions if they exist
 diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index 5bca664c7c0..4498bdcd77e 100644
+index a9057893368..af2ec48c2e1 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -198,8 +198,52 @@ void ResolvedMethodTable::print() {
+@@ -197,8 +197,52 @@ void ResolvedMethodTable::print() {
  #endif // PRODUCT
  
  #if INCLUDE_JVMTI

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

@@ -1,7 +1,7 @@
-From b765fdd15ad06d3a75d47560624d56c11c0a539e Mon Sep 17 00:00:00 2001
+From caa877d9126bd91d6719675a83928ba01bffb69a Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 12 Dec 2018 19:38:28 +0100
-Subject: [PATCH 03/30] Support for Concurrent Mark Sweep (CMS) collector
+Subject: [PATCH 03/28] Support for Concurrent Mark Sweep (CMS) collector
 
 ---
  .../share/gc/cms/compactibleFreeListSpace.cpp | 139 ++++++++++++------
@@ -422,7 +422,7 @@ index 6b109fcd2e5..8c255d6d428 100644
          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 43d761cdbb2..14af1aad21b 100644
+index 92ce6c27b8a..41e82ae7a69 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -54,6 +54,7 @@

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

@@ -1,7 +1,7 @@
-From c8787d7d44cc2f988e8a297ed71a12e4e223c3a0 Mon Sep 17 00:00:00 2001
+From 93373779a1d44181ca07498faa8a0e8d7fc6b608 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@mailprofiler.com>
 Date: Wed, 11 Mar 2020 14:19:34 +0100
-Subject: [PATCH 04/30] Fix class cast exception on redefinition of class A,
+Subject: [PATCH 04/28] Fix class cast exception on redefinition of class A,
  that is superclass of B that has anonymous class C
 
 ---

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

@@ -1,7 +1,7 @@
-From 2a370311c44db34aa4571d156b8408d8f6353150 Mon Sep 17 00:00:00 2001
+From c8850725d4c84f93beaee3c05f9d8f9862fe6159 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Thu, 15 Nov 2018 03:20:08 +0700
-Subject: [PATCH 05/30] HotswapAgent integration
+Subject: [PATCH 05/28] HotswapAgent integration
 
 It include:
 
@@ -390,10 +390,10 @@ index 82311e69fd6..bd39f8595b2 100644
      CFLAGS := -DENABLE_ARG_FILES, \
  ))
 diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
-index 17f7e720c95..0d0badeabd0 100644
+index 26ff6ee9853..2409af9b06e 100644
 --- a/src/hotspot/share/classfile/vmSymbols.hpp
 +++ b/src/hotspot/share/classfile/vmSymbols.hpp
-@@ -343,6 +343,7 @@
+@@ -342,6 +342,7 @@
    /* common method and field names */                                                             \
    template(object_initializer_name,                   "<init>")                                   \
    template(class_initializer_name,                    "<clinit>")                                 \
@@ -511,7 +511,7 @@ index cc7f71a4404..b2bab2e1f44 100644
    static size_t max_heap_for_compressed_oops();
  
 diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 194242e4c4b..9c007fc2d82 100644
+index a6c33744760..b8dba232fc1 100644
 --- a/src/hotspot/share/runtime/globals.hpp
 +++ b/src/hotspot/share/runtime/globals.hpp
 @@ -32,6 +32,12 @@
@@ -527,7 +527,7 @@ index 194242e4c4b..9c007fc2d82 100644
  // The larger HeapWordSize for 64bit requires larger heaps
  // for the same application running in 64bit.  See bug 4967770.
  // The minimum alignment to a heap word size is done.  Other
-@@ -2684,8 +2690,10 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
+@@ -2678,8 +2684,10 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
                                                                              \
    product(bool, AllowEnhancedClassRedefinition, true,                       \
               "Allow enhanced class redefinition beyond swapping method "    \

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

@@ -1,7 +1,7 @@
-From 1791046a450852eabeffcc044f77cebd19b2b760 Mon Sep 17 00:00:00 2001
+From 1552e3854e11fb835452aa531ef53b78bb4588a5 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 4 Oct 2020 21:12:12 +0200
-Subject: [PATCH 06/30] Support for Lambda class redefinition
+Subject: [PATCH 06/28] Support for Lambda class redefinition
 
 ---
  .../share/classfile/classLoaderData.cpp       |  9 +++
@@ -15,7 +15,7 @@ Subject: [PATCH 06/30] Support for Lambda class redefinition
  8 files changed, 85 insertions(+), 10 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 1c0d5b0a8f2..d5ee3c0338c 100644
+index ab2615da0ed..1bc67adf5a7 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
 @@ -663,6 +663,15 @@ Dictionary* ClassLoaderData::create_dictionary() {
@@ -47,7 +47,7 @@ index 7e357929971..00a84610b43 100644
  
    void unload();
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 52b6ed22b5d..1dd53e0b7bc 100644
+index 19bc8d9899a..a6a03d3c0e9 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
 @@ -971,12 +971,16 @@ InstanceKlass* SystemDictionary::parse_stream(Symbol* class_name,
@@ -81,7 +81,7 @@ index 52b6ed22b5d..1dd53e0b7bc 100644
  
    if (host_klass != NULL && k != NULL) {
      // Anonymous classes must update ClassLoaderData holder (was host_klass loader)
-@@ -1846,7 +1854,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
+@@ -1844,7 +1852,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
    k->remove_from_sibling_list();
  }
  
@@ -91,10 +91,10 @@ index 52b6ed22b5d..1dd53e0b7bc 100644
    constraints()->update_after_redefinition();
  }
 diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
-index b956c6a7519..a8359143908 100644
+index 06f6c869d63..1dbbffa197f 100644
 --- a/src/hotspot/share/classfile/systemDictionary.hpp
 +++ b/src/hotspot/share/classfile/systemDictionary.hpp
-@@ -307,6 +307,7 @@ public:
+@@ -304,6 +304,7 @@ public:
                          protection_domain,
                          st,
                          NULL, // host klass
@@ -102,7 +102,7 @@ index b956c6a7519..a8359143908 100644
                          NULL, // cp_patches
                          THREAD);
    }
-@@ -315,6 +316,7 @@ public:
+@@ -312,6 +313,7 @@ public:
                                       Handle protection_domain,
                                       ClassFileStream* st,
                                       const InstanceKlass* host_klass,
@@ -111,7 +111,7 @@ index b956c6a7519..a8359143908 100644
                                       TRAPS);
  
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 14af1aad21b..0b239b2ff6d 100644
+index 41e82ae7a69..b94caa39562 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -488,6 +488,8 @@ void VM_EnhancedRedefineClasses::doit() {
@@ -208,7 +208,7 @@ index 14af1aad21b..0b239b2ff6d 100644
  
    // 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 a48e07e3a6a..3551b06ecde 100644
+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 {
@@ -220,10 +220,10 @@ index a48e07e3a6a..3551b06ecde 100644
    // 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 4498bdcd77e..8966ee8a00a 100644
+index af2ec48c2e1..7741328979f 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -201,7 +201,7 @@ void ResolvedMethodTable::print() {
+@@ -200,7 +200,7 @@ void ResolvedMethodTable::print() {
  
  void ResolvedMethodTable::adjust_method_entries(bool * trace_name_printed) {
    assert(SafepointSynchronize::is_at_safepoint(), "only called at safepoint");
@@ -232,7 +232,7 @@ index 4498bdcd77e..8966ee8a00a 100644
    for (int i = 0; i < _the_table->table_size(); ++i) {
      for (ResolvedMethodEntry* entry = _the_table->bucket(i);
           entry != NULL;
-@@ -272,6 +272,8 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -271,6 +271,8 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
          InstanceKlass* newer_klass = InstanceKlass::cast(old_method->method_holder()->new_version());
          Method* newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
  

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

@@ -1,7 +1,7 @@
-From 4614ca90036fd413dd536f05b1c981d12d48577f Mon Sep 17 00:00:00 2001
+From 83c2efaeb6ea9ee29c6d9eb779991db787c036ac Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 23 May 2020 10:02:15 +0200
-Subject: [PATCH 07/30] Fix "no original bytecode found" error if method with
+Subject: [PATCH 07/28] Fix "no original bytecode found" error if method with
  bkp is missing
 
 Sometimes IDE can deploy class with erroneous method, such method has
@@ -41,10 +41,10 @@ index c25e13d83e8..2a66419908c 100644
  
  IRT_ENTRY(void, InterpreterRuntime::set_original_bytecode_at(JavaThread* thread, Method* method, address bcp, Bytecodes::Code new_code))
 diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index e47dd223f92..165a2e4de36 100644
+index ed6f769bf1b..031f255e632 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
-@@ -1789,14 +1789,14 @@ bool CompressedLineNumberReadStream::read_pair() {
+@@ -1744,14 +1744,14 @@ bool CompressedLineNumberReadStream::read_pair() {
  
  #if INCLUDE_JVMTI
  
@@ -61,7 +61,7 @@ index e47dd223f92..165a2e4de36 100644
      ResourceMark rm;
      fatal("no original bytecode found in %s at bci %d", name_and_sig_as_C_string(), bci);
    }
-@@ -1942,7 +1942,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int bci) {
+@@ -1897,7 +1897,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 e47dd223f92..165a2e4de36 100644
    _next = NULL;
  }
  
-@@ -1951,7 +1951,7 @@ void BreakpointInfo::set(Method* method) {
+@@ -1906,7 +1906,7 @@ void BreakpointInfo::set(Method* method) {
    {
      Bytecodes::Code code = (Bytecodes::Code) *method->bcp_from(_bci);
      if (code == Bytecodes::_breakpoint)
@@ -80,7 +80,7 @@ index e47dd223f92..165a2e4de36 100644
    }
  #endif
 diff --git a/src/hotspot/share/oops/method.hpp b/src/hotspot/share/oops/method.hpp
-index 4ac3e6e80de..9ff4f0e8036 100644
+index 4533476ff8f..193e1845b23 100644
 --- a/src/hotspot/share/oops/method.hpp
 +++ b/src/hotspot/share/oops/method.hpp
 @@ -230,7 +230,7 @@ class Method : public Metadata {
@@ -102,7 +102,7 @@ index 4ac3e6e80de..9ff4f0e8036 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 0b239b2ff6d..aba99bb60fa 100644
+index b94caa39562..1fbba406087 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -1356,14 +1356,16 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {

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

@@ -1,7 +1,7 @@
-From 4c810c66030c0c0ef59d87a2e1d14297405d5f40 Mon Sep 17 00:00:00 2001
+From f9e238b9bf2cc3ae0c437fa3ebb1703c35f575cf Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 24 May 2020 12:07:42 +0200
-Subject: [PATCH 08/30] Replace deleted method with
+Subject: [PATCH 08/28] Replace deleted method with
  Universe::throw_no_such_method_error
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 08/30] Replace deleted method with
  1 file changed, 14 insertions(+), 14 deletions(-)
 
 diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
-index 8966ee8a00a..c3ed1d28fe5 100644
+index 7741328979f..06581643c3b 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -262,25 +262,25 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -261,25 +261,25 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
  
        if (old_method->is_old()) {
  

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

@@ -1,7 +1,7 @@
-From e8c2f8d3c8ea52933af43ef6f0f2751cb9dc9856 Mon Sep 17 00:00:00 2001
+From a579caf20ac76a5d7cc159d5fed2efa074380f0f Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 12 Jun 2020 17:43:52 +0200
-Subject: [PATCH 09/30] Support for G1 gc
+Subject: [PATCH 09/28] Support for G1 gc
 
 ---
  src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  20 +++
@@ -31,10 +31,10 @@ Subject: [PATCH 09/30] Support for G1 gc
  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 83b7d6b5077..c4ae1eee351 100644
+index a15b400c8e4..985fbad581b 100644
 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
-@@ -2115,6 +2115,21 @@ public:
+@@ -2111,6 +2111,21 @@ public:
    }
  };
  
@@ -56,7 +56,7 @@ index 83b7d6b5077..c4ae1eee351 100644
  void G1CollectedHeap::object_iterate(ObjectClosure* cl) {
    IterateObjectClosureRegionClosure blk(cl);
    heap_region_iterate(&blk);
-@@ -2128,6 +2143,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
+@@ -2124,6 +2139,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
    _hrm.iterate(cl);
  }
  
@@ -1040,7 +1040,7 @@ index d0a6d665aa0..3dc4cc1323c 100644
    SystemDictionary::oops_do(oopClosure);
  }
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index aba99bb60fa..8b6fad2128e 100644
+index 1fbba406087..e67fc2dd58f 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -36,7 +36,6 @@
@@ -1244,7 +1244,7 @@ index aba99bb60fa..8b6fad2128e 100644
    ResourceMark mark(THREAD);
  
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index 3551b06ecde..62a0fbf54d4 100644
+index d8a11b51fe9..9755944d70b 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 @@ -86,9 +86,10 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {

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

@@ -1,7 +1,7 @@
-From c50454b917b5daedd640c11db88eb206ca585654 Mon Sep 17 00:00:00 2001
+From 8d14e792d9849beedc74de690cf4d208ac384878 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 13 Jun 2020 18:50:59 +0200
-Subject: [PATCH 10/30] Change log level in advanced redefinition
+Subject: [PATCH 10/28] 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
@@ -11,7 +11,7 @@ Subject: [PATCH 10/30] Change log level in advanced redefinition
  2 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 8b6fad2128e..a8adfa5af47 100644
+index e67fc2dd58f..5be9bb74305 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -915,7 +915,7 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
@@ -24,10 +24,10 @@ index 8b6fad2128e..a8adfa5af47 100644
    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 c3ed1d28fe5..650007b26ff 100644
+index 06581643c3b..10806bee29b 100644
 --- a/src/hotspot/share/prims/resolvedMethodTable.cpp
 +++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
-@@ -271,7 +271,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -270,7 +270,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
          } else {
            newer_method = newer_klass->method_with_idnum(old_method->orig_method_idnum());
  
@@ -36,7 +36,7 @@ index c3ed1d28fe5..650007b26ff 100644
  
            assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
            assert(newer_method != NULL, "method_with_idnum() should not be NULL");
-@@ -291,7 +291,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+@@ -290,7 +290,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
  
          ResourceMark rm;
          if (!(*trace_name_printed)) {

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

@@ -1,7 +1,7 @@
-From 9d84e9bc3a5f7777f212f79c034b5f9b561af335 Mon Sep 17 00:00:00 2001
+From 5c437ade174426dbaf99a53823597ac7d3b1b4da Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Tue, 6 Oct 2020 22:15:31 +0200
-Subject: [PATCH 11/30] AllowEnhancedClassRedefinition is false (disabled) by
+Subject: [PATCH 11/28] AllowEnhancedClassRedefinition is false (disabled) by
  default
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 11/30] 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 9c007fc2d82..705381825ff 100644
+index b8dba232fc1..d4453de1ff5 100644
 --- a/src/hotspot/share/runtime/globals.hpp
 +++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2688,7 +2688,7 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
+@@ -2682,7 +2682,7 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
    experimental(bool, UseFastUnorderedTimeStamps, false,                     \
            "Use platform unstable time where supported for timestamps only") \
                                                                              \

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

@@ -1,7 +1,7 @@
-From 17acd65fbb25cd9c905b33b4d1f2ba0c59b91bd0 Mon Sep 17 00:00:00 2001
+From 8b1c8178e66af30012fdda3e7f1076309daaf6c4 Mon Sep 17 00:00:00 2001
 From: Artem Khvastunov <artem.khvastunov@jetbrains.com>
 Date: Tue, 14 Apr 2020 19:11:35 +0200
-Subject: [PATCH 12/30] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
+Subject: [PATCH 12/28] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
 
 ---
  jb/project/hotspot-cmake/CMakeLists.txt | 2 ++

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

@@ -1,14 +1,14 @@
-From 66dbe53a6a2846008a21d0d2dc4f1375da8c572b Mon Sep 17 00:00:00 2001
+From 5e7a1218684556596677f39ae01b2ec13ff68a19 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Mon, 19 Oct 2020 20:00:04 +0200
-Subject: [PATCH 13/30] Set HOTSPOT_VM_DISTRO=Dynamic Code Evolution
+Subject: [PATCH 13/28] 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 12a95c59483..662ad155896 100644
+index b9440902d34..c487ac6f047 100644
 --- a/make/autoconf/version-numbers
 +++ b/make/autoconf/version-numbers
 @@ -44,7 +44,7 @@ PRODUCT_NAME=OpenJDK

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

@@ -1,7 +1,7 @@
-From 0e3ec3a8a8ae1da11585d3764f0755ef3a68910a Mon Sep 17 00:00:00 2001
+From c2a4abf7d01ecd7bd262e824338d6235a584086b Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 11 Oct 2020 10:43:28 +0200
-Subject: [PATCH 14/30] Fix G1 nmethod registration
+Subject: [PATCH 14/28] Fix G1 nmethod registration
 
 ---
  .../prims/jvmtiEnhancedRedefineClasses.cpp    | 19 ++++++++++++++++---
@@ -9,7 +9,7 @@ Subject: [PATCH 14/30] Fix G1 nmethod registration
  2 files changed, 18 insertions(+), 4 deletions(-)
 
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index a8adfa5af47..4ee12b7021f 100644
+index 5be9bb74305..f4bde7504c8 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -217,7 +217,14 @@ void VM_EnhancedRedefineClasses::mark_as_scavengable(nmethod* nm) {
@@ -53,7 +53,7 @@ index a8adfa5af47..4ee12b7021f 100644
    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 62a0fbf54d4..d00109a0b92 100644
+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 {

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

@@ -1,14 +1,14 @@
-From 898ed14007ccbc3e65f6e1cc30612833857331ec Mon Sep 17 00:00:00 2001
+From f0b7253294f14a64a5a4d0ef825e5377da03efa5 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Thu, 22 Oct 2020 20:15:20 +0200
-Subject: [PATCH 15/30] Initialize method's _new_version/_old_version to NULL
+Subject: [PATCH 15/28] 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 165a2e4de36..17c08a9dc18 100644
+index 031f255e632..a9556ecf0c4 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
 @@ -83,7 +83,8 @@ Method* Method::allocate(ClassLoaderData* loader_data,

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

@@ -1,7 +1,7 @@
-From 998963048b6f11b10f460fd692f403ded9905062 Mon Sep 17 00:00:00 2001
+From 0550e70425054a77e32fb96770d416b077720857 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 23 Oct 2020 10:20:26 +0200
-Subject: [PATCH 16/30] Clear dcevm code separation
+Subject: [PATCH 16/28] Clear dcevm code separation
 
 ---
  src/hotspot/share/classfile/systemDictionary.cpp   |  4 ++--
@@ -15,7 +15,7 @@ Subject: [PATCH 16/30] Clear dcevm code separation
  8 files changed, 27 insertions(+), 17 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index 1dd53e0b7bc..fe537421e22 100644
+index a6a03d3c0e9..9e0f4dd3c96 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
 @@ -1152,7 +1152,7 @@ InstanceKlass* SystemDictionary::resolve_from_stream(Symbol* class_name,
@@ -27,7 +27,7 @@ index 1dd53e0b7bc..fe537421e22 100644
    } );
  
    return k;
-@@ -2155,7 +2155,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
+@@ -2153,7 +2153,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
        // also hold array classes.
  
        assert(check->is_instance_klass(), "noninstance in systemdictionary");
@@ -148,10 +148,10 @@ index 7eb1b01c785..710e0ddc930 100644
  
    // Verify implementor fields requires the Compile_lock, but this is sometimes
 diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
-index 17c08a9dc18..2596ed7add2 100644
+index a9556ecf0c4..6c7edaca67e 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
-@@ -2145,7 +2145,7 @@ void Method::ensure_jmethod_ids(ClassLoaderData* loader_data, int capacity) {
+@@ -2100,7 +2100,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) ???

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

@@ -1,7 +1,7 @@
-From 0ba7b3d1a31ddb8a1963d174b45e7aa819e8070d Mon Sep 17 00:00:00 2001
+From fde9f15ed4fdb5139b6b81238d0a667327b552bb Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 23 Oct 2020 11:07:40 +0200
-Subject: [PATCH 17/30] Fix metadataOnStack bug
+Subject: [PATCH 17/28] Fix metadataOnStack bug
 
 ---
  .../share/classfile/classLoaderData.cpp       |  7 +-
@@ -11,10 +11,10 @@ Subject: [PATCH 17/30] Fix metadataOnStack bug
  4 files changed, 41 insertions(+), 38 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index d5ee3c0338c..0376777649b 100644
+index 1bc67adf5a7..bba5ce0511f 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1401,13 +1401,10 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1398,13 +1398,10 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    // Klassesoto delete.
  
    // FIXME: dcevm - block asserts in MetadataOnStackMark

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

@@ -1,17 +1,17 @@
-From d91a15b71cd0168a52ca7f58697b29aaacb54ba9 Mon Sep 17 00:00:00 2001
+From 5b5f620932894e807956b45653d153d001be9fb1 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 1 Nov 2020 21:19:00 +0100
-Subject: [PATCH 18/30] Ignore MetadataOnStackMark if redefining_gc_run
+Subject: [PATCH 18/28] Ignore MetadataOnStackMark if redefining_gc_run
 
 ---
  src/hotspot/share/classfile/classLoaderData.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index 0376777649b..b649d6358ed 100644
+index bba5ce0511f..8b2deb70e1b 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1404,7 +1404,7 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
+@@ -1401,7 +1401,7 @@ bool ClassLoaderDataGraph::do_unloading(bool clean_previous_versions) {
    bool walk_all_metadata = clean_previous_versions &&
                               JvmtiExport::has_redefined_a_class() &&
                               InstanceKlass::has_previous_versions_and_reset();

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

@@ -1,7 +1,7 @@
-From c7e49ebc93c95ddc511627dc0d8fe83647d2f1eb Mon Sep 17 00:00:00 2001
+From 29ac3233d58d9a1a30160ae13a895ff70e504022 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Wed, 11 Nov 2020 18:45:15 +0100
-Subject: [PATCH 19/30] Fix LoadedClassesClosure - fixes problems with remote
+Subject: [PATCH 19/28] Fix LoadedClassesClosure - fixes problems with remote
  debugging
 
 ---

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

@@ -1,7 +1,7 @@
-From ddd3ed21c2310c0bd227a0b17fb2d6708549fd01 Mon Sep 17 00:00:00 2001
+From 99e8f8d420dd09d6fb7f035d4baf7ef4816177e8 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Fri, 5 Feb 2021 23:30:49 +0100
-Subject: [PATCH 20/30] Disable AllowEnhancedClassRedefinition in flight
+Subject: [PATCH 20/28] Disable AllowEnhancedClassRedefinition in flight
  recorder
 
 ---

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

@@ -1,7 +1,7 @@
-From ccd321f98573e0c32e0928b98594ab4794702b24 Mon Sep 17 00:00:00 2001
+From 1bb55ff9f91733e45dd6f87eb4201a989b3338e3 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Fri, 12 Feb 2021 12:33:11 +0100
-Subject: [PATCH 21/30] JBR-3106 Check InstanceKlass::has_nestmate_access_to
+Subject: [PATCH 21/28] JBR-3106 Check InstanceKlass::has_nestmate_access_to
  with active classes
 
 Dcevm can leave old host in nested class if nested class is not

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

@@ -1,7 +1,7 @@
-From a1ff2ca342f7e0cf957de2516f2cf6802c2fb748 Mon Sep 17 00:00:00 2001
+From 52427060aba227d09dce4bd14410e1e626d64e46 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 7 Feb 2021 12:08:58 +0100
-Subject: [PATCH 22/30] JBR-3110 Fix assert in MetadataOnStackMark
+Subject: [PATCH 22/28] JBR-3110 Fix assert in MetadataOnStackMark
 
 Fixed fastdebug tests crashes in redefine gc run
 ---

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

@@ -1,7 +1,7 @@
-From a717db28a9090fe247beb357995fdbd8dd21fc50 Mon Sep 17 00:00:00 2001
+From 93cea8d61ef395a1ef9e308b0d3a8f9409b108d0 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 12 Feb 2021 11:27:39 +0100
-Subject: [PATCH 23/30] Code cleanup
+Subject: [PATCH 23/28] Code cleanup
 
 - Rename confusing method name old_if_redefined to old_if_redefining
 - Remove unused is_redefining_gc_run
@@ -12,7 +12,7 @@ Subject: [PATCH 23/30] Code cleanup
  3 files changed, 4 insertions(+), 9 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index a97b48fe5bb..781a929e7de 100644
+index dda5188c370..4e361d439f4 100644
 --- a/src/hotspot/share/classfile/dictionary.cpp
 +++ b/src/hotspot/share/classfile/dictionary.cpp
 @@ -381,7 +381,7 @@ InstanceKlass* Dictionary::find(unsigned int hash, Symbol* name,

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

@@ -1,7 +1,7 @@
-From fbb2002d56a5d94d96421e7113e32470f2b2ced5 Mon Sep 17 00:00:00 2001
+From dcb44f0e56dbc63b90d655b694a3f7751744fe53 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 13 Feb 2021 20:47:52 +0100
-Subject: [PATCH 24/30] JBR-3111 Update class in all dictionaries where it was
+Subject: [PATCH 24/28] JBR-3111 Update class in all dictionaries where it was
  already defined
 
 This patch keeps compatibility with std redefinition, that does not
@@ -16,10 +16,10 @@ dictionaries containing this class.
  5 files changed, 17 insertions(+), 3 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index b649d6358ed..a70d92c27fc 100644
+index 8b2deb70e1b..4e06b09e7d5 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1277,6 +1277,15 @@ void ClassLoaderDataGraph::rollback_redefinition() {
+@@ -1274,6 +1274,15 @@ void ClassLoaderDataGraph::rollback_redefinition() {
    }
  }
  
@@ -50,7 +50,7 @@ index 00a84610b43..16711dca237 100644
    static void dictionary_all_entries_do(void f(InstanceKlass*, ClassLoaderData*));
  
 diff --git a/src/hotspot/share/classfile/dictionary.cpp b/src/hotspot/share/classfile/dictionary.cpp
-index 781a929e7de..a1baaef86f5 100644
+index 4e361d439f4..6c072407fd9 100644
 --- a/src/hotspot/share/classfile/dictionary.cpp
 +++ b/src/hotspot/share/classfile/dictionary.cpp
 @@ -345,7 +345,7 @@ DictionaryEntry* Dictionary::get_entry(int index, unsigned int hash,
@@ -76,10 +76,10 @@ index f6e08e7bfd5..2932cc9c320 100644
    void rollback_redefinition();
  
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index fe537421e22..f7452adcf02 100644
+index 9e0f4dd3c96..789b5fb1e6d 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -1608,7 +1608,9 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, InstanceKlass* ol
+@@ -1606,7 +1606,9 @@ void SystemDictionary::define_instance_class(InstanceKlass* k, InstanceKlass* ol
    Dictionary* dictionary = loader_data->dictionary();
    unsigned int d_hash = dictionary->compute_hash(name_h);
    if (is_redefining) {

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

@@ -1,7 +1,7 @@
-From dc587d25fa3f7ced9dcf8c1d9c563177f4beebb6 Mon Sep 17 00:00:00 2001
+From b9692c48bdbad8474251cfe72ac85e5c7ff2847e Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Thu, 18 Jun 2020 18:40:11 +0200
-Subject: [PATCH 25/30] JBR-3140 - support for modularized HotswapAgent
+Subject: [PATCH 25/28] JBR-3140 - support for modularized HotswapAgent
 
 Add -XX:HotswapAgent=[disabled,fatjar.core]
 ---
@@ -500,10 +500,10 @@ index 8763b83fd37..c9ed15a89e1 100644
  
  #endif /* SHARE_VM_RUNTIME_JVMFLAGCONSTRAINTSRUNTIME_HPP */
 diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
-index 705381825ff..eda4eca2451 100644
+index d4453de1ff5..8c41f0af888 100644
 --- a/src/hotspot/share/runtime/globals.hpp
 +++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2692,8 +2692,16 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
+@@ -2686,8 +2686,16 @@ define_pd_global(uint64_t,MaxRAM,                    1ULL*G);
               "Allow enhanced class redefinition beyond swapping method "    \
               "bodies")                                                      \
                                                                              \

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

@@ -1,7 +1,7 @@
-From 8e75a385faaa7ac120f895a59d9634fb0044cb8c Mon Sep 17 00:00:00 2001
+From f279999a412cc87c6f4a7eed7e1e2ad34655b4fe Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <vladimir.dvorak@jetbrains.com>
 Date: Mon, 8 Mar 2021 02:22:54 +0700
-Subject: [PATCH 26/30] Support for redefinition of Well Known classses
+Subject: [PATCH 26/28] Support for redefinition of Well Known classses
  (java.*,jdk.*, sun.*)
 
 ---
@@ -122,10 +122,10 @@ index 3e9d48c4cdc..79059f6e2e8 100644
    void remove_symbols();
  
 diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
-index f7452adcf02..1d2c7d22ce0 100644
+index 789b5fb1e6d..25e577a664c 100644
 --- a/src/hotspot/share/classfile/systemDictionary.cpp
 +++ b/src/hotspot/share/classfile/systemDictionary.cpp
-@@ -1985,6 +1985,16 @@ bool SystemDictionary::is_well_known_klass(Symbol* class_name) {
+@@ -1983,6 +1983,16 @@ bool SystemDictionary::is_well_known_klass(Symbol* class_name) {
  }
  #endif
  
@@ -143,10 +143,10 @@ index f7452adcf02..1d2c7d22ce0 100644
    assert(id >= (int)FIRST_WKID && id < (int)WKID_LIMIT, "oob");
    int  info = wk_init_info[id - FIRST_WKID];
 diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
-index a8359143908..aba2780a321 100644
+index 1dbbffa197f..4220978a025 100644
 --- a/src/hotspot/share/classfile/systemDictionary.hpp
 +++ b/src/hotspot/share/classfile/systemDictionary.hpp
-@@ -470,6 +470,8 @@ public:
+@@ -467,6 +467,8 @@ public:
    static bool is_well_known_klass(Symbol* class_name);
  #endif
  
@@ -156,10 +156,10 @@ index a8359143908..aba2780a321 100644
    static void remove_from_hierarchy(InstanceKlass* k);
    static void update_constraints_after_redefinition();
 diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
-index 0d0badeabd0..3477a408cb6 100644
+index 2409af9b06e..daaa8d12375 100644
 --- a/src/hotspot/share/classfile/vmSymbols.hpp
 +++ b/src/hotspot/share/classfile/vmSymbols.hpp
-@@ -356,6 +356,8 @@
+@@ -355,6 +355,8 @@
    template(exit_method_name,                          "exit")                                     \
    template(add_method_name,                           "add")                                      \
    template(remove_method_name,                        "remove")                                   \
@@ -169,7 +169,7 @@ index 0d0badeabd0..3477a408cb6 100644
    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 0ed0ca52cb0..4f64beae978 100644
+index 765b8ffa4dc..25271feb41f 100644
 --- a/src/hotspot/share/compiler/compileBroker.cpp
 +++ b/src/hotspot/share/compiler/compileBroker.cpp
 @@ -1877,6 +1877,17 @@ void CompileBroker::compiler_thread_loop() {
@@ -224,7 +224,7 @@ index 742dada0e8f..d1af82b5fa7 100644
    static oop          arithmetic_exception_instance() { return _arithmetic_exception_instance; }
    static oop          virtual_machine_error_instance() { return _virtual_machine_error_instance; }
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 4ee12b7021f..7997b178d22 100644
+index f4bde7504c8..80d4e68ccae 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -497,6 +497,16 @@ void VM_EnhancedRedefineClasses::doit() {
@@ -316,7 +316,7 @@ index 4ee12b7021f..7997b178d22 100644
  //      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 d00109a0b92..8c47baa8a74 100644
+index 4c0412d343d..79ea17b0d47 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 @@ -141,6 +141,8 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {

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

@@ -1,7 +1,7 @@
-From 62a55e255da86ce4c8e670d3ce8df12910c43bb1 Mon Sep 17 00:00:00 2001
+From 416d06e7e5f3517e9303b0b5a705888e4db740bd Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Fri, 19 Mar 2021 19:13:38 +0100
-Subject: [PATCH 27/30] JBR-3458: Skip dynamic proxy classes based on
+Subject: [PATCH 27/28] JBR-3458: Skip dynamic proxy classes based on
  com.sun.proxy
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 27/30] JBR-3458: Skip dynamic proxy classes based on
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 7997b178d22..0d1c68f5cd0 100644
+index 80d4e68ccae..10c375d601c 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -689,7 +689,8 @@ void VM_EnhancedRedefineClasses::reinitializeJDKClasses() {

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

@@ -1,7 +1,7 @@
-From 0259a5ed1e3f019c1d01365f84dcc5fe1b8bc868 Mon Sep 17 00:00:00 2001
+From 88e0325768b074607f5f9edfbb7f8e4a76159942 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 20 Mar 2021 20:51:08 +0100
-Subject: [PATCH 28/30] JBR-3459: Fix race condition in
+Subject: [PATCH 28/28] JBR-3459: Fix race condition in
  ClassLoaderDataGraph::classes_do
 
 InstanceKlass in ClassLoaderData can be uninitialized when
@@ -15,10 +15,10 @@ persisting with anonymous classes.
  3 files changed, 25 insertions(+), 2 deletions(-)
 
 diff --git a/src/hotspot/share/classfile/classLoaderData.cpp b/src/hotspot/share/classfile/classLoaderData.cpp
-index a70d92c27fc..f6764ff37a0 100644
+index 4e06b09e7d5..f319cca3b2b 100644
 --- a/src/hotspot/share/classfile/classLoaderData.cpp
 +++ b/src/hotspot/share/classfile/classLoaderData.cpp
-@@ -1169,6 +1169,16 @@ void ClassLoaderDataGraph::classes_do(KlassClosure* klass_closure) {
+@@ -1166,6 +1166,16 @@ void ClassLoaderDataGraph::classes_do(KlassClosure* klass_closure) {
    }
  }
  
@@ -51,7 +51,7 @@ index 16711dca237..b10fafa01e5 100644
    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 0d1c68f5cd0..745109902af 100644
+index 10c375d601c..5de5f78aea0 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -2130,8 +2130,17 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {

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

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

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

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

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

@@ -1,142 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to be built; possible values:
-#                        jcef - the release bundles with jcef
-#                        dcevm - the release bundles with dcevm patches
-#                        nomod - the release bundles without any additional modules (jcef)
-#                        fd - the fastdebug bundles which also include the jcef module
-#
-# jbrsdk-${JBSDK_VERSION}-windows-aarch64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-windows-aarch64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-# Environment variables:
-#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
-#                      By default imported modules should be located in ./modular-sdk.
-#   JCEF_PATH        - specifies the path to the directory with JCEF binaries.
-#                      By default JCEF binaries should be located in ./jcef_win_aarch64.
-#   BOOT_JDK         - specifies the path to the directory with a ready build of OpenJDK 11 with
-#                      the same architecture as the build system. It will be used as the boot jdk.
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-bundle_type=$4
-JBSDK_VERSION_WITH_DOTS=$(echo $JBSDK_VERSION | sed 's/_/\./g')
-WORK_DIR=$(pwd)
-WITH_IMPORT_MODULES="--with-import-modules=${MODULAR_SDK_PATH:=${WORK_DIR}/modular-sdk}"
-JCEF_PATH=${JCEF_PATH:=${WORK_DIR}/jcef_win_aarch64}
-TOOLCHAIN_VERSION=${TOOLCHAIN_VERSION:=2019}
-
-source jb/project/tools/common.sh
-
-function create_jbr {
-
-  JBR_BUNDLE=jbr_${bundle_type}
-
-  case "${bundle_type}" in
-  "jcef" | "dcevm" | "nomod" | "fd")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
-    ;;
-  esac
-
-  echo "Exclude jdk.internal.vm.compiler and jdk.aot (because aot is not supported yet)"
-  cat modules.list | \
-    grep -v "jdk.internal.vm.compiler\|jdk.aot" \
-    > modules_tmp.list
-
-  rm -rf ${JBR_BUNDLE}
-
-  echo Running jlink....
-  ${BOOT_JDK}/bin/jlink \
-    --module-path ${JSDK}/jmods --no-man-pages --compress=2 \
-    --add-modules $(xargs < modules_tmp.list | sed 's/ //g' | sed 's/,\?$//g') --output ${JBR_BUNDLE} || do_exit $?
-  if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]
-  then
-    rsync -av ${JCEF_PATH}/ ${JBR_BUNDLE}/bin --exclude="modular-sdk" || do_exit $?
-  fi
-  echo Modifying release info ...
-  cat ${JSDK}/release | tr -d '\r' | grep -v 'JAVA_VERSION' | grep -v 'MODULES' >> ${JBR_BUNDLE}/release
-}
-
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=windows-aarch64-normal-server-release
-JBSDK=${JBRSDK_BASE_NAME}-windows-aarch64-b${build_number}
-case "$bundle_type" in
-  "jcef")
-    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-    do_reset_changes=1
-    ;;
-  "dcevm")
-    HEAD_REVISION=$(git rev-parse HEAD)
-    git am jb/project/tools/patches/dcevm/*.patch || do_exit $?
-    do_reset_dcevm=1
-    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-    do_reset_changes=1
-    ;;
-  "nomod")
-    WITH_IMPORT_MODULES=""
-    ;;
-  "fd")
-    git apply -p0 < jb/project/tools/patches/add_jcef_module.patch || do_exit $?
-    do_reset_changes=1
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=windows-aarch64-normal-server-fastdebug
-    JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}-fastdebug
-    JBSDK=${JBRSDK_BASE_NAME}-windows-aarch64-fastdebug-b${build_number}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
-    ;;
-esac
-
-sh ./configure \
-  --openjdk-target=aarch64-unknown-cygwin \
-  --disable-warnings-as-errors \
-  $WITH_DEBUG_LEVEL \
-  --with-vendor-name="${VENDOR_NAME}" \
-  --with-vendor-version-string="${VENDOR_VERSION_STRING}" \
-  --with-jvm-features=shenandoahgc \
-  --with-version-pre= \
-  --with-version-build=${JDK_BUILD_NUMBER} \
-  --with-version-opt=b${build_number} \
-  $WITH_IMPORT_MODULES \
-  --with-toolchain-version=${TOOLCHAIN_VERSION} \
-  --with-boot-jdk=${BOOT_JDK} \
-  --with-build-jdk=${BOOT_JDK} \
-  --disable-ccache \
-  --enable-cds=yes || do_exit $?
-
-if [ "${bundle_type}" == "jcef" ]; then
-  make LOG=info clean images test-image CONF=$RELEASE_NAME || do_exit $?
-else
-  make LOG=info clean images CONF=$RELEASE_NAME || do_exit $?
-fi
-
-JSDK=build/$RELEASE_NAME/images/jdk
-BASE_DIR=build/$RELEASE_NAME/images
-JBRSDK_BUNDLE=jbrsdk
-
-rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE} && rsync -a --exclude demo --exclude sample ${JSDK}/ ${JBRSDK_BUNDLE} || do_exit $?
-if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]
-then
-  rsync -av ${JCEF_PATH}/ ${JBRSDK_BUNDLE}/bin --exclude='modular-sdk' || do_exit $?
-  sed 's/JBR/JBRSDK/g' ${JSDK}/release > release
-  mv release ${JBRSDK_BUNDLE}/release
-fi
-
-create_jbr || do_exit $?
-
-do_exit 0

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

@@ -1,83 +0,0 @@
-#!/bin/bash -x
-
-# The following parameters must be specified:
-#   JBSDK_VERSION    - specifies major version of OpenJDK e.g. 11_0_6 (instead of dots '.' underbars "_" are used)
-#   JDK_BUILD_NUMBER - specifies update release of OpenJDK build or the value of --with-version-build argument to configure
-#   build_number     - specifies the number of JetBrainsRuntime build
-#   bundle_type      - specifies bundle to be built; possible values:
-#                        jcef - the release bundles with jcef
-#                        dcevm - the release bundles with dcevm patches
-#                        nomod - the release bundles without any additional modules (jcef)
-#                        fd - the fastdebug bundles which also include the jcef module
-#
-# jbrsdk-${JBSDK_VERSION}-windows-aarch64-b${build_number}.tar.gz
-# jbr-${JBSDK_VERSION}-windows-aarch64-b${build_number}.tar.gz
-#
-# $ ./java --version
-# openjdk 11.0.6 2020-01-14
-# OpenJDK Runtime Environment (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number})
-# OpenJDK 64-Bit Server VM (build 11.0.6+${JDK_BUILD_NUMBER}-b${build_number}, mixed mode)
-#
-# Environment variables:
-#   MODULAR_SDK_PATH - specifies the path to the directory where imported modules are located.
-#                      By default imported modules should be located in ./modular-sdk.
-#   JCEF_PATH        - specifies the path to the directory with JCEF binaries.
-#                      By default JCEF binaries should be located in ./jcef_win_aarch64.
-
-JBSDK_VERSION=$1
-JDK_BUILD_NUMBER=$2
-build_number=$3
-bundle_type=$4
-
-source jb/project/tools/common.sh
-
-function pack_jbr {
-
-  JBR_BUNDLE=jbr_${bundle_type}
-
-  case "${bundle_type}" in
-  "jcef" | "dcevm" | "nomod" | "fd")
-    JBR_BASE_NAME=jbr_${bundle_type}-${JBSDK_VERSION}
-    ;;
-  *)
-    echo "***ERR*** bundle was not specified" && do_exit 1
-    ;;
-  esac
-
-  JBR=$JBR_BASE_NAME-windows-aarch64-b$build_number
-  echo Creating $JBR.tar.gz ...
-  chmod -R ug+rwx,o+rx ${BASE_DIR}/${JBR_BUNDLE}
-  cp -R ${BASE_DIR}/${JBR_BUNDLE} ${BASE_DIR}/jbr
-  /usr/bin/tar -czf $JBR.tar.gz -C $BASE_DIR jbr || do_exit $?
-}
-
-JBRSDK_BASE_NAME=jbrsdk-${JBSDK_VERSION}
-WITH_DEBUG_LEVEL="--with-debug-level=release"
-RELEASE_NAME=windows-aarch64-normal-server-release
-JBSDK=${JBRSDK_BASE_NAME}-windows-aarch64-b${build_number}
-case "$bundle_type" in
-  "fd")
-    WITH_DEBUG_LEVEL="--with-debug-level=fastdebug"
-    RELEASE_NAME=windows-aarch64-normal-server-fastdebug
-    JBSDK=${JBRSDK_BASE_NAME}-windows-aarch64-fastdebug-b${build_number}
-    ;;
-esac
-
-IMAGES_DIR=build/$RELEASE_NAME/images
-JSDK=$IMAGES_DIR/jdk
-BASE_DIR=.
-
-if [ "${bundle_type}" == "jcef" ] || [ "${bundle_type}" == "fd" ]; then
-  JBRSDK_BUNDLE=jbrsdk
-  echo Creating $JBSDK.tar.gz ...
-  [ -f "$JBSDK.tar.gz" ] && rm "$JBSDK.tar.gz"
-  /usr/bin/tar -czf $JBSDK.tar.gz $JBRSDK_BUNDLE || do_exit $?
-fi
-
-pack_jbr $bundle_type
-
-if [ "$bundle_type" == "jcef" ]; then
-  JBRSDK_TEST=$JBRSDK_BASE_NAME-windows-test-aarch64-b$build_number
-  echo Creating $JBRSDK_TEST.tar.gz ...
-  /usr/bin/tar -czf $JBRSDK_TEST.tar.gz -C $IMAGES_DIR --exclude='test/jdk/demos' test || do_exit $?
-fi

make/JBRApi.gmk

@@ -1,80 +0,0 @@
-#
-# Copyright 2000-2021 JetBrains s.r.o.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include $(SPEC)
-include MakeBase.gmk
-include JavaCompilation.gmk
-include SetupJavaCompilers.gmk
-
-JBR_API_ROOT_DIR := $(TOPDIR)/src/jetbrains.api
-JBR_API_GENSRC_TEMPLATES := $(JBR_API_ROOT_DIR)/templates
-JBR_API_SRC_DIR          := $(JBR_API_ROOT_DIR)/src
-JBR_API_OUTPUT_DIR := $(OUTPUTDIR)/jbr-api
-JBR_API_GENSRC_DIR := $(JBR_API_OUTPUT_DIR)/gensrc
-JBR_API_BIN_DIR    := $(JBR_API_OUTPUT_DIR)/bin
-JBR_API_VERSION_PROPERTIES := $(JBR_API_ROOT_DIR)/version.properties
-
-JBR_API_GENSRC_SOURCES := $(call FindFiles, $(JBR_API_GENSRC_TEMPLATES))
-JBR_API_GENSRC_FILES := $(JBR_API_GENSRC_DIR)/com/jetbrains/JBR.java
-JBR_API_SRC_FILES := $(call FindFiles, $(JBR_API_SRC_DIR))
-
-ifeq ($(JBR_API_JBR_VERSION),)
-  JBR_API_JBR_VERSION := <DEVELOPMENT>
-  JBR_API_FAIL_ON_HASH_MISMATCH := false
-else
-  .PHONY: $(JBR_API_VERSION_PROPERTIES)
-  JBR_API_FAIL_ON_HASH_MISMATCH := true
-endif
-
-ARCHIVE_BUILD_JBR_API_BIN := $(JBR_API_BIN_DIR)
-$(eval $(call SetupJavaCompilation, BUILD_JBR_API, \
-    SETUP := BOOT_JAVAC, \
-    SRC := $(JBR_API_GENSRC_DIR) $(JBR_API_SRC_DIR), \
-    EXTRA_FILES := $(JBR_API_GENSRC_FILES), \
-    DEPENDS := $(JBR_API_GENSRC_FILES), \
-    BIN := $(JBR_API_BIN_DIR), \
-    JAR := $(JBR_API_OUTPUT_DIR)/jbr-api.jar, \
-))
-
-$(eval $(call SetupJarArchive, BUILD_JBR_API_SOURCES_JAR, \
-    DEPENDENCIES := $(JBR_API_GENSRC_FILES) $(JBR_API_SRC_FILES), \
-    SRCS := $(JBR_API_GENSRC_DIR) $(JBR_API_SRC_DIR), \
-    JAR := $(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar, \
-    SUFFIXES := .java, \
-    BIN := $(JBR_API_BIN_DIR), \
-))
-
-$(JBR_API_GENSRC_FILES): $(JBR_API_GENSRC_SOURCES) $(JBR_API_SRC_FILES) $(JBR_API_VERSION_PROPERTIES)
-	$(ECHO) Generating sources for JBR API
-	$(JAVA_CMD) $(JAVA_FLAGS_SMALL) "$(JBR_API_GENSRC_TEMPLATES)/Gensrc.java" \
-	    "$(TOPDIR)/src" "$(JBR_API_OUTPUT_DIR)" "$(JBR_API_JBR_VERSION)"
-
-jbr-api-check-version: $(JBR_API_GENSRC_FILES) $(JBR_API_SRC_FILES) $(JBR_API_VERSION_PROPERTIES)
-	$(JAVA_CMD) $(JAVA_FLAGS_SMALL) "$(JBR_API_GENSRC_TEMPLATES)/CheckVersion.java" \
-	    "$(JBR_API_ROOT_DIR)" "$(JBR_API_GENSRC_DIR)" "$(JBR_API_FAIL_ON_HASH_MISMATCH)"
-
-jbr-api: $(BUILD_JBR_API) $(BUILD_JBR_API_SOURCES_JAR) jbr-api-check-version
-
-.PHONY: jbr-api jbr-api-check-version
-
-ifneq ($(JBR_API_CONF_FILE),)
-  $(JBR_API_CONF_FILE): $(JBR_API_GENSRC_FILES)
-	$(ECHO) "VERSION=`$(CAT) $(JBR_API_OUTPUT_DIR)/jbr-api.version`" > $(JBR_API_CONF_FILE)
-	$(ECHO) "JAR=$(JBR_API_OUTPUT_DIR)/jbr-api.jar" >> $(JBR_API_CONF_FILE)
-	$(ECHO) "SOURCES_JAR=$(JBR_API_OUTPUT_DIR)/jbr-api-sources.jar" >> $(JBR_API_CONF_FILE)
-  jbr-api: $(JBR_API_CONF_FILE)
-  .PHONY: $(JBR_API_CONF_FILE)
-endif

make/Main.gmk

@@ -1254,13 +1254,6 @@ ALL_TARGETS += clean clean-docs clean-compile-commands dist-clean $(CLEAN_DIR_TA
     $(CLEAN_SUPPORT_DIR_TARGETS) $(CLEAN_TEST_TARGETS) $(CLEAN_PHASE_TARGETS) \
     $(CLEAN_MODULE_TARGETS) $(CLEAN_MODULE_PHASE_TARGETS)
 
-################################################################################
-# JBR API
-
-jbr-api:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f JBRApi.gmk jbr-api)
-ALL_TARGETS += jbr-api
-
 ################################################################################
 # Declare *-only targets for each normal target
 $(foreach t, $(ALL_TARGETS), $(eval $(t)-only: $(t)))

make/RunTests.gmk

@@ -532,7 +532,6 @@ define SetupRunGtestTestBody
 	    $$(FIXPATH) $$(TEST_IMAGE_DIR)/hotspot/gtest/$$($1_VARIANT)/gtestLauncher \
 	        -jdk $(JDK_IMAGE_DIR) $$($1_GTEST_FILTER) \
 	        --gtest_output=xml:$$($1_TEST_RESULTS_DIR)/gtest.xml \
-	        --gtest_catch_exceptions=0 \
 	        $$($1_GTEST_REPEAT) $$(GTEST_OPTIONS) $$(GTEST_VM_OPTIONS) \
 	        $$(GTEST_JAVA_OPTIONS) $$($1_AOT_OPTIONS) \
 	        > >($(TEE) $$($1_TEST_RESULTS_DIR)/gtest.txt) \

make/autoconf/basics.m4

@@ -672,16 +672,6 @@ AC_DEFUN([BASIC_EVAL_DEVKIT_VARIABLE],
   fi
 ])
 
-###############################################################################
-# Evaluates platform specific overrides for build devkit variables.
-# $1: Name of variable
-AC_DEFUN([BASIC_EVAL_BUILD_DEVKIT_VARIABLE],
-[
-  if test "x[$]$1" = x; then
-    eval $1="\${$1_${OPENJDK_BUILD_CPU}}"
-  fi
-])
-
 ###############################################################################
 AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
 [

make/autoconf/basics_windows.m4

@@ -112,6 +112,7 @@ AC_DEFUN([BASIC_FIXUP_PATH_CYGWIN],
   # unix format.
   path="[$]$1"
   new_path=`$CYGPATH -u "$path"`
+
   # Cygwin tries to hide some aspects of the Windows file system, such that binaries are
   # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered
   # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then
@@ -401,19 +402,8 @@ AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH],
     BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W])
     $RM -rf $FIXPATH_BIN $FIXPATH_DIR
     $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
-    # simple cross compilation solution for fixpath for aarch64
-    # Final solution should be backport of 8257679
-    if test "x$COMPILE_TYPE-$OPENJDK_TARGET_CPU" = xcross-aarch64; then
-      FIXPATH_CC=`$ECHO "$CC"|$SED 's|/arm64/cl|/x64/cl|I'`
-      FIXPATH_LIB=`$ECHO "$LIB"|$SED 's|arm64|x64|gI'`
-    else
-      FIXPATH_CC=$CC
-      FIXPATH_LIB=$LIB
-    fi
-    OLDLIB=$LIB
-    export LIB="$FIXPATH_LIB"
     cd $FIXPATH_DIR
-    $FIXPATH_CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
+    $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
     cd $CURDIR
 
     if test ! -x $FIXPATH_BIN; then
@@ -424,10 +414,9 @@ AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH],
     AC_MSG_RESULT([yes])
     AC_MSG_CHECKING([if fixpath.exe works])
     cd $FIXPATH_DIR
-    $FIXPATH $FIXPATH_CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
+    $FIXPATH $CC $FIXPATH_SRC -Fe$FIXPATH_DIR/fixpath2.exe \
         > $FIXPATH_DIR/fixpath2.log 2>&1
     cd $CURDIR
-    export LIB="$OLDLIB"
     if test ! -x $FIXPATH_DIR/fixpath2.exe; then
       AC_MSG_RESULT([no])
       cat $FIXPATH_DIR/fixpath2.log

make/autoconf/buildjdk-spec.gmk.in

@@ -30,13 +30,13 @@
 # First include the real base spec.gmk file
 include @SPEC@
 
-CC := @FIXPATH@ @BUILD_CC@
-CXX := @FIXPATH@ @BUILD_CXX@
-LD := @FIXPATH@ @BUILD_LD@
-LDCXX := @FIXPATH@ @BUILD_LDCXX@
-AS := @FIXPATH@ @BUILD_AS@
+CC := @BUILD_CC@
+CXX := @BUILD_CXX@
+LD := @BUILD_LD@
+LDCXX := @BUILD_LDCXX@
+AS := @BUILD_AS@
 NM := @BUILD_NM@
-AR := @FIXPATH@ @BUILD_AR@
+AR := @BUILD_AR@
 OBJCOPY := @BUILD_OBJCOPY@
 STRIP := @BUILD_STRIP@
 SYSROOT_CFLAGS := @BUILD_SYSROOT_CFLAGS@

make/autoconf/flags-cflags.m4

@@ -705,9 +705,7 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -DcpuIntel -Di586 -D$FLAGS_CPU_LEGACY_LIB"
     fi
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    if test "x$FLAGS_CPU" = xaarch64; then
-      $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_ARM64_ -Darm64"
-    elif test "x$FLAGS_CPU" = xx86_64; then
+    if test "x$FLAGS_CPU" = xx86_64; then
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_AMD64_ -Damd64"
     else
       $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_X86_ -Dx86"

make/autoconf/flags-ldflags.m4

@@ -188,19 +188,20 @@ AC_DEFUN([FLAGS_SETUP_LDFLAGS_CPU_DEP],
     fi
 
   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    if test "x${OPENJDK_$1_CPU_BITS}" = "x32"; then
-      $1_CPU_EXECUTABLE_LDFLAGS="-stack:327680"
-    elif test "x${OPENJDK_$1_CPU_BITS}" = "x64"; then
-      $1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576"
-    fi
     if test "x${OPENJDK_$1_CPU}" = "xx86"; then
       $1_CPU_LDFLAGS="-safeseh"
+      # NOTE: Old build added -machine. Probably not needed.
+      $1_CPU_LDFLAGS_JVM_ONLY="-machine:I386"
+      $1_CPU_EXECUTABLE_LDFLAGS="-stack:327680"
+    else
+      $1_CPU_LDFLAGS_JVM_ONLY="-machine:AMD64"
+      $1_CPU_EXECUTABLE_LDFLAGS="-stack:1048576"
     fi
   fi
 
   # JVM_VARIANT_PATH depends on if this is build or target...
   if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-    $1_LDFLAGS_JDK_LIBPATH="-libpath:\${SUPPORT_OUTPUTDIR}/modules_libs/java.base"
+    $1_LDFLAGS_JDK_LIBPATH="-libpath:${OUTPUTDIR}/support/modules_libs/java.base"
   else
     $1_LDFLAGS_JDK_LIBPATH="-L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base \
         -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/${$1_JVM_VARIANT_PATH}"

make/autoconf/flags-other.m4

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -107,17 +107,6 @@ AC_DEFUN([FLAGS_SETUP_ASFLAGS],
 [
   if test "x$OPENJDK_TARGET_OS" = xmacosx; then
     JVM_BASIC_ASFLAGS="-x assembler-with-cpp -mno-omit-leaf-frame-pointer -mstack-alignment=16"
-
-    # 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 \
-        -mmacosx-version-min=$MACOSX_VERSION_MIN"
-
-    if test -n "$MACOSX_VERSION_MAX"; then
-        JVM_BASIC_ASFLAGS="$JVM_BASIC_ASFLAGS $OS_CFLAGS \
-            -DMAC_OS_X_VERSION_MAX_ALLOWED=$MACOSX_VERSION_MAX_NODOTS"
-    fi
   fi
 ])
 

make/autoconf/hotspot.m4

@@ -221,7 +221,7 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
 
   if test "x$ENABLE_AOT" = "xtrue"; then
     # Only enable AOT on X64 platforms.
-    if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-aarch64" ; then
+    if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
       if test -e "${TOPDIR}/src/jdk.aot"; then
         if test -e "${TOPDIR}/src/jdk.internal.vm.compiler"; then
           ENABLE_AOT="true"
@@ -240,7 +240,7 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
     else
       ENABLE_AOT="false"
       if test "x$enable_aot" = "xyes"; then
-        AC_MSG_ERROR([AOT is currently only supported on x86_64 and linux-aarch64. Remove --enable-aot.])
+        AC_MSG_ERROR([AOT is currently only supported on x86_64 and aarch64. Remove --enable-aot.])
       fi
     fi
   fi
@@ -364,10 +364,6 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
   AC_MSG_CHECKING([if shenandoah can be built])
   if HOTSPOT_CHECK_JVM_FEATURE(shenandoahgc); then
     if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
-      # Filter out Shenandoah from user requested features, as it's already in non-minimal set
-      if HOTSPOT_CHECK_JVM_VARIANT(minimal); then
-        BASIC_GET_NON_MATCHING_VALUES(JVM_FEATURES, $JVM_FEATURES, shenandoahgc)
-      fi
       AC_MSG_RESULT([yes])
     else
       DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
@@ -375,7 +371,6 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     fi
   else
       DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
-      AC_MSG_RESULT([no, not enabled by default])
   fi
 
   # Only enable ZGC on supported platforms
@@ -425,9 +420,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     # Only enable jvmci on x86_64, sparcv9 and aarch64
     if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
        test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \
-       test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xwindows-aarch64" || \
-       test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xlinux-aarch64"   || \
-       test "x$OPENJDK_TARGET_OS-$OPENJDK_TARGET_CPU" = "xmacosx-aarch64" ; then
+       test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
       AC_MSG_RESULT([yes])
       JVM_FEATURES_jvmci="jvmci"
       INCLUDE_JVMCI="true"
@@ -458,11 +451,10 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
       JVM_FEATURES_graal="graal"
       INCLUDE_GRAAL="true"
     else
-      # By default enable graal build on x64/aarch64 or where AOT is available.
+      # By default enable graal build on x64 or where AOT is available.
       # graal build requires jvmci.
       if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \
           (test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \
-           test "x$OPENJDK_TARGET_CPU" = "xaarch64" || \
            test "x$ENABLE_AOT" = "xtrue") ; then
         AC_MSG_RESULT([yes])
         JVM_FEATURES_graal="graal"

make/autoconf/jdk-options.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
@@ -291,7 +291,11 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
       [AS_HELP_STRING([--with-native-debug-symbols],
       [set the native debug symbol configuration (none, internal, external, zipped) @<:@varying@:>@])],
       [
-        if test "x$OPENJDK_TARGET_OS" = xwindows; then
+        if test "x$OPENJDK_TARGET_OS" = xaix; then
+          if test "x$withval" = xexternal || test "x$withval" = xzipped; then
+            AC_MSG_ERROR([AIX only supports the parameters 'none' and 'internal' for --with-native-debug-symbols])
+          fi
+        elif test "x$OPENJDK_TARGET_OS" = xwindows; then
           if test "x$withval" = xinternal; then
             AC_MSG_ERROR([Windows does not support the parameter 'internal' for --with-native-debug-symbols])
           fi
@@ -301,7 +305,12 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
         if test "x$STATIC_BUILD" = xtrue; then
           with_native_debug_symbols="none"
         else
-          with_native_debug_symbols="external"
+          if test "x$OPENJDK_TARGET_OS" = xaix; then
+            # AIX doesn't support 'external' so use 'internal' as default
+            with_native_debug_symbols="internal"
+          else
+            with_native_debug_symbols="external"
+          fi
         fi
       ])
   AC_MSG_RESULT([$with_native_debug_symbols])

make/autoconf/spec.gmk.in

@@ -382,7 +382,7 @@ GCOV_ENABLED=@GCOV_ENABLED@
 export ASAN_ENABLED:=@ASAN_ENABLED@
 export DEVKIT_LIB_DIR:=@DEVKIT_LIB_DIR@
 ifeq ($(ASAN_ENABLED), yes)
-  export ASAN_OPTIONS=handle_segv=0 detect_leaks=0
+  export ASAN_OPTIONS="handle_segv=0 detect_leaks=0"
   ifneq ($(DEVKIT_LIB_DIR),)
     export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):$(DEVKIT_LIB_DIR)
   endif

make/autoconf/toolchain.m4

@@ -918,18 +918,14 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
           . $CONFIGURESUPPORT_OUTPUTDIR/build-devkit.info
           # This potentially sets the following:
           # A descriptive name of the devkit
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_NAME])
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_NAME])
           # Corresponds to --with-extra-path
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_EXTRA_PATH])
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_EXTRA_PATH])
           # Corresponds to --with-toolchain-path
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_TOOLCHAIN_PATH])
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_TOOLCHAIN_PATH])
           # Corresponds to --with-sysroot
-          BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_SYSROOT])
-
-          if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-            BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_VS_INCLUDE])
-            BASIC_EVAL_BUILD_DEVKIT_VARIABLE([BUILD_DEVKIT_VS_LIB])
-          fi
+          BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_SYSROOT])
+          # Skip the Window specific parts
         fi
 
         AC_MSG_CHECKING([for build platform devkit])
@@ -939,37 +935,13 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
           AC_MSG_RESULT([$BUILD_DEVKIT_ROOT])
         fi
 
-        PATH="$BUILD_DEVKIT_EXTRA_PATH:$PATH"
+        BUILD_SYSROOT="$BUILD_DEVKIT_SYSROOT"
 
-        # Fallback default of just /bin if DEVKIT_PATH is not defined
+         # Fallback default of just /bin if DEVKIT_PATH is not defined
         if test "x$BUILD_DEVKIT_TOOLCHAIN_PATH" = x; then
           BUILD_DEVKIT_TOOLCHAIN_PATH="$BUILD_DEVKIT_ROOT/bin"
         fi
-        PATH="$BUILD_DEVKIT_TOOLCHAIN_PATH:$PATH"
-
-        BUILD_SYSROOT="$BUILD_DEVKIT_SYSROOT"
-
-        if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-          BUILD_VS_INCLUDE="$BUILD_DEVKIT_VS_INCLUDE"
-          BUILD_VS_LIB="$BUILD_DEVKIT_VS_LIB"
-
-          TOOLCHAIN_SETUP_VISUAL_STUDIO_SYSROOT_FLAGS([BUILD_])
-        fi
-      fi
-    else
-      if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-        if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-          # try to guess compiler layout. Final solution should be
-          # backport of 8257679. Try primitive approach for now 
-          BUILD_CC=`$ECHO "$CC"|$SED 's|/arm64/cl|/x64/cl|I'`
-          BUILD_CXX=`$ECHO "$CXX"|$SED 's|/arm64/cl|/x64/cl|I'`
-          BUILD_AR=`$ECHO "$AR"|$SED 's|/arm64/lib|/x64/lib|I'`
-          BUILD_LD=`$ECHO "$LD"|$SED 's|/arm64/link|/x64/link|I'`
-          BUILD_SYSROOT_CFLAGS=`$ECHO "$SYSROOT_CFLAGS"|$SED 's|/arm64|/x64|gI'`
-          BUILD_SYSROOT_LDFLAGS=`$ECHO "$SYSROOT_LDFLAGS"|$SED 's|/arm64|/x64|gI'`
-        else
-          AC_MSG_ERROR([only windows-aarch64 cross compilation is supported so far])
-        fi
+        PATH="$BUILD_DEVKIT_TOOLCHAIN_PATH:$BUILD_DEVKIT_EXTRA_PATH"
       fi
     fi
 
@@ -995,37 +967,9 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS],
     BASIC_FIXUP_EXECUTABLE(BUILD_STRIP)
     # Assume the C compiler is the assembler
     BUILD_AS="$BUILD_CC -c"
-    if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-      # In the Microsoft toolchain we have a separate LD command "link".
-      # Make sure we reject /usr/bin/link (as determined in CYGWIN_LINK), which is
-      # a cygwin program for something completely different.
-      AC_CHECK_PROG([BUILD_LD], [link$EXE_SUFFIX],[link$EXE_SUFFIX],,, [$CYGWIN_LINK])
-      BASIC_FIXUP_EXECUTABLE(BUILD_LD)
-      # Verify that we indeed succeeded with this trick.
-      AC_MSG_CHECKING([if the found link.exe is actually the Visual Studio linker])
-
-      # Reset PATH since it can contain a mix of WSL/linux paths and Windows paths from VS,
-      # which, in combination with WSLENV, will make the WSL layer complain
-      old_path="$PATH"
-      PATH=
-
-      "$BUILD_LD" --version > /dev/null
-
-      if test $? -eq 0 ; then
-        AC_MSG_RESULT([no])
-        AC_MSG_ERROR([This is the Cygwin link tool. Please check your PATH and rerun configure.])
-      else
-        AC_MSG_RESULT([yes])
-      fi
-
-      PATH="$old_path"
-
-      BUILD_LDCXX="$BUILD_LD"
-    else
-      # Just like for the target compiler, use the compiler as linker
-      BUILD_LD="$BUILD_CC"
-      BUILD_LDCXX="$BUILD_CXX"
-    fi
+    # Just like for the target compiler, use the compiler as linker
+    BUILD_LD="$BUILD_CC"
+    BUILD_LDCXX="$BUILD_CXX"
 
     PATH="$OLDPATH"
 
@@ -1081,10 +1025,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
       if test "x$COMPILER_CPU_TEST" != "xx64"; then
         AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "x64".])
       fi
-    elif test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-      if test "x$COMPILER_CPU_TEST" != "xARM64"; then
-        AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "arm64".])
-      fi
     fi
   fi
 

make/autoconf/toolchain_windows.m4

@@ -25,7 +25,7 @@
 
 ################################################################################
 # The order of these defines the priority by which we try to find them.
-VALID_VS_VERSIONS="2019 2017 2013 2015 2012 2010"
+VALID_VS_VERSIONS="2017 2013 2015 2012 2010"
 
 VS_DESCRIPTION_2010="Microsoft Visual Studio 2010"
 VS_VERSION_INTERNAL_2010=100
@@ -80,7 +80,7 @@ VS_VERSION_INTERNAL_2017=141
 VS_MSVCR_2017=vcruntime140.dll
 VS_MSVCP_2017=msvcp140.dll
 VS_ENVVAR_2017="VS150COMNTOOLS"
-VS_USE_UCRT_2017="false"
+VS_USE_UCRT_2017="true"
 VS_VS_INSTALLDIR_2017="Microsoft Visual Studio/2017"
 VS_EDITIONS_2017="BuildTools Community Professional Enterprise"
 VS_SDK_INSTALLDIR_2017=
@@ -88,19 +88,6 @@ VS_VS_PLATFORM_NAME_2017="v141"
 VS_SDK_PLATFORM_NAME_2017=
 VS_SUPPORTED_2017=true
 
-VS_DESCRIPTION_2019="Microsoft Visual Studio 2019"
-VS_VERSION_INTERNAL_2019=142
-VS_MSVCR_2019=vcruntime140.dll
-VS_MSVCP_2019=msvcp140.dll
-VS_ENVVAR_2019="VS160COMNTOOLS"
-VS_USE_UCRT_2019="false"
-VS_VS_INSTALLDIR_2019="Microsoft Visual Studio/2019"
-VS_EDITIONS_2019="BuildTools Community Professional Enterprise"
-VS_SDK_INSTALLDIR_2019=
-VS_VS_PLATFORM_NAME_2019="v142"
-VS_SDK_PLATFORM_NAME_2019=
-VS_SUPPORTED_2019=true
-
 ################################################################################
 
 AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
@@ -124,15 +111,11 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT],
 
     if test -d "$VS_BASE"; then
       AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
-      if test "x$OPENJDK_TARGET_CPU" = xx86; then
+      if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
         VCVARSFILES="vc/bin/vcvars32.bat vc/auxiliary/build/vcvars32.bat"
-      elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+      else
         VCVARSFILES="vc/bin/amd64/vcvars64.bat vc/bin/x86_amd64/vcvarsx86_amd64.bat \
             vc/auxiliary/build/vcvarsx86_amd64.bat vc/auxiliary/build/vcvars64.bat"
-      elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-        # for host x86-64, target aarch64
-        VCVARSFILES="vc/auxiliary/build/vcvarsamd64_arm64.bat \
-            vc/auxiliary/build/vcvarsx86_arm64.bat"
       fi
 
       for VCVARSFILE in $VCVARSFILES; do
@@ -172,12 +155,10 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT],
       elif test -f "$WIN_SDK_BASE/Bin/SetEnv.Cmd"; then
         AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
         VS_ENV_CMD="$WIN_SDK_BASE/Bin/SetEnv.Cmd"
-        if test "x$OPENJDK_TARGET_CPU" = xx86; then
+        if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
           VS_ENV_ARGS="/x86"
-        elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+        else
           VS_ENV_ARGS="/x64"
-        elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-          VS_ENV_ARGS="/arm64"
         fi
         # PLATFORM_TOOLSET is used during the compilation of the freetype sources (see
         # 'LIB_BUILD_FREETYPE' in libraries.m4) and must be 'Windows7.1SDK' for Windows7.1SDK
@@ -474,7 +455,41 @@ AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
       AC_SUBST(VS_INCLUDE)
       AC_SUBST(VS_LIB)
 
-      TOOLCHAIN_SETUP_VISUAL_STUDIO_SYSROOT_FLAGS
+      # Convert VS_INCLUDE into SYSROOT_CFLAGS
+      OLDIFS="$IFS"
+      IFS=";"
+      for i in $VS_INCLUDE; do
+        ipath=$i
+        # Only process non-empty elements
+        if test "x$ipath" != x; then
+          IFS="$OLDIFS"
+          # Check that directory exists before calling fixup_path
+          testpath=$ipath
+          BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
+          if test -d "$testpath"; then
+            BASIC_FIXUP_PATH([ipath])
+            SYSROOT_CFLAGS="$SYSROOT_CFLAGS -I$ipath"
+          fi
+          IFS=";"
+        fi
+      done
+      # Convert VS_LIB into SYSROOT_LDFLAGS
+      for i in $VS_LIB; do
+        libpath=$i
+        # Only process non-empty elements
+        if test "x$libpath" != x; then
+          IFS="$OLDIFS"
+          # Check that directory exists before calling fixup_path
+          testpath=$libpath
+          BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
+          if test -d "$testpath"; then
+            BASIC_FIXUP_PATH([libpath])
+            SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS -libpath:$libpath"
+          fi
+          IFS=";"
+        fi
+      done
+      IFS="$OLDIFS"
     fi
   else
     AC_MSG_RESULT([not found])
@@ -511,15 +526,10 @@ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL],
         CORRECT_MSVCR_ARCH="PE32+ executable"
       fi
     else
-      if test "x$OPENJDK_TARGET_CPU" = xx86; then
+      if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
         CORRECT_MSVCR_ARCH=386
-      elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
+      else
         CORRECT_MSVCR_ARCH=x86-64
-      elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-        # The cygwin 'file' command only returns "PE32+ executable (DLL) (console), for MS Windows",
-        # without specifying which architecture it is for specifically. This has been fixed upstream.
-        # https://github.com/file/file/commit/b849b1af098ddd530094bf779b58431395db2e10#diff-ff2eced09e6860de75057dd731d092aeR142
-        CORRECT_MSVCR_ARCH="PE32+ executable"
       fi
     fi
     if $ECHO "$MSVC_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
@@ -539,24 +549,24 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
   DLL_NAME="$1"
   MSVC_DLL=
 
-  if test "x$OPENJDK_TARGET_CPU" = xx86; then
-    vs_target_cpu=x86
-  elif test "x$OPENJDK_TARGET_CPU" = xx86_64; then
-    vs_target_cpu=x64
-  elif test "x$OPENJDK_TARGET_CPU" = xaarch64; then
-    vs_target_cpu=arm64
-  fi
-
   if test "x$MSVC_DLL" = x; then
     if test "x$VCINSTALLDIR" != x; then
       CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
       BASIC_FIXUP_PATH(CYGWIN_VC_INSTALL_DIR)
       if test "$VS_VERSION" -lt 2017; then
         # Probe: Using well-known location from Visual Studio 12.0 and older
-        POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/$vs_target_cpu/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
+        if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+          POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
+        else
+          POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME"
+        fi
       else
         # Probe: Using well-known location from VS 2017
-        POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_INSTALL_DIR/Redist/MSVC/*/$vs_target_cpu/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
+        if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+          POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_INSTALL_DIR/Redist/MSVC/*/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
+        else
+          POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_INSTALL_DIR/Redist/MSVC/*/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`"
+        fi
       fi
       # In case any of the above finds more than one file, loop over them.
       for possible_msvc_dll in $POSSIBLE_MSVC_DLL; do
@@ -588,8 +598,13 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
     if test "x$VS100COMNTOOLS" != x; then
       CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
       BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR)
-      POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
-        | $GREP -i /$vs_target_cpu/ | $HEAD --lines 1`
+      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
+        POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
+	    | $GREP -i /x64/ | $HEAD --lines 1`
+      else
+        POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
+	    | $GREP -i /x86/ | $HEAD --lines 1`
+      fi
       TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
           [search of VS100COMNTOOLS])
     fi
@@ -599,17 +614,17 @@ AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
     # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
     # (This was the original behaviour; kept since it might turn something up)
     if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
-      if test "x$OPENJDK_TARGET_CPU" = xx86; then
+      if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
         POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
-        | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $GREP -v arm64 | $HEAD --lines 1`
+	    | $GREP x64 | $HEAD --lines 1`
+      else
+        POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
+	    | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
         if test "x$POSSIBLE_MSVC_DLL" = x; then
           # We're grasping at straws now...
           POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
 	      | $HEAD --lines 1`
         fi
-      else
-        POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
-          | $GREP $vs_target_cpu | $HEAD --lines 1`
       fi
 
       TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
@@ -693,12 +708,8 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
       CYGWIN_WINDOWSSDKDIR="${WINDOWSSDKDIR}"
       BASIC_FIXUP_PATH([CYGWIN_WINDOWSSDKDIR])
       dll_subdir=$OPENJDK_TARGET_CPU
-      if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
-        dll_subdir="arm64"
-      elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
+      if test "x$dll_subdir" = "xx86_64"; then
         dll_subdir="x64"
-      elif test "x$OPENJDK_TARGET_CPU" = "xx86"; then
-        dll_subdir="x86"
       fi
       UCRT_DLL_DIR="$CYGWIN_WINDOWSSDKDIR/Redist/ucrt/DLLs/$dll_subdir"
       if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
@@ -721,49 +732,3 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
   fi
   AC_SUBST(UCRT_DLL_DIR)
 ])
-
-# Setup the sysroot flags and add them to global CFLAGS and LDFLAGS so
-# that configure can use them while detecting compilers.
-# TOOLCHAIN_TYPE is available here.
-# Param 1 - Optional prefix to all variables. (e.g BUILD_)
-AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_SYSROOT_FLAGS],
-[
-  # Convert $1VS_INCLUDE into $1SYSROOT_CFLAGS
-  OLDIFS="$IFS"
-  IFS=";"
-  for i in [$]$1VS_INCLUDE; do
-    ipath=$i
-    # Only process non-empty elements
-    if test "x$ipath" != x; then
-      IFS="$OLDIFS"
-      # Check that directory exists before calling fixup_path
-      testpath=$ipath
-      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
-      if test -d "$testpath"; then
-        BASIC_FIXUP_PATH([ipath])
-        $1SYSROOT_CFLAGS="[$]$1SYSROOT_CFLAGS -I$ipath"
-      fi
-      IFS=";"
-    fi
-  done
-  # Convert $1VS_LIB into $1SYSROOT_LDFLAGS
-  for i in [$]$1VS_LIB; do
-    libpath=$i
-    # Only process non-empty elements
-    if test "x$libpath" != x; then
-      IFS="$OLDIFS"
-      # Check that directory exists before calling fixup_path
-      testpath=$libpath
-      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
-      if test -d "$testpath"; then
-        BASIC_FIXUP_PATH([libpath])
-        $1SYSROOT_LDFLAGS="[$]$1SYSROOT_LDFLAGS -libpath:$libpath"
-      fi
-      IFS=";"
-    fi
-  done
-  IFS="$OLDIFS"
-
-  AC_SUBST($1SYSROOT_CFLAGS)
-  AC_SUBST($1SYSROOT_LDFLAGS)
-])

make/autoconf/version-numbers

@@ -28,12 +28,12 @@
 
 DEFAULT_VERSION_FEATURE=11
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=12
+DEFAULT_VERSION_UPDATE=11
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2021-07-20
+DEFAULT_VERSION_DATE=2021-04-20
 DEFAULT_VERSION_CLASSFILE_MAJOR=55  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"

make/common/NativeCompilation.gmk

@@ -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
@@ -1008,13 +1008,6 @@ define SetupNativeCompilationBody
               $(CD) $$($1_OUTPUT_DIR) && \
                   $$($1_OBJCOPY) --add-gnu-debuglink=$$($1_DEBUGINFO_FILES) $$($1_TARGET)
 
-        else ifeq ($(OPENJDK_TARGET_OS), aix)
-          # AIX does not provide the equivalent of OBJCOPY to extract debug symbols,
-          # so we copy the compiled object with symbols to the .debuginfo file, which
-          # happens prior to the STRIP_CMD on the original target object file.
-          $1_DEBUGINFO_FILES := $$($1_OUTPUT_DIR)/$$($1_NOSUFFIX).debuginfo 
-          $1_CREATE_DEBUGINFO_CMDS := $(CP) $$($1_TARGET) $$($1_DEBUGINFO_FILES)
-
         else ifeq ($(OPENJDK_TARGET_OS), macosx)
           $1_DEBUGINFO_FILES := \
               $$($1_OUTPUT_DIR)/$$($1_BASENAME).dSYM/Contents/Info.plist \

make/common/TestFilesCompilation.gmk

@@ -75,7 +75,7 @@ define SetupTestFilesCompilationBody
 
   # Locate all files with the matching prefix
   $1_FILE_LIST := \
-      $$(call FindFiles, $$($1_SOURCE_DIRS), $$($1_PREFIX)*.c $$($1_PREFIX)*.m)
+      $$(call FindFiles, $$($1_SOURCE_DIRS), $$($1_PREFIX)*.c)
 
   $1_EXCLUDE_PATTERN := $$(addprefix %/, $$($1_EXCLUDE))
   $1_FILTERED_FILE_LIST := $$(filter-out $$($1_EXCLUDE_PATTERN), $$($1_FILE_LIST))

make/conf/jib-profiles.js

@@ -1160,15 +1160,15 @@ var concatObjects = function (o1, o2) {
  * @param patch Override patch version
  * @returns {String} The numeric version string
  */
-var getVersion = function (feature, interim, update, patch, extra1, extra2, extra3) {
+var getVersion = function (feature, interim, update, patch) {
     var version_numbers = getVersionNumbers();
     var version = (feature != null ? feature : version_numbers.get("DEFAULT_VERSION_FEATURE"))
         + "." + (interim != null ? interim : version_numbers.get("DEFAULT_VERSION_INTERIM"))
         + "." + (update != null ? update :  version_numbers.get("DEFAULT_VERSION_UPDATE"))
         + "." + (patch != null ? patch : version_numbers.get("DEFAULT_VERSION_PATCH"))
-        + "." + (extra1 != null ? extra1 : version_numbers.get("DEFAULT_VERSION_EXTRA1"))
-        + "." + (extra2 != null ? extra2 : version_numbers.get("DEFAULT_VERSION_EXTRA2"))
-        + "." + (extra3 != null ? extra3 : version_numbers.get("DEFAULT_VERSION_EXTRA3"));
+        + "." + version_numbers.get("DEFAULT_VERSION_EXTRA1")
+        + "." + version_numbers.get("DEFAULT_VERSION_EXTRA2")
+        + "." + version_numbers.get("DEFAULT_VERSION_EXTRA3");
     while (version.match(".*\\.0$")) {
         version = version.substring(0, version.length - 2);
     }

make/copy/Copy-java.base.gmk

@@ -43,43 +43,38 @@ ifneq ($(findstring $(OPENJDK_TARGET_OS), windows aix),)
 endif
 
 ################################################################################
-# Copy the microsoft runtime libraries on windows, but only if we are not
-# creating a buildjdk. If we are, the provided runtime librareis are made for
-# the target platform, not the build platform (and we should not need to bundle
-# anything with the minimalistic, locally-only buildjdk.)
+# Copy the microsoft runtime libraries on windows
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  ifneq ($(CREATING_BUILDJDK), true)
 
-    # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
-    define copy-and-chmod
+  # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
+  define copy-and-chmod
 	$(install-file)
 	$(CHMOD) a+rx $@
-    endef
+  endef
 
-    # Use separate macro calls in case the source files are not in the same
-    # directory.
-    $(eval $(call SetupCopyFiles,COPY_MSVCR, \
+  # Use separate macro calls in case the source files are not in the same
+  # directory.
+  $(eval $(call SetupCopyFiles,COPY_MSVCR, \
       DEST := $(LIB_DST_DIR), \
       FILES := $(MSVCR_DLL), \
       MACRO := copy-and-chmod))
 
-    $(eval $(call SetupCopyFiles,COPY_MSVCP, \
+  $(eval $(call SetupCopyFiles,COPY_MSVCP, \
       DEST := $(LIB_DST_DIR), \
       FILES := $(MSVCP_DLL), \
       MACRO := copy-and-chmod))
 
-    TARGETS += $(COPY_MSVCR) $(COPY_MSVCP)
+  TARGETS += $(COPY_MSVCR) $(COPY_MSVCP)
 
-    ifneq ($(UCRT_DLL_DIR), )
-      $(eval $(call SetupCopyFiles, COPY_UCRT_DLLS, \
+  ifneq ($(UCRT_DLL_DIR), )
+    $(eval $(call SetupCopyFiles, COPY_UCRT_DLLS, \
         DEST := $(LIB_DST_DIR), \
         SRC := $(UCRT_DLL_DIR), \
         FILES := $(wildcard $(UCRT_DLL_DIR)/*.dll), \
         MACRO := copy-and-chmod, \
-      ))
+    ))
 
-      TARGETS += $(COPY_UCRT_DLLS)
-    endif
+    TARGETS += $(COPY_UCRT_DLLS)
   endif
 endif
 

make/copy/Copy-java.desktop.gmk

@@ -86,7 +86,7 @@ TARGETS += $(COPY_LEGAL)
 ################################################################################
 
 FONTFILE_SRC_DIR := $(TOPDIR)/src/java.desktop/share
-FONTFILE_SRCS := $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.ttf) $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.otf) $(FONTFILE_SRC_DIR)/fonts/fonts.dir $(FONTFILE_SRC_DIR)/fonts/font.conf
+FONTFILE_SRCS := $(wildcard $(FONTFILE_SRC_DIR)/fonts/*.ttf) $(FONTFILE_SRC_DIR)/fonts/fonts.dir $(FONTFILE_SRC_DIR)/fonts/font.conf
 FONTFILE_TARGET_FILES := $(subst $(FONTFILE_SRC_DIR),$(LIB_DST_DIR),$(FONTFILE_SRCS))
 
 $(LIB_DST_DIR)/fonts/%: $(FONTFILE_SRC_DIR)/fonts/%

make/data/cacerts/soneraclass2ca

@@ -0,0 +1,26 @@
+Owner: CN=Sonera Class2 CA, O=Sonera, C=FI
+Issuer: CN=Sonera Class2 CA, O=Sonera, C=FI
+Serial number: 1d
+Valid from: Fri Apr 06 07:29:40 GMT 2001 until: Tue Apr 06 07:29:40 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 2048-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEP
+MA0GA1UEChMGU29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAx
+MDQwNjA3Mjk0MFoXDTIxMDQwNjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNV
+BAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3/Ei9vX+ALTU74W+o
+Z6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybTdXnt
+5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s
+3TmVToMGf+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2Ej
+vOr7nQKV0ba5cTppCD8PtOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu
+8nYybieDwnPz3BjotJPqdURrBGAgcVeHnfO+oJAjPYok4doh28MCAwEAAaMzMDEw
+DwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITTXjwwCwYDVR0PBAQDAgEG
+MA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt0jSv9zil
+zqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/
+3DEIcbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvD
+FNr450kkkdAdavphOe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6
+Tk6ezAyNlNzZRZxe7EJQY670XcSxEtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2
+ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLHllpwrN9M
+-----END CERTIFICATE-----

make/data/cacerts/thawtepremiumserverca

@@ -0,0 +1,27 @@
+Owner: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+Issuer: EMAILADDRESS=premium-server@thawte.com, CN=Thawte Premium Server CA, OU=Certification Services Division, O=Thawte Consulting cc, L=Cape Town, ST=Western Cape, C=ZA
+Serial number: 36122296c5e338a520a1d25f4cd70954
+Valid from: Thu Aug 01 00:00:00 GMT 1996 until: Fri Jan 01 23:59:59 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAp+gAwIBAgIQNhIilsXjOKUgodJfTNcJVDANBgkqhkiG9w0BAQUFADCB
+zjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
+Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
+CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhh
+d3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNl
+cnZlckB0aGF3dGUuY29tMB4XDTk2MDgwMTAwMDAwMFoXDTIxMDEwMTIzNTk1OVow
+gc4xCzAJBgNVBAYTAlpBMRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcT
+CUNhcGUgVG93bjEdMBsGA1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNV
+BAsTH0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRo
+YXd0ZSBQcmVtaXVtIFNlcnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1z
+ZXJ2ZXJAdGhhd3RlLmNvbTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2
+aovXwlue2oFBYo847kkEVdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560
+ZXUCTe/LCaIhUdib0GfQug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j
++ao6hnO2RlNYyIkFvYMRuHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/
+BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBlkKyID1bZ5jA01CbH0FDxkt5r1DmI
+CSLGpmODA/eZd9iy5Ri4XWPz1HP7bJyZePFLeH0ZJMMrAoT4vCLZiiLXoPxx7JGH
+IPG47LHlVYCsPVLIOQ7C8MAFT9aCdYy9X9LcdpoFEsmvcsPcJX6kTY4XpeCHf+Ga
+WuFg3GQjPEIuTQ==
+-----END CERTIFICATE-----

make/data/cacerts/verisignclass2g2ca

@@ -0,0 +1,26 @@
+Owner: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 2 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Issuer: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 2 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Serial number: b92f60cc889fa17a4609b85b706c8aaf
+Valid from: Mon May 18 00:00:00 GMT 1998 until: Tue Aug 01 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 1
+-----BEGIN CERTIFICATE-----
+MIIDAzCCAmwCEQC5L2DMiJ+hekYJuFtwbIqvMA0GCSqGSIb3DQEBBQUAMIHBMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0Ns
+YXNzIDIgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
+MjE6MDgGA1UECxMxKGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
+aXplZCB1c2Ugb25seTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazAe
+Fw05ODA1MTgwMDAwMDBaFw0yODA4MDEyMzU5NTlaMIHBMQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xPDA6BgNVBAsTM0NsYXNzIDIgUHVibGlj
+IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjE6MDgGA1UECxMx
+KGMpIDE5OTggVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAp4gBIXQs5xoD8JjhlzwPIQjxnNuX6Zr8wgQGE75fUsjM
+HiwSViy4AWkszJkfrbCWrnkE8hM5wXuYuggs6MKEEyyqaekJ9MepAqRCwiNPStjw
+DqL7MWzJ5m+ZJwf15vRMeJ5t60aG+rmGyVTyssSv1EYcWskVMP8NbPUtDm3Of3cC
+AwEAATANBgkqhkiG9w0BAQUFAAOBgQByLvl/0fFx+8Se9sVeUYpAmLho+Jscg9ji
+nb3/7aHmZuovCfTK1+qlK5X2JGCGTUQug6XELaDTrnhpb3LabK4I8GOSN+a7xDAX
+rXfMSTWqz9iP0b63GJZHc2pUIjRkLbYWm1lbtFFZOrMLFPQS32eg9K0yZF6xRnIn
+jBJ7xUS0rg==
+-----END CERTIFICATE-----

make/data/cacerts/verisignclass3ca

@@ -0,0 +1,21 @@
+Owner: OU=Class 3 Public Primary Certification Authority, O="VeriSign, Inc.", C=US
+Issuer: OU=Class 3 Public Primary Certification Authority, O="VeriSign, Inc.", C=US
+Serial number: 3c9131cb1ff6d01b0e9ab8d044bf12be
+Valid from: Mon Jan 29 00:00:00 GMT 1996 until: Wed Aug 02 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 1
+-----BEGIN CERTIFICATE-----
+MIICPDCCAaUCEDyRMcsf9tAbDpq40ES/Er4wDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFz
+cyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTk2
+MDEyOTAwMDAwMFoXDTI4MDgwMjIzNTk1OVowXzELMAkGA1UEBhMCVVMxFzAVBgNV
+BAoTDlZlcmlTaWduLCBJbmMuMTcwNQYDVQQLEy5DbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGfMA0GCSqGSIb3DQEBAQUAA4GN
+ADCBiQKBgQDJXFme8huKARS0EN8EQNvjV69qRUCPhAwL0TPZ2RHP7gJYHyX3KqhE
+BarsAx94f56TuZoAqiN91qyFomNFx3InzPRMxnVx0jnvT0Lwdd8KkMaOIG+YD/is
+I19wKTakyYbnsZogy1Olhec9vn2a/iRFM9x2Fe0PonFkTGUugWhFpwIDAQABMA0G
+CSqGSIb3DQEBBQUAA4GBABByUqkFFBkyCEHwxWsKzH4PIRnN5GfcX6kb5sroc50i
+2JhucwNhkcV8sEVAbkSdjbCxlnRhLQ2pRdKkkirWmnWXbj9T/UWZYB2oK0z5XqcJ
+2HUw19JlYD1n1khVdWk/kfVIC0dpImmClr7JyDiGSnoscxlIaU5rfGW/D/xwzoiQ
+-----END CERTIFICATE-----

make/data/cacerts/verisignclass3g2ca

@@ -0,0 +1,26 @@
+Owner: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 3 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Issuer: OU=VeriSign Trust Network, OU="(c) 1998 VeriSign, Inc. - For authorized use only", OU=Class 3 Public Primary Certification Authority - G2, O="VeriSign, Inc.", C=US
+Serial number: 7dd9fe07cfa81eb7107967fba78934c6
+Valid from: Mon May 18 00:00:00 GMT 1998 until: Tue Aug 01 23:59:59 GMT 2028
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 1
+-----BEGIN CERTIFICATE-----
+MIIDAjCCAmsCEH3Z/gfPqB63EHln+6eJNMYwDQYJKoZIhvcNAQEFBQAwgcExCzAJ
+BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xh
+c3MgMyBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcy
+MTowOAYDVQQLEzEoYykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3Jp
+emVkIHVzZSBvbmx5MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMB4X
+DTk4MDUxODAwMDAwMFoXDTI4MDgwMTIzNTk1OVowgcExCzAJBgNVBAYTAlVTMRcw
+FQYDVQQKEw5WZXJpU2lnbiwgSW5jLjE8MDoGA1UECxMzQ2xhc3MgMyBQdWJsaWMg
+UHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMTowOAYDVQQLEzEo
+YykgMTk5OCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5
+MR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDMXtERXVxp0KvTuWpMmR9ZmDCOFoUgRm1HP9SFIIThbbP4
+pO0M8RcPO/mn+SXXwc+EY/J8Y8+iR/LGWzOOZEAEaMGAuWQcRXfH2G71lSk8UOg0
+13gfqLptQ5GVj0VXXn7F+8qkBOvqlzdUMG+7AUcyM83cV5tkaWH4mx0ciU9cZwID
+AQABMA0GCSqGSIb3DQEBBQUAA4GBAFFNzb5cy5gZnBWyATl4Lk0PZ3BwmcYQWpSk
+U01UbSuvDV1Ai2TT1+7eVmGSX6bEHRBhNtMsJzzoKQm5EWR0zLVznxxIqbxhAe7i
+F6YM40AIOw7n60RzKprxaZLvcRTDOaxxp5EJb+RxBrO6WVcmeQD2+A2iMzAo1KpY
+oJ2daZH9
+-----END CERTIFICATE-----

make/data/cacerts/verisigntsaca

@@ -0,0 +1,24 @@
+Owner: CN=Thawte Timestamping CA, OU=Thawte Certification, O=Thawte, L=Durbanville, ST=Western Cape, C=ZA
+Issuer: CN=Thawte Timestamping CA, OU=Thawte Certification, O=Thawte, L=Durbanville, ST=Western Cape, C=ZA
+Serial number: 67c8e1e8e3be1cbdfc913b8ea6238749
+Valid from: Wed Jan 01 00:00:00 GMT 1997 until: Fri Jan 01 23:59:59 GMT 2021
+Signature algorithm name: SHA1withRSA
+Subject Public Key Algorithm: 1024-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICsDCCAhmgAwIBAgIQZ8jh6OO+HL38kTuOpiOHSTANBgkqhkiG9w0BAQUFADCB
+izELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxML
+RHVyYmFudmlsbGUxDzANBgNVBAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENl
+cnRpZmljYXRpb24xHzAdBgNVBAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwHhcN
+OTcwMTAxMDAwMDAwWhcNMjEwMTAxMjM1OTU5WjCBizELMAkGA1UEBhMCWkExFTAT
+BgNVBAgTDFdlc3Rlcm4gQ2FwZTEUMBIGA1UEBxMLRHVyYmFudmlsbGUxDzANBgNV
+BAoTBlRoYXd0ZTEdMBsGA1UECxMUVGhhd3RlIENlcnRpZmljYXRpb24xHzAdBgNV
+BAMTFlRoYXd0ZSBUaW1lc3RhbXBpbmcgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0A
+MIGJAoGBANYrWHhhRYZT6jR7UZztsOYuGA7+4F+oJ9O0yeB8WU4WDnNUYMF/9p8u
+6TqFJBU820cEY8OexJQaWt9MevPZQx08EHp5JduQ/vBR5zDWQQD9nyjfeb6Uu522
+FOMjhdepQeBMpHmwKxqL8vg7ij5FrHGSALSQQZj7X+36ty6K+Ig3AgMBAAGjEzAR
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAS+mqF4EF+3kKMZ/F
+QfRWVKvpwuWXjhj+kckMPiZkyaFMJ2SnvQGTVXFuF0853BvcSTUQOSP/ypvIz2Y/
+3Ewa1IEGQlIf4SaxFhe65nByMUToTo1b5NP50OOPJWQx5yr4GIg2GlLFDUE1G2m3
+JvUXzMEZXkt8XOKDgJH6L/uatxY=
+-----END CERTIFICATE-----

make/data/lsrdata/language-subtag-registry.txt

@@ -1,4 +1,4 @@
-File-Date: 2020-09-29
+File-Date: 2019-09-16
 %%
 Type: language
 Subtag: aa
@@ -1530,7 +1530,7 @@ Added: 2005-10-16
 %%
 Type: language
 Subtag: adb
-Description: Atauran
+Description: Adabe
 Added: 2009-07-29
 %%
 Type: language
@@ -2707,7 +2707,6 @@ Type: language
 Subtag: aoh
 Description: Arma
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: aoi
@@ -3771,7 +3770,6 @@ Type: language
 Subtag: ayy
 Description: Tayabas Ayta
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: ayz
@@ -4087,7 +4085,6 @@ Type: language
 Subtag: bbz
 Description: Babalia Creole Arabic
 Added: 2009-07-29
-Deprecated: 2020-03-28
 Macrolanguage: ar
 %%
 Type: language
@@ -5758,7 +5755,6 @@ Type: language
 Subtag: bpb
 Description: Barbacoas
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: bpd
@@ -6015,7 +6011,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: brf
-Description: Bira
+Description: Bera
 Added: 2009-07-29
 %%
 Type: language
@@ -7378,7 +7374,6 @@ Type: language
 Subtag: cca
 Description: Cauca
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: ccc
@@ -7485,7 +7480,6 @@ Type: language
 Subtag: cdg
 Description: Chamari
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: cdh
@@ -7881,11 +7875,6 @@ Description: Cibak
 Added: 2009-07-29
 %%
 Type: language
-Subtag: ckm
-Description: Chakavian
-Added: 2020-03-28
-%%
-Type: language
 Subtag: ckn
 Description: Kaang Chin
 Added: 2013-09-10
@@ -8132,13 +8121,6 @@ Description: Con
 Added: 2009-07-29
 %%
 Type: language
-Subtag: cnp
-Description: Northern Ping Chinese
-Description: Northern Pinghua
-Added: 2020-03-28
-Macrolanguage: zh
-%%
-Type: language
 Subtag: cnr
 Description: Montenegrin
 Added: 2018-01-23
@@ -8582,13 +8564,6 @@ Description: Sochiapan Chinantec
 Added: 2009-07-29
 %%
 Type: language
-Subtag: csp
-Description: Southern Ping Chinese
-Description: Southern Pinghua
-Added: 2020-03-28
-Macrolanguage: zh
-%%
-Type: language
 Subtag: csq
 Description: Croatia Sign Language
 Added: 2009-07-29
@@ -9343,7 +9318,6 @@ Macrolanguage: doi
 Type: language
 Subtag: dgr
 Description: Dogrib
-Description: Tłı̨chǫ
 Added: 2005-10-16
 %%
 Type: language
@@ -9360,7 +9334,6 @@ Type: language
 Subtag: dgu
 Description: Degaru
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: dgw
@@ -9747,11 +9720,6 @@ Description: Dugwor
 Added: 2009-07-29
 %%
 Type: language
-Subtag: dmf
-Description: Medefaidrin
-Added: 2020-03-28
-%%
-Type: language
 Subtag: dmg
 Description: Upper Kinabatangan
 Added: 2009-07-29
@@ -10073,8 +10041,6 @@ Type: language
 Subtag: drr
 Description: Dororo
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Preferred-Value: kzk
 %%
 Type: language
 Subtag: drs
@@ -10364,11 +10330,6 @@ Description: Diri
 Added: 2009-07-29
 %%
 Type: language
-Subtag: dwk
-Description: Dawik Kui
-Added: 2020-03-28
-%%
-Type: language
 Subtag: dwl
 Description: Walo Kumbe Dogon
 Added: 2009-07-29
@@ -10494,11 +10455,6 @@ Description: Karenggapa
 Added: 2013-09-10
 %%
 Type: language
-Subtag: ebc
-Description: Beginci
-Added: 2020-03-28
-%%
-Type: language
 Subtag: ebg
 Description: Ebughu
 Added: 2009-07-29
@@ -10620,7 +10576,6 @@ Type: language
 Subtag: ekc
 Description: Eastern Karnic
 Added: 2013-09-10
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: eke
@@ -11260,11 +11215,6 @@ Description: Fyer
 Added: 2009-07-29
 %%
 Type: language
-Subtag: fif
-Description: Faifi
-Added: 2020-06-08
-%%
-Type: language
 Subtag: fil
 Description: Filipino
 Description: Pilipino
@@ -11931,7 +11881,6 @@ Added: 2009-07-29
 Type: language
 Subtag: gdh
 Description: Gadjerawang
-Description: Gajirrabeng
 Added: 2009-07-29
 %%
 Type: language
@@ -12021,11 +11970,6 @@ Description: Gade
 Added: 2009-07-29
 %%
 Type: language
-Subtag: gef
-Description: Gerai
-Added: 2020-03-28
-%%
-Type: language
 Subtag: geg
 Description: Gengle
 Added: 2009-07-29
@@ -12437,8 +12381,6 @@ Type: language
 Subtag: gli
 Description: Guliguli
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Preferred-Value: kzk
 %%
 Type: language
 Subtag: glj
@@ -12534,12 +12476,6 @@ Added: 2009-07-29
 Scope: collection
 %%
 Type: language
-Subtag: gmr
-Description: Mirning
-Description: Mirniny
-Added: 2020-03-28
-%%
-Type: language
 Subtag: gmu
 Description: Gumalu
 Added: 2009-07-29
@@ -13219,7 +13155,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: gwc
-Description: Gawri
 Description: Kalami
 Added: 2009-07-29
 %%
@@ -13924,11 +13859,6 @@ Description: Chhattisgarhi
 Added: 2009-07-29
 %%
 Type: language
-Subtag: hng
-Description: Hungu
-Added: 2020-03-28
-%%
-Type: language
 Subtag: hnh
 Description: ǁAni
 Added: 2009-07-29
@@ -14210,7 +14140,6 @@ Added: 2009-07-29
 Type: language
 Subtag: huc
 Description: ǂHua
-Description: ǂʼAmkhoe
 Added: 2009-07-29
 %%
 Type: language
@@ -15981,7 +15910,6 @@ Added: 2009-07-29
 Type: language
 Subtag: kaa
 Description: Kara-Kalpak
-Description: Karakalpak
 Added: 2005-10-16
 %%
 Type: language
@@ -17139,9 +17067,8 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: kjf
-Description: Khalaj [Indo-Iranian]
+Description: Khalaj
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: kjg
@@ -17321,7 +17248,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: kkq
-Description: Kaeku
+Description: Kaiku
 Added: 2009-07-29
 %%
 Type: language
@@ -17417,7 +17344,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: klj
-Description: Khalaj
+Description: Turkic Khalaj
 Added: 2009-07-29
 %%
 Type: language
@@ -18570,7 +18497,6 @@ Added: 2009-07-29
 Type: language
 Subtag: kui
 Description: Kuikúro-Kalapálo
-Description: Kalapalo
 Added: 2009-07-29
 %%
 Type: language
@@ -18982,8 +18908,6 @@ Type: language
 Subtag: kxl
 Description: Nepali Kurux
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Preferred-Value: kru
 %%
 Type: language
 Subtag: kxm
@@ -19029,8 +18953,6 @@ Type: language
 Subtag: kxu
 Description: Kui (India)
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Comments: see dwk, uki
 %%
 Type: language
 Subtag: kxv
@@ -20415,7 +20337,6 @@ Type: language
 Subtag: lmz
 Description: Lumbee
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: lna
@@ -22867,7 +22788,6 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: moe
-Description: Innu
 Description: Montagnais
 Added: 2009-07-29
 %%
@@ -26279,11 +26199,6 @@ Description: Sangtam Naga
 Added: 2009-07-29
 %%
 Type: language
-Subtag: nsb
-Description: Lower Nossob
-Added: 2020-03-28
-%%
-Type: language
 Subtag: nsc
 Description: Nshi
 Added: 2009-07-29
@@ -26752,8 +26667,6 @@ Type: language
 Subtag: nxu
 Description: Narau
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Preferred-Value: bpp
 %%
 Type: language
 Subtag: nxx
@@ -28253,7 +28166,7 @@ Added: 2009-07-29
 %%
 Type: language
 Subtag: pfe
-Description: Pere
+Description: Peere
 Added: 2009-07-29
 %%
 Type: language
@@ -28659,7 +28572,6 @@ Type: language
 Subtag: plp
 Description: Palpa
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: plq
@@ -31220,8 +31132,6 @@ Type: language
 Subtag: sdm
 Description: Semandang
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Comments: see ebc, gef, sdq
 %%
 Type: language
 Subtag: sdn
@@ -31240,11 +31150,6 @@ Description: Sherdukpen
 Added: 2009-07-29
 %%
 Type: language
-Subtag: sdq
-Description: Semandang
-Added: 2020-03-28
-%%
-Type: language
 Subtag: sdr
 Description: Oraon Sadri
 Added: 2009-07-29
@@ -33597,7 +33502,6 @@ Type: language
 Subtag: tbb
 Description: Tapeba
 Added: 2009-07-29
-Deprecated: 2020-03-28
 %%
 Type: language
 Subtag: tbc
@@ -34315,8 +34219,6 @@ Type: language
 Subtag: thw
 Description: Thudam
 Added: 2009-07-29
-Deprecated: 2020-06-08
-Preferred-Value: ola
 %%
 Type: language
 Subtag: thx
@@ -36338,11 +36240,6 @@ Description: Ukhwejo
 Added: 2009-07-29
 %%
 Type: language
-Subtag: uki
-Description: Kui (India)
-Added: 2020-03-28
-%%
-Type: language
 Subtag: ukk
 Description: Muak Sa-aak
 Added: 2017-02-23
@@ -36374,11 +36271,6 @@ Description: Ukue
 Added: 2009-07-29
 %%
 Type: language
-Subtag: ukv
-Description: Kuku
-Added: 2020-03-28
-%%
-Type: language
 Subtag: ukw
 Description: Ukwuani-Aboh-Ndoni
 Added: 2009-07-29
@@ -37868,11 +37760,6 @@ Description: Kunbarlang
 Added: 2009-07-29
 %%
 Type: language
-Subtag: wlh
-Description: Welaun
-Added: 2020-03-28
-%%
-Type: language
 Subtag: wli
 Description: Waioli
 Added: 2009-07-29
@@ -39345,11 +39232,6 @@ Description: Nganakarti
 Added: 2013-09-10
 %%
 Type: language
-Subtag: xnm
-Description: Ngumbarl
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xnn
 Description: Northern Kankanay
 Added: 2009-07-29
@@ -39452,45 +39334,22 @@ Description: Pirriya
 Added: 2013-09-10
 %%
 Type: language
-Subtag: xpb
-Description: Northeastern Tasmanian
-Description: Pyemmairrener
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpc
 Description: Pecheneg
 Added: 2009-07-29
 %%
 Type: language
-Subtag: xpd
-Description: Oyster Bay Tasmanian
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpe
 Description: Liberia Kpelle
 Added: 2009-07-29
 Macrolanguage: kpe
 %%
 Type: language
-Subtag: xpf
-Description: Southeast Tasmanian
-Description: Nuenonne
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpg
 Description: Phrygian
 Added: 2009-07-29
 %%
 Type: language
-Subtag: xph
-Description: North Midlands Tasmanian
-Description: Tyerrenoterpanner
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpi
 Description: Pictish
 Added: 2009-07-29
@@ -39506,11 +39365,6 @@ Description: Kulina Pano
 Added: 2009-07-29
 %%
 Type: language
-Subtag: xpl
-Description: Port Sorell Tasmanian
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpm
 Description: Pumpokol
 Added: 2009-07-29
@@ -39556,34 +39410,11 @@ Description: Punic
 Added: 2009-07-29
 %%
 Type: language
-Subtag: xpv
-Description: Northern Tasmanian
-Description: Tommeginne
-Added: 2020-03-28
-%%
-Type: language
-Subtag: xpw
-Description: Northwestern Tasmanian
-Description: Peerapper
-Added: 2020-03-28
-%%
-Type: language
-Subtag: xpx
-Description: Southwestern Tasmanian
-Description: Toogee
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xpy
 Description: Puyo
 Added: 2009-07-29
 %%
 Type: language
-Subtag: xpz
-Description: Bruny Island Tasmanian
-Added: 2020-03-28
-%%
-Type: language
 Subtag: xqa
 Description: Karakhanid
 Added: 2009-07-29
@@ -39637,8 +39468,6 @@ Type: language
 Subtag: xrq
 Description: Karranga
 Added: 2013-09-10
-Deprecated: 2020-03-28
-Preferred-Value: dmw
 %%
 Type: language
 Subtag: xrr
@@ -39871,8 +39700,6 @@ Type: language
 Subtag: xtz
 Description: Tasmanian
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Comments: see xpb, xpd, xpf, xph, xpl, xpv, xpw, xpx, xpz
 %%
 Type: language
 Subtag: xua
@@ -39902,7 +39729,6 @@ Added: 2009-07-29
 Type: language
 Subtag: xul
 Description: Ngunawal
-Description: Nunukul
 Added: 2013-09-10
 %%
 Type: language
@@ -41495,11 +41321,6 @@ Description: Zari
 Added: 2009-07-29
 %%
 Type: language
-Subtag: zba
-Description: Balaibalan
-Added: 2020-03-28
-%%
-Type: language
 Subtag: zbc
 Description: Central Berawan
 Added: 2009-07-29
@@ -41665,8 +41486,6 @@ Type: language
 Subtag: zir
 Description: Ziriya
 Added: 2009-07-29
-Deprecated: 2020-03-28
-Preferred-Value: scv
 %%
 Type: language
 Subtag: ziw
@@ -42644,7 +42463,6 @@ Type: extlang
 Subtag: bbz
 Description: Babalia Creole Arabic
 Added: 2009-07-29
-Deprecated: 2020-03-28
 Preferred-Value: bbz
 Prefix: ar
 Macrolanguage: ar
@@ -42762,15 +42580,6 @@ Prefix: zh
 Macrolanguage: zh
 %%
 Type: extlang
-Subtag: cnp
-Description: Northern Ping Chinese
-Description: Northern Pinghua
-Added: 2020-03-28
-Preferred-Value: cnp
-Prefix: zh
-Macrolanguage: zh
-%%
-Type: extlang
 Subtag: coa
 Description: Cocos Islands Malay
 Added: 2009-07-29
@@ -42838,15 +42647,6 @@ Preferred-Value: csn
 Prefix: sgn
 %%
 Type: extlang
-Subtag: csp
-Description: Southern Ping Chinese
-Description: Southern Pinghua
-Added: 2020-03-28
-Preferred-Value: csp
-Prefix: zh
-Macrolanguage: zh
-%%
-Type: extlang
 Subtag: csq
 Description: Croatia Sign Language
 Added: 2009-07-29
@@ -45128,11 +44928,6 @@ Description: Tirhuta
 Added: 2011-08-16
 %%
 Type: script
-Subtag: Toto
-Description: Toto
-Added: 2020-05-12
-%%
-Type: script
 Subtag: Ugar
 Description: Ugaritic
 Added: 2005-10-16
@@ -46835,12 +46630,6 @@ Comments: Denotes conventions established by the Academia Brasileira de
   Letras in 1943 and generally used in Brazil until 2009
 %%
 Type: variant
-Subtag: akuapem
-Description: Akuapem Twi
-Added: 2017-06-05
-Prefix: tw
-%%
-Type: variant
 Subtag: alalc97
 Description: ALA-LC Romanization, 1997 edition
 Added: 2009-12-09
@@ -46859,6 +46648,12 @@ Comments: Aluku dialect of the "Busi Nenge Tongo" English-based Creole
   continuum in Eastern Suriname and Western French Guiana
 %%
 Type: variant
+Subtag: akuapem
+Description: Akuapem Twi
+Added: 2017-06-05
+Prefix: tw
+%%
+Type: variant
 Subtag: ao1990
 Description: Portuguese Language Orthographic Agreement of 1990 (Acordo
   Ortográfico da Língua Portuguesa de 1990)
@@ -47334,16 +47129,6 @@ Comments: Pamaka dialect of the "Busi Nenge Tongo" English-based
   Creole continuum in Eastern Suriname and Western French Guiana
 %%
 Type: variant
-Subtag: peano
-Description: Latino Sine Flexione
-Description: Interlingua de API
-Description: Interlingua de Peano
-Prefix: la
-Comments: Peano’s Interlingua, created in 1903 by Giuseppe Peano as an
-  international auxiliary language
-Added: 2020-03-12
-%%
-Type: variant
 Subtag: petr1708
 Description: Petrine orthography
 Added: 2010-10-10
@@ -47481,23 +47266,6 @@ Comments: The subtag represents Branislau Taraskievic's Belarusian
   Miensk 2005).
 %%
 Type: variant
-Subtag: tongyong
-Description: Tongyong Pinyin romanization
-Added: 2020-06-08
-Prefix: zh-Latn
-Comments: Former official transcription standard for Mandarin Chinese in
-  Taiwan.
-%%
-Type: variant
-Subtag: tunumiit
-Description: Tunumiisiut
-Description: East Greenlandic
-Description: Østgrønlandsk
-Added: 2020-07-16
-Prefix: kl
-Comments: Also known as Tunumiit oraasiat
-%%
-Type: variant
 Subtag: uccor
 Description: Unified Cornish orthography of Revived Cornish
 Added: 2008-10-14
@@ -47550,14 +47318,6 @@ Comments: Vallader is one of the five traditional written standards or
   "idioms" of the Romansh language.
 %%
 Type: variant
-Subtag: vecdruka
-Description: Latvian orthography used before 1920s ("vecā druka")
-Added: 2020-09-26
-Prefix: lv
-Comments: The subtag represents the old orthography of the Latvian
-  language used during c. 1600s–1920s.
-%%
-Type: variant
 Subtag: vivaraup
 Description: Vivaro-Alpine
 Added: 2018-04-22

make/devkit/createWindowsDevkit2017.sh

@@ -89,23 +89,19 @@ if [ ! -d $DEVKIT_ROOT/VC ]; then
     REDIST_SUBDIR="VC/Redist/MSVC/14.12.25810"
     echo "Copying VC..."
     mkdir -p $DEVKIT_ROOT/VC/bin
-    cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/arm64" $DEVKIT_ROOT/VC/bin/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/x64" $DEVKIT_ROOT/VC/bin/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx86/x86" $DEVKIT_ROOT/VC/bin/
     mkdir -p $DEVKIT_ROOT/VC/lib
-    cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/arm64" $DEVKIT_ROOT/VC/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/x64" $DEVKIT_ROOT/VC/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/x86" $DEVKIT_ROOT/VC/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/include" $DEVKIT_ROOT/VC/
     mkdir -p $DEVKIT_ROOT/VC/atlmfc/lib
-    cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/arm64" $DEVKIT_ROOT/VC/atlmfc/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/x64" $DEVKIT_ROOT/VC/atlmfc/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/x86" $DEVKIT_ROOT/VC/atlmfc/lib/
     cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/include" $DEVKIT_ROOT/VC/atlmfc/
     mkdir -p $DEVKIT_ROOT/VC/Auxiliary
     cp -r "$VS_INSTALL_DIR/VC/Auxiliary/Build" $DEVKIT_ROOT/VC/Auxiliary/
     mkdir -p $DEVKIT_ROOT/VC/redist
-    cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/arm64" $DEVKIT_ROOT/VC/redist/
     cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/x64" $DEVKIT_ROOT/VC/redist/
     cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/x86" $DEVKIT_ROOT/VC/redist/
 
@@ -115,8 +111,6 @@ if [ ! -d $DEVKIT_ROOT/VC ]; then
     cp $DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x86
     cp $DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x64
     cp $DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x64
-    cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/arm64
-    cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/arm64
 fi
 
 ################################################################################
@@ -134,10 +128,8 @@ if [ ! -d $DEVKIT_ROOT/$SDK_VERSION ]; then
     cp -r "$SDK_INSTALL_DIR/bin/$SDK_FULL_VERSION/x64" $DEVKIT_ROOT/$SDK_VERSION/bin/
     cp -r "$SDK_INSTALL_DIR/bin/$SDK_FULL_VERSION/x86" $DEVKIT_ROOT/$SDK_VERSION/bin/
     mkdir -p $DEVKIT_ROOT/$SDK_VERSION/lib
-    cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/arm64" $DEVKIT_ROOT/$SDK_VERSION/lib/
     cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/x64" $DEVKIT_ROOT/$SDK_VERSION/lib/
     cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/x86" $DEVKIT_ROOT/$SDK_VERSION/lib/
-    cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/arm64" $DEVKIT_ROOT/$SDK_VERSION/lib/
     cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/x64" $DEVKIT_ROOT/$SDK_VERSION/lib/
     cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/x86" $DEVKIT_ROOT/$SDK_VERSION/lib/
     mkdir -p $DEVKIT_ROOT/$SDK_VERSION/Redist
@@ -172,13 +164,6 @@ echo-info "DEVKIT_VS_LIB_x86_64=\"\$DEVKIT_ROOT/VC/lib/x64;\$DEVKIT_ROOT/VC/atlm
 echo-info "DEVKIT_MSVCR_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL\""
 echo-info "DEVKIT_MSVCP_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL\""
 echo-info "DEVKIT_UCRT_DLL_DIR_x86_64=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/x64\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_aarch64=\"\$DEVKIT_ROOT/VC/bin/arm64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_aarch64=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_aarch64=\"\$DEVKIT_ROOT/VC/lib/arm64;\$DEVKIT_ROOT/VC/atlmfc/lib/arm64;\$DEVKIT_ROOT/$SDK_VERSION/lib/arm64\""
-echo-info "DEVKIT_MSVCR_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_aarch64=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/arm64\""
 
 ################################################################################
 # Copy this script

make/devkit/createWindowsDevkit2019.sh

@@ -1,227 +0,0 @@
-#!/bin/bash
-#
-# 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 script copies parts of a Visual Studio installation into a devkit
-# suitable for building OpenJDK and OracleJDK. Needs to run in Cygwin or WSL.
-# erik.joelsson@oracle.com
-
-VS_VERSION="2019"
-VS_VERSION_NUM_NODOT="160"
-VS_DLL_VERSION="140"
-SDK_VERSION="10"
-SDK_FULL_VERSION="10.0.17763.0"
-MSVC_DIR="Microsoft.VC142.CRT"
-MSVC_FULL_VERSION="14.12.27508"
-REDIST_FULL_VERSION="14.20.27508"
-
-SCRIPT_DIR="$(cd "$(dirname $0)" > /dev/null && pwd)"
-BUILD_DIR="${SCRIPT_DIR}/../../build/devkit"
-
-################################################################################
-# Prepare settings
-
-UNAME_SYSTEM=`uname -s`
-UNAME_RELEASE=`uname -r`
-
-# Detect cygwin or WSL
-IS_CYGWIN=`echo $UNAME_SYSTEM | grep -i CYGWIN`
-IS_WSL=`echo $UNAME_RELEASE | grep Microsoft`
-if test "x$IS_CYGWIN" != "x"; then
-    BUILD_ENV="cygwin"
-elif test "x$IS_WSL" != "x"; then
-    BUILD_ENV="wsl"
-else
-    echo "Unknown environment; only Cygwin and WSL are supported."
-    exit 1
-fi
-
-if test "x$BUILD_ENV" = "xcygwin"; then
-    WINDOWS_PATH_TO_UNIX_PATH="cygpath -u"
-elif test "x$BUILD_ENV" = "xwsl"; then
-    WINDOWS_PATH_TO_UNIX_PATH="wslpath -u"
-fi
-
-# Work around the insanely named ProgramFiles(x86) env variable
-PROGRAMFILES_X86="$($WINDOWS_PATH_TO_UNIX_PATH "$(cmd.exe /c set | sed -n 's/^ProgramFiles(x86)=//p' | tr -d '\r')")"
-
-# Find Visual Studio installation dir
-VSNNNCOMNTOOLS=`cmd.exe /c echo %VS${VS_VERSION_NUM_NODOT}COMNTOOLS% | tr -d '\r'`
-if [ -d "$VSNNNCOMNTOOLS" ]; then
-    VS_INSTALL_DIR="$($WINDOWS_PATH_TO_UNIX_PATH "$VSNNNCOMNTOOLS/../..")"
-else
-    VS_INSTALL_DIR="${PROGRAMFILES_X86}/Microsoft Visual Studio/2019"
-    VS_INSTALL_DIR="$(ls -d "${VS_INSTALL_DIR}/"{Community,Professional,Enterprise} 2>/dev/null | head -n1)"
-fi
-echo "VS_INSTALL_DIR: $VS_INSTALL_DIR"
-
-# Extract semantic version
-POTENTIAL_INI_FILES="Common7/IDE/wdexpress.isolation.ini Common7/IDE/devenv.isolation.ini"
-for f in $POTENTIAL_INI_FILES; do
-    if [ -f "$VS_INSTALL_DIR/$f" ]; then
-        VS_VERSION_SP="$(grep ^SemanticVersion= "$VS_INSTALL_DIR/$f")"
-        # Remove SemnaticVersion=
-        VS_VERSION_SP="${VS_VERSION_SP#*=}"
-        # Remove suffix of too detailed numbering starting with +
-        VS_VERSION_SP="${VS_VERSION_SP%+*}"
-        break
-    fi
-done
-if [ -z "$VS_VERSION_SP" ]; then
-    echo "Failed to find SP version"
-    exit 1
-fi
-echo "Found Version SP: $VS_VERSION_SP"
-
-# Setup output dirs
-DEVKIT_ROOT="${BUILD_DIR}/VS${VS_VERSION}-${VS_VERSION_SP}-devkit"
-DEVKIT_BUNDLE="${DEVKIT_ROOT}.tar.gz"
-
-echo "Creating devkit in $DEVKIT_ROOT"
-
-MSVCR_DLL=${MSVC_DIR}/vcruntime${VS_DLL_VERSION}.dll
-VCRUNTIME_1_DLL=${MSVC_DIR}/vcruntime${VS_DLL_VERSION}_1.dll
-MSVCP_DLL=${MSVC_DIR}/msvcp${VS_DLL_VERSION}.dll
-
-################################################################################
-# Copy Visual Studio files
-
-TOOLS_VERSION="$(ls "$VS_INSTALL_DIR/VC/Tools/MSVC" | sort -r -n | head -n1)"
-echo "Found Tools version: $TOOLS_VERSION"
-VC_SUBDIR="VC/Tools/MSVC/$TOOLS_VERSION"
-REDIST_VERSION="$(ls "$VS_INSTALL_DIR/VC/Redist/MSVC" | sort -r -n | head -n1)"
-echo "Found Redist version: $REDIST_VERSION"
-REDIST_SUBDIR="VC/Redist/MSVC/$REDIST_VERSION"
-echo "Copying VC..."
-rm -rf $DEVKIT_ROOT/VC
-mkdir -p $DEVKIT_ROOT/VC/bin
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/arm64" $DEVKIT_ROOT/VC/bin/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx64/x64" $DEVKIT_ROOT/VC/bin/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/bin/Hostx86/x86" $DEVKIT_ROOT/VC/bin/
-mkdir -p $DEVKIT_ROOT/VC/lib
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/arm64" $DEVKIT_ROOT/VC/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/x64" $DEVKIT_ROOT/VC/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/lib/x86" $DEVKIT_ROOT/VC/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/include" $DEVKIT_ROOT/VC/
-mkdir -p $DEVKIT_ROOT/VC/atlmfc/lib
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/arm64" $DEVKIT_ROOT/VC/atlmfc/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/x64" $DEVKIT_ROOT/VC/atlmfc/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/lib/x86" $DEVKIT_ROOT/VC/atlmfc/lib/
-cp -r "$VS_INSTALL_DIR/${VC_SUBDIR}/atlmfc/include" $DEVKIT_ROOT/VC/atlmfc/
-mkdir -p $DEVKIT_ROOT/VC/Auxiliary
-cp -r "$VS_INSTALL_DIR/VC/Auxiliary/Build" $DEVKIT_ROOT/VC/Auxiliary/
-mkdir -p $DEVKIT_ROOT/VC/redist
-cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/arm64" $DEVKIT_ROOT/VC/redist/
-cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/x64" $DEVKIT_ROOT/VC/redist/
-cp -r "$VS_INSTALL_DIR/$REDIST_SUBDIR/x86" $DEVKIT_ROOT/VC/redist/
-
-# The redist runtime libs are needed to run the compiler but may not be
-# installed on the machine where the devkit will be used.
-cp $DEVKIT_ROOT/VC/redist/x86/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x86
-cp $DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x86
-cp $DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/x64
-cp $DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/x64
-cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL $DEVKIT_ROOT/VC/bin/arm64
-cp $DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL $DEVKIT_ROOT/VC/bin/arm64
-
-################################################################################
-# Copy SDK files
-
-SDK_INSTALL_DIR="$PROGRAMFILES_X86/Windows Kits/$SDK_VERSION"
-echo "SDK_INSTALL_DIR: $SDK_INSTALL_DIR"
-
-SDK_FULL_VERSION="$(ls "$SDK_INSTALL_DIR/bin" | sort -r -n | head -n1)"
-echo "Found SDK version: $SDK_FULL_VERSION"
-UCRT_VERSION="$(ls "$SDK_INSTALL_DIR/Redist" | grep $SDK_VERSION | sort -r -n | head -n1)"
-echo "Found UCRT version: $UCRT_VERSION"
-echo "Copying SDK..."
-rm -rf $DEVKIT_ROOT/$SDK_VERSION
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/bin
-cp -r "$SDK_INSTALL_DIR/bin/$SDK_FULL_VERSION/x64" $DEVKIT_ROOT/$SDK_VERSION/bin/
-cp -r "$SDK_INSTALL_DIR/bin/$SDK_FULL_VERSION/x86" $DEVKIT_ROOT/$SDK_VERSION/bin/
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/lib
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/arm64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/x64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/um/x86" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/arm64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/x64" $DEVKIT_ROOT/$SDK_VERSION/lib/
-cp -r "$SDK_INSTALL_DIR/lib/$SDK_FULL_VERSION/ucrt/x86" $DEVKIT_ROOT/$SDK_VERSION/lib/
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/Redist
-cp -r "$SDK_INSTALL_DIR/Redist/$UCRT_VERSION/ucrt" $DEVKIT_ROOT/$SDK_VERSION/Redist/
-mkdir -p $DEVKIT_ROOT/$SDK_VERSION/include
-cp -r "$SDK_INSTALL_DIR/include/$SDK_FULL_VERSION/"* $DEVKIT_ROOT/$SDK_VERSION/include/
-
-################################################################################
-# Generate devkit.info
-
-echo-info() {
-    echo "$1" >> $DEVKIT_ROOT/devkit.info
-}
-
-echo "Generating devkit.info..."
-rm -f $DEVKIT_ROOT/devkit.info
-echo-info "# This file describes to configure how to interpret the contents of this devkit"
-echo-info "DEVKIT_NAME=\"Microsoft Visual Studio $VS_VERSION $VS_VERSION_SP (devkit)\""
-echo-info "DEVKIT_VS_VERSION=\"$VS_VERSION\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_x86=\"\$DEVKIT_ROOT/VC/bin/x86:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_x86=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_x86=\"\$DEVKIT_ROOT/VC/lib/x86;\$DEVKIT_ROOT/VC/atlmfc/lib/x86;\$DEVKIT_ROOT/$SDK_VERSION/lib/x86\""
-echo-info "DEVKIT_MSVCR_DLL_x86=\"\$DEVKIT_ROOT/VC/redist/x86/$MSVCR_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_x86=\"\$DEVKIT_ROOT/VC/redist/x86/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_x86=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/x86\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_x86_64=\"\$DEVKIT_ROOT/VC/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_x86_64=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_x86_64=\"\$DEVKIT_ROOT/VC/lib/x64;\$DEVKIT_ROOT/VC/atlmfc/lib/x64;\$DEVKIT_ROOT/$SDK_VERSION/lib/x64\""
-echo-info "DEVKIT_MSVCR_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$MSVCR_DLL\""
-echo-info "DEVKIT_VCRUNTIME_1_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$VCRUNTIME_1_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_x86_64=\"\$DEVKIT_ROOT/VC/redist/x64/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_x86_64=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/x64\""
-echo-info ""
-echo-info "DEVKIT_TOOLCHAIN_PATH_aarch64=\"\$DEVKIT_ROOT/VC/bin/arm64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x64:\$DEVKIT_ROOT/$SDK_VERSION/bin/x86\""
-echo-info "DEVKIT_VS_INCLUDE_aarch64=\"\$DEVKIT_ROOT/VC/include;\$DEVKIT_ROOT/VC/atlmfc/include;\$DEVKIT_ROOT/$SDK_VERSION/include/shared;\$DEVKIT_ROOT/$SDK_VERSION/include/ucrt;\$DEVKIT_ROOT/$SDK_VERSION/include/um;\$DEVKIT_ROOT/$SDK_VERSION/include/winrt\""
-echo-info "DEVKIT_VS_LIB_aarch64=\"\$DEVKIT_ROOT/VC/lib/arm64;\$DEVKIT_ROOT/VC/atlmfc/lib/arm64;\$DEVKIT_ROOT/$SDK_VERSION/lib/arm64\""
-echo-info "DEVKIT_MSVCR_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$MSVCR_DLL\""
-echo-info "DEVKIT_VCRUNTIME_1_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$VCRUNTIME_1_DLL\""
-echo-info "DEVKIT_MSVCP_DLL_aarch64=\"\$DEVKIT_ROOT/VC/redist/arm64/$MSVCP_DLL\""
-echo-info "DEVKIT_UCRT_DLL_DIR_aarch64=\"\$DEVKIT_ROOT/10/Redist/ucrt/DLLs/arm64\""
-echo-info ""
-echo-info "DEVKIT_TOOLS_VERSION=\"$TOOLS_VERSION\""
-echo-info "DEVKIT_REDIST_VERSION=\"$REDIST_VERSION\""
-echo-info "DEVKIT_SDK_VERSION=\"$SDK_FULL_VERSION\""
-echo-info "DEVKIT_UCRT_VERSION=\"$UCRT_VERSION\""
-
-################################################################################
-# Copy this script
-
-echo "Copying this script..."
-cp $0 $DEVKIT_ROOT/
-
-################################################################################
-# Create bundle
-
-echo "Creating bundle: $DEVKIT_BUNDLE"
-(cd "$DEVKIT_ROOT" && tar zcf "$DEVKIT_BUNDLE" .)

make/gensrc/GensrcMisc.gmk

@@ -63,12 +63,6 @@ ifneq ($(filter $(TOOLCHAIN_TYPE), gcc clang), )
   CPP_FLAGS += -x c
 else ifeq ($(TOOLCHAIN_TYPE), microsoft)
   CPP_FLAGS += -nologo
-
-  ifeq ($(OPENJDK_TARGET_CPU),aarch64)
-    # cl.exe does only recognize few file extensions as valid (ex: .c, .h, .cpp), so
-    # make sure *.java.template files are recognized as valid input files
-    CPP_FILEPREFIX = -Tc
-  endif
 endif
 
 # Generate a java source file from a template through the C preprocessor for the
@@ -81,7 +75,7 @@ endif
 define generate-preproc-src
 	$(call MakeDir, $(@D))
 	( $(NAWK) '/@@END_COPYRIGHT@@/{exit}1' $< && \
-	  $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $(CPP_FILEPREFIX) $< \
+	  $(CPP) $(CPP_FLAGS) $(SYSROOT_CFLAGS) $(CFLAGS_JDKLIB) $< \
 	      2> >($(GREP) -v '^$(<F)$$' >&2) \
 	      | $(NAWK) '/@@START_HERE@@/,0' \
 	      |  $(SED) -e 's/@@START_HERE@@/\/\/ AUTOMATICALLY GENERATED FILE - DO NOT EDIT/' \

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -99,16 +99,6 @@ ifeq ($(call check-jvm-feature, compiler2), true)
     ADLCFLAGS += -DAIX=1
   else ifeq ($(OPENJDK_TARGET_OS), macosx)
     ADLCFLAGS += -D_ALLBSD_SOURCE=1 -D_GNU_SOURCE=1
-    ifeq ($(HOTSPOT_TARGET_CPU_ARCH), aarch64)
-      ADLCFLAGS += -DR18_RESERVED=1
-    endif
-  else ifeq ($(OPENJDK_TARGET_OS), windows)
-    ifeq ($(call isTargetCpuBits, 64), true)
-      ADLCFLAGS += -D_WIN64=1
-    endif
-    ifeq ($(HOTSPOT_TARGET_CPU_ARCH), aarch64)
-      ADLCFLAGS += -DR18_RESERVED=1
-    endif
   endif
 
   ifneq ($(OPENJDK_TARGET_OS), windows)

make/hotspot/lib/CompileGtest.gmk

@@ -78,8 +78,6 @@ $(eval $(call SetupNativeCompilation, BUILD_GTEST_LIBJVM, \
     DISABLED_WARNINGS_clang := undef switch format-nonliteral \
         tautological-undefined-compare $(BUILD_LIBJVM_DISABLED_WARNINGS_clang), \
     DISABLED_WARNINGS_solstudio := identexpected, \
-    DISABLED_WARNINGS_microsoft := 4100 4127 4146 4201 4244 4291 4351 \
-        4511 4512 4514 4624 4996, \
     LDFLAGS := $(JVM_LDFLAGS), \
     LDFLAGS_solaris := -library=stlport4 $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JVM_LIBS), \

make/hotspot/lib/CompileJvm.gmk

@@ -164,8 +164,6 @@ $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
     DISABLED_WARNINGS_solstudio := $(DISABLED_WARNINGS_solstudio), \
     DISABLED_WARNINGS_xlc := 1540-0216 1540-0198 1540-1090 1540-1639 \
         1540-1088 1500-010, \
-    DISABLED_WARNINGS_microsoft := 4100 4127 4146 4201 4244 4291 4351 \
-        4511 4512 4514 4624 4996, \
     ASFLAGS := $(JVM_ASFLAGS), \
     LDFLAGS := $(JVM_LDFLAGS), \
     LIBS := $(JVM_LIBS), \

make/jdk/src/classes/build/tools/generatelsrequivmaps/EquivMapsGenerator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,12 +33,10 @@ import java.nio.file.Paths;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.stream.Collectors;
 
 /**
  * This tool reads the IANA Language Subtag Registry data file downloaded from
@@ -77,49 +75,32 @@ public class EquivMapsGenerator {
         String type = null;
         String tag = null;
         String preferred = null;
-        String prefix = null;
 
         for (String line : Files.readAllLines(Paths.get(filename),
                                               Charset.forName("UTF-8"))) {
             line = line.toLowerCase(Locale.ROOT);
-            int index = line.indexOf(' ') + 1;
+            int index = line.indexOf(' ')+1;
             if (line.startsWith("file-date:")) {
                 LSRrevisionDate = line.substring(index);
             } else if (line.startsWith("type:")) {
                 type = line.substring(index);
             } else if (line.startsWith("tag:") || line.startsWith("subtag:")) {
                 tag = line.substring(index);
-            } else if (line.startsWith("preferred-value:")) {
+            } else if (line.startsWith("preferred-value:")
+                       && !type.equals("extlang")) {
                 preferred = line.substring(index);
-            } else if (line.startsWith("prefix:")) {
-                prefix = line.substring(index);
+                processDeprecatedData(type, tag, preferred);
             } else if (line.equals("%%")) {
-                processDeprecatedData(type, tag, preferred, prefix);
                 type = null;
                 tag = null;
-                preferred = null;
-                prefix = null;
             }
         }
-
-        // Last entry
-        processDeprecatedData(type, tag, preferred, prefix);
     }
 
     private static void processDeprecatedData(String type,
                                               String tag,
-                                              String preferred,
-                                              String prefix) {
+                                              String preferred) {
         StringBuilder sb;
-
-        if (type == null || tag == null || preferred == null) {
-            return;
-        }
-
-        if (type.equals("extlang") && prefix != null) {
-            tag = prefix + "-" + tag;
-        }
-
         if (type.equals("region") || type.equals("variant")) {
             if (!initialRegionVariantMap.containsKey(preferred)) {
                 sb = new StringBuilder("-");
@@ -132,7 +113,7 @@ public class EquivMapsGenerator {
                     + " A region/variant subtag \"" + preferred
                     + "\" is registered for more than one subtags.");
             }
-        } else { // language, extlang, grandfathered, and redundant
+        } else { // language, grandfahered, and redundant
             if (!initialLanguageMap.containsKey(preferred)) {
                 sb = new StringBuilder(preferred);
                 sb.append(',');
@@ -150,12 +131,7 @@ public class EquivMapsGenerator {
     private static void generateEquivalentMap() {
         String[] subtags;
         for (String preferred : initialLanguageMap.keySet()) {
-            // There are cases where the same tag may appear in two entries, e.g.,
-            // "yue" is defined both as extlang and redundant. Remove the dup.
-            subtags = Arrays.stream(initialLanguageMap.get(preferred).toString().split(","))
-                    .distinct()
-                    .collect(Collectors.toList())
-                    .toArray(new String[0]);
+            subtags = initialLanguageMap.get(preferred).toString().split(",");
 
             if (subtags.length == 2) {
                 sortedLanguageMap1.put(subtags[0], subtags[1]);
@@ -239,7 +215,10 @@ public class EquivMapsGenerator {
         + "    static final Map<String, String[]> multiEquivsMap;\n"
         + "    static final Map<String, String> regionVariantEquivMap;\n\n"
         + "    static {\n"
-        + "        singleEquivMap = new HashMap<>(";
+        + "        singleEquivMap = new HashMap<>();\n"
+        + "        multiEquivsMap = new HashMap<>();\n"
+        + "        regionVariantEquivMap = new HashMap<>();\n\n"
+        + "        // This is an auto-generated file and should not be manually edited.\n";
 
     private static final String footerText =
         "    }\n\n"
@@ -263,12 +242,6 @@ public class EquivMapsGenerator {
                 Paths.get(fileName))) {
             writer.write(getOpenJDKCopyright());
             writer.write(headerText
-                + (int)(sortedLanguageMap1.size() / 0.75f + 1) + ");\n"
-                + "        multiEquivsMap = new HashMap<>("
-                + (int)(sortedLanguageMap2.size() / 0.75f + 1) + ");\n"
-                + "        regionVariantEquivMap = new HashMap<>("
-                + (int)(sortedRegionVariantMap.size() / 0.75f + 1) + ");\n\n"
-                + "        // This is an auto-generated file and should not be manually edited.\n"
                 + "        //   LSR Revision: " + LSRrevisionDate);
             writer.newLine();
 

make/lib/Awt2dLibraries.gmk

@@ -245,6 +245,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
     LIBS_macosx := -lmlib_image \
         -framework Cocoa \
         -framework OpenGL \
+        -framework JavaNativeFoundation \
         -framework JavaRuntimeSupport \
         -framework ApplicationServices \
         -framework AudioToolbox, \
@@ -390,7 +391,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBLCMS, \
         common/awt/debug \
         libawt/java2d, \
     HEADERS_FROM_SRC := $(LIBLCMS_HEADERS_FROM_SRC), \
-    DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation stringop-truncation, \
+    DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \
     DISABLED_WARNINGS_clang := tautological-compare, \
     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
     DISABLED_WARNINGS_microsoft := 4819, \
@@ -864,7 +865,8 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
         $(LIBM) -lpthread -liconv -losxapp \
         -framework ApplicationServices \
         -framework Foundation \
-        -framework Cocoa
+        -framework Cocoa \
+        -framework JavaNativeFoundation
   else ifeq ($(OPENJDK_TARGET_OS), windows)
     LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib
   else
@@ -960,6 +962,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           -framework Cocoa \
           -framework Security \
           -framework ExceptionHandling \
+          -framework JavaNativeFoundation \
           -framework JavaRuntimeSupport \
           -framework OpenGL \
           -framework QuartzCore -ljava, \
@@ -997,6 +1000,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           -framework Cocoa \
           -framework Carbon \
           -framework ApplicationServices \
+          -framework JavaNativeFoundation \
           -framework JavaRuntimeSupport \
           -ljava -ljvm, \
   ))

make/lib/Lib-java.base.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -110,9 +110,9 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
             $(call SET_SHARED_LIBRARY_ORIGIN), \
         LIBS := \
             -lobjc \
+            -framework JavaNativeFoundation \
             -framework CoreServices \
             -framework Security \
-            -framework Foundation \
             $(JDKLIB_LIBS), \
     ))
 

make/lib/Lib-java.desktop.gmk

@@ -96,7 +96,6 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := \
-          -ljava \
           -framework Accelerate \
           -framework ApplicationServices \
           -framework AudioToolbox \
@@ -104,14 +103,13 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           -framework Cocoa \
           -framework Security \
           -framework ExceptionHandling \
+          -framework JavaNativeFoundation \
           -framework JavaRuntimeSupport \
           -framework OpenGL \
           -framework IOSurface \
           -framework QuartzCore, \
   ))
 
-  $(BUILD_LIBOSXAPP): $(call FindLib, java.base, java)
-
   TARGETS += $(BUILD_LIBOSXAPP)
 
   ##############################################################################
@@ -129,6 +127,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
           -losxapp \
           -framework Cocoa \
           -framework ApplicationServices \
+          -framework JavaNativeFoundation \
           -framework JavaRuntimeSupport \
           -framework SystemConfiguration \
           $(JDKLIB_LIBS), \

make/lib/Lib-java.security.jgss.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -78,8 +78,8 @@ ifneq ($(BUILD_CRYPTO), false)
         DISABLED_WARNINGS_clang := deprecated-declarations, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
-        LIBS := -framework Cocoa -framework SystemConfiguration \
-            -framework Kerberos, \
+        LIBS := -framework JavaNativeFoundation -framework Cocoa \
+            -framework SystemConfiguration -framework Kerberos, \
     ))
 
     TARGETS += $(BUILD_LIBOSXKRB5)

make/lib/Lib-jdk.hotspot.agent.gmk

@@ -67,7 +67,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBSA, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(SA_LDFLAGS), \
     LIBS_linux := -lthread_db $(LIBDL), \
     LIBS_solaris := -ldl -ldemangle -lthread -lproc, \
-    LIBS_macosx := -framework Foundation \
+    LIBS_macosx := -framework Foundation -framework JavaNativeFoundation \
         -framework JavaRuntimeSupport -framework Security -framework CoreFoundation, \
     LIBS_windows := dbgeng.lib, \
 ))

make/test/JtregNativeJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -76,13 +76,11 @@ else
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
+  BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libTestMainKeyWindow := -ObjC
   BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestMainKeyWindow := \
-      -framework Cocoa
-  BUILD_JDK_JTREG_LIBRARIES_LIBS_libTestDynamicStore := \
-      -framework Cocoa -framework SystemConfiguration
+      -framework Cocoa -framework JavaNativeFoundation
 else
-  BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.m
-  BUILD_JDK_JTREG_EXCLUDE += libTestDynamicStore.m
+  BUILD_JDK_JTREG_EXCLUDE += libTestMainKeyWindow.c
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)

src/hotspot/cpu/aarch64/aarch64_ad.m4

@@ -232,44 +232,44 @@ instruct ubfxIConvI2L(iRegLNoSp dst, iRegIorL2I src, immI rshift, immI_bitmask m
   ins_pipe(ialu_reg_shift);
 %}
 
-define(`UBFIZ_INSN', `// We can use ubfiz when masking by a positive number and then left shifting the result.
+define(`UBFIZ_INSN', `// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+
+// We can use ubfiz when masking by a positive number and then left shifting the result.
 // We know that the mask is positive because imm$1_bitmask guarantees it.
-instruct $3$1$8(iReg$2NoSp dst, iReg$1`'ORL2I($1) src, immI lshift, $7 mask)
+instruct $2$1(iReg$1NoSp dst, iReg$1`'ORL2I($1) src, immI lshift, imm$1_bitmask mask)
 %{
-  ifelse($8,,
-    match(Set dst (LShift$1 (And$1 src mask) lshift));,
-    match(Set dst ($8 (LShift$1 (And$1 src mask) lshift)));)
-  ifelse($8,,
-    predicate(($6(n->in(1)->in(2)->get_$5() + 1) + (n->in(2)->get_int() & $4)) <= ($4 + 1));,
-    predicate(($6(n->in(1)->in(1)->in(2)->get_$5() + 1) + (n->in(1)->in(2)->get_int() & $4)) <= 31);)
+  match(Set dst (LShift$1 (And$1 src mask) lshift));
+  predicate((exact_log2$5(n->in(1)->in(2)->get_$4() + 1) + (n->in(2)->get_int() & $3)) <= ($3 + 1));
 
   ins_cost(INSN_COST);
-  format %{ "$3 $dst, $src, $lshift, $mask" %}
+  format %{ "$2 $dst, $src, $lshift, $mask" %}
   ins_encode %{
-    int lshift = $lshift$$constant & $4;
+    int lshift = $lshift$$constant & $3;
     intptr_t mask = $mask$$constant;
-    int width = $6(mask+1);
-    __ $3(as_Register($dst$$reg),
+    int width = exact_log2$5(mask+1);
+    __ $2(as_Register($dst$$reg),
           as_Register($src$$reg), lshift, width);
   %}
   ins_pipe(ialu_reg_shift);
 %}
 ')
-UBFIZ_INSN(I, I, ubfizw, 31, int,  exact_log2,      immI_bitmask)
-UBFIZ_INSN(L, L, ubfiz,  63, long, exact_log2_long, immL_bitmask)
-UBFIZ_INSN(I, L, ubfizw, 31, int,  exact_log2,      immI_bitmask,           ConvI2L)
-UBFIZ_INSN(L, I, ubfiz,  63, long, exact_log2_long, immL_positive_bitmaskI, ConvL2I)
+UBFIZ_INSN(I, ubfizw, 31, int)
+UBFIZ_INSN(L, ubfiz,  63, long, _long)
 
-define(`BFX1_INSN', `// If there is a convert $1 to $2 block between and And$1 and a LShift$2, we can also match ubfiz
-instruct ubfiz$1Conv$3$9(iReg$2NoSp dst, iReg$1`'ORL2I($1) src, immI lshift, $8 mask)
+// This pattern is automatically generated from aarch64_ad.m4
+// DO NOT EDIT ANYTHING IN THIS SECTION OF THE FILE
+
+// If there is a convert I to L block between and AndI and a LShiftL, we can also match ubfiz
+instruct ubfizIConvI2L(iRegLNoSp dst, iRegIorL2I src, immI lshift, immI_bitmask mask)
 %{
-  match(Set dst (LShift$2 (Conv$3 (And$1 src mask)) lshift));
-  predicate(($4(n->in(1)->in(1)->in(2)->$5() + 1) + (n->in(2)->get_int() & $6)) <= $7);
+  match(Set dst (LShiftL (ConvI2L (AndI src mask)) lshift));
+  predicate((exact_log2(n->in(1)->in(1)->in(2)->get_int() + 1) + (n->in(2)->get_int() & 63)) <= (63 + 1));
 
   ins_cost(INSN_COST);
   format %{ "ubfiz $dst, $src, $lshift, $mask" %}
   ins_encode %{
-    int lshift = $lshift$$constant & $6;
+    int lshift = $lshift$$constant & 63;
     intptr_t mask = $mask$$constant;
     int width = exact_log2(mask+1);
     __ ubfiz(as_Register($dst$$reg),
@@ -277,20 +277,7 @@ instruct ubfiz$1Conv$3$9(iReg$2NoSp dst, iReg$1`'ORL2I($1) src, immI lshift, $8
   %}
   ins_pipe(ialu_reg_shift);
 %}
-')dnl
-BFX1_INSN(I, L, I2L, exact_log2,      get_int,  63, (63 + 1), immI_bitmask)
-BFX1_INSN(L, I, L2I, exact_log2_long, get_long, 31, 31,       immL_positive_bitmaskI, x)
-// Can skip int2long conversions after AND with small bitmask
-instruct ubfizIConvI2LAndI(iRegLNoSp dst, iRegI src, immI_bitmask msk)
-%{
-  match(Set dst (ConvI2L (AndI src msk)));
-  ins_cost(INSN_COST);
-  format %{ "ubfiz $dst, $src, 0, exact_log2($msk + 1) " %}
-  ins_encode %{
-    __ ubfiz(as_Register($dst$$reg), as_Register($src$$reg), 0, exact_log2($msk$$constant + 1));
-  %}
-  ins_pipe(ialu_reg_shift);
-%}
+
 
 // Rotations dnl
 define(`EXTRACT_INSN',`

src/hotspot/cpu/aarch64/abstractInterpreter_aarch64.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2014, Red Hat Inc. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -135,20 +135,7 @@ void AbstractInterpreter::layout_activation(Method* method,
   // interpreter_frame_sender_sp interpreter_frame_sender_sp is
   // the original sp of the caller (the unextended_sp) and
   // sender_sp is fp+8/16 (32bit/64bit) XXX
-  //
-  // The interpreted method entry on AArch64 aligns SP to 16 bytes
-  // before generating the fixed part of the activation frame. So there
-  // may be a gap between the locals block and the saved sender SP. For
-  // an interpreted caller we need to recreate this gap and exactly
-  // align the incoming parameters with the caller's temporary
-  // expression stack. For other types of caller frame it doesn't
-  // matter.
-  intptr_t* locals;
-  if (caller->is_interpreted_frame()) {
-    locals = caller->interpreter_frame_last_sp() + caller_actual_parameters - 1;
-  } else {
-    locals = interpreter_frame->sender_sp() + max_locals - 1;
-  }
+  intptr_t* locals = interpreter_frame->sender_sp() + max_locals - 1;
 
 #ifdef ASSERT
   if (caller->is_interpreted_frame()) {

src/hotspot/cpu/aarch64/assembler_aarch64.hpp

@@ -28,19 +28,6 @@
 
 #include "asm/register.hpp"
 
-#ifdef __GNUC__
-
-// __nop needs volatile so that compiler doesn't optimize it away
-#define NOP() asm volatile ("nop");
-
-#elif defined(_MSC_VER)
-
-// Use MSVC instrinsic: https://docs.microsoft.com/en-us/cpp/intrinsics/arm64-intrinsics?view=vs-2019#I
-#define NOP() __nop();
-
-#endif
-
-
 // definitions of various symbolic names for machine registers
 
 // First intercalls between C and Java which use 8 general registers
@@ -214,7 +201,7 @@ public:
 
   static void patch(address a, int msb, int lsb, uint64_t val) {
     int nbits = msb - lsb + 1;
-    guarantee(val < (1ULL << nbits), "Field too big for insn");
+    guarantee(val < (1U << nbits), "Field too big for insn");
     assert_cond(msb >= lsb);
     unsigned mask = checked_cast<unsigned>(right_n_bits(nbits));
     val <<= lsb;
@@ -319,12 +306,10 @@ public:
 };
 class Post : public PrePost {
   Register _idx;
-  bool _is_postreg;
 public:
-  Post(Register reg, int o) : PrePost(reg, o) { _idx = NULL; _is_postreg = false; }
-  Post(Register reg, Register idx) : PrePost(reg, 0) { _idx = idx; _is_postreg = true; }
+  Post(Register reg, int o) : PrePost(reg, o) { _idx = NULL; }
+  Post(Register reg, Register idx) : PrePost(reg, 0) { _idx = idx; }
   Register idx_reg() { return _idx; }
-  bool is_postreg() {return _is_postreg; }
 };
 
 namespace ext
@@ -414,7 +399,7 @@ class Address {
     : _base(p.reg()), _offset(p.offset()), _mode(pre) { }
   Address(Post p)
     : _base(p.reg()),  _index(p.idx_reg()), _offset(p.offset()),
-      _mode(p.is_postreg() ? post_reg : post), _target(0) { }
+      _mode(p.idx_reg() == NULL ? post : post_reg), _target(0) { }
   Address(address target, RelocationHolder const& rspec)
     : _mode(literal),
       _rspec(rspec),
@@ -436,8 +421,8 @@ class Address {
   }
 
   Register base() const {
-    guarantee((_mode == base_plus_offset || _mode == base_plus_offset_reg
-               || _mode == post || _mode == post_reg),
+    guarantee((_mode == base_plus_offset | _mode == base_plus_offset_reg
+               | _mode == post | _mode == post_reg),
               "wrong mode");
     return _base;
   }
@@ -615,9 +600,7 @@ class InternalAddress: public Address {
   InternalAddress(address target) : Address(target, relocInfo::internal_word_type) {}
 };
 
-const int FPUStateSizeInWords = FloatRegisterImpl::number_of_registers *
-                                FloatRegisterImpl::save_slots_per_register;
-
+const int FPUStateSizeInWords = 32 * 2;
 typedef enum {
   PLDL1KEEP = 0b00000, PLDL1STRM, PLDL2KEEP, PLDL2STRM, PLDL3KEEP, PLDL3STRM,
   PSTL1KEEP = 0b10000, PSTL1STRM, PSTL2KEEP, PSTL2STRM, PSTL3KEEP, PSTL3STRM,
@@ -631,7 +614,7 @@ class Assembler : public AbstractAssembler {
 
   void emit_long(jint x) {
     if ((uintptr_t)pc() == asm_bp)
-      NOP();
+      asm volatile ("nop");
     AbstractAssembler::emit_int32(x);
   }
 #else
@@ -663,8 +646,6 @@ public:
     return Address(Post(base, idx));
   }
 
-  static address locate_next_instruction(address inst);
-
   Instruction_aarch64* current;
 
   void set_current(Instruction_aarch64* i) { current = i; }
@@ -816,34 +797,32 @@ public:
 #undef INSN
 
   // Bitfield
-#define INSN(NAME, opcode, size)                                        \
+#define INSN(NAME, opcode)                                              \
   void NAME(Register Rd, Register Rn, unsigned immr, unsigned imms) {   \
     starti;                                                             \
-    guarantee(size == 1 || (immr < 32 && imms < 32), "incorrect immr/imms");\
     f(opcode, 31, 22), f(immr, 21, 16), f(imms, 15, 10);                \
     zrf(Rn, 5), rf(Rd, 0);                                              \
   }
 
-  INSN(sbfmw, 0b0001001100, 0);
-  INSN(bfmw,  0b0011001100, 0);
-  INSN(ubfmw, 0b0101001100, 0);
-  INSN(sbfm,  0b1001001101, 1);
-  INSN(bfm,   0b1011001101, 1);
-  INSN(ubfm,  0b1101001101, 1);
+  INSN(sbfmw, 0b0001001100);
+  INSN(bfmw,  0b0011001100);
+  INSN(ubfmw, 0b0101001100);
+  INSN(sbfm,  0b1001001101);
+  INSN(bfm,   0b1011001101);
+  INSN(ubfm,  0b1101001101);
 
 #undef INSN
 
   // Extract
-#define INSN(NAME, opcode, size)                                        \
+#define INSN(NAME, opcode)                                              \
   void NAME(Register Rd, Register Rn, Register Rm, unsigned imms) {     \
     starti;                                                             \
-    guarantee(size == 1 || imms < 32, "incorrect imms");                \
     f(opcode, 31, 21), f(imms, 15, 10);                                 \
-    zrf(Rm, 16), zrf(Rn, 5), zrf(Rd, 0);                                \
+    rf(Rm, 16), rf(Rn, 5), rf(Rd, 0);                                   \
   }
 
-  INSN(extrw, 0b00010011100, 0);
-  INSN(extr,  0b10010011110, 1);
+  INSN(extrw, 0b00010011100);
+  INSN(extr,  0b10010011110);
 
 #undef INSN
 
@@ -1137,7 +1116,7 @@ public:
     Register Rn, enum operand_size sz, int op, bool ordered) {
     starti;
     f(sz, 31, 30), f(0b001000, 29, 24), f(op, 23, 21);
-    rf(Rs, 16), f(ordered, 15), zrf(Rt2, 10), srf(Rn, 5), zrf(Rt1, 0);
+    rf(Rs, 16), f(ordered, 15), rf(Rt2, 10), srf(Rn, 5), zrf(Rt1, 0);
   }
 
   void load_exclusive(Register dst, Register addr,
@@ -1266,7 +1245,7 @@ public:
                   enum operand_size sz, int op1, int op2, bool a, bool r) {
     starti;
     f(sz, 31, 30), f(0b111000, 29, 24), f(a, 23), f(r, 22), f(1, 21);
-    zrf(Rs, 16), f(op1, 15), f(op2, 14, 12), f(0, 11, 10), srf(Rn, 5), zrf(Rt, 0);
+    rf(Rs, 16), f(op1, 15), f(op2, 14, 12), f(0, 11, 10), rf(Rn, 5), zrf(Rt, 0);
   }
 
 #define INSN(NAME, NAME_A, NAME_L, NAME_AL, op1, op2)                   \
@@ -1488,7 +1467,6 @@ public:
   void NAME(Register Rd, Register Rn, Register Rm,              \
             enum shift_kind kind = LSL, unsigned shift = 0) {   \
     starti;                                                     \
-    guarantee(size == 1 || shift < 32, "incorrect shift");      \
     f(N, 21);                                                   \
     zrf(Rm, 16), zrf(Rn, 5), zrf(Rd, 0);                        \
     op_shifted_reg(0b01010, kind, shift, size, op);             \
@@ -1533,11 +1511,6 @@ public:
 
 #undef INSN
 
-#ifdef _WIN64
-// In MSVC, `mvn` is defined as a macro and it affects compilation
-#undef mvn
-#endif
-
   // Aliases for short forms of orn
 void mvn(Register Rd, Register Rm,
             enum shift_kind kind = LSL, unsigned shift = 0) {
@@ -1556,7 +1529,6 @@ void mvnw(Register Rd, Register Rm,
     starti;                                             \
     f(0, 21);                                           \
     assert_cond(kind != ROR);                           \
-    guarantee(size == 1 || shift < 32, "incorrect shift");\
     zrf(Rd, 0), zrf(Rn, 5), zrf(Rm, 16);                \
     op_shifted_reg(0b01011, kind, shift, size, op);     \
   }
@@ -1585,7 +1557,7 @@ void mvnw(Register Rd, Register Rm,
   void add_sub_extended_reg(unsigned op, unsigned decode,
     Register Rd, Register Rn, Register Rm,
     unsigned opt, ext::operation option, unsigned imm) {
-    guarantee(imm <= 4, "shift amount must be <= 4");
+    guarantee(imm <= 4, "shift amount must be < 4");
     f(op, 31, 29), f(decode, 28, 24), f(opt, 23, 22), f(1, 21);
     f(option, 15, 13), f(imm, 12, 10);
   }
@@ -1670,7 +1642,7 @@ void mvnw(Register Rd, Register Rm,
     f(o2, 10);
     f(o3, 4);
     f(nzcv, 3, 0);
-    f(imm5, 20, 16), zrf(Rn, 5);
+    f(imm5, 20, 16), rf(Rn, 5);
   }
 
 #define INSN(NAME, op)                                                  \
@@ -2023,21 +1995,6 @@ public:
 #undef INSN
 #undef INSN1
 
-// Floating-point compare. 3-registers versions (scalar).
-#define INSN(NAME, sz, e)                                             \
-  void NAME(FloatRegister Vd, FloatRegister Vn, FloatRegister Vm) {   \
-    starti;                                                           \
-    f(0b01111110, 31, 24), f(e, 23), f(sz, 22), f(1, 21), rf(Vm, 16); \
-    f(0b111011, 15, 10), rf(Vn, 5), rf(Vd, 0);                        \
-  }                                                                   \
-
-  INSN(facged, 1, 0); // facge-double
-  INSN(facges, 0, 0); // facge-single
-  INSN(facgtd, 1, 1); // facgt-double
-  INSN(facgts, 0, 1); // facgt-single
-
-#undef INSN
-
   // Floating-point Move (immediate)
 private:
   unsigned pack(double value);
@@ -2154,12 +2111,7 @@ public:
   }
   void ld_st(FloatRegister Vt, SIMD_Arrangement T, Register Xn,
              int imm, int op1, int op2, int regs) {
-
-    bool replicate = op2 >> 2 == 3;
-    // post-index value (imm) is formed differently for replicate/non-replicate ld* instructions
-    int expectedImmediate = replicate ? regs * (1 << (T >> 1)) : SIMD_Size_in_bytes[T] * regs;
-    guarantee(T < T1Q , "incorrect arrangement");
-    guarantee(imm == expectedImmediate, "bad offset");
+    guarantee(T <= T1Q && imm == SIMD_Size_in_bytes[T] * regs, "bad offset");
     starti;
     f(0,31), f((int)T & 1, 30);
     f(op1 | 0b100, 29, 21), f(0b11111, 20, 16), f(op2, 15, 12);
@@ -2266,62 +2218,39 @@ public:
 
 #undef INSN
 
-#define INSN(NAME, opc, opc2, acceptT2D)                                                \
+#define INSN(NAME, opc, opc2)                                                                 \
   void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm) { \
-    guarantee(T != T1Q && T != T1D, "incorrect arrangement");                           \
-    if (!acceptT2D) guarantee(T != T2D, "incorrect arrangement");                       \
     starti;                                                                             \
     f(0, 31), f((int)T & 1, 30), f(opc, 29), f(0b01110, 28, 24);                        \
     f((int)T >> 1, 23, 22), f(1, 21), rf(Vm, 16), f(opc2, 15, 10);                      \
     rf(Vn, 5), rf(Vd, 0);                                                               \
   }
 
-  INSN(addv,   0, 0b100001, true);  // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
-  INSN(subv,   1, 0b100001, true);  // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
-  INSN(mulv,   0, 0b100111, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
-  INSN(mlav,   0, 0b100101, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
-  INSN(mlsv,   1, 0b100101, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
-  INSN(sshl,   0, 0b010001, true);  // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
-  INSN(ushl,   1, 0b010001, true);  // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
-  INSN(umullv, 1, 0b110000, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
-  INSN(umlalv, 1, 0b100000, false); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
+  INSN(addv, 0, 0b100001);
+  INSN(subv, 1, 0b100001);
+  INSN(mulv, 0, 0b100111);
+  INSN(mlav, 0, 0b100101);
+  INSN(mlsv, 1, 0b100101);
+  INSN(sshl, 0, 0b010001);
+  INSN(ushl, 1, 0b010001);
 
 #undef INSN
 
-#define INSN(NAME, opc, opc2, accepted) \
+#define INSN(NAME, opc, opc2) \
   void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {                   \
-    guarantee(T != T1Q && T != T1D, "incorrect arrangement");                           \
-    if (accepted < 3) guarantee(T != T2D, "incorrect arrangement");                     \
-    if (accepted < 2) guarantee(T != T2S, "incorrect arrangement");                     \
-    if (accepted < 1) guarantee(T == T8B || T == T16B, "incorrect arrangement");        \
     starti;                                                                             \
     f(0, 31), f((int)T & 1, 30), f(opc, 29), f(0b01110, 28, 24);                        \
     f((int)T >> 1, 23, 22), f(opc2, 21, 10);                                            \
     rf(Vn, 5), rf(Vd, 0);                                                               \
   }
 
-  INSN(absr,   0, 0b100000101110, 3); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
-  INSN(negr,   1, 0b100000101110, 3); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S, T2D
-  INSN(notr,   1, 0b100000010110, 0); // accepted arrangements: T8B, T16B
-  INSN(addv,   0, 0b110001101110, 1); // accepted arrangements: T8B, T16B, T4H, T8H,      T4S
-  INSN(cls,    0, 0b100000010010, 2); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
-  INSN(clz,    1, 0b100000010010, 2); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
-  INSN(cnt,    0, 0b100000010110, 0); // accepted arrangements: T8B, T16B
-  INSN(uaddlp, 1, 0b100000001010, 2); // accepted arrangements: T8B, T16B, T4H, T8H, T2S, T4S
-  INSN(uaddlv, 1, 0b110000001110, 1); // accepted arrangements: T8B, T16B, T4H, T8H,      T4S
-
-#undef INSN
-
-#define INSN(NAME, opc) \
-  void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn) {                  \
-    starti;                                                                            \
-    assert(T == T4S, "arrangement must be T4S");                                       \
-    f(0, 31), f((int)T & 1, 30), f(0b101110, 29, 24), f(opc, 23),                      \
-    f(T == T4S ? 0 : 1, 22), f(0b110000111110, 21, 10); rf(Vn, 5), rf(Vd, 0);          \
-  }
-
-  INSN(fmaxv, 0);
-  INSN(fminv, 1);
+  INSN(absr,  0, 0b100000101110);
+  INSN(negr,  1, 0b100000101110);
+  INSN(notr,  1, 0b100000010110);
+  INSN(addv,  0, 0b110001101110);
+  INSN(cls,   0, 0b100000010010);
+  INSN(clz,   1, 0b100000010010);
+  INSN(cnt,   0, 0b100000010110);
 
 #undef INSN
 
@@ -2332,7 +2261,7 @@ public:
     starti;                                                                            \
     assert(lsl == 0 ||                                                                 \
            ((T == T4H || T == T8H) && lsl == 8) ||                                     \
-           ((T == T2S || T == T4S) && ((lsl >> 3) < 4) && ((lsl & 7) == 0)), "invalid shift");\
+           ((T == T2S || T == T4S) && ((lsl >> 3) < 4)), "invalid shift");             \
     cmode |= lsl >> 2;                                                                 \
     if (T == T4H || T == T8H) cmode |= 0b1000;                                         \
     if (!(T == T4H || T == T8H || T == T2S || T == T4S)) {                             \
@@ -2366,8 +2295,6 @@ public:
   INSN(fsub, 0, 1, 0b110101);
   INSN(fmla, 0, 0, 0b110011);
   INSN(fmls, 0, 1, 0b110011);
-  INSN(fmax, 0, 0, 0b111101);
-  INSN(fmin, 0, 1, 0b111101);
 
 #undef INSN
 
@@ -2493,22 +2420,7 @@ public:
 
 #undef INSN
 
-#define INSN(NAME, opc, opc2, isSHR)                                    \
-  void NAME(FloatRegister Vd, FloatRegister Vn, int shift){             \
-    starti;                                                             \
-    int encodedShift = isSHR ? 128 - shift : 64 + shift;                \
-    f(0b01, 31, 30), f(opc, 29), f(0b111110, 28, 23),                   \
-    f(encodedShift, 22, 16); f(opc2, 15, 10), rf(Vn, 5), rf(Vd, 0);     \
-  }
-
-  INSN(shld,  0, 0b010101, /* isSHR = */ false);
-  INSN(sshrd, 0, 0b000001, /* isSHR = */ true);
-  INSN(ushrd, 1, 0b000001, /* isSHR = */ true);
-
-#undef INSN
-
-private:
-  void _ushll(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, SIMD_Arrangement Tb, int shift) {
+  void ushll(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, SIMD_Arrangement Tb, int shift) {
     starti;
     /* The encodings for the immh:immb fields (bits 22:16) are
      *   0001 xxx       8H, 8B/16b shift = xxx
@@ -2521,16 +2433,8 @@ private:
     f(0, 31), f(Tb & 1, 30), f(0b1011110, 29, 23), f((1 << ((Tb>>1)+3))|shift, 22, 16);
     f(0b101001, 15, 10), rf(Vn, 5), rf(Vd, 0);
   }
-
-public:
-  void ushll(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn,  SIMD_Arrangement Tb, int shift) {
-    assert(Tb == T8B || Tb == T4H || Tb == T2S, "invalid arrangement");
-    _ushll(Vd, Ta, Vn, Tb, shift);
-  }
-
   void ushll2(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn,  SIMD_Arrangement Tb, int shift) {
-    assert(Tb == T16B || Tb == T8H || Tb == T4S, "invalid arrangement");
-    _ushll(Vd, Ta, Vn, Tb, shift);
+    ushll(Vd, Ta, Vn, Tb, shift);
   }
 
   // Move from general purpose register
@@ -2538,21 +2442,19 @@ public:
   void mov(FloatRegister Vd, SIMD_Arrangement T, int index, Register Xn) {
     starti;
     f(0b01001110000, 31, 21), f(((1 << (T >> 1)) | (index << ((T >> 1) + 1))), 20, 16);
-    f(0b000111, 15, 10), zrf(Xn, 5), rf(Vd, 0);
+    f(0b000111, 15, 10), rf(Xn, 5), rf(Vd, 0);
   }
 
   // Move to general purpose register
   //   mov  Rd, Vn.T[index]
   void mov(Register Xd, FloatRegister Vn, SIMD_Arrangement T, int index) {
-    guarantee(T >= T2S && T < T1Q, "only D and S arrangements are supported");
     starti;
     f(0, 31), f((T >= T1D) ? 1:0, 30), f(0b001110000, 29, 21);
     f(((1 << (T >> 1)) | (index << ((T >> 1) + 1))), 20, 16);
     f(0b001111, 15, 10), rf(Vn, 5), rf(Xd, 0);
   }
 
-private:
-  void _pmull(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, FloatRegister Vm, SIMD_Arrangement Tb) {
+  void pmull(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, FloatRegister Vm, SIMD_Arrangement Tb) {
     starti;
     assert((Ta == T1Q && (Tb == T1D || Tb == T2D)) ||
            (Ta == T8H && (Tb == T8B || Tb == T16B)), "Invalid Size specifier");
@@ -2560,16 +2462,9 @@ private:
     f(0, 31), f(Tb & 1, 30), f(0b001110, 29, 24), f(size, 23, 22);
     f(1, 21), rf(Vm, 16), f(0b111000, 15, 10), rf(Vn, 5), rf(Vd, 0);
   }
-
-public:
-  void pmull(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, FloatRegister Vm, SIMD_Arrangement Tb) {
-    assert(Tb == T1D || Tb == T8B, "pmull assumes T1D or T8B as the second size specifier");
-    _pmull(Vd, Ta, Vn, Vm, Tb);
-  }
-
   void pmull2(FloatRegister Vd, SIMD_Arrangement Ta, FloatRegister Vn, FloatRegister Vm, SIMD_Arrangement Tb) {
     assert(Tb == T2D || Tb == T16B, "pmull2 assumes T2D or T16B as the second size specifier");
-    _pmull(Vd, Ta, Vn, Vm, Tb);
+    pmull(Vd, Ta, Vn, Vm, Tb);
   }
 
   void uqxtn(FloatRegister Vd, SIMD_Arrangement Tb, FloatRegister Vn, SIMD_Arrangement Ta) {
@@ -2586,7 +2481,7 @@ public:
     starti;
     assert(T != T1D, "reserved encoding");
     f(0,31), f((int)T & 1, 30), f(0b001110000, 29, 21);
-    f((1 << (T >> 1)), 20, 16), f(0b000011, 15, 10), zrf(Xs, 5), rf(Vd, 0);
+    f((1 << (T >> 1)), 20, 16), f(0b000011, 15, 10), rf(Xs, 5), rf(Vd, 0);
   }
 
   void dup(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, int index = 0)
@@ -2601,7 +2496,6 @@ public:
   // AdvSIMD ZIP/UZP/TRN
 #define INSN(NAME, opcode)                                              \
   void NAME(FloatRegister Vd, SIMD_Arrangement T, FloatRegister Vn, FloatRegister Vm) { \
-    guarantee(T != T1D && T != T1Q, "invalid arrangement");             \
     starti;                                                             \
     f(0, 31), f(0b001110, 29, 24), f(0, 21), f(0, 15);                  \
     f(opcode, 14, 12), f(0b10, 11, 10);                                 \

src/hotspot/cpu/aarch64/assembler_aarch64.inline.hpp

@@ -32,7 +32,7 @@
 
 
 inline bool Address::offset_ok_for_immed(int64_t offset, uint shift) {
-  unsigned mask = (1 << shift) - 1;
+  uint mask = (1 << shift) - 1;
   if (offset < 0 || (offset & mask) != 0) {
     // Unscaled signed offset, encoded in a signed imm9 field.
     return Assembler::is_simm9(offset);

src/hotspot/cpu/aarch64/atomic_aarch64.hpp

@@ -1,49 +0,0 @@
-/* Copyright (c) 2021, Red Hat Inc. 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.
- *
- */
-
-#ifndef CPU_AARCH64_ATOMIC_AARCH64_HPP
-#define CPU_AARCH64_ATOMIC_AARCH64_HPP
-
-// Atomic stub implementation.
-// Default implementations are in atomic_linux_aarch64.S
-//
-// All stubs pass arguments the same way
-// x0: src/dest address
-// x1: arg1
-// x2: arg2 (optional)
-// x3, x8, x9: scratch
-typedef uint64_t (*aarch64_atomic_stub_t)(volatile void *ptr, uint64_t arg1, uint64_t arg2);
-
-// Pointers to stubs
-extern aarch64_atomic_stub_t aarch64_atomic_fetch_add_4_impl;
-extern aarch64_atomic_stub_t aarch64_atomic_fetch_add_8_impl;
-extern aarch64_atomic_stub_t aarch64_atomic_xchg_4_impl;
-extern aarch64_atomic_stub_t aarch64_atomic_xchg_8_impl;
-extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_1_impl;
-extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_4_impl;
-extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_8_impl;
-extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_1_relaxed_impl;
-extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_4_relaxed_impl;
-extern aarch64_atomic_stub_t aarch64_atomic_cmpxchg_8_relaxed_impl;
-
-#endif // CPU_AARCH64_ATOMIC_AARCH64_HPP

src/hotspot/cpu/aarch64/c1_Defs_aarch64.hpp

@@ -44,13 +44,13 @@ enum {
   pd_nof_cpu_regs_frame_map = RegisterImpl::number_of_registers,       // number of registers used during code emission
   pd_nof_fpu_regs_frame_map = FloatRegisterImpl::number_of_registers,  // number of registers used during code emission
 
-  pd_nof_caller_save_cpu_regs_frame_map = 19 - 2 /* rscratch1 and rscratch2 */ R18_RESERVED_ONLY(- 1),  // number of registers killed by calls
+  pd_nof_caller_save_cpu_regs_frame_map = 19 - 2 BSD_ONLY(- 1 /* r18 */),  // number of registers killed by calls
   pd_nof_caller_save_fpu_regs_frame_map = 32,  // number of registers killed by calls
 
-  pd_first_callee_saved_reg = 19 - 2 /* rscratch1 and rscratch2 */ R18_RESERVED_ONLY(- 1),
-  pd_last_callee_saved_reg = 26 - 2 /* rscratch1 and rscratch2 */ R18_RESERVED_ONLY(- 1),
+  pd_first_callee_saved_reg = 19 - 2 BSD_ONLY(- 1 /* r18 */),
+  pd_last_callee_saved_reg = 26 - 2 BSD_ONLY(- 1 /* r18 */),
 
-  pd_last_allocatable_cpu_reg = 16 R18_RESERVED_ONLY(- 1),
+  pd_last_allocatable_cpu_reg = 16 BSD_ONLY(- 1 /* r18 */),
 
   pd_nof_cpu_regs_reg_alloc
     = pd_last_allocatable_cpu_reg + 1,  // number of registers that are visible to register allocator
@@ -60,9 +60,9 @@ enum {
   pd_nof_fpu_regs_linearscan = pd_nof_fpu_regs_frame_map, // number of registers visible to linear scan
   pd_nof_xmm_regs_linearscan = 0, // like sparc we don't have any of these
   pd_first_cpu_reg = 0,
-  pd_last_cpu_reg = 16 R18_RESERVED_ONLY(- 1),
+  pd_last_cpu_reg = 16 BSD_ONLY(- 1 /* r18 */),
   pd_first_byte_reg = 0,
-  pd_last_byte_reg = 16 R18_RESERVED_ONLY(- 1),
+  pd_last_byte_reg = 16 BSD_ONLY(- 1 /* r18 */),
   pd_first_fpu_reg = pd_nof_cpu_regs_frame_map,
   pd_last_fpu_reg =  pd_first_fpu_reg + 31,
 

src/hotspot/cpu/aarch64/c1_FpuStackSim_aarch64.cpp

@@ -28,4 +28,3 @@
 //--------------------------------------------------------
 
 // No FPU stack on AARCH64
-#include "precompiled.hpp"

src/hotspot/cpu/aarch64/c1_FrameMap_aarch64.cpp

@@ -181,9 +181,8 @@ void FrameMap::initialize() {
   map_register(i, r15); r15_opr = LIR_OprFact::single_cpu(i); i++;
   map_register(i, r16); r16_opr = LIR_OprFact::single_cpu(i); i++;
   map_register(i, r17); r17_opr = LIR_OprFact::single_cpu(i); i++;
-#ifndef R18_RESERVED
-  // See comment in register_aarch64.hpp
-  map_register(i, r18_reserved); r18_opr = LIR_OprFact::single_cpu(i); i++;
+#ifndef __APPLE__
+  map_register(i, r18); r18_opr = LIR_OprFact::single_cpu(i); i++;
 #endif
   map_register(i, r19); r19_opr = LIR_OprFact::single_cpu(i); i++;
   map_register(i, r20); r20_opr = LIR_OprFact::single_cpu(i); i++;
@@ -202,9 +201,8 @@ void FrameMap::initialize() {
   map_register(i, r8); r8_opr = LIR_OprFact::single_cpu(i); i++;   // rscratch1
   map_register(i, r9); r9_opr = LIR_OprFact::single_cpu(i); i++;   // rscratch2
 
-#ifdef R18_RESERVED
-  // See comment in register_aarch64.hpp
-  map_register(i, r18_reserved); r18_opr = LIR_OprFact::single_cpu(i); i++;
+#ifdef __APPLE__
+  map_register(i, r18); r18_opr = LIR_OprFact::single_cpu(i); i++;   // rscratch2
 #endif
 
   rscratch1_opr = r8_opr;
@@ -235,8 +233,7 @@ void FrameMap::initialize() {
   _caller_save_cpu_regs[13] = r15_opr;
   _caller_save_cpu_regs[14] = r16_opr;
   _caller_save_cpu_regs[15] = r17_opr;
-#ifndef R18_RESERVED
-  // See comment in register_aarch64.hpp
+#ifndef __APPLE__
   _caller_save_cpu_regs[16] = r18_opr;
 #endif
 
@@ -264,7 +261,7 @@ void FrameMap::initialize() {
   r15_oop_opr = as_oop_opr(r15);
   r16_oop_opr = as_oop_opr(r16);
   r17_oop_opr = as_oop_opr(r17);
-  r18_oop_opr = as_oop_opr(r18_reserved);
+  r18_oop_opr = as_oop_opr(r18);
   r19_oop_opr = as_oop_opr(r19);
   r20_oop_opr = as_oop_opr(r20);
   r21_oop_opr = as_oop_opr(r21);

src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp

@@ -2042,7 +2042,7 @@ void LIR_Assembler::comp_fl2i(LIR_Code code, LIR_Opr left, LIR_Opr right, LIR_Op
   } else if (code == lir_cmp_l2i) {
     Label done;
     __ cmp(left->as_register_lo(), right->as_register_lo());
-    __ mov(dst->as_register(), (uint64_t)-1L);
+    __ mov(dst->as_register(), (u_int64_t)-1L);
     __ br(Assembler::LT, done);
     __ csinc(dst->as_register(), zr, zr, Assembler::EQ);
     __ bind(done);
@@ -2314,6 +2314,7 @@ void LIR_Assembler::emit_arraycopy(LIR_OpArrayCopy* op) {
   assert(default_type != NULL && default_type->is_array_klass() && default_type->is_loaded(), "must be true at this point");
 
   int elem_size = type2aelembytes(basic_type);
+  int shift_amount;
   int scale = exact_log2(elem_size);
 
   Address src_length_addr = Address(src, arrayOopDesc::length_offset_in_bytes());

src/hotspot/cpu/aarch64/c1_LIRGenerator_aarch64.cpp

@@ -173,10 +173,10 @@ LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
     if (large_disp != 0) {
       LIR_Opr tmp = new_pointer_register();
       if (Assembler::operand_valid_for_add_sub_immediate(large_disp)) {
-        __ add(index, LIR_OprFact::intptrConst(large_disp), tmp);
+        __ add(tmp, tmp, LIR_OprFact::intptrConst(large_disp));
         index = tmp;
       } else {
-        __ move(LIR_OprFact::intptrConst(large_disp), tmp);
+        __ move(tmp, LIR_OprFact::intptrConst(large_disp));
         __ add(tmp, index, tmp);
         index = tmp;
       }
@@ -190,7 +190,7 @@ LIR_Address* LIRGenerator::generate_address(LIR_Opr base, LIR_Opr index,
   }
 
   // at this point we either have base + index or base + displacement
-  if (large_disp == 0 && index->is_register()) {
+  if (large_disp == 0) {
     return new LIR_Address(base, index, type);
   } else {
     assert(Address::offset_ok_for_immed(large_disp, 0), "must be");
@@ -290,7 +290,7 @@ void LIRGenerator::cmp_reg_mem(LIR_Condition condition, LIR_Opr reg, LIR_Opr bas
 }
 
 
-bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, jint c, LIR_Opr result, LIR_Opr tmp) {
+bool LIRGenerator::strength_reduce_multiply(LIR_Opr left, int c, LIR_Opr result, LIR_Opr tmp) {
 
   if (is_power_of_2(c - 1)) {
     __ shift_left(left, exact_log2(c - 1), tmp);

src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp

@@ -143,7 +143,7 @@ int StubAssembler::call_RT(Register oop_result1, Register metadata_result, addre
   if (arg1 == c_rarg2 || arg1 == c_rarg3 ||
       arg2 == c_rarg1 || arg2 == c_rarg3 ||
       arg3 == c_rarg1 || arg3 == c_rarg2) {
-    stp(arg3, arg2, Address(pre(sp, -2 * wordSize)));
+    stp(arg3, arg2, Address(pre(sp, 2 * wordSize)));
     stp(arg1, zr, Address(pre(sp, -2 * wordSize)));
     ldp(c_rarg1, zr, Address(post(sp, 2 * wordSize)));
     ldp(c_rarg3, c_rarg2, Address(post(sp, 2 * wordSize)));

src/hotspot/cpu/aarch64/c2_globals_aarch64.hpp

@@ -46,7 +46,7 @@ define_pd_global(intx, CompileThreshold,             10000);
 
 define_pd_global(intx, OnStackReplacePercentage,     140);
 define_pd_global(intx, ConditionalMoveLimit,         3);
-define_pd_global(intx, FLOATPRESSURE,                32);
+define_pd_global(intx, FLOATPRESSURE,                64);
 define_pd_global(intx, FreqInlineSize,               325);
 define_pd_global(intx, MinJumpTableSize,             10);
 define_pd_global(intx, INTPRESSURE,                  24);
@@ -76,7 +76,7 @@ define_pd_global(intx, ReservedCodeCacheSize,        48*M);
 define_pd_global(intx, NonProfiledCodeHeapSize,      21*M);
 define_pd_global(intx, ProfiledCodeHeapSize,         22*M);
 define_pd_global(intx, NonNMethodCodeHeapSize,       5*M );
-define_pd_global(uintx, CodeCacheMinBlockLength,     6);
+define_pd_global(uintx, CodeCacheMinBlockLength,     4);
 define_pd_global(uintx, CodeCacheMinimumUseSpace,    400*K);
 
 // Heap related flags

src/hotspot/cpu/aarch64/compiledIC_aarch64.cpp

@@ -36,9 +36,6 @@
 
 #define __ _masm.
 address CompiledStaticCall::emit_to_interp_stub(CodeBuffer &cbuf, address mark) {
-  precond(cbuf.stubs()->start() != badAddress);
-  precond(cbuf.stubs()->end() != badAddress);
-
   // Stub is fixed up when the corresponding call is converted from
   // calling compiled code to calling interpreted code.
   // mov rmethod, 0

src/hotspot/cpu/aarch64/frame_aarch64.cpp

@@ -539,7 +539,7 @@ bool frame::is_interpreted_frame_valid(JavaThread* thread) const {
   Method* m = *interpreter_frame_method_addr();
 
   // validate the method we'd find in this potential sender
-  if (!Method::is_valid_method(m)) return false;
+  if (!m->is_valid_method()) return false;
 
   // stack frames shouldn't be much larger than max_stack elements
   // this test requires the use of unextended_sp which is the sp as seen by
@@ -670,18 +670,17 @@ intptr_t* frame::real_fp() const {
 
 #undef DESCRIBE_FP_OFFSET
 
-#define DESCRIBE_FP_OFFSET(name)                     \
-  {                                                  \
-    uintptr_t *p = (uintptr_t *)fp;                  \
-    printf(INTPTR_FORMAT " " INTPTR_FORMAT " %s\n",  \
-           (uintptr_t)(p + frame::name##_offset),    \
-           p[frame::name##_offset], #name);          \
+#define DESCRIBE_FP_OFFSET(name)                                        \
+  {                                                                     \
+    uintptr_t *p = (uintptr_t *)fp;                                     \
+    printf("0x%016lx 0x%016lx %s\n", (uintptr_t)(p + frame::name##_offset), \
+           p[frame::name##_offset], #name);                             \
   }
 
-static THREAD_LOCAL uintptr_t nextfp;
-static THREAD_LOCAL uintptr_t nextpc;
-static THREAD_LOCAL uintptr_t nextsp;
-static THREAD_LOCAL RegisterMap *reg_map;
+static __thread uintptr_t nextfp;
+static __thread uintptr_t nextpc;
+static __thread uintptr_t nextsp;
+static __thread RegisterMap *reg_map;
 
 static void printbc(Method *m, intptr_t bcx) {
   const char *name;

src/hotspot/cpu/aarch64/frame_aarch64.hpp

@@ -61,7 +61,6 @@
 //    [last sp               ]
 //    [oop temp              ]                     (only for native calls)
 
-//    [padding               ]                     (to preserve machine SP alignment)
 //    [locals and parameters ]
 //                               <- sender sp
 // ------------------------------ Asm interpreter ----------------------------------------

src/hotspot/cpu/aarch64/globalDefinitions_aarch64.hpp

@@ -53,13 +53,4 @@ const bool CCallingConventionRequiresIntsAsLongs = false;
 
 #define THREAD_LOCAL_POLL
 
-#if defined(__APPLE__) || defined(_WIN64)
-#define R18_RESERVED
-#define R18_RESERVED_ONLY(code) code
-#define NOT_R18_RESERVED(code)
-#else
-#define R18_RESERVED_ONLY(code)
-#define NOT_R18_RESERVED(code) code
-#endif
-
 #endif // CPU_AARCH64_VM_GLOBALDEFINITIONS_AARCH64_HPP

src/hotspot/cpu/aarch64/icache_aarch64.hpp

@@ -26,6 +26,19 @@
 #ifndef CPU_AARCH64_VM_ICACHE_AARCH64_HPP
 #define CPU_AARCH64_VM_ICACHE_AARCH64_HPP
 
-#include OS_CPU_HEADER(icache)
+// Interface for updating the instruction cache.  Whenever the VM
+// modifies code, part of the processor instruction cache potentially
+// has to be flushed.
+
+class ICache : public AbstractICache {
+ public:
+  static void initialize();
+  static void invalidate_word(address addr) {
+    __clear_cache((char *)addr, (char *)(addr + 3));
+  }
+  static void invalidate_range(address start, int nbytes) {
+    __clear_cache((char *)start, (char *)(start + nbytes));
+  }
+};
 
 #endif // CPU_AARCH64_VM_ICACHE_AARCH64_HPP

src/hotspot/cpu/aarch64/immediate_aarch64.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2020, Red Hat Inc. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. 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,10 +23,6 @@
  */
 
 #include <stdlib.h>
-#include <stdint.h>
-
-#include "precompiled.hpp"
-#include "utilities/globalDefinitions.hpp"
 #include "immediate_aarch64.hpp"
 
 // there are at most 2^13 possible logical immediate encodings
@@ -38,14 +34,14 @@ static int li_table_entry_count;
 // for forward lookup we just use a direct array lookup
 // and assume that the cient has supplied a valid encoding
 // table[encoding] = immediate
-static uint64_t LITable[LI_TABLE_SIZE];
+static u_int64_t LITable[LI_TABLE_SIZE];
 
 // for reverse lookup we need a sparse map so we store a table of
 // immediate and encoding pairs sorted by immediate value
 
 struct li_pair {
-  uint64_t immediate;
-  uint32_t encoding;
+  u_int64_t immediate;
+  u_int32_t encoding;
 };
 
 static struct li_pair InverseLITable[LI_TABLE_SIZE];
@@ -67,9 +63,9 @@ int compare_immediate_pair(const void *i1, const void *i2)
 // helper functions used by expandLogicalImmediate
 
 // for i = 1, ... N result<i-1> = 1 other bits are zero
-static inline uint64_t ones(int N)
+static inline u_int64_t ones(int N)
 {
-  return (N == 64 ? -1ULL : (1ULL << N) - 1);
+  return (N == 64 ? (u_int64_t)-1UL : ((1UL << N) - 1));
 }
 
 /*
@@ -77,49 +73,49 @@ static inline uint64_t ones(int N)
  */
 
 // 32 bit mask with bits [hi,...,lo] set
-static inline uint32_t mask32(int hi = 31, int lo = 0)
+static inline u_int32_t mask32(int hi = 31, int lo = 0)
 {
   int nbits = (hi + 1) - lo;
   return ((1 << nbits) - 1) << lo;
 }
 
-static inline uint64_t mask64(int hi = 63, int lo = 0)
+static inline u_int64_t mask64(int hi = 63, int lo = 0)
 {
   int nbits = (hi + 1) - lo;
   return ((1L << nbits) - 1) << lo;
 }
 
 // pick bits [hi,...,lo] from val
-static inline uint32_t pick32(uint32_t val, int hi = 31, int lo = 0)
+static inline u_int32_t pick32(u_int32_t val, int hi = 31, int lo = 0)
 {
   return (val & mask32(hi, lo));
 }
 
 // pick bits [hi,...,lo] from val
-static inline uint64_t pick64(uint64_t val, int hi = 31, int lo = 0)
+static inline u_int64_t pick64(u_int64_t val, int hi = 31, int lo = 0)
 {
   return (val & mask64(hi, lo));
 }
 
 // mask [hi,lo] and shift down to start at bit 0
-static inline uint32_t pickbits32(uint32_t val, int hi = 31, int lo = 0)
+static inline u_int32_t pickbits32(u_int32_t val, int hi = 31, int lo = 0)
 {
   return (pick32(val, hi, lo) >> lo);
 }
 
 // mask [hi,lo] and shift down to start at bit 0
-static inline uint64_t pickbits64(uint64_t val, int hi = 63, int lo = 0)
+static inline u_int64_t pickbits64(u_int64_t val, int hi = 63, int lo = 0)
 {
   return (pick64(val, hi, lo) >> lo);
 }
 
 // result<0> to val<N>
-static inline uint64_t pickbit(uint64_t val, int N)
+static inline u_int64_t pickbit(u_int64_t val, int N)
 {
   return pickbits64(val, N, N);
 }
 
-static inline uint32_t uimm(uint32_t val, int hi, int lo)
+static inline u_int32_t uimm(u_int32_t val, int hi, int lo)
 {
   return pickbits32(val, hi, lo);
 }
@@ -127,11 +123,11 @@ static inline uint32_t uimm(uint32_t val, int hi, int lo)
 // SPEC bits(M*N) Replicate(bits(M) x, integer N);
 // this is just an educated guess
 
-uint64_t replicate(uint64_t bits, int nbits, int count)
+u_int64_t replicate(u_int64_t bits, int nbits, int count)
 {
-  uint64_t result = 0;
+  u_int64_t result = 0;
   // nbits may be 64 in which case we want mask to be -1
-  uint64_t mask = ones(nbits);
+  u_int64_t mask = ones(nbits);
   for (int i = 0; i < count ; i++) {
     result <<= nbits;
     result |= (bits & mask);
@@ -144,24 +140,24 @@ uint64_t replicate(uint64_t bits, int nbits, int count)
 // encoding must be treated as an UNALLOC instruction
 
 // construct a 32 bit immediate value for a logical immediate operation
-int expandLogicalImmediate(uint32_t immN, uint32_t immr,
-                            uint32_t imms, uint64_t &bimm)
+int expandLogicalImmediate(u_int32_t immN, u_int32_t immr,
+                            u_int32_t imms, u_int64_t &bimm)
 {
-  int len;                 // ought to be <= 6
-  uint32_t levels;         // 6 bits
-  uint32_t tmask_and;      // 6 bits
-  uint32_t wmask_and;      // 6 bits
-  uint32_t tmask_or;       // 6 bits
-  uint32_t wmask_or;       // 6 bits
-  uint64_t imm64;          // 64 bits
-  uint64_t tmask, wmask;   // 64 bits
-  uint32_t S, R, diff;     // 6 bits?
+  int len;                  // ought to be <= 6
+  u_int32_t levels;         // 6 bits
+  u_int32_t tmask_and;      // 6 bits
+  u_int32_t wmask_and;      // 6 bits
+  u_int32_t tmask_or;       // 6 bits
+  u_int32_t wmask_or;       // 6 bits
+  u_int64_t imm64;          // 64 bits
+  u_int64_t tmask, wmask;   // 64 bits
+  u_int32_t S, R, diff;     // 6 bits?
 
   if (immN == 1) {
     len = 6; // looks like 7 given the spec above but this cannot be!
   } else {
     len = 0;
-    uint32_t val = (~imms & 0x3f);
+    u_int32_t val = (~imms & 0x3f);
     for (int i = 5; i > 0; i--) {
       if (val & (1 << i)) {
         len = i;
@@ -174,7 +170,7 @@ int expandLogicalImmediate(uint32_t immN, uint32_t immr,
     // for valid inputs leading 1s in immr must be less than leading
     // zeros in imms
     int len2 = 0;                   // ought to be < len
-    uint32_t val2 = (~immr & 0x3f);
+    u_int32_t val2 = (~immr & 0x3f);
     for (int i = 5; i > 0; i--) {
       if (!(val2 & (1 << i))) {
         len2 = i;
@@ -203,12 +199,12 @@ int expandLogicalImmediate(uint32_t immN, uint32_t immr,
 
   for (int i = 0; i < 6; i++) {
     int nbits = 1 << i;
-    uint64_t and_bit = pickbit(tmask_and, i);
-    uint64_t or_bit = pickbit(tmask_or, i);
-    uint64_t and_bits_sub = replicate(and_bit, 1, nbits);
-    uint64_t or_bits_sub = replicate(or_bit, 1, nbits);
-    uint64_t and_bits_top = (and_bits_sub << nbits) | ones(nbits);
-    uint64_t or_bits_top = (0 << nbits) | or_bits_sub;
+    u_int64_t and_bit = pickbit(tmask_and, i);
+    u_int64_t or_bit = pickbit(tmask_or, i);
+    u_int64_t and_bits_sub = replicate(and_bit, 1, nbits);
+    u_int64_t or_bits_sub = replicate(or_bit, 1, nbits);
+    u_int64_t and_bits_top = (and_bits_sub << nbits) | ones(nbits);
+    u_int64_t or_bits_top = (0 << nbits) | or_bits_sub;
 
     tmask = ((tmask
               & (replicate(and_bits_top, 2 * nbits, 32 / nbits)))
@@ -222,12 +218,12 @@ int expandLogicalImmediate(uint32_t immN, uint32_t immr,
 
   for (int i = 0; i < 6; i++) {
     int nbits = 1 << i;
-    uint64_t and_bit = pickbit(wmask_and, i);
-    uint64_t or_bit = pickbit(wmask_or, i);
-    uint64_t and_bits_sub = replicate(and_bit, 1, nbits);
-    uint64_t or_bits_sub = replicate(or_bit, 1, nbits);
-    uint64_t and_bits_top = (ones(nbits) << nbits) | and_bits_sub;
-    uint64_t or_bits_top = (or_bits_sub << nbits) | 0;
+    u_int64_t and_bit = pickbit(wmask_and, i);
+    u_int64_t or_bit = pickbit(wmask_or, i);
+    u_int64_t and_bits_sub = replicate(and_bit, 1, nbits);
+    u_int64_t or_bits_sub = replicate(or_bit, 1, nbits);
+    u_int64_t and_bits_top = (ones(nbits) << nbits) | and_bits_sub;
+    u_int64_t or_bits_top = (or_bits_sub << nbits) | 0;
 
     wmask = ((wmask
               & (replicate(and_bits_top, 2 * nbits, 32 / nbits)))
@@ -247,17 +243,14 @@ int expandLogicalImmediate(uint32_t immN, uint32_t immr,
 
 // constructor to initialise the lookup tables
 
-static void initLITables();
-// Use an empty struct with a construtor as MSVC doesn't support `__attribute__ ((constructor))`
-// See https://stackoverflow.com/questions/1113409/attribute-constructor-equivalent-in-vc
-static struct initLITables_t { initLITables_t(void) { initLITables(); } } _initLITables;
+static void initLITables() __attribute__ ((constructor));
 static void initLITables()
 {
   li_table_entry_count = 0;
   for (unsigned index = 0; index < LI_TABLE_SIZE; index++) {
-    uint32_t N = uimm(index, 12, 12);
-    uint32_t immr = uimm(index, 11, 6);
-    uint32_t imms = uimm(index, 5, 0);
+    u_int32_t N = uimm(index, 12, 12);
+    u_int32_t immr = uimm(index, 11, 6);
+    u_int32_t imms = uimm(index, 5, 0);
     if (expandLogicalImmediate(N, immr, imms, LITable[index])) {
       InverseLITable[li_table_entry_count].immediate = LITable[index];
       InverseLITable[li_table_entry_count].encoding = index;
@@ -271,12 +264,12 @@ static void initLITables()
 
 // public APIs provided for logical immediate lookup and reverse lookup
 
-uint64_t logical_immediate_for_encoding(uint32_t encoding)
+u_int64_t logical_immediate_for_encoding(u_int32_t encoding)
 {
   return LITable[encoding];
 }
 
-uint32_t encoding_for_logical_immediate(uint64_t immediate)
+u_int32_t encoding_for_logical_immediate(u_int64_t immediate)
 {
   struct li_pair pair;
   struct li_pair *result;
@@ -300,15 +293,15 @@ uint32_t encoding_for_logical_immediate(uint64_t immediate)
 // fpimm[3:0] = fraction (assuming leading 1)
 // i.e. F = s * 1.f * 2^(e - b)
 
-uint64_t fp_immediate_for_encoding(uint32_t imm8, int is_dp)
+u_int64_t fp_immediate_for_encoding(u_int32_t imm8, int is_dp)
 {
   union {
     float fpval;
     double dpval;
-    uint64_t val;
+    u_int64_t val;
   };
 
-  uint32_t s, e, f;
+  u_int32_t s, e, f;
   s = (imm8 >> 7 ) & 0x1;
   e = (imm8 >> 4) & 0x7;
   f = imm8 & 0xf;
@@ -336,7 +329,7 @@ uint64_t fp_immediate_for_encoding(uint32_t imm8, int is_dp)
   return val;
 }
 
-uint32_t encoding_for_fp_immediate(float immediate)
+u_int32_t encoding_for_fp_immediate(float immediate)
 {
   // given a float which is of the form
   //
@@ -348,10 +341,10 @@ uint32_t encoding_for_fp_immediate(float immediate)
 
   union {
     float fpval;
-    uint32_t val;
+    u_int32_t val;
   };
   fpval = immediate;
-  uint32_t s, r, f, res;
+  u_int32_t s, r, f, res;
   // sign bit is 31
   s = (val >> 31) & 0x1;
   // exponent is bits 30-23 but we only want the bottom 3 bits

src/hotspot/cpu/aarch64/immediate_aarch64.hpp

@@ -46,9 +46,9 @@
  * encoding then a map lookup will return 0xffffffff.
  */
 
-uint64_t logical_immediate_for_encoding(uint32_t encoding);
-uint32_t encoding_for_logical_immediate(uint64_t immediate);
-uint64_t fp_immediate_for_encoding(uint32_t imm8, int is_dp);
-uint32_t encoding_for_fp_immediate(float immediate);
+u_int64_t logical_immediate_for_encoding(u_int32_t encoding);
+u_int32_t encoding_for_logical_immediate(u_int64_t immediate);
+u_int64_t fp_immediate_for_encoding(u_int32_t imm8, int is_dp);
+u_int32_t encoding_for_fp_immediate(float immediate);
 
 #endif // _IMMEDIATE_H

src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp

@@ -21,7 +21,6 @@
  * questions.
  */
 
-#include "precompiled.hpp"
 #include "asm/macroAssembler.hpp"
 #include "jvmci/jvmciCodeInstaller.hpp"
 #include "jvmci/jvmciRuntime.hpp"

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp

@@ -40,21 +40,16 @@
 #include "oops/accessDecorators.hpp"
 #include "oops/compressedOops.inline.hpp"
 #include "oops/klass.inline.hpp"
+#include "oops/oop.hpp"
+#include "opto/compile.hpp"
+#include "opto/intrinsicnode.hpp"
+#include "opto/node.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/icache.hpp"
 #include "runtime/interfaceSupport.inline.hpp"
 #include "runtime/jniHandles.inline.hpp"
 #include "runtime/sharedRuntime.hpp"
 #include "runtime/thread.hpp"
-#ifdef COMPILER1
-#include "c1/c1_LIRAssembler.hpp"
-#endif
-#ifdef COMPILER2
-#include "oops/oop.hpp"
-#include "opto/compile.hpp"
-#include "opto/intrinsicnode.hpp"
-#include "opto/node.hpp"
-#endif
 
 #ifdef PRODUCT
 #define BLOCK_COMMENT(str) /* nothing */
@@ -93,7 +88,7 @@ int MacroAssembler::pd_patch_instruction_size(address branch, address target) {
     offset = target-branch;
     int shift = Instruction_aarch64::extract(insn, 31, 31);
     if (shift) {
-      uint64_t dest = (uint64_t)target;
+      u_int64_t dest = (u_int64_t)target;
       uint64_t pc_page = (uint64_t)branch >> 12;
       uint64_t adr_page = (uint64_t)target >> 12;
       unsigned offset_lo = dest & 0xfff;
@@ -146,7 +141,7 @@ int MacroAssembler::pd_patch_instruction_size(address branch, address target) {
     Instruction_aarch64::spatch(branch, 23, 5, offset);
     Instruction_aarch64::patch(branch, 30, 29, offset_lo);
   } else if (Instruction_aarch64::extract(insn, 31, 21) == 0b11010010100) {
-    uint64_t dest = (uint64_t)target;
+    u_int64_t dest = (u_int64_t)target;
     // Move wide constant
     assert(nativeInstruction_at(branch+4)->is_movk(), "wrong insns in patch");
     assert(nativeInstruction_at(branch+8)->is_movk(), "wrong insns in patch");
@@ -272,13 +267,13 @@ address MacroAssembler::target_addr_for_insn(address insn_addr, unsigned insn) {
       ShouldNotReachHere();
     }
   } else if (Instruction_aarch64::extract(insn, 31, 23) == 0b110100101) {
-    uint32_t *insns = (uint32_t *)insn_addr;
+    u_int32_t *insns = (u_int32_t *)insn_addr;
     // Move wide constant: movz, movk, movk.  See movptr().
     assert(nativeInstruction_at(insns+1)->is_movk(), "wrong insns in patch");
     assert(nativeInstruction_at(insns+2)->is_movk(), "wrong insns in patch");
-    return address(uint64_t(Instruction_aarch64::extract(insns[0], 20, 5))
-                   + (uint64_t(Instruction_aarch64::extract(insns[1], 20, 5)) << 16)
-                   + (uint64_t(Instruction_aarch64::extract(insns[2], 20, 5)) << 32));
+    return address(u_int64_t(Instruction_aarch64::extract(insns[0], 20, 5))
+                   + (u_int64_t(Instruction_aarch64::extract(insns[1], 20, 5)) << 16)
+                   + (u_int64_t(Instruction_aarch64::extract(insns[2], 20, 5)) << 32));
   } else if (Instruction_aarch64::extract(insn, 31, 22) == 0b1011100101 &&
              Instruction_aarch64::extract(insn, 4, 0) == 0b11111) {
     return 0;
@@ -700,11 +695,6 @@ void MacroAssembler::call_VM_base(Register oop_result,
   // do the call, remove parameters
   MacroAssembler::call_VM_leaf_base(entry_point, number_of_arguments, &l);
 
-  // lr could be poisoned with PAC signature during throw_pending_exception
-  // if it was tail-call optimized by compiler, since lr is not callee-saved
-  // reload it with proper value
-  adr(lr, l);
-
   // reset last Java frame
   // Only interpreter should have to clear fp
   reset_last_Java_frame(true);
@@ -745,19 +735,15 @@ address MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
 
   // We need a trampoline if branches are far.
   if (far_branches()) {
-    bool in_scratch_emit_size = false;
-#ifdef COMPILER2
     // We don't want to emit a trampoline if C2 is generating dummy
     // code during its branch shortening phase.
     CompileTask* task = ciEnv::current()->task();
-    in_scratch_emit_size =
+    bool in_scratch_emit_size =
       (task != NULL && is_c2_compile(task->comp_level()) &&
        Compile::current()->in_scratch_emit_size());
-#endif
     if (!in_scratch_emit_size) {
       address stub = emit_trampoline_stub(offset(), entry.target());
       if (stub == NULL) {
-        postcond(pc() == badAddress);
         return NULL; // CodeCache is full
       }
     }
@@ -771,7 +757,6 @@ address MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
     bl(pc());
   }
   // just need to return a non-null address
-  postcond(pc() != badAddress);
   return pc();
 }
 
@@ -789,9 +774,7 @@ address MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
 
 address MacroAssembler::emit_trampoline_stub(int insts_call_instruction_offset,
                                              address dest) {
-  // Max stub size: alignment nop, TrampolineStub.
-  address stub = start_a_stub(NativeInstruction::instruction_size
-                   + NativeCallTrampolineStub::instruction_size);
+  address stub = start_a_stub(Compile::MAX_stubs_size/2);
   if (stub == NULL) {
     return NULL;  // CodeBuffer::expand failed
   }
@@ -1031,22 +1014,27 @@ void MacroAssembler::lookup_interface_method(Register recv_klass,
   // }
   Label search, found_method;
 
-  ldr(method_result, Address(scan_temp, itableOffsetEntry::interface_offset_in_bytes()));
-  cmp(intf_klass, method_result);
-  br(Assembler::EQ, found_method);
-  bind(search);
-  // Check that the previous entry is non-null.  A null entry means that
-  // the receiver class doesn't implement the interface, and wasn't the
-  // same as when the caller was compiled.
-  cbz(method_result, L_no_such_interface);
-  if (itableOffsetEntry::interface_offset_in_bytes() != 0) {
-    add(scan_temp, scan_temp, scan_step);
+  for (int peel = 1; peel >= 0; peel--) {
     ldr(method_result, Address(scan_temp, itableOffsetEntry::interface_offset_in_bytes()));
-  } else {
-    ldr(method_result, Address(pre(scan_temp, scan_step)));
+    cmp(intf_klass, method_result);
+
+    if (peel) {
+      br(Assembler::EQ, found_method);
+    } else {
+      br(Assembler::NE, search);
+      // (invert the test to fall through to found_method...)
+    }
+
+    if (!peel)  break;
+
+    bind(search);
+
+    // Check that the previous entry is non-null.  A null entry means that
+    // the receiver class doesn't implement the interface, and wasn't the
+    // same as when the caller was compiled.
+    cbz(method_result, L_no_such_interface);
+    add(scan_temp, scan_temp, scan_step);
   }
-  cmp(intf_klass, method_result);
-  br(Assembler::NE, search);
 
   bind(found_method);
 
@@ -1480,7 +1468,7 @@ void MacroAssembler::null_check(Register reg, int offset) {
 
 void MacroAssembler::mov(Register r, Address dest) {
   code_section()->relocate(pc(), dest.rspec());
-  uint64_t imm64 = (uint64_t)dest.target();
+  u_int64_t imm64 = (u_int64_t)dest.target();
   movptr(r, imm64);
 }
 
@@ -1492,7 +1480,7 @@ void MacroAssembler::movptr(Register r, uintptr_t imm64) {
 #ifndef PRODUCT
   {
     char buffer[64];
-    snprintf(buffer, sizeof(buffer), PTR64_FORMAT, imm64);
+    snprintf(buffer, sizeof(buffer), "0x%"PRIX64, (uint64_t)imm64);
     block_comment(buffer);
   }
 #endif
@@ -1513,20 +1501,20 @@ void MacroAssembler::movptr(Register r, uintptr_t imm64) {
 //   imm32 == hex abcdefgh  T2S:  Vd = abcdefghabcdefgh
 //   imm32 == hex abcdefgh  T4S:  Vd = abcdefghabcdefghabcdefghabcdefgh
 //   T1D/T2D: invalid
-void MacroAssembler::mov(FloatRegister Vd, SIMD_Arrangement T, uint32_t imm32) {
+void MacroAssembler::mov(FloatRegister Vd, SIMD_Arrangement T, u_int32_t imm32) {
   assert(T != T1D && T != T2D, "invalid arrangement");
   if (T == T8B || T == T16B) {
     assert((imm32 & ~0xff) == 0, "extraneous bits in unsigned imm32 (T8B/T16B)");
     movi(Vd, T, imm32 & 0xff, 0);
     return;
   }
-  uint32_t nimm32 = ~imm32;
+  u_int32_t nimm32 = ~imm32;
   if (T == T4H || T == T8H) {
     assert((imm32  & ~0xffff) == 0, "extraneous bits in unsigned imm32 (T4H/T8H)");
     imm32 &= 0xffff;
     nimm32 &= 0xffff;
   }
-  uint32_t x = imm32;
+  u_int32_t x = imm32;
   int movi_cnt = 0;
   int movn_cnt = 0;
   while (x) { if (x & 0xff) movi_cnt++; x >>= 8; }
@@ -1550,12 +1538,12 @@ void MacroAssembler::mov(FloatRegister Vd, SIMD_Arrangement T, uint32_t imm32) {
   }
 }
 
-void MacroAssembler::mov_immediate64(Register dst, uint64_t imm64)
+void MacroAssembler::mov_immediate64(Register dst, u_int64_t imm64)
 {
 #ifndef PRODUCT
   {
     char buffer[64];
-    snprintf(buffer, sizeof(buffer), PTR64_FORMAT, imm64);
+    snprintf(buffer, sizeof(buffer), "0x%"PRIX64, (uint64_t)imm64);
     block_comment(buffer);
   }
 #endif
@@ -1564,7 +1552,7 @@ void MacroAssembler::mov_immediate64(Register dst, uint64_t imm64)
   } else {
     // we can use a combination of MOVZ or MOVN with
     // MOVK to build up the constant
-    uint64_t imm_h[4];
+    u_int64_t imm_h[4];
     int zero_count = 0;
     int neg_count = 0;
     int i;
@@ -1585,7 +1573,7 @@ void MacroAssembler::mov_immediate64(Register dst, uint64_t imm64)
     } else if (zero_count == 3) {
       for (i = 0; i < 4; i++) {
         if (imm_h[i] != 0L) {
-          movz(dst, (uint32_t)imm_h[i], (i << 4));
+          movz(dst, (u_int32_t)imm_h[i], (i << 4));
           break;
         }
       }
@@ -1593,7 +1581,7 @@ void MacroAssembler::mov_immediate64(Register dst, uint64_t imm64)
       // one MOVN will do
       for (int i = 0; i < 4; i++) {
         if (imm_h[i] != 0xffffL) {
-          movn(dst, (uint32_t)imm_h[i] ^ 0xffffL, (i << 4));
+          movn(dst, (u_int32_t)imm_h[i] ^ 0xffffL, (i << 4));
           break;
         }
       }
@@ -1601,74 +1589,74 @@ void MacroAssembler::mov_immediate64(Register dst, uint64_t imm64)
       // one MOVZ and one MOVK will do
       for (i = 0; i < 3; i++) {
         if (imm_h[i] != 0L) {
-          movz(dst, (uint32_t)imm_h[i], (i << 4));
+          movz(dst, (u_int32_t)imm_h[i], (i << 4));
           i++;
           break;
         }
       }
       for (;i < 4; i++) {
         if (imm_h[i] != 0L) {
-          movk(dst, (uint32_t)imm_h[i], (i << 4));
+          movk(dst, (u_int32_t)imm_h[i], (i << 4));
         }
       }
     } else if (neg_count == 2) {
       // one MOVN and one MOVK will do
       for (i = 0; i < 4; i++) {
         if (imm_h[i] != 0xffffL) {
-          movn(dst, (uint32_t)imm_h[i] ^ 0xffffL, (i << 4));
+          movn(dst, (u_int32_t)imm_h[i] ^ 0xffffL, (i << 4));
           i++;
           break;
         }
       }
       for (;i < 4; i++) {
         if (imm_h[i] != 0xffffL) {
-          movk(dst, (uint32_t)imm_h[i], (i << 4));
+          movk(dst, (u_int32_t)imm_h[i], (i << 4));
         }
       }
     } else if (zero_count == 1) {
       // one MOVZ and two MOVKs will do
       for (i = 0; i < 4; i++) {
         if (imm_h[i] != 0L) {
-          movz(dst, (uint32_t)imm_h[i], (i << 4));
+          movz(dst, (u_int32_t)imm_h[i], (i << 4));
           i++;
           break;
         }
       }
       for (;i < 4; i++) {
         if (imm_h[i] != 0x0L) {
-          movk(dst, (uint32_t)imm_h[i], (i << 4));
+          movk(dst, (u_int32_t)imm_h[i], (i << 4));
         }
       }
     } else if (neg_count == 1) {
       // one MOVN and two MOVKs will do
       for (i = 0; i < 4; i++) {
         if (imm_h[i] != 0xffffL) {
-          movn(dst, (uint32_t)imm_h[i] ^ 0xffffL, (i << 4));
+          movn(dst, (u_int32_t)imm_h[i] ^ 0xffffL, (i << 4));
           i++;
           break;
         }
       }
       for (;i < 4; i++) {
         if (imm_h[i] != 0xffffL) {
-          movk(dst, (uint32_t)imm_h[i], (i << 4));
+          movk(dst, (u_int32_t)imm_h[i], (i << 4));
         }
       }
     } else {
       // use a MOVZ and 3 MOVKs (makes it easier to debug)
-      movz(dst, (uint32_t)imm_h[0], 0);
+      movz(dst, (u_int32_t)imm_h[0], 0);
       for (i = 1; i < 4; i++) {
-        movk(dst, (uint32_t)imm_h[i], (i << 4));
+        movk(dst, (u_int32_t)imm_h[i], (i << 4));
       }
     }
   }
 }
 
-void MacroAssembler::mov_immediate32(Register dst, uint32_t imm32)
+void MacroAssembler::mov_immediate32(Register dst, u_int32_t imm32)
 {
 #ifndef PRODUCT
     {
       char buffer[64];
-      snprintf(buffer, sizeof(buffer), PTR32_FORMAT, imm32);
+      snprintf(buffer, sizeof(buffer), "0x%"PRIX32, imm32);
       block_comment(buffer);
     }
 #endif
@@ -1677,7 +1665,7 @@ void MacroAssembler::mov_immediate32(Register dst, uint32_t imm32)
   } else {
     // we can use MOVZ, MOVN or two calls to MOVK to build up the
     // constant
-    uint32_t imm_h[2];
+    u_int32_t imm_h[2];
     imm_h[0] = imm32 & 0xffff;
     imm_h[1] = ((imm32 >> 16) & 0xffff);
     if (imm_h[0] == 0) {
@@ -1717,7 +1705,7 @@ Address MacroAssembler::form_address(Register Rd, Register base, int64_t byte_of
   {
     uint64_t word_offset = byte_offset >> shift;
     uint64_t masked_offset = word_offset & 0xfff000;
-    if (Address::offset_ok_for_immed(word_offset - masked_offset)
+    if (Address::offset_ok_for_immed(word_offset - masked_offset, 0)
         && Assembler::operand_valid_for_add_sub_immediate(masked_offset << shift)) {
       add(Rd, base, masked_offset << shift);
       word_offset -= masked_offset;
@@ -1832,7 +1820,7 @@ bool MacroAssembler::try_merge_ldst(Register rt, const Address &adr, size_t size
     return true;
   } else {
     assert(size_in_bytes == 8 || size_in_bytes == 4, "only 8 bytes or 4 bytes load/store is supported.");
-    const uint64_t mask = size_in_bytes - 1;
+    const unsigned mask = size_in_bytes - 1;
     if (adr.getMode() == Address::base_plus_offset &&
         (adr.offset() & mask) == 0) { // only supports base_plus_offset.
       code()->set_last_insn(pc());
@@ -2470,8 +2458,6 @@ void MacroAssembler::atomic_##OP(Register prev, Register newv, Register addr) {
 
 ATOMIC_XCHG(xchg, swp, ldxr, stxr, Assembler::xword)
 ATOMIC_XCHG(xchgw, swp, ldxrw, stxrw, Assembler::word)
-ATOMIC_XCHG(xchgl, swpl, ldxr, stlxr, Assembler::xword)
-ATOMIC_XCHG(xchglw, swpl, ldxrw, stlxrw, Assembler::word)
 ATOMIC_XCHG(xchgal, swpal, ldaxr, stlxr, Assembler::xword)
 ATOMIC_XCHG(xchgalw, swpal, ldaxrw, stlxrw, Assembler::word)
 
@@ -2544,17 +2530,9 @@ void MacroAssembler::debug64(char* msg, int64_t pc, int64_t regs[])
   }
 }
 
-RegSet MacroAssembler::call_clobbered_registers() {
-  RegSet regs = RegSet::range(r0, r17) - RegSet::of(rscratch1, rscratch2);
-#ifndef R18_RESERVED
-  regs += r18_reserved;
-#endif
-  return regs;
-}
-
 void MacroAssembler::push_call_clobbered_registers() {
   int step = 4 * wordSize;
-  push(call_clobbered_registers() - RegSet::of(rscratch1, rscratch2), sp);
+  push(RegSet::range(r0, r18) - RegSet::of(rscratch1, rscratch2) BSD_ONLY(- r18), sp);
   sub(sp, sp, step);
   mov(rscratch1, -step);
   // Push v0-v7, v16-v31.
@@ -2574,7 +2552,7 @@ void MacroAssembler::pop_call_clobbered_registers() {
           as_FloatRegister(i+3), T1D, Address(post(sp, 4 * wordSize)));
   }
 
-  pop(call_clobbered_registers() - RegSet::of(rscratch1, rscratch2), sp);
+  pop(RegSet::range(r0, r18) - RegSet::of(rscratch1, rscratch2) BSD_ONLY(- r18), sp);
 }
 
 void MacroAssembler::push_CPU_state(bool save_vectors) {
@@ -2760,7 +2738,7 @@ void MacroAssembler::merge_ldst(Register rt,
   // Overwrite previous generated binary.
   code_section()->set_end(prev);
 
-  const size_t sz = prev_ldst->size_in_bytes();
+  const int sz = prev_ldst->size_in_bytes();
   assert(sz == 8 || sz == 4, "only supports 64/32bit merging.");
   if (!is_store) {
     BLOCK_COMMENT("merged ldr pair");
@@ -4299,7 +4277,6 @@ void MacroAssembler::remove_frame(int framesize) {
   }
 }
 
-#ifdef COMPILER2
 typedef void (MacroAssembler::* chr_insn)(Register Rt, const Address &adr);
 
 // Search for str1 in str2 and return index or -1
@@ -4805,7 +4782,7 @@ void MacroAssembler::string_compare(Register str1, Register str2,
     Register cnt1, Register cnt2, Register result, Register tmp1, Register tmp2,
     FloatRegister vtmp1, FloatRegister vtmp2, FloatRegister vtmp3, int ae) {
   Label DONE, SHORT_LOOP, SHORT_STRING, SHORT_LAST, TAIL, STUB,
-      DIFF, NEXT_WORD, SHORT_LOOP_TAIL, SHORT_LAST2, SHORT_LAST_INIT,
+      DIFFERENCE, NEXT_WORD, SHORT_LOOP_TAIL, SHORT_LAST2, SHORT_LAST_INIT,
       SHORT_LOOP_START, TAIL_CHECK;
 
   const int STUB_THRESHOLD = 64 + 8;
@@ -4892,7 +4869,7 @@ void MacroAssembler::string_compare(Register str1, Register str2,
     adds(cnt2, cnt2, isUL ? 4 : 8);
     br(GE, TAIL);
     eor(rscratch2, tmp1, tmp2);
-    cbnz(rscratch2, DIFF);
+    cbnz(rscratch2, DIFFERENCE);
     // main loop
     bind(NEXT_WORD);
     if (str1_isL == str2_isL) {
@@ -4918,10 +4895,10 @@ void MacroAssembler::string_compare(Register str1, Register str2,
 
     eor(rscratch2, tmp1, tmp2);
     cbz(rscratch2, NEXT_WORD);
-    b(DIFF);
+    b(DIFFERENCE);
     bind(TAIL);
     eor(rscratch2, tmp1, tmp2);
-    cbnz(rscratch2, DIFF);
+    cbnz(rscratch2, DIFFERENCE);
     // Last longword.  In the case where length == 4 we compare the
     // same longword twice, but that's still faster than another
     // conditional branch.
@@ -4945,7 +4922,7 @@ void MacroAssembler::string_compare(Register str1, Register str2,
 
     // Find the first different characters in the longwords and
     // compute their difference.
-    bind(DIFF);
+    bind(DIFFERENCE);
     rev(rscratch2, rscratch2);
     clz(rscratch2, rscratch2);
     andr(rscratch2, rscratch2, isLL ? -8 : -16);
@@ -5025,10 +5002,9 @@ void MacroAssembler::string_compare(Register str1, Register str2,
 
   BLOCK_COMMENT("} string_compare");
 }
-#endif // COMPILER2
 
 // This method checks if provided byte array contains byte with highest bit set.
-address MacroAssembler::has_negatives(Register ary1, Register len, Register result) {
+void MacroAssembler::has_negatives(Register ary1, Register len, Register result) {
     // Simple and most common case of aligned small array which is not at the
     // end of memory page is placed here. All other cases are in stub.
     Label LOOP, END, STUB, STUB_LONG, SET_RESULT, DONE;
@@ -5065,38 +5041,27 @@ address MacroAssembler::has_negatives(Register ary1, Register len, Register resu
     b(SET_RESULT);
 
   BIND(STUB);
-    RuntimeAddress has_neg = RuntimeAddress(StubRoutines::aarch64::has_negatives());
+    RuntimeAddress has_neg =  RuntimeAddress(StubRoutines::aarch64::has_negatives());
     assert(has_neg.target() != NULL, "has_negatives stub has not been generated");
-    address tpc1 = trampoline_call(has_neg);
-    if (tpc1 == NULL) {
-      DEBUG_ONLY(reset_labels3(STUB_LONG, SET_RESULT, DONE));
-      postcond(pc() == badAddress);
-      return NULL;
-    }
+    trampoline_call(has_neg);
     b(DONE);
 
   BIND(STUB_LONG);
-    RuntimeAddress has_neg_long = RuntimeAddress(StubRoutines::aarch64::has_negatives_long());
+    RuntimeAddress has_neg_long =  RuntimeAddress(
+            StubRoutines::aarch64::has_negatives_long());
     assert(has_neg_long.target() != NULL, "has_negatives stub has not been generated");
-    address tpc2 = trampoline_call(has_neg_long);
-    if (tpc2 == NULL) {
-      DEBUG_ONLY(reset_labels2(SET_RESULT, DONE));
-      postcond(pc() == badAddress);
-      return NULL;
-    }
+    trampoline_call(has_neg_long);
     b(DONE);
 
   BIND(SET_RESULT);
     cset(result, NE); // set true or false
 
   BIND(DONE);
-  postcond(pc() != badAddress);
-  return pc();
 }
 
-address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
-                                      Register tmp4, Register tmp5, Register result,
-                                      Register cnt1, int elem_size) {
+void MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
+                                   Register tmp4, Register tmp5, Register result,
+                                   Register cnt1, int elem_size) {
   Label DONE, SAME;
   Register tmp1 = rscratch1;
   Register tmp2 = rscratch2;
@@ -5200,7 +5165,7 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
       }
     }
   } else {
-    Label NEXT_DWORD, SHORT, TAIL, TAIL2, STUB,
+    Label NEXT_DWORD, SHORT, TAIL, TAIL2, STUB, EARLY_OUT,
         CSET_EQ, LAST_CHECK;
     mov(result, false);
     cbz(a1, DONE);
@@ -5259,14 +5224,10 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
     cbnz(tmp5, DONE);
     RuntimeAddress stub = RuntimeAddress(StubRoutines::aarch64::large_array_equals());
     assert(stub.target() != NULL, "array_equals_long stub has not been generated");
-    address tpc = trampoline_call(stub);
-    if (tpc == NULL) {
-      DEBUG_ONLY(reset_labels5(SHORT, LAST_CHECK, CSET_EQ, SAME, DONE));
-      postcond(pc() == badAddress);
-      return NULL;
-    }
+    trampoline_call(stub);
     b(DONE);
 
+    bind(EARLY_OUT);
     // (a1 != null && a2 == null) || (a1 != null && a2 != null && a1 == a2)
     // so, if a2 == null => return false(0), else return true, so we can return a2
     mov(result, a2);
@@ -5293,8 +5254,6 @@ address MacroAssembler::arrays_equals(Register a1, Register a2, Register tmp3,
   bind(DONE);
 
   BLOCK_COMMENT("} array_equals");
-  postcond(pc() != badAddress);
-  return pc();
 }
 
 // Compare Strings
@@ -5402,7 +5361,7 @@ const int MacroAssembler::zero_words_block_size = 8;
 // cnt:   Count in HeapWords.
 //
 // ptr, cnt, rscratch1, and rscratch2 are clobbered.
-address MacroAssembler::zero_words(Register ptr, Register cnt)
+void MacroAssembler::zero_words(Register ptr, Register cnt)
 {
   assert(is_power_of_2(zero_words_block_size), "adjust this");
   assert(ptr == r10 && cnt == r11, "mismatch in register usage");
@@ -5412,15 +5371,10 @@ address MacroAssembler::zero_words(Register ptr, Register cnt)
   Label around, done, done16;
   br(LO, around);
   {
-    RuntimeAddress zero_blocks = RuntimeAddress(StubRoutines::aarch64::zero_blocks());
+    RuntimeAddress zero_blocks =  RuntimeAddress(StubRoutines::aarch64::zero_blocks());
     assert(zero_blocks.target() != NULL, "zero_blocks stub has not been generated");
     if (StubRoutines::aarch64::complete()) {
-      address tpc = trampoline_call(zero_blocks);
-      if (tpc == NULL) {
-        DEBUG_ONLY(reset_labels1(around));
-        postcond(pc() == badAddress);
-        return NULL;
-      }
+      trampoline_call(zero_blocks);
     } else {
       bl(zero_blocks);
     }
@@ -5441,29 +5395,26 @@ address MacroAssembler::zero_words(Register ptr, Register cnt)
     bind(l);
   }
   BLOCK_COMMENT("} zero_words");
-  postcond(pc() != badAddress);
-  return pc();
 }
 
 // base:         Address of a buffer to be zeroed, 8 bytes aligned.
 // cnt:          Immediate count in HeapWords.
 #define SmallArraySize (18 * BytesPerLong)
-void MacroAssembler::zero_words(Register base, uint64_t cnt)
+void MacroAssembler::zero_words(Register base, u_int64_t cnt)
 {
   BLOCK_COMMENT("zero_words {");
   int i = cnt & 1;  // store any odd word to start
   if (i) str(zr, Address(base));
 
   if (cnt <= SmallArraySize / BytesPerLong) {
-    for (; i < (int)cnt; i += 2) {
+    for (; i < (int)cnt; i += 2)
       stp(zr, zr, Address(base, i * wordSize));
-    }
   } else {
     const int unroll = 4; // Number of stp(zr, zr) instructions we'll unroll
     int remainder = cnt % (2 * unroll);
-    for (; i < remainder; i += 2) {
+    for (; i < remainder; i += 2)
       stp(zr, zr, Address(base, i * wordSize));
-    }
+
     Label loop;
     Register cnt_reg = rscratch1;
     Register loop_base = rscratch2;
@@ -5473,9 +5424,8 @@ void MacroAssembler::zero_words(Register base, uint64_t cnt)
     add(loop_base, base, (remainder - 2) * wordSize);
     bind(loop);
     sub(cnt_reg, cnt_reg, 2 * unroll);
-    for (i = 1; i < unroll; i++) {
+    for (i = 1; i < unroll; i++)
       stp(zr, zr, Address(loop_base, 2 * i * wordSize));
-    }
     stp(zr, zr, Address(pre(loop_base, 2 * unroll * wordSize)));
     cbnz(cnt_reg, loop);
   }
@@ -5691,9 +5641,9 @@ void MacroAssembler::encode_iso_array(Register src, Register dst,
 
 
 // Inflate byte[] array to char[].
-address MacroAssembler::byte_array_inflate(Register src, Register dst, Register len,
-                                           FloatRegister vtmp1, FloatRegister vtmp2,
-                                           FloatRegister vtmp3, Register tmp4) {
+void MacroAssembler::byte_array_inflate(Register src, Register dst, Register len,
+                                        FloatRegister vtmp1, FloatRegister vtmp2, FloatRegister vtmp3,
+                                        Register tmp4) {
   Label big, done, after_init, to_stub;
 
   assert_different_registers(src, dst, len, tmp4, rscratch1);
@@ -5730,14 +5680,9 @@ address MacroAssembler::byte_array_inflate(Register src, Register dst, Register
 
   if (SoftwarePrefetchHintDistance >= 0) {
     bind(to_stub);
-      RuntimeAddress stub = RuntimeAddress(StubRoutines::aarch64::large_byte_array_inflate());
+      RuntimeAddress stub =  RuntimeAddress(StubRoutines::aarch64::large_byte_array_inflate());
       assert(stub.target() != NULL, "large_byte_array_inflate stub has not been generated");
-      address tpc = trampoline_call(stub);
-      if (tpc == NULL) {
-        DEBUG_ONLY(reset_labels2(big, done));
-        postcond(pc() == badAddress);
-        return NULL;
-      }
+      trampoline_call(stub);
       b(after_init);
   }
 
@@ -5791,8 +5736,6 @@ address MacroAssembler::byte_array_inflate(Register src, Register dst, Register
   strq(vtmp3, Address(dst, -16));
 
   bind(done);
-  postcond(pc() != badAddress);
-  return pc();
 }
 
 // Compress char[] array to byte[].
@@ -5811,14 +5754,10 @@ void MacroAssembler::char_array_compress(Register src, Register dst, Register le
 // by the call to JavaThread::aarch64_get_thread_helper() or, indeed,
 // the call setup code.
 //
-// On Linux, aarch64_get_thread_helper() clobbers only r0, r1, and flags.
-// On other systems, the helper is a usual C function.
+// aarch64_get_thread_helper() clobbers only r0, r1, and flags.
 //
 void MacroAssembler::get_thread(Register dst) {
-  RegSet saved_regs =
-    LINUX_ONLY(RegSet::range(r0, r1)  + lr - dst)
-    NOT_LINUX (RegSet::range(r0, r17) + lr - dst);
-
+  RegSet saved_regs = RegSet::range(r0, r1) + BSD_ONLY(RegSet::range(r2, r17)) + lr - dst;
   push(saved_regs, sp);
 
   mov(lr, CAST_FROM_FN_PTR(address, JavaThread::aarch64_get_thread_helper));