JBR-2834 Typing happens in the editor when comparing editor to clipboard

Reviewed-by: rhalade, mschoene, serb, psadhukhan

.hgtags

@@ -598,3 +598,15 @@ e42c6d1a1993c720a4643140190bb1ba6f1bbf9f jdk-11.0.8+6
 59f8565ee5e224697a9e09ee2c557836733bc579 jdk-11.0.8+9
 0b0d55cb09b29360ab254edeef32a3b386e9713e jdk-11.0.8+10
 0b0d55cb09b29360ab254edeef32a3b386e9713e jdk-11.0.8-ga
+5cc275af8419178813299cc0ed81a2a85dadfdcd jdk-11.0.9+1
+3112657edde9491fb83f098f1a8b7e9275bcb2f7 jdk-11.0.9+2
+d8a0513b92ee262d4e64c1e13d43e1b3f3e5c5d5 jdk-11.0.9+3
+cb299db4a5698b814f6b3ba1f3d73d01f6a0e1f6 jdk-11.0.9+4
+55237fa85afb404bc0dc0f4948a6459d8d3e5dac jdk-11.0.9+5
+c07e785e36f587b95e151de382844cea3d1a5868 jdk-11.0.9+6
+1ba4c16a8afa3f5aaa7830fc1f14a0137cc2553b jdk-11.0.9+7
+8711e8554e15ae2fa38718d5c7dc858da10e8a4a jdk-11.0.9+8
+e872676174c7f171a9864becba83cb783cfec9d0 jdk-11.0.9+9
+6ac1b68e7c0034e08a96d7d37e93e5075a6e8d61 jdk-11.0.9+10
+4397fa4529b2794ddcdf3445c0611fe383243fb4 jdk-11.0.9+11
+4397fa4529b2794ddcdf3445c0611fe383243fb4 jdk-11.0.9-ga

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

@@ -63,7 +63,7 @@ function create_jbr {
 
   if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]; then
     cp -R $BASE_DIR/$JBR_BUNDLE $BASE_DIR/jbr
-    cp -R ${JCEF_PATH}/* $BASE_DIR/$JBR_BUNDLE/lib || exit $?
+    rsync -av ${JCEF_PATH}/ $BASE_DIR/$JBR_BUNDLE/lib --exclude="modular-sdk" || do_exit $?
   fi
   grep -v "^JAVA_VERSION" $JSDK/release | grep -v "^MODULES" >> $BASE_DIR/$JBR_BUNDLE/release
 
@@ -140,7 +140,7 @@ rm -rf ${BASE_DIR}/${JBRSDK_BUNDLE}
 cp -r $JSDK $BASE_DIR/$JBRSDK_BUNDLE || do_exit $?
 
 if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]; then
-  cp -R ${JCEF_PATH}/* $BASE_DIR/$JBRSDK_BUNDLE/lib || do_exit $?
+  rsync -av ${JCEF_PATH}/ $BASE_DIR/$JBRSDK_BUNDLE/lib --exclude="modular-sdk" || do_exit $?
 fi
 if [ "${bundle_type}" == "jcef" ] || [ "${bundle_type}" == "fd" ]; then
   echo Creating $JBSDK.tar.gz ...

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

@@ -1,7 +1,7 @@
-From 4f9a0ded48f51bdfb3ed7cc18df812c456d48a8c Mon Sep 17 00:00:00 2001
+From b36887fca0b0b251c914567d0ee2871c6d786c09 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/50] Apply basic dcevm11 patch
+Subject: [PATCH 01/17] Apply basic dcevm11 patch
 
 ---
  src/hotspot/share/ci/ciObjectFactory.cpp      |   25 +
@@ -14,8 +14,9 @@ Subject: [PATCH 01/50] Apply basic dcevm11 patch
  .../share/classfile/classLoaderExt.cpp        |    1 +
  src/hotspot/share/classfile/dictionary.cpp    |   46 +-
  src/hotspot/share/classfile/dictionary.hpp    |   10 +
- src/hotspot/share/classfile/javaClasses.cpp   |   51 +
- src/hotspot/share/classfile/javaClasses.hpp   |   52 +-
+ src/hotspot/share/classfile/javaClasses.cpp   |   63 +
+ src/hotspot/share/classfile/javaClasses.hpp   |   54 +-
+ .../share/classfile/javaClasses.inline.hpp    |    8 +
  src/hotspot/share/classfile/klassFactory.cpp  |    3 +
  src/hotspot/share/classfile/klassFactory.hpp  |    1 +
  .../share/classfile/loaderConstraints.cpp     |   15 +-
@@ -66,7 +67,7 @@ Subject: [PATCH 01/50] Apply basic dcevm11 patch
  src/hotspot/share/runtime/mutexLocker.cpp     |    5 +-
  src/hotspot/share/runtime/mutexLocker.hpp     |    2 +
  src/hotspot/share/runtime/reflection.cpp      |    6 +
- 62 files changed, 3530 insertions(+), 74 deletions(-)
+ 63 files changed, 3552 insertions(+), 74 deletions(-)
  create mode 100644 src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
  create mode 100644 src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 
@@ -125,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 0d4862dd449..ea150df9104 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,
@@ -137,7 +138,7 @@ index 0d4862dd449..ea150df9104 100644
        if (!interf->is_interface()) {
          THROW_MSG(vmSymbols::java_lang_IncompatibleClassChangeError(),
                    err_msg("class %s can not implement %s, because it is not an interface (%s)",
-@@ -3747,7 +3749,7 @@ const InstanceKlass* ClassFileParser::parse_super_class(ConstantPool* const cp,
+@@ -3826,7 +3828,7 @@ const InstanceKlass* ClassFileParser::parse_super_class(ConstantPool* const cp,
      // However, make sure it is not an array type.
      bool is_array = false;
      if (cp->tag_at(super_class_index).is_klass()) {
@@ -146,7 +147,7 @@ index 0d4862dd449..ea150df9104 100644
        if (need_verify)
          is_array = super_klass->is_array_klass();
      } else if (need_verify) {
-@@ -4415,7 +4417,10 @@ void ClassFileParser::set_precomputed_flags(InstanceKlass* ik) {
+@@ -4494,7 +4496,10 @@ void ClassFileParser::set_precomputed_flags(InstanceKlass* ik) {
    if (!_has_empty_finalizer) {
      if (_has_finalizer ||
          (super != NULL && super->has_finalizer())) {
@@ -158,7 +159,7 @@ index 0d4862dd449..ea150df9104 100644
      }
    }
  
-@@ -5792,6 +5797,7 @@ ClassFileParser::ClassFileParser(ClassFileStream* stream,
+@@ -5872,6 +5877,7 @@ ClassFileParser::ClassFileParser(ClassFileStream* stream,
                                   const InstanceKlass* host_klass,
                                   GrowableArray<Handle>* cp_patches,
                                   Publicity pub_level,
@@ -166,7 +167,7 @@ index 0d4862dd449..ea150df9104 100644
                                   TRAPS) :
    _stream(stream),
    _requested_name(name),
-@@ -5850,7 +5856,8 @@ ClassFileParser::ClassFileParser(ClassFileStream* stream,
+@@ -5930,7 +5936,8 @@ ClassFileParser::ClassFileParser(ClassFileStream* stream,
    _has_finalizer(false),
    _has_empty_finalizer(false),
    _has_vanilla_constructor(false),
@@ -176,7 +177,7 @@ index 0d4862dd449..ea150df9104 100644
  
    _class_name = name != NULL ? name : vmSymbols::unknown_class_name();
  
-@@ -6251,14 +6258,15 @@ void ClassFileParser::post_process_parsed_stream(const ClassFileStream* const st
+@@ -6331,14 +6338,15 @@ void ClassFileParser::post_process_parsed_stream(const ClassFileStream* const st
          CHECK);
      }
      Handle loader(THREAD, _loader_data->class_loader());
@@ -195,7 +196,7 @@ index 0d4862dd449..ea150df9104 100644
    if (_super_klass != NULL) {
      if (_super_klass->has_nonstatic_concrete_methods()) {
 diff --git a/src/hotspot/share/classfile/classFileParser.hpp b/src/hotspot/share/classfile/classFileParser.hpp
-index 9f7204be9b6..3db14b678f3 100644
+index 3bdfd34e39f..d792ab4bb3f 100644
 --- a/src/hotspot/share/classfile/classFileParser.hpp
 +++ b/src/hotspot/share/classfile/classFileParser.hpp
 @@ -115,6 +115,9 @@ class ClassFileParser {
@@ -208,7 +209,7 @@ index 9f7204be9b6..3db14b678f3 100644
    enum { fixed_buffer_size = 128 };
    u_char _linenumbertable_buffer[fixed_buffer_size];
  
-@@ -496,6 +499,9 @@ class ClassFileParser {
+@@ -500,6 +503,9 @@ class ClassFileParser {
                       FieldLayoutInfo* info,
                       TRAPS);
  
@@ -218,7 +219,7 @@ index 9f7204be9b6..3db14b678f3 100644
   public:
    ClassFileParser(ClassFileStream* stream,
                    Symbol* name,
-@@ -504,6 +510,7 @@ class ClassFileParser {
+@@ -508,6 +514,7 @@ class ClassFileParser {
                    const InstanceKlass* host_klass,
                    GrowableArray<Handle>* cp_patches,
                    Publicity pub_level,
@@ -226,7 +227,7 @@ index 9f7204be9b6..3db14b678f3 100644
                    TRAPS);
  
    ~ClassFileParser();
-@@ -532,6 +539,7 @@ class ClassFileParser {
+@@ -536,6 +543,7 @@ class ClassFileParser {
    ClassLoaderData* loader_data() const { return _loader_data; }
    const Symbol* class_name() const { return _class_name; }
    const InstanceKlass* super_klass() const { return _super_klass; }
@@ -235,7 +236,7 @@ index 9f7204be9b6..3db14b678f3 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 2c73ef93934..28ed54b93e1 100644
+index f0cf1fb7cb1..5713bb9e98c 100644
 --- a/src/hotspot/share/classfile/classLoader.cpp
 +++ b/src/hotspot/share/classfile/classLoader.cpp
 @@ -1501,6 +1501,7 @@ InstanceKlass* ClassLoader::load_class(Symbol* name, bool search_append_only, TR
@@ -448,10 +449,10 @@ 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 438e7aa4ec9..a89443d22ea 100644
+index 6d320fb0d30..1004f41b277 100644
 --- a/src/hotspot/share/classfile/javaClasses.cpp
 +++ b/src/hotspot/share/classfile/javaClasses.cpp
-@@ -2443,6 +2443,8 @@ void java_lang_Throwable::fill_in_stack_trace(Handle throwable, const methodHand
+@@ -2444,6 +2444,8 @@ void java_lang_Throwable::fill_in_stack_trace(Handle throwable, const methodHand
          skip_throwableInit_check = true;
        }
      }
@@ -460,7 +461,7 @@ index 438e7aa4ec9..a89443d22ea 100644
      if (method->is_hidden()) {
        if (skip_hidden)  continue;
      }
-@@ -3625,6 +3627,50 @@ void java_lang_invoke_DirectMethodHandle::serialize_offsets(SerializeClosure* f)
+@@ -3626,6 +3628,62 @@ void java_lang_invoke_DirectMethodHandle::serialize_offsets(SerializeClosure* f)
  }
  #endif
  
@@ -478,14 +479,20 @@ index 438e7aa4ec9..a89443d22ea 100644
 +  dmh->long_field_put(_static_offset_offset, static_offset);
 +}
 +
++#define DIRECTMETHODHANDLE_STATIC_ACCESSOR_FIELDS_DO(macro) \
++  macro(_static_offset_offset, k, vmSymbols::static_offset_name(), long_signature, false)
 +
 +void java_lang_invoke_DirectMethodHandle_StaticAccessor::compute_offsets() {
-+  Klass* klass_oop = SystemDictionary::DirectMethodHandle_StaticAccessor_klass();
-+  if (klass_oop != NULL) {
-+    compute_offset(_static_offset_offset, InstanceKlass::cast(klass_oop), vmSymbols::static_offset_name(), vmSymbols::long_signature());
-+  }
++  InstanceKlass* k = SystemDictionary::DirectMethodHandle_StaticAccessor_klass();
++  DIRECTMETHODHANDLE_STATIC_ACCESSOR_FIELDS_DO(FIELD_COMPUTE_OFFSET);
 +}
 +
++#if INCLUDE_CDS
++void java_lang_invoke_DirectMethodHandle_StaticAccessor::serialize_offsets(SerializeClosure* f) {
++  DIRECTMETHODHANDLE_STATIC_ACCESSOR_FIELDS_DO(FIELD_SERIALIZE_OFFSET);
++}
++#endif
++
 +// Support for java_lang_invoke_DirectMethodHandle$Accessor
 +
 +int java_lang_invoke_DirectMethodHandle_Accessor::_field_offset_offset;
@@ -500,18 +507,24 @@ index 438e7aa4ec9..a89443d22ea 100644
 +  dmh->int_field_put(_field_offset_offset, field_offset);
 +}
 +
++#define DIRECTMETHODHANDLE_ACCESSOR_FIELDS_DO(macro) \
++  macro(_field_offset_offset, k, vmSymbols::field_offset_name(), int_signature, false)
 +
 +void java_lang_invoke_DirectMethodHandle_Accessor::compute_offsets() {
-+  Klass* klass_oop = SystemDictionary::DirectMethodHandle_Accessor_klass();
-+  if (klass_oop != NULL) {
-+    compute_offset(_field_offset_offset, InstanceKlass::cast(klass_oop), vmSymbols::field_offset_name(), vmSymbols::int_signature());
-+  }
++  InstanceKlass* k = SystemDictionary::DirectMethodHandle_Accessor_klass();
++  DIRECTMETHODHANDLE_ACCESSOR_FIELDS_DO(FIELD_COMPUTE_OFFSET);
 +}
++
++#if INCLUDE_CDS
++void java_lang_invoke_DirectMethodHandle_Accessor::serialize_offsets(SerializeClosure* f) {
++  DIRECTMETHODHANDLE_ACCESSOR_FIELDS_DO(FIELD_SERIALIZE_OFFSET);
++}
++#endif
 +
  // Support for java_lang_invoke_MethodHandle
  
  int java_lang_invoke_MethodHandle::_type_offset;
-@@ -3811,6 +3857,11 @@ void java_lang_invoke_ResolvedMethodName::set_vmtarget(oop resolved_method, Meth
+@@ -3812,6 +3870,11 @@ void java_lang_invoke_ResolvedMethodName::set_vmtarget(oop resolved_method, Meth
    resolved_method->address_field_put(_vmtarget_offset, (address)m);
  }
  
@@ -524,10 +537,19 @@ index 438e7aa4ec9..a89443d22ea 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 bd9cdca3fe3..ceb1670df5d 100644
+index bd9cdca3fe3..da004d1b307 100644
 --- a/src/hotspot/share/classfile/javaClasses.hpp
 +++ b/src/hotspot/share/classfile/javaClasses.hpp
-@@ -253,10 +253,10 @@ class java_lang_Class : AllStatic {
+@@ -67,6 +67,8 @@
+   f(java_lang_invoke_LambdaForm) \
+   f(java_lang_invoke_MethodType) \
+   f(java_lang_invoke_CallSite) \
++  f(java_lang_invoke_DirectMethodHandle_StaticAccessor) \
++  f(java_lang_invoke_DirectMethodHandle_Accessor) \
+   f(java_lang_invoke_MethodHandleNatives_CallSiteContext) \
+   f(java_security_AccessControlContext) \
+   f(java_lang_reflect_AccessibleObject) \
+@@ -253,10 +255,10 @@ class java_lang_Class : AllStatic {
    static void set_init_lock(oop java_class, oop init_lock);
    static void set_protection_domain(oop java_class, oop protection_domain);
    static void set_class_loader(oop java_class, oop class_loader);
@@ -539,7 +561,7 @@ index bd9cdca3fe3..ceb1670df5d 100644
    static void allocate_fixup_lists();
    static void compute_offsets();
  
-@@ -1055,6 +1055,55 @@ class java_lang_invoke_DirectMethodHandle: AllStatic {
+@@ -1055,6 +1057,55 @@ class java_lang_invoke_DirectMethodHandle: AllStatic {
    static int member_offset_in_bytes()           { return _member_offset; }
  };
  
@@ -562,9 +584,9 @@ index bd9cdca3fe3..ceb1670df5d 100644
 +  static bool is_subclass(Klass* klass) {
 +    return klass->is_subclass_of(SystemDictionary::DirectMethodHandle_StaticAccessor_klass());
 +  }
-+  static bool is_instance(oop obj) {
-+    return obj != NULL && is_subclass(obj->klass());
-+  }
++  static bool is_instance(oop obj);
++
++  static void serialize_offsets(SerializeClosure* f) NOT_CDS_RETURN;
 +};
 +
 +// Interface to java.lang.invoke.DirectMethodHandle$Accessor objects
@@ -586,16 +608,16 @@ index bd9cdca3fe3..ceb1670df5d 100644
 +  static bool is_subclass(Klass* klass) {
 +    return klass->is_subclass_of(SystemDictionary::DirectMethodHandle_Accessor_klass());
 +  }
-+  static bool is_instance(oop obj) {
-+    return obj != NULL && is_subclass(obj->klass());
-+  }
++  static bool is_instance(oop obj);
++
++  static void serialize_offsets(SerializeClosure* f) NOT_CDS_RETURN;
 +};
 +
 +
  // Interface to java.lang.invoke.LambdaForm objects
  // (These are a private interface for managing adapter code generation.)
  
-@@ -1106,6 +1155,7 @@ class java_lang_invoke_ResolvedMethodName : AllStatic {
+@@ -1106,6 +1157,7 @@ class java_lang_invoke_ResolvedMethodName : AllStatic {
  
    static Method* vmtarget(oop resolved_method);
    static void set_vmtarget(oop resolved_method, Method* method);
@@ -603,6 +625,25 @@ index bd9cdca3fe3..ceb1670df5d 100644
  
    // find or create resolved member name
    static oop find_resolved_method(const methodHandle& m, TRAPS);
+diff --git a/src/hotspot/share/classfile/javaClasses.inline.hpp b/src/hotspot/share/classfile/javaClasses.inline.hpp
+index 6c5787f4b70..ba9cffa8c62 100644
+--- a/src/hotspot/share/classfile/javaClasses.inline.hpp
++++ b/src/hotspot/share/classfile/javaClasses.inline.hpp
+@@ -175,6 +175,14 @@ inline bool java_lang_invoke_DirectMethodHandle::is_instance(oop obj) {
+   return obj != NULL && is_subclass(obj->klass());
+ }
+ 
++inline bool java_lang_invoke_DirectMethodHandle_StaticAccessor::is_instance(oop obj) {
++  return obj != NULL && is_subclass(obj->klass());
++}
++
++inline bool java_lang_invoke_DirectMethodHandle_Accessor::is_instance(oop obj) {
++  return obj != NULL && is_subclass(obj->klass());
++}
++
+ inline bool java_lang_Module::is_instance(oop obj) {
+   return obj != NULL && obj->klass() == SystemDictionary::Module_klass();
+ }
 diff --git a/src/hotspot/share/classfile/klassFactory.cpp b/src/hotspot/share/classfile/klassFactory.cpp
 index 3614480f16b..355016c8f61 100644
 --- a/src/hotspot/share/classfile/klassFactory.cpp
@@ -691,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 91dc9faeccb..9dbd6cc9c12 100644
+index 5c8ff453823..669de5e56a5 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
@@ -783,7 +824,7 @@ index 91dc9faeccb..9dbd6cc9c12 100644
    } );
  
    return k;
-@@ -1554,11 +1567,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
    }
  }
  
@@ -797,7 +838,7 @@ index 91dc9faeccb..9dbd6cc9c12 100644
  
   // for bootstrap and other parallel classloaders don't acquire lock,
   // use placeholder token
-@@ -1583,7 +1597,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);
@@ -810,7 +851,7 @@ index 91dc9faeccb..9dbd6cc9c12 100644
  
    // Register class just loaded with class loader (placed in Vector)
    // Note we do this before updating the dictionary, as this can
-@@ -1617,7 +1635,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
@@ -819,7 +860,7 @@ index 91dc9faeccb..9dbd6cc9c12 100644
        assert(THREAD->is_Java_thread(), "thread->is_Java_thread()");
        JvmtiExport::post_class_load((JavaThread *) THREAD, k);
  
-@@ -1695,7 +1713,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
      }
    }
  
@@ -828,7 +869,7 @@ index 91dc9faeccb..9dbd6cc9c12 100644
  
    Handle linkage_exception = Handle(); // null handle
  
-@@ -1818,6 +1836,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);
  }
  
@@ -847,7 +888,7 @@ index 91dc9faeccb..9dbd6cc9c12 100644
  // ----------------------------------------------------------------------------
  // GC support
  
-@@ -2089,7 +2119,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");
@@ -857,10 +898,10 @@ index 91dc9faeccb..9dbd6cc9c12 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 d38dd0fd003..717f34ce9a0 100644
+index 649b321a6a4..06f6c869d63 100644
 --- a/src/hotspot/share/classfile/systemDictionary.hpp
 +++ b/src/hotspot/share/classfile/systemDictionary.hpp
-@@ -158,6 +158,8 @@ class OopStorage;
+@@ -161,6 +161,8 @@ class OopStorage;
                                                                                                                           \
    /* support for dynamic typing; it's OK if these are NULL in earlier JDKs */                                            \
    do_klass(DirectMethodHandle_klass,                    java_lang_invoke_DirectMethodHandle,       Opt                 ) \
@@ -869,7 +910,7 @@ index d38dd0fd003..717f34ce9a0 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                 ) \
-@@ -315,6 +317,7 @@ public:
+@@ -318,6 +320,7 @@ public:
                                              Handle class_loader,
                                              Handle protection_domain,
                                              ClassFileStream* st,
@@ -877,9 +918,9 @@ index d38dd0fd003..717f34ce9a0 100644
                                              TRAPS);
  
    // Lookup an already loaded class. If not found NULL is returned.
-@@ -452,6 +455,10 @@ public:
-   }
-   static BasicType box_klass_type(Klass* k);  // inverse of box_klass
+@@ -462,6 +465,10 @@ public:
+   static bool is_well_known_klass(Symbol* class_name);
+ #endif
  
 +  // Enhanced class redefinition
 +  static void remove_from_hierarchy(InstanceKlass* k);
@@ -888,7 +929,7 @@ index d38dd0fd003..717f34ce9a0 100644
  protected:
    // Returns the class loader data to be used when looking up/updating the
    // system dictionary.
-@@ -645,7 +652,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);
@@ -898,7 +939,7 @@ index d38dd0fd003..717f34ce9a0 100644
                                                  Handle class_loader,
                                                  InstanceKlass* k, TRAPS);
 diff --git a/src/hotspot/share/classfile/systemDictionaryShared.cpp b/src/hotspot/share/classfile/systemDictionaryShared.cpp
-index ed75ecd9261..1f1441f3ffb 100644
+index ad638e26579..32de261588a 100644
 --- a/src/hotspot/share/classfile/systemDictionaryShared.cpp
 +++ b/src/hotspot/share/classfile/systemDictionaryShared.cpp
 @@ -520,7 +520,7 @@ InstanceKlass* SystemDictionaryShared::find_or_load_shared_class(
@@ -936,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 73645b42857..e2bac31b27f 100644
+index 44cf2583eb9..41e9a84cd69 100644
 --- a/src/hotspot/share/classfile/vmSymbols.hpp
 +++ b/src/hotspot/share/classfile/vmSymbols.hpp
-@@ -284,6 +284,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")      \
@@ -948,7 +989,7 @@ index 73645b42857..e2bac31b27f 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")            \
-@@ -444,6 +446,12 @@
+@@ -446,6 +448,12 @@
    template(module_entry_name,                         "module_entry")                             \
    template(resolved_references_name,                  "<resolved_references>")                    \
    template(init_lock_name,                            "<init_lock>")                              \
@@ -962,7 +1003,7 @@ index 73645b42857..e2bac31b27f 100644
    /* name symbols needed by intrinsics */                                                         \
    VM_INTRINSICS_DO(VM_INTRINSIC_IGNORE, VM_SYMBOL_IGNORE, template, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE) \
 diff --git a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
-index 7b9096d73be..a93f764f1b9 100644
+index 17d563338b8..4c9918627a2 100644
 --- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
 +++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
 @@ -376,6 +376,12 @@ CompactibleFreeListSpace::CompactibleFreeListSpace(BlockOffsetSharedArray* bs, M
@@ -978,7 +1019,7 @@ index 7b9096d73be..a93f764f1b9 100644
  // Like CompactibleSpace forward() but always calls cross_threshold() to
  // update the block offset table.  Removed initialize_threshold call because
  // CFLS does not use a block offset array for contiguous spaces.
-@@ -2190,7 +2196,8 @@ CompactibleFreeListSpace::refillLinearAllocBlock(LinearAllocBlock* blk) {
+@@ -2203,7 +2209,8 @@ CompactibleFreeListSpace::refillLinearAllocBlock(LinearAllocBlock* blk) {
  
  // Support for compaction
  void CompactibleFreeListSpace::prepare_for_compaction(CompactPoint* cp) {
@@ -988,7 +1029,7 @@ index 7b9096d73be..a93f764f1b9 100644
    // Prepare_for_compaction() uses the space between live objects
    // so that later phase can skip dead space quickly.  So verification
    // of the free lists doesn't work after.
-@@ -2208,7 +2215,7 @@ void CompactibleFreeListSpace::adjust_pointers() {
+@@ -2221,7 +2228,7 @@ void CompactibleFreeListSpace::adjust_pointers() {
  }
  
  void CompactibleFreeListSpace::compact() {
@@ -1195,10 +1236,10 @@ index cf96ade0ef0..b6187dae4d0 100644
  
    static void follow_klass(Klass* klass);
 diff --git a/src/hotspot/share/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
-index ddc84c1d2a4..8aac2b39e1e 100644
+index 8c42e43b00d..9779df92447 100644
 --- a/src/hotspot/share/gc/shared/gcConfig.cpp
 +++ b/src/hotspot/share/gc/shared/gcConfig.cpp
-@@ -101,7 +101,10 @@ void GCConfig::fail_if_unsupported_gc_is_selected() {
+@@ -106,7 +106,10 @@ void GCConfig::fail_if_unsupported_gc_is_selected() {
  }
  
  void GCConfig::select_gc_ergonomically() {
@@ -1878,7 +1919,7 @@ index 2a93500b794..2a9eb978b43 100644
  
    // RedefineClasses support
 diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index 9ba36f2de3f..8a262bc3735 100644
+index c6752eb373f..e9c1d4e5226 100644
 --- a/src/hotspot/share/oops/instanceKlass.cpp
 +++ b/src/hotspot/share/oops/instanceKlass.cpp
 @@ -832,7 +832,8 @@ bool InstanceKlass::link_class_impl(bool throw_verifyerror, TRAPS) {
@@ -1972,7 +2013,7 @@ index 9ba36f2de3f..8a262bc3735 100644
  }
  
  #ifndef PRODUCT
-@@ -3532,7 +3582,7 @@ void InstanceKlass::verify_on(outputStream* st) {
+@@ -3552,7 +3602,7 @@ void InstanceKlass::verify_on(outputStream* st) {
      }
  
      guarantee(sib->is_klass(), "should be klass");
@@ -2145,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 7ca9b4b90ca..bee69f9cec6 100644
+index 916772c0b10..ed6f769bf1b 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
-@@ -1405,6 +1405,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);
@@ -2157,7 +2198,7 @@ index 7ca9b4b90ca..bee69f9cec6 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");
-@@ -2099,6 +2101,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) {
@@ -2219,10 +2260,10 @@ index f9a69ef0c8b..231ada3f0ab 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 797b022d5e5..eb4b7622820 100644
+index 24c66ab3918..82b359ee9a3 100644
 --- a/src/hotspot/share/prims/jvm.cpp
 +++ b/src/hotspot/share/prims/jvm.cpp
-@@ -927,6 +927,7 @@ static jclass jvm_define_class_common(JNIEnv *env, const char *name,
+@@ -935,6 +935,7 @@ static jclass jvm_define_class_common(JNIEnv *env, const char *name,
                                                     class_loader,
                                                     protection_domain,
                                                     &st,
@@ -2232,7 +2273,7 @@ index 797b022d5e5..eb4b7622820 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..83c0952de37
+index 00000000000..80c31135487
 --- /dev/null
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -0,0 +1,2255 @@
@@ -4493,7 +4534,7 @@ index 00000000000..83c0952de37
 +}
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 new file mode 100644
-index 00000000000..b712d69a193
+index 00000000000..3f95cf42645
 --- /dev/null
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 @@ -0,0 +1,202 @@
@@ -4765,10 +4806,10 @@ index 1dd911fd8d8..bc6ebb2d4af 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 c2e86c2406a..2463c1f7bdb 100644
+index 375aa5f54f8..08f910bd2ac 100644
 --- a/src/hotspot/share/prims/jvmtiExport.cpp
 +++ b/src/hotspot/share/prims/jvmtiExport.cpp
-@@ -2799,7 +2799,7 @@ JvmtiDynamicCodeEventCollector::JvmtiDynamicCodeEventCollector() : _code_blobs(N
+@@ -2813,7 +2813,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() {
@@ -4778,7 +4819,7 @@ index c2e86c2406a..2463c1f7bdb 100644
   if (_code_blobs != NULL) {
     for (int i=0; i<_code_blobs->length(); i++) {
 diff --git a/src/hotspot/share/prims/jvmtiExport.hpp b/src/hotspot/share/prims/jvmtiExport.hpp
-index 99288f7590c..bb58ad9432c 100644
+index 557d10543c6..ef8c266bc6e 100644
 --- a/src/hotspot/share/prims/jvmtiExport.hpp
 +++ b/src/hotspot/share/prims/jvmtiExport.hpp
 @@ -178,6 +178,7 @@ class JvmtiExport : public AllStatic {
@@ -4894,10 +4935,10 @@ index c071e0641d4..a9057893368 100644
  }
  #endif // INCLUDE_JVMTI
 diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index 740c44cded4..ca57b524593 100644
+index 3e7d48ad5a3..a11dfe48dd6 100644
 --- a/src/hotspot/share/runtime/arguments.cpp
 +++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -2035,6 +2035,36 @@ unsigned int addopens_count = 0;
+@@ -2033,6 +2033,36 @@ unsigned int addopens_count = 0;
  unsigned int addmods_count = 0;
  unsigned int patch_mod_count = 0;
  
@@ -4934,7 +4975,7 @@ index 740c44cded4..ca57b524593 100644
  // Check the consistency of vm_init_args
  bool Arguments::check_vm_args_consistency() {
    // Method for adding checks for flag consistency.
-@@ -2051,6 +2081,8 @@ bool Arguments::check_vm_args_consistency() {
+@@ -2049,6 +2079,8 @@ bool Arguments::check_vm_args_consistency() {
      status = false;
    }
  
@@ -4944,10 +4985,10 @@ index 740c44cded4..ca57b524593 100644
  #if INCLUDE_NMT
      if (MemTracker::tracking_level() == NMT_off) {
 diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
-index 72bfd2bf9e3..46450cce5c9 100644
+index bd439aab073..cc7f71a4404 100644
 --- a/src/hotspot/share/runtime/arguments.hpp
 +++ b/src/hotspot/share/runtime/arguments.hpp
-@@ -505,6 +505,7 @@ class Arguments : AllStatic {
+@@ -506,6 +506,7 @@ class Arguments : AllStatic {
    static bool process_settings_file(const char* file_name, bool should_exist, jboolean ignore_unrecognized);
  
    static size_t conservative_max_heap_alignment() { return _conservative_max_heap_alignment; }
@@ -4956,10 +4997,10 @@ index 72bfd2bf9e3..46450cce5c9 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 6b5713be433..f3cf08fffb6 100644
+index 3cd51a1ac95..7b061359c1d 100644
 --- a/src/hotspot/share/runtime/globals.hpp
 +++ b/src/hotspot/share/runtime/globals.hpp
-@@ -2671,7 +2671,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,                     \
@@ -4973,10 +5014,10 @@ index 6b5713be433..f3cf08fffb6 100644
  #define VM_FLAGS(develop,                                                   \
                   develop_pd,                                                \
 diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
-index f5dac06750a..40a8bdd8e62 100644
+index 0267345b535..bcdd8e5d3e6 100644
 --- a/src/hotspot/share/runtime/interfaceSupport.inline.hpp
 +++ b/src/hotspot/share/runtime/interfaceSupport.inline.hpp
-@@ -277,8 +277,8 @@ class ThreadToNativeFromVM : public ThreadStateTransition {
+@@ -276,8 +276,8 @@ class ThreadToNativeFromVM : public ThreadStateTransition {
   public:
    ThreadToNativeFromVM(JavaThread *thread) : ThreadStateTransition(thread) {
      // We are leaving the VM at this point and going directly to native code.
@@ -5002,7 +5043,7 @@ index 32040586b36..0eb2fc1ec6b 100644
    _result   = result;
  
 diff --git a/src/hotspot/share/runtime/mutexLocker.cpp b/src/hotspot/share/runtime/mutexLocker.cpp
-index b258e347c94..0e60bb4b6bd 100644
+index b56b44eab69..2e1514cf750 100644
 --- a/src/hotspot/share/runtime/mutexLocker.cpp
 +++ b/src/hotspot/share/runtime/mutexLocker.cpp
 @@ -5,7 +5,7 @@
@@ -5023,7 +5064,7 @@ index b258e347c94..0e60bb4b6bd 100644
  Monitor* GCTaskManager_lock           = NULL;
  
  Mutex*   Management_lock              = NULL;
-@@ -275,6 +277,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);
@@ -5062,5 +5103,5 @@ index a49b5108821..ed789b0bc2b 100644
    // field's access bits are "access".  We assume that we've already verified
    // that current_class can access member_class.
 -- 
-2.24.3 (Apple Git-128)
+2.23.0
 

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

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

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

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

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

@@ -1,7 +1,7 @@
-From cbe52ffcde1851f2c3527825f37145428aeedc67 Mon Sep 17 00:00:00 2001
+From dcf2c02f9ce950170b0e448b8ef3aceb19732a86 Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 12 Dec 2018 19:38:28 +0100
-Subject: [PATCH 09/50] Support for Concurrent Mark Sweep (CMS) collector
+Subject: [PATCH 03/17] Support for Concurrent Mark Sweep (CMS) collector
 
 ---
  .../share/gc/cms/compactibleFreeListSpace.cpp | 139 ++++++++++++------
@@ -17,7 +17,7 @@ Subject: [PATCH 09/50] Support for Concurrent Mark Sweep (CMS) collector
  10 files changed, 135 insertions(+), 79 deletions(-)
 
 diff --git a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
-index a93f764f1b9..efaa09473a9 100644
+index 4c9918627a2..f335173576f 100644
 --- a/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
 +++ b/src/hotspot/share/gc/cms/compactibleFreeListSpace.cpp
 @@ -376,55 +376,58 @@ CompactibleFreeListSpace::CompactibleFreeListSpace(BlockOffsetSharedArray* bs, M
@@ -118,7 +118,7 @@ index a93f764f1b9..efaa09473a9 100644
      q->forward_to(oop(compact_top));
      assert(q->is_gc_marked(), "encoding the pointer should preserve the mark");
    } else {
-@@ -2196,13 +2199,60 @@ CompactibleFreeListSpace::refillLinearAllocBlock(LinearAllocBlock* blk) {
+@@ -2209,13 +2212,60 @@ CompactibleFreeListSpace::refillLinearAllocBlock(LinearAllocBlock* blk) {
  
  // Support for compaction
  void CompactibleFreeListSpace::prepare_for_compaction(CompactPoint* cp) {
@@ -181,7 +181,7 @@ index a93f764f1b9..efaa09473a9 100644
  void CompactibleFreeListSpace::adjust_pointers() {
    // In other versions of adjust_pointers(), a bail out
    // based on the amount of live data in the generation
-@@ -2215,7 +2265,12 @@ void CompactibleFreeListSpace::adjust_pointers() {
+@@ -2228,7 +2278,12 @@ void CompactibleFreeListSpace::adjust_pointers() {
  }
  
  void CompactibleFreeListSpace::compact() {
@@ -253,10 +253,10 @@ index d0ff86c8215..b4ed59f020c 100644
      }
      _rescued_oops->clear();
 diff --git a/src/hotspot/share/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
-index 8aac2b39e1e..39364a64cb2 100644
+index 9779df92447..adb0f5dd25c 100644
 --- a/src/hotspot/share/gc/shared/gcConfig.cpp
 +++ b/src/hotspot/share/gc/shared/gcConfig.cpp
-@@ -101,7 +101,7 @@ void GCConfig::fail_if_unsupported_gc_is_selected() {
+@@ -106,7 +106,7 @@ void GCConfig::fail_if_unsupported_gc_is_selected() {
  }
  
  void GCConfig::select_gc_ergonomically() {
@@ -266,7 +266,7 @@ index 8aac2b39e1e..39364a64cb2 100644
      FLAG_SET_ERGO(bool, UseSerialGC, true);
    } else if (os::is_server_class_machine()) {
 diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
-index 763abc91a39..947dff8ae0c 100644
+index bc0dd1980db..56b144b46f1 100644
 --- a/src/hotspot/share/gc/shared/space.cpp
 +++ b/src/hotspot/share/gc/shared/space.cpp
 @@ -388,11 +388,11 @@ HeapWord* CompactibleSpace::forward_compact_top(size_t size, CompactPoint* cp, H
@@ -301,7 +301,7 @@ index 763abc91a39..947dff8ae0c 100644
    size_t forward_size = size;
  
    // (DCEVM) There is a new version of the class of q => different size
-   if (oop(q)->klass()->new_version() != NULL && oop(q)->klass()->new_version()->update_information() != NULL) {
+   if (oop(q)->klass()->new_version() != NULL) {
  
      size_t new_size = oop(q)->size_given_klass(oop(q)->klass()->new_version());
 -    assert(size != new_size, "instances without changed size have to be updated prior to GC run");
@@ -360,7 +360,7 @@ index 8eb5669fb79..901c89d8a30 100644
    HeapWord* forward_rescued(CompactPoint* cp, HeapWord* compact_top);
  
 diff --git a/src/hotspot/share/gc/shared/space.inline.hpp b/src/hotspot/share/gc/shared/space.inline.hpp
-index 75d7e685edf..26e56ae6f7e 100644
+index 6b109fcd2e5..8c255d6d428 100644
 --- a/src/hotspot/share/gc/shared/space.inline.hpp
 +++ b/src/hotspot/share/gc/shared/space.inline.hpp
 @@ -163,6 +163,8 @@ inline void CompactibleSpace::scan_and_forward(SpaceType* space, CompactPoint* c
@@ -402,7 +402,7 @@ index 75d7e685edf..26e56ae6f7e 100644
          end_of_live = end;
        } else {
          // otherwise, it really is a free region.
-@@ -351,7 +354,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
+@@ -352,7 +355,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
        HeapWord* compaction_top = (HeapWord*)oop(cur_obj)->forwardee();
  
        if (redefinition_run &&  space->must_rescue(oop(cur_obj), oop(cur_obj)->forwardee())) {
@@ -411,7 +411,7 @@ index 75d7e685edf..26e56ae6f7e 100644
          debug_only(Copy::fill_to_words(cur_obj, size, 0));
          cur_obj += size;
          continue;
-@@ -361,8 +364,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
+@@ -362,8 +365,7 @@ inline void CompactibleSpace::scan_and_compact(SpaceType* space, bool redefiniti
        Prefetch::write(compaction_top, copy_interval);
  
        // copy object and reinit its mark
@@ -422,10 +422,10 @@ index 75d7e685edf..26e56ae6f7e 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 c64d6bb1bb5..9b8678a53fb 100644
+index 43d761cdbb2..14af1aad21b 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -52,6 +52,7 @@
+@@ -54,6 +54,7 @@
  #include "prims/jvmtiThreadState.inline.hpp"
  #include "utilities/events.hpp"
  #include "oops/constantPool.inline.hpp"
@@ -433,7 +433,7 @@ index c64d6bb1bb5..9b8678a53fb 100644
  
  Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
  Array<Method*>* VM_EnhancedRedefineClasses::_new_methods = NULL;
-@@ -420,13 +421,11 @@ public:
+@@ -416,13 +417,11 @@ public:
        Klass* new_klass = obj->klass()->new_version();
  
        if (new_klass->update_information() != NULL) {
@@ -449,7 +449,7 @@ index c64d6bb1bb5..9b8678a53fb 100644
            oop src = obj;
            if (new_klass->is_copying_backwards()) {
              copy_to_tmp(obj);
-@@ -436,11 +435,6 @@ public:
+@@ -432,11 +431,6 @@ public:
            //  FIXME: instance updates...
            //guarantee(false, "instance updates!");
            MarkSweep::update_fields(obj, src, new_klass->update_information());
@@ -462,10 +462,10 @@ index c64d6bb1bb5..9b8678a53fb 100644
        } else {
          obj->set_klass(obj->klass()->new_version());
 diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index ca57b524593..2ca6dde069d 100644
+index a11dfe48dd6..013ba213c00 100644
 --- a/src/hotspot/share/runtime/arguments.cpp
 +++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -2047,14 +2047,14 @@ bool Arguments::check_gc_consistency() {
+@@ -2045,14 +2045,14 @@ bool Arguments::check_gc_consistency() {
    if (AllowEnhancedClassRedefinition) {
      // Must use serial GC. This limitation applies because the instance size changing GC modifications
      // are only built into the mark and compact algorithm.
@@ -484,5 +484,5 @@ index ca57b524593..2ca6dde069d 100644
                  "Conflicting collector combinations in option list; "
                  "please refer to the release notes for the combinations "
 -- 
-2.24.3 (Apple Git-128)
+2.23.0
 

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

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

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

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

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

@@ -1,7 +1,7 @@
-From 24a60477aef7098ea23ab50a573332957741ea7b Mon Sep 17 00:00:00 2001
+From 25cb9b5fa97749d3bc13dc6c848c7eb9cc1b66bb Mon Sep 17 00:00:00 2001
 From: skybber <lada.dvorak7@gmail.com>
 Date: Wed, 14 Nov 2018 21:20:08 +0100
-Subject: [PATCH 15/50] HotswapAgent integration
+Subject: [PATCH 05/17] HotswapAgent integration
 
 It include:
 
@@ -9,16 +9,25 @@ It include:
 to CFLAGS (bash configure --with-extra-cflags="-DDCEVM_ONLY"), by
 default compilation goes with HotswapAgent
 
+Allow ha class initializer calls
+
 Add --add-opens for necessary modules/packages
 - java.base/java.lang - for reflection access to Proxy.proxyCache
 - java.base/jdk.internal.loader - for access proxyCache class
 - java.desktop/java.beans - for reflection access to Introspector
+- java.desktop/com.sun.beans
+- java.base/java.io
+- com.sun.beans.util
+
+Open jdk module to access ClassInfo.CACHE
 
 - be quiet if HotswapAgent is not found in lib/, it is compatible with
 old DCEVM
-- disable hotswapagent for -Xshare:dump
+- disable HotswapAgent for -Xshare:dump
 - disable HotswapAgent in jvm tools
+- disable HotswapAgent in keytool
 ---
+ make/launcher/Launcher-java.base.gmk          |  1 +
  make/launcher/Launcher-java.rmi.gmk           |  2 +
  make/launcher/Launcher-java.scripting.gmk     |  3 +-
  make/launcher/Launcher-java.security.jgss.gmk |  3 +
@@ -37,11 +46,32 @@ old DCEVM
  make/launcher/Launcher-jdk.pack.gmk           |  1 +
  make/launcher/Launcher-jdk.rmic.gmk           |  1 +
  .../Launcher-jdk.scripting.nashorn.shell.gmk  |  3 +-
- src/hotspot/share/runtime/arguments.cpp       | 59 +++++++++++++++++++
+ src/hotspot/share/classfile/vmSymbols.hpp     |  1 +
+ .../share/interpreter/linkResolver.cpp        |  2 +-
+ src/hotspot/share/runtime/arguments.cpp       | 67 +++++++++++++++++++
  src/hotspot/share/runtime/arguments.hpp       |  3 +
  src/hotspot/share/runtime/globals.hpp         | 12 +++-
- 21 files changed, 117 insertions(+), 10 deletions(-)
+ .../sun/beans/introspect/package-info.java    | 26 +++++++
+ .../classes/com/sun/beans/package-info.java   | 26 +++++++
+ .../com/sun/beans/util/package-info.java      | 26 +++++++
+ .../share/classes/module-info.java            |  3 +
+ 28 files changed, 209 insertions(+), 11 deletions(-)
+ create mode 100644 src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java
+ create mode 100644 src/java.desktop/share/classes/com/sun/beans/package-info.java
+ create mode 100644 src/java.desktop/share/classes/com/sun/beans/util/package-info.java
 
+diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk
+index f6d4aa28fe6..38ba29530d8 100644
+--- a/make/launcher/Launcher-java.base.gmk
++++ b/make/launcher/Launcher-java.base.gmk
+@@ -52,6 +52,7 @@ endif
+ 
+ $(eval $(call SetupBuildLauncher, keytool, \
+     MAIN_CLASS := sun.security.tools.keytool.Main, \
++    JAVA_ARGS := -XX:+DisableHotswapAgent, \
+ ))
+ 
+ ################################################################################
 diff --git a/make/launcher/Launcher-java.rmi.gmk b/make/launcher/Launcher-java.rmi.gmk
 index a69a90bcc81..07046232275 100644
 --- a/make/launcher/Launcher-java.rmi.gmk
@@ -229,16 +259,16 @@ index 7117fa78059..761a52d8466 100644
  
  # Hook to include the corresponding custom file, if present.
 diff --git a/make/launcher/Launcher-jdk.jconsole.gmk b/make/launcher/Launcher-jdk.jconsole.gmk
-index 6205ae63d16..5ca6a0c123b 100644
+index 575b9e0595b..9b38683a489 100644
 --- a/make/launcher/Launcher-jdk.jconsole.gmk
 +++ b/make/launcher/Launcher-jdk.jconsole.gmk
-@@ -28,7 +28,8 @@ include LauncherCommon.gmk
- $(eval $(call SetupBuildLauncher, jconsole, \
+@@ -29,7 +29,8 @@ $(eval $(call SetupBuildLauncher, jconsole, \
      MAIN_CLASS := sun.tools.jconsole.JConsole, \
      JAVA_ARGS := --add-opens java.base/java.io=jdk.jconsole \
--		 -Djconsole.showOutputViewer, \
-+      -Djconsole.showOutputViewer \
-+      -XX:+DisableHotswapAgent, \
+ 		 -Djconsole.showOutputViewer \
+-		 -Djdk.attach.allowAttachSelf=true, \
++		 -Djdk.attach.allowAttachSelf=true \
++		 -XX:+DisableHotswapAgent, \
      CFLAGS_windows := -DJAVAW, \
      LIBS_windows := user32.lib, \
  ))
@@ -361,11 +391,36 @@ index 82311e69fd6..bd39f8595b2 100644
 +        -XX:+DisableHotswapAgent, \
      CFLAGS := -DENABLE_ARG_FILES, \
  ))
+diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
+index 41e9a84cd69..1f67eb202b5 100644
+--- a/src/hotspot/share/classfile/vmSymbols.hpp
++++ b/src/hotspot/share/classfile/vmSymbols.hpp
+@@ -342,6 +342,7 @@
+   /* common method and field names */                                                             \
+   template(object_initializer_name,                   "<init>")                                   \
+   template(class_initializer_name,                    "<clinit>")                                 \
++  template(ha_class_initializer_name,                 "$$ha$clinit")                              \
+   template(println_name,                              "println")                                  \
+   template(printStackTrace_name,                      "printStackTrace")                          \
+   template(main_name,                                 "main")                                     \
+diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
+index 0c24146ff00..9dc184d02f5 100644
+--- a/src/hotspot/share/interpreter/linkResolver.cpp
++++ b/src/hotspot/share/interpreter/linkResolver.cpp
+@@ -1009,7 +1009,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
+         assert(!m.is_null(), "information about the current method must be available for 'put' bytecodes");
+         bool is_initialized_static_final_update = (byte == Bytecodes::_putstatic &&
+                                                    fd.is_static() &&
+-                                                   !m()->is_static_initializer());
++                                                   !(m()->is_static_initializer() || m()->name() == vmSymbols::ha_class_initializer_name()));
+         bool is_initialized_instance_final_update = ((byte == Bytecodes::_putfield || byte == Bytecodes::_nofast_putfield) &&
+                                                      !fd.is_static() &&
+                                                      !m->is_object_initializer());
 diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index 2ca6dde069d..c75bb5d8f49 100644
+index 013ba213c00..2b5ba619f43 100644
 --- a/src/hotspot/share/runtime/arguments.cpp
 +++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -3937,6 +3937,8 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
+@@ -3962,6 +3962,8 @@ jint Arguments::parse(const JavaVMInitArgs* initial_cmd_args) {
    // Set object alignment values.
    set_object_alignment();
  
@@ -374,7 +429,7 @@ index 2ca6dde069d..c75bb5d8f49 100644
  #if !INCLUDE_CDS
    if (DumpSharedSpaces || RequireSharedSpaces) {
      jio_fprintf(defaultStream::error_stream(),
-@@ -4270,3 +4272,60 @@ bool Arguments::copy_expand_pid(const char* src, size_t srclen,
+@@ -4295,3 +4297,68 @@ bool Arguments::copy_expand_pid(const char* src, size_t srclen,
    *b = '\0';
    return (p == src_end); // return false if not all of the source was copied
  }
@@ -431,15 +486,23 @@ index 2ca6dde069d..c75bb5d8f49 100644
 +  create_numbered_property("jdk.module.addopens", "java.base/java.lang=ALL-UNNAMED", addopens_count++);
 +  // Class of  field java.lang.reflect.Proxy/proxyCache
 +  create_numbered_property("jdk.module.addopens", "java.base/jdk.internal.loader=ALL-UNNAMED", addopens_count++);
++  // Use to access java.io.Reader, java.io.InputStream, java.io.FileInputStream
++  create_numbered_property("jdk.module.addopens", "java.base/java.io=ALL-UNNAMED", addopens_count++);
 +  // java.beans.Introspector access
 +  create_numbered_property("jdk.module.addopens", "java.desktop/java.beans=ALL-UNNAMED", addopens_count++);
++  // java.beans.Introspector access
++  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans=ALL-UNNAMED", addopens_count++);
++  // com.sun.beans.introspect.ClassInfo access
++  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans.introspect=ALL-UNNAMED", addopens_count++);
++  // com.sun.beans.introspect.util.Cache access
++  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans.util=ALL-UNNAMED", addopens_count++);
 +
 +}
 diff --git a/src/hotspot/share/runtime/arguments.hpp b/src/hotspot/share/runtime/arguments.hpp
-index 46450cce5c9..3dc5b3d4bae 100644
+index cc7f71a4404..b2bab2e1f44 100644
 --- a/src/hotspot/share/runtime/arguments.hpp
 +++ b/src/hotspot/share/runtime/arguments.hpp
-@@ -506,6 +506,9 @@ class Arguments : AllStatic {
+@@ -507,6 +507,9 @@ class Arguments : AllStatic {
  
    static size_t conservative_max_heap_alignment() { return _conservative_max_heap_alignment; }
  
@@ -450,7 +513,7 @@ index 46450cce5c9..3dc5b3d4bae 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 f3cf08fffb6..5f6c7b8e388 100644
+index 7b061359c1d..fc0405b5df2 100644
 --- a/src/hotspot/share/runtime/globals.hpp
 +++ b/src/hotspot/share/runtime/globals.hpp
 @@ -32,6 +32,12 @@
@@ -466,7 +529,7 @@ index f3cf08fffb6..5f6c7b8e388 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
-@@ -2675,8 +2681,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 "    \
@@ -479,6 +542,116 @@ index f3cf08fffb6..5f6c7b8e388 100644
  #define VM_FLAGS(develop,                                                   \
                   develop_pd,                                                \
                   product,                                                   \
+diff --git a/src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java b/src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java
+new file mode 100644
+index 00000000000..6636e4dd62a
+--- /dev/null
++++ b/src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java
+@@ -0,0 +1,26 @@
++/*
++ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.  Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.beans.introspect;
+diff --git a/src/java.desktop/share/classes/com/sun/beans/package-info.java b/src/java.desktop/share/classes/com/sun/beans/package-info.java
+new file mode 100644
+index 00000000000..5c097eeaa53
+--- /dev/null
++++ b/src/java.desktop/share/classes/com/sun/beans/package-info.java
+@@ -0,0 +1,26 @@
++/*
++ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.  Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.beans;
+diff --git a/src/java.desktop/share/classes/com/sun/beans/util/package-info.java b/src/java.desktop/share/classes/com/sun/beans/util/package-info.java
+new file mode 100644
+index 00000000000..2d5d735ffa8
+--- /dev/null
++++ b/src/java.desktop/share/classes/com/sun/beans/util/package-info.java
+@@ -0,0 +1,26 @@
++/*
++ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.  Oracle designates this
++ * particular file as subject to the "Classpath" exception as provided
++ * by Oracle in the LICENSE file that accompanied this code.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++package com.sun.beans.util;
+diff --git a/src/java.desktop/share/classes/module-info.java b/src/java.desktop/share/classes/module-info.java
+index b663b382f52..2a8f0a67d52 100644
+--- a/src/java.desktop/share/classes/module-info.java
++++ b/src/java.desktop/share/classes/module-info.java
+@@ -104,6 +104,9 @@ module java.desktop {
+     exports javax.swing.text.rtf;
+     exports javax.swing.tree;
+     exports javax.swing.undo;
++    exports com.sun.beans;
++    exports com.sun.beans.introspect;
++    exports com.sun.beans.util;
+ 
+     // qualified exports may be inserted at build time
+     // see make/GensrcModuleInfo.gmk
 -- 
-2.24.3 (Apple Git-128)
+2.23.0
 

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

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

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

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

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

@@ -1,7 +1,7 @@
-From 2ab70b495c43c4699ad402a714710566400de99d Mon Sep 17 00:00:00 2001
+From 28d352b4b7cda96a37f95d75cf576570271157e3 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Fri, 22 May 2020 21:23:01 +0200
-Subject: [PATCH 43/50] Support for Lambda class redefinition
+Date: Sun, 4 Oct 2020 21:12:12 +0200
+Subject: [PATCH 06/17] Support for Lambda class redefinition
 
 ---
  .../share/classfile/classLoaderData.cpp       |  9 +++
@@ -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 e70865109dd..cc9f1fa7831 100644
+index e464b94b420..791b49c68ad 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 e70865109dd..cc9f1fa7831 100644
  
    if (host_klass != NULL && k != NULL) {
      // Anonymous classes must update ClassLoaderData holder (was host_klass loader)
-@@ -1845,7 +1853,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
+@@ -1844,7 +1852,7 @@ void SystemDictionary::remove_from_hierarchy(InstanceKlass* k) {
    k->remove_from_sibling_list();
  }
  
@@ -91,10 +91,10 @@ index e70865109dd..cc9f1fa7831 100644
    constraints()->update_after_redefinition();
  }
 diff --git a/src/hotspot/share/classfile/systemDictionary.hpp b/src/hotspot/share/classfile/systemDictionary.hpp
-index 717f34ce9a0..dc111846c12 100644
+index 06f6c869d63..1dbbffa197f 100644
 --- a/src/hotspot/share/classfile/systemDictionary.hpp
 +++ b/src/hotspot/share/classfile/systemDictionary.hpp
-@@ -301,6 +301,7 @@ public:
+@@ -304,6 +304,7 @@ public:
                          protection_domain,
                          st,
                          NULL, // host klass
@@ -102,7 +102,7 @@ index 717f34ce9a0..dc111846c12 100644
                          NULL, // cp_patches
                          THREAD);
    }
-@@ -309,6 +310,7 @@ public:
+@@ -312,6 +313,7 @@ public:
                                       Handle protection_domain,
                                       ClassFileStream* st,
                                       const InstanceKlass* host_klass,
@@ -111,10 +111,10 @@ index 717f34ce9a0..dc111846c12 100644
                                       TRAPS);
  
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-index 0ca675e8ee6..08fe42d5c28 100644
+index 14af1aad21b..0b239b2ff6d 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -503,6 +503,8 @@ void VM_EnhancedRedefineClasses::doit() {
+@@ -488,6 +488,8 @@ void VM_EnhancedRedefineClasses::doit() {
      ClassLoaderDataGraph::classes_do(&clear_cpool_cache);
  
  
@@ -123,7 +123,7 @@ index 0ca675e8ee6..08fe42d5c28 100644
    // JSR-292 support
    if (_any_class_has_resolved_methods) {
      bool trace_name_printed = false;
-@@ -774,12 +776,34 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+@@ -750,12 +752,34 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
      // load hook event.
      state->set_class_being_redefined(the_class, _class_load_kind);
  
@@ -164,7 +164,7 @@ index 0ca675e8ee6..08fe42d5c28 100644
      // Clear class_being_redefined just to be sure.
      state->clear_class_being_redefined();
  
-@@ -1469,6 +1493,30 @@ void VM_EnhancedRedefineClasses::MethodDataCleaner::do_klass(Klass* k) {
+@@ -1436,6 +1460,30 @@ void VM_EnhancedRedefineClasses::MethodDataCleaner::do_klass(Klass* k) {
    }
  }
  
@@ -195,7 +195,7 @@ index 0ca675e8ee6..08fe42d5c28 100644
  void VM_EnhancedRedefineClasses::update_jmethod_ids() {
    for (int j = 0; j < _matching_methods_length; ++j) {
      Method* old_method = _matching_old_methods[j];
-@@ -2018,7 +2066,10 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
+@@ -1973,7 +2021,10 @@ jvmtiError VM_EnhancedRedefineClasses::find_sorted_affected_classes(TRAPS) {
    // Find classes not directly redefined, but affected by a redefinition (because one of its supertypes is redefined)
    AffectedKlassClosure closure(_affected_klasses);
    // Updated in j10, from original SystemDictionary::classes_do
@@ -208,10 +208,10 @@ index 0ca675e8ee6..08fe42d5c28 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 ed44f0e27ce..7e2afd49650 100644
+index a48e07e3a6a..3551b06ecde 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -119,6 +119,7 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+@@ -116,6 +116,7 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
    void rollback();
    static void mark_as_scavengable(nmethod* nm);
    static void unpatch_bytecode(Method* method);
@@ -254,5 +254,5 @@ index 2f14e01ce0d..d0e0367d8eb 100644
                                                  CHECK_NULL);
    if (anonk == NULL) {
 -- 
-2.24.3 (Apple Git-128)
+2.23.0
 

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

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

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

@@ -1,11 +1,11 @@
-From d0d6602fe3d664cb2322d7066bf46fa7e20d5d4e Mon Sep 17 00:00:00 2001
+From 3b6c7d2f807857712df6fd51a36a5a906b705f57 Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sat, 23 May 2020 10:02:15 +0200
-Subject: [PATCH 45/50] Fix "no original bytecode found" error if method with
+Subject: [PATCH 07/17] Fix "no original bytecode found" error if method with
  bkp is missing
 
 Sometimes IDE can deploy class with erroneous method, such method has
-no bytecode, but breakpoint position can still exist.
+n bytecode, but breakpoint position can still exist.
 ---
  src/hotspot/share/interpreter/bytecodes.cpp    |  2 +-
  .../share/interpreter/interpreterRuntime.cpp   |  2 +-
@@ -41,10 +41,10 @@ index f367e658879..71bbd15a4f5 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 bee69f9cec6..f1e22db70d6 100644
+index ed6f769bf1b..031f255e632 100644
 --- a/src/hotspot/share/oops/method.cpp
 +++ b/src/hotspot/share/oops/method.cpp
-@@ -1747,14 +1747,14 @@ bool CompressedLineNumberReadStream::read_pair() {
+@@ -1744,14 +1744,14 @@ bool CompressedLineNumberReadStream::read_pair() {
  
  #if INCLUDE_JVMTI
  
@@ -61,7 +61,7 @@ index bee69f9cec6..f1e22db70d6 100644
      ResourceMark rm;
      fatal("no original bytecode found in %s at bci %d", name_and_sig_as_C_string(), bci);
    }
-@@ -1900,7 +1900,7 @@ BreakpointInfo::BreakpointInfo(Method* m, int bci) {
+@@ -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 bee69f9cec6..f1e22db70d6 100644
    _next = NULL;
  }
  
-@@ -1909,7 +1909,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)
@@ -102,10 +102,10 @@ index 4533476ff8f..193e1845b23 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 a785a43d352..2321483dcbd 100644
+index 0b239b2ff6d..aba99bb60fa 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
-@@ -1389,14 +1389,16 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
+@@ -1356,14 +1356,16 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
  
      if (code == Bytecodes::_breakpoint) {
        int bci = method->bci_from(bcp);
@@ -131,5 +131,5 @@ index a785a43d352..2321483dcbd 100644
      } else {
        java_code = Bytecodes::java_code(code);
 -- 
-2.24.3 (Apple Git-128)
+2.23.0
 

jb/project/tools/patches/dcevm/0008-Fix-nonstatic-field-handles.patch

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

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

@@ -1,7 +1,7 @@
-From 8b79e673a3a9d12c97b8b7dd2f4d79c2d4cdd1d6 Mon Sep 17 00:00:00 2001
+From 102b7a0ba69c1411ec926985c79a36a2fc1978dd Mon Sep 17 00:00:00 2001
 From: Vladimir Dvorak <lada.dvorak7@gmail.com>
 Date: Sun, 24 May 2020 12:07:42 +0200
-Subject: [PATCH 48/50] Replace deleted method with
+Subject: [PATCH 08/17] Replace deleted method with
  Universe::throw_no_such_method_error
 
 ---
@@ -53,5 +53,5 @@ index 7741328979f..06581643c3b 100644
  
          java_lang_invoke_ResolvedMethodName::set_vmtarget(mem_name, newer_method);
 -- 
-2.24.3 (Apple Git-128)
+2.23.0
 

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

@@ -1,10 +1,11 @@
-From caf7fe94c42bea9606f96023cebe466058a1eef5 Mon Sep 17 00:00:00 2001
+From a89a7aad1d44b540e4704332939d639e66392bd5 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 49/50] Support for G1 gc
+Subject: [PATCH 09/17] Support for G1 gc
 
 ---
- src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |   1 +
+ src/hotspot/share/gc/g1/g1CollectedHeap.cpp   |  20 +++
+ src/hotspot/share/gc/g1/g1CollectedHeap.hpp   |   3 +
  src/hotspot/share/gc/g1/g1FullCollector.cpp   |  16 +-
  .../share/gc/g1/g1FullGCCompactTask.cpp       |  92 +++++++++-
  .../share/gc/g1/g1FullGCCompactTask.hpp       |  19 +++
@@ -21,16 +22,54 @@ Subject: [PATCH 49/50] Support for G1 gc
  src/hotspot/share/gc/shared/gcConfig.cpp      |   2 +-
  src/hotspot/share/gc/shared/space.inline.hpp  |   3 +-
  src/hotspot/share/memory/universe.cpp         |   5 +
- .../prims/jvmtiEnhancedRedefineClasses.cpp    |  31 +++-
- .../prims/jvmtiEnhancedRedefineClasses.hpp    |   1 +
- src/hotspot/share/runtime/arguments.cpp       |   2 +-
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    |  75 ++++++---
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |   6 +-
+ src/hotspot/share/runtime/arguments.cpp       |   4 +-
  src/hotspot/share/utilities/growableArray.hpp |   4 +
- 21 files changed, 570 insertions(+), 126 deletions(-)
+ 22 files changed, 628 insertions(+), 141 deletions(-)
  create mode 100644 src/hotspot/share/gc/shared/dcevmSharedGC.cpp
  create mode 100644 src/hotspot/share/gc/shared/dcevmSharedGC.hpp
 
+diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+index dea8d9fdb0e..33664a30519 100644
+--- a/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
++++ b/src/hotspot/share/gc/g1/g1CollectedHeap.cpp
+@@ -2108,6 +2108,21 @@ public:
+   }
+ };
+ 
++class G1IterateObjectClosureTask : public AbstractGangTask {
++ private:
++  ObjectClosure* _cl;
++  G1CollectedHeap* _g1h;
++  HeapRegionClaimer _hrclaimer;
++ public:
++  G1IterateObjectClosureTask(ObjectClosure* cl, G1CollectedHeap* g1h) : AbstractGangTask("IterateObject Closure"),
++    _cl(cl), _g1h(g1h),  _hrclaimer(g1h->workers()->active_workers()) { }
++
++  virtual void work(uint worker_id) {
++    IterateObjectClosureRegionClosure blk(_cl);
++    _g1h->heap_region_par_iterate_from_worker_offset(&blk, &_hrclaimer, worker_id);
++  }
++};
++
+ void G1CollectedHeap::object_iterate(ObjectClosure* cl) {
+   IterateObjectClosureRegionClosure blk(cl);
+   heap_region_iterate(&blk);
+@@ -2117,6 +2132,11 @@ void G1CollectedHeap::heap_region_iterate(HeapRegionClosure* cl) const {
+   _hrm.iterate(cl);
+ }
+ 
++void G1CollectedHeap::object_par_iterate(ObjectClosure* cl) {
++  G1IterateObjectClosureTask iocl_task(cl, this);
++  workers()->run_task(&iocl_task);
++}
++
+ void G1CollectedHeap::heap_region_par_iterate_from_worker_offset(HeapRegionClosure* cl,
+                                                                  HeapRegionClaimer *hrclaimer,
+                                                                  uint worker_id) const {
 diff --git a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
-index 8a171dc6b52..0735eef0da8 100644
+index 8a171dc6b52..05a068bb2e0 100644
 --- a/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
 +++ b/src/hotspot/share/gc/g1/g1CollectedHeap.hpp
 @@ -144,6 +144,7 @@ class G1CollectedHeap : public CollectedHeap {
@@ -41,6 +80,15 @@ index 8a171dc6b52..0735eef0da8 100644
  
    // Other related classes.
    friend class HeapRegionClaimer;
+@@ -1116,6 +1117,8 @@ public:
+ 
+   // Iteration functions.
+ 
++  void object_par_iterate(ObjectClosure* cl);
++
+   // Iterate over all objects, calling "cl.do_object" on each.
+   virtual void object_iterate(ObjectClosure* cl);
+ 
 diff --git a/src/hotspot/share/gc/g1/g1FullCollector.cpp b/src/hotspot/share/gc/g1/g1FullCollector.cpp
 index 4362ee87e30..7b9496976b8 100644
 --- a/src/hotspot/share/gc/g1/g1FullCollector.cpp
@@ -76,7 +124,7 @@ index 4362ee87e30..7b9496976b8 100644
  }
  
 diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
-index 660afc88f02..d101a9f2177 100644
+index 0c2fc088fa4..e7d830979f6 100644
 --- a/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
 +++ b/src/hotspot/share/gc/g1/g1FullGCCompactTask.cpp
 @@ -30,6 +30,7 @@
@@ -236,7 +284,7 @@ index 6c8eaf5967e..ea52a2db8cc 100644
  
  #endif // SHARE_GC_G1_G1FULLGCCOMPACTTASK_HPP
 diff --git a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
-index 3e3440804e4..23c0d615088 100644
+index 76e9e77d739..44fc32c1c47 100644
 --- a/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
 +++ b/src/hotspot/share/gc/g1/g1FullGCCompactionPoint.cpp
 @@ -31,13 +31,19 @@
@@ -942,10 +990,10 @@ index 00000000000..e2ef0171fb2
 +
 +#endif
 diff --git a/src/hotspot/share/gc/shared/gcConfig.cpp b/src/hotspot/share/gc/shared/gcConfig.cpp
-index 39364a64cb2..945b06ad2a4 100644
+index adb0f5dd25c..20e0ef9ee8a 100644
 --- a/src/hotspot/share/gc/shared/gcConfig.cpp
 +++ b/src/hotspot/share/gc/shared/gcConfig.cpp
-@@ -101,7 +101,7 @@ void GCConfig::fail_if_unsupported_gc_is_selected() {
+@@ -106,7 +106,7 @@ void GCConfig::fail_if_unsupported_gc_is_selected() {
  }
  
  void GCConfig::select_gc_ergonomically() {
@@ -992,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 1fbba406087..32929b3d7a0 100644
+index aba99bb60fa..8b6fad2128e 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
 @@ -36,7 +36,6 @@
@@ -1003,15 +1051,16 @@ index 1fbba406087..32929b3d7a0 100644
  #include "oops/fieldStreams.hpp"
  #include "oops/klassVtable.hpp"
  #include "oops/oop.inline.hpp"
-@@ -55,6 +54,7 @@
+@@ -55,6 +54,8 @@
  #include "utilities/events.hpp"
  #include "oops/constantPool.inline.hpp"
  #include "gc/cms/cmsHeap.hpp"
++#include "gc/g1/g1CollectedHeap.hpp"
 +#include "gc/shared/dcevmSharedGC.hpp"
  
  Array<Method*>* VM_EnhancedRedefineClasses::_old_methods = NULL;
  Array<Method*>* VM_EnhancedRedefineClasses::_new_methods = NULL;
-@@ -78,7 +78,7 @@ Klass*      VM_EnhancedRedefineClasses::_the_class_oop = NULL;
+@@ -78,7 +79,7 @@ Klass*      VM_EnhancedRedefineClasses::_the_class_oop = NULL;
  //  - class_defs class definition - either new class or redefined class
  //               note that this is not the final array of classes to be redefined
  //               we need to scan for all affected classes (e.g. subclasses) and
@@ -1020,7 +1069,7 @@ index 1fbba406087..32929b3d7a0 100644
  // @param class_load_kind always jvmti_class_load_kind_redefine
  VM_EnhancedRedefineClasses::VM_EnhancedRedefineClasses(jint class_count, const jvmtiClassDefinition *class_defs, JvmtiClassLoadKind class_load_kind) :
          VM_GC_Operation(Universe::heap()->total_collections(), GCCause::_heap_inspection, Universe::heap()->total_full_collections(), true) {
-@@ -216,6 +216,13 @@ void VM_EnhancedRedefineClasses::mark_as_scavengable(nmethod* nm) {
+@@ -216,6 +217,13 @@ void VM_EnhancedRedefineClasses::mark_as_scavengable(nmethod* nm) {
    }
  }
  
@@ -1034,7 +1083,7 @@ index 1fbba406087..32929b3d7a0 100644
  // TODO comment
  struct StoreBarrier {
    // TODO: j10 review change ::oop_store -> HeapAccess<>::oop_store
-@@ -430,7 +437,7 @@ public:
+@@ -430,7 +438,7 @@ public:
            src->set_klass(obj->klass()->new_version());
            //  FIXME: instance updates...
            //guarantee(false, "instance updates!");
@@ -1043,7 +1092,18 @@ index 1fbba406087..32929b3d7a0 100644
          }
        } else {
          obj->set_klass(obj->klass()->new_version());
-@@ -507,7 +514,12 @@ void VM_EnhancedRedefineClasses::doit() {
+@@ -452,6 +460,10 @@ public:
+ void VM_EnhancedRedefineClasses::doit() {
+   Thread *thread = Thread::current();
+ 
++  if (log_is_enabled(Info, redefine, class, timer)) {
++    _timer_vm_op_doit.start();
++  }
++
+ #if INCLUDE_CDS
+   if (UseSharedSpaces) {
+     // Sharing is enabled so we remap the shared readonly space to
+@@ -507,12 +519,31 @@ void VM_EnhancedRedefineClasses::doit() {
      // mark such nmethod's as "scavengable".
      // For now, mark all nmethod's as scavengable that are not scavengable already
      if (ScavengeRootsInCode) {
@@ -1057,24 +1117,85 @@ index 1fbba406087..32929b3d7a0 100644
      }
  
      Universe::heap()->ensure_parsability(false);
-@@ -567,6 +579,7 @@ void VM_EnhancedRedefineClasses::doit() {
+-    Universe::heap()->object_iterate(&objectClosure);
++    if (UseG1GC) {
++      if (log_is_enabled(Info, redefine, class, timer)) {
++        _timer_heap_iterate.start();
++      }
++      G1CollectedHeap::heap()->object_par_iterate(&objectClosure);
++      _timer_heap_iterate.stop();
++    } else {
++      if (log_is_enabled(Info, redefine, class, timer)) {
++        _timer_heap_iterate.start();
++      }
++      Universe::heap()->object_iterate(&objectClosure);
++      _timer_heap_iterate.stop();
++    }
++
+     Universe::root_oops_do(&oopClosureNoBarrier);
++
+   }
+   log_trace(redefine, class, obsolete, metadata)("After updating instances");
+ 
+@@ -565,11 +596,19 @@ void VM_EnhancedRedefineClasses::doit() {
+ 
+   if (objectClosure.needs_instance_update()) {
      // Do a full garbage collection to update the instance sizes accordingly
++
++    if (log_is_enabled(Info, redefine, class, timer)) {
++      _timer_heap_full_gc.start();
++    }
++
      Universe::set_redefining_gc_run(true);
      notify_gc_begin(true);
 +    // TODO: check _metadata_GC_clear_soft_refs with ScavengeRootsInCode
      Universe::heap()->collect_as_vm_thread(GCCause::_heap_inspection);
      notify_gc_end();
      Universe::set_redefining_gc_run(false);
-@@ -877,7 +890,7 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
-  // Calculated the difference between new and old class  (field change, method change, supertype change, ...).
- int VM_EnhancedRedefineClasses::calculate_redefinition_flags(InstanceKlass* new_class) {
-   int result = Klass::NoRedefinition;
--  log_info(redefine, class, load)("Comparing different class versions of class %s",new_class->name()->as_C_string());
-+  log_debug(redefine, class, load)("Comparing different class versions of class %s",new_class->name()->as_C_string());
++
++    _timer_heap_full_gc.stop();
+   }
  
-   assert(new_class->old_version() != NULL, "must have old version");
-   InstanceKlass* the_class = InstanceKlass::cast(new_class->old_version());
-@@ -1584,7 +1597,7 @@ class TransferNativeFunctionRegistration {
+   // Unmark Klass*s as "redefining"
+@@ -617,6 +656,7 @@ void VM_EnhancedRedefineClasses::doit() {
+   }
+ #endif
+ 
++  _timer_vm_op_doit.stop();
+ }
+ 
+ // Cleanup - runs in JVM thread
+@@ -640,16 +680,14 @@ void VM_EnhancedRedefineClasses::doit_epilogue() {
+   if (log_is_enabled(Info, redefine, class, timer)) {
+     // Used to have separate timers for "doit" and "all", but the timer
+     // overhead skewed the measurements.
+-    jlong doit_time = _timer_rsc_phase1.milliseconds() +
+-                      _timer_rsc_phase2.milliseconds();
+-    jlong all_time = _timer_vm_op_prologue.milliseconds() + doit_time;
++    jlong all_time = _timer_vm_op_prologue.milliseconds() + _timer_vm_op_doit.milliseconds();
+ 
+     log_info(redefine, class, timer)
+       ("vm_op: all=" JLONG_FORMAT "  prologue=" JLONG_FORMAT "  doit=" JLONG_FORMAT,
+-       all_time, _timer_vm_op_prologue.milliseconds(), doit_time);
++       all_time, _timer_vm_op_prologue.milliseconds(), _timer_vm_op_doit.milliseconds());
+     log_info(redefine, class, timer)
+-      ("redefine_single_class: phase1=" JLONG_FORMAT "  phase2=" JLONG_FORMAT,
+-       _timer_rsc_phase1.milliseconds(), _timer_rsc_phase2.milliseconds());
++      ("doit: heap iterate=" JLONG_FORMAT "  fullgc=" JLONG_FORMAT,
++       _timer_heap_iterate.milliseconds(), _timer_heap_full_gc.milliseconds());
+   }
+ }
+ 
+@@ -1398,7 +1436,7 @@ void VM_EnhancedRedefineClasses::unpatch_bytecode(Method* method) {
+ // arrayKlassOops. See Open Issues in jvmtiRedefineClasses.hpp.
+ void VM_EnhancedRedefineClasses::ClearCpoolCacheAndUnpatch::do_klass(Klass* k) {
+   if (!k->is_instance_klass()) {
+-	return;
++    return;
+   }
+ 
+   HandleMark hm(_thread);
+@@ -1584,7 +1622,7 @@ class TransferNativeFunctionRegistration {
  
    // Recursively search the binary tree of possibly prefixed method names.
    // Iteration could be used if all agents were well behaved. Full tree walk is
@@ -1083,7 +1204,7 @@ index 1fbba406087..32929b3d7a0 100644
    // Branch at each depth in the binary tree is:
    //    (1) without the prefix.
    //    (2) with the prefix.
-@@ -1689,7 +1702,7 @@ void VM_EnhancedRedefineClasses::transfer_old_native_function_registrations(Inst
+@@ -1689,7 +1727,7 @@ void VM_EnhancedRedefineClasses::transfer_old_native_function_registrations(Inst
    transfer.transfer_registrations(_matching_old_methods, _matching_methods_length);
  }
  
@@ -1092,7 +1213,26 @@ index 1fbba406087..32929b3d7a0 100644
  // Deoptimize all compiled code that depends on this class.
  //
  // If the can_redefine_classes capability is obtained in the onload
-@@ -2057,8 +2070,8 @@ static bool match_second(void* value, KlassPair elem) {
+@@ -1816,10 +1854,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+ 
+   HandleMark hm(THREAD);   // make sure handles from this call are freed
+ 
+-  if (log_is_enabled(Info, redefine, class, timer)) {
+-    _timer_rsc_phase1.start();
+-  }
+-
+   InstanceKlass* new_class = new_class_oop;
+   InstanceKlass* the_class = InstanceKlass::cast(new_class_oop->old_version());
+   assert(the_class != NULL, "must have old version");
+@@ -1874,7 +1908,6 @@ void VM_EnhancedRedefineClasses::redefine_single_class(InstanceKlass* new_class_
+                              new_class->external_name(),
+                              java_lang_Class::classRedefinedCount(new_class->java_mirror()));
+   }
+-  _timer_rsc_phase2.stop();
+ } // end redefine_single_class()
+ 
+ 
+@@ -2057,8 +2090,8 @@ static bool match_second(void* value, KlassPair elem) {
  // For each class to be redefined parse the bytecode and figure out the superclass and all interfaces.
  // First newly introduced classes (_class_defs) are scanned and then affected classed (_affected_klasses).
  // Affected flag is cleared (clear_redefinition_flag(Klass::MarkedAsAffected))
@@ -1104,10 +1244,23 @@ index 1fbba406087..32929b3d7a0 100644
    ResourceMark mark(THREAD);
  
 diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index d8a11b51fe9..030852b160a 100644
+index 3551b06ecde..62a0fbf54d4 100644
 --- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
 +++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -115,6 +115,7 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+@@ -86,9 +86,10 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+   // Performance measurement support. These timers do not cover all
+   // the work done for JVM/TI RedefineClasses() but they do cover
+   // the heavy lifting.
+-  elapsedTimer  _timer_rsc_phase1;
+-  elapsedTimer  _timer_rsc_phase2;
++  elapsedTimer  _timer_vm_op_doit;
+   elapsedTimer  _timer_vm_op_prologue;
++  elapsedTimer  _timer_heap_iterate;
++  elapsedTimer  _timer_heap_full_gc;
+ 
+   // These routines are roughly in call order unless otherwise noted.
+ 
+@@ -115,6 +116,7 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
  
    void rollback();
    static void mark_as_scavengable(nmethod* nm);
@@ -1116,18 +1269,21 @@ index d8a11b51fe9..030852b160a 100644
    static void fix_invoke_method(Method* method);
  
 diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index 72580b384dd..45f0858e57d 100644
+index 2b5ba619f43..5053ad7ee61 100644
 --- a/src/hotspot/share/runtime/arguments.cpp
 +++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -2047,7 +2047,7 @@ bool Arguments::check_gc_consistency() {
+@@ -2045,9 +2045,9 @@ bool Arguments::check_gc_consistency() {
    if (AllowEnhancedClassRedefinition) {
      // Must use serial GC. This limitation applies because the instance size changing GC modifications
      // are only built into the mark and compact algorithm.
 -    if ((!UseSerialGC && !UseConcMarkSweepGC) && i >= 1) {
 +    if ((!UseSerialGC && !UseConcMarkSweepGC && !UseG1GC) && i >= 1) {
        jio_fprintf(defaultStream::error_stream(),
-                   "Must use the serial or concurrent mark sweep GC with enhanced class redefinition.\n");
+-                  "Must use the serial or concurrent mark sweep GC with enhanced class redefinition.\n");
++                  "Must use the Serial, Concurrent Mark Sweep or G1 GC with enhanced class redefinition.\n");
        return false;
+     }
+   }
 diff --git a/src/hotspot/share/utilities/growableArray.hpp b/src/hotspot/share/utilities/growableArray.hpp
 index f37d94a0529..738d475aea6 100644
 --- a/src/hotspot/share/utilities/growableArray.hpp
@@ -1144,5 +1300,5 @@ index f37d94a0529..738d475aea6 100644
  
  // Custom STL-style iterator to iterate over elements of a GrowableArray that satisfy a given predicate
 -- 
-2.24.3 (Apple Git-128)
+2.23.0
 

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

@@ -0,0 +1,50 @@
+From 2c6512bb54400e3836a3c348c10c78557c1abbf5 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/17] Change log level in advanced redefinition
+
+- Change log level for "Comparing different class ver.." to debug
+- Fix adjust_method_entries_dcevm logging levels and severity
+---
+ src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp | 2 +-
+ src/hotspot/share/prims/resolvedMethodTable.cpp          | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index 8b6fad2128e..a8adfa5af47 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -915,7 +915,7 @@ jvmtiError VM_EnhancedRedefineClasses::load_new_class_versions(TRAPS) {
+  // Calculated the difference between new and old class  (field change, method change, supertype change, ...).
+ int VM_EnhancedRedefineClasses::calculate_redefinition_flags(InstanceKlass* new_class) {
+   int result = Klass::NoRedefinition;
+-  log_info(redefine, class, load)("Comparing different class versions of class %s",new_class->name()->as_C_string());
++  log_debug(redefine, class, load)("Comparing different class versions of class %s",new_class->name()->as_C_string());
+ 
+   assert(new_class->old_version() != NULL, "must have old version");
+   InstanceKlass* the_class = InstanceKlass::cast(new_class->old_version());
+diff --git a/src/hotspot/share/prims/resolvedMethodTable.cpp b/src/hotspot/share/prims/resolvedMethodTable.cpp
+index 06581643c3b..10806bee29b 100644
+--- a/src/hotspot/share/prims/resolvedMethodTable.cpp
++++ b/src/hotspot/share/prims/resolvedMethodTable.cpp
+@@ -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());
+ 
+-          log_info(redefine, class, load, exceptions)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
++          log_debug(redefine, class, update)("Adjusting method: '%s' of new class %s", newer_method->name_and_sig_as_C_string(), newer_klass->name()->as_C_string());
+ 
+           assert(newer_klass == newer_method->method_holder(), "call after swapping redefined guts");
+           assert(newer_method != NULL, "method_with_idnum() should not be NULL");
+@@ -290,7 +290,7 @@ void ResolvedMethodTable::adjust_method_entries_dcevm(bool * trace_name_printed)
+ 
+         ResourceMark rm;
+         if (!(*trace_name_printed)) {
+-          log_info(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
++          log_debug(redefine, class, update)("adjust: name=%s", old_method->method_holder()->external_name());
+            *trace_name_printed = true;
+         }
+         log_debug(redefine, class, update, constantpool)
+-- 
+2.23.0
+

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

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

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

@@ -0,0 +1,26 @@
+From 9c8d44a088bfd73f9be3678110a67a5ed8954c8a 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/17] AllowEnhancedClassRedefinition is false (disabled) by
+ default
+
+---
+ src/hotspot/share/runtime/globals.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hotspot/share/runtime/globals.hpp b/src/hotspot/share/runtime/globals.hpp
+index fc0405b5df2..607a39449dc 100644
+--- a/src/hotspot/share/runtime/globals.hpp
++++ b/src/hotspot/share/runtime/globals.hpp
+@@ -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") \
+                                                                             \
+-  product(bool, AllowEnhancedClassRedefinition, true,                       \
++  product(bool, AllowEnhancedClassRedefinition, false,                      \
+              "Allow enhanced class redefinition beyond swapping method "    \
+              "bodies")                                                      \
+                                                                             \
+-- 
+2.23.0
+

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

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

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

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

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

@@ -1,7 +1,7 @@
-From 800b44f545c7b99026d203690def30ec4b9ed08e Mon Sep 17 00:00:00 2001
+From 69bc6c03ad25d485182d1b17f265a59ff98e3352 Mon Sep 17 00:00:00 2001
 From: Artem Khvastunov <artem.khvastunov@jetbrains.com>
 Date: Tue, 14 Apr 2020 19:11:35 +0200
-Subject: [PATCH 32/50] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
+Subject: [PATCH 12/17] add jvmtiEnhancedRedefineClasses.* to CMakeLists.txt
 
 ---
  jb/project/hotspot-cmake/CMakeLists.txt | 2 ++
@@ -28,5 +28,5 @@ index 8b552c27206..6516e39058f 100644
  ../../../src/hotspot/share/prims/jvmtiEnvBase.cpp
  ../../../src/hotspot/share/prims/methodHandles.cpp
 -- 
-2.24.3 (Apple Git-128)
+2.23.0
 

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

@@ -1,25 +0,0 @@
-From 35aba247d8a3e25f5d19403ba5f293bfdaf6539c Mon Sep 17 00:00:00 2001
-From: skybber <lada.dvorak7@gmail.com>
-Date: Fri, 1 Mar 2019 18:45:13 +0100
-Subject: [PATCH 13/50] Cleanup
-
----
- src/hotspot/share/gc/shared/space.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/gc/shared/space.cpp b/src/hotspot/share/gc/shared/space.cpp
-index 947dff8ae0c..56b144b46f1 100644
---- a/src/hotspot/share/gc/shared/space.cpp
-+++ b/src/hotspot/share/gc/shared/space.cpp
-@@ -862,7 +862,7 @@ HeapWord* CompactibleSpace::forward_with_rescue(HeapWord* q, size_t size,
-   size_t forward_size = size;
- 
-   // (DCEVM) There is a new version of the class of q => different size
--  if (oop(q)->klass()->new_version() != NULL && oop(q)->klass()->new_version()->update_information() != NULL) {
-+  if (oop(q)->klass()->new_version() != NULL) {
- 
-     size_t new_size = oop(q)->size_given_klass(oop(q)->klass()->new_version());
-     // assert(size != new_size, "instances without changed size have to be updated prior to GC run");
--- 
-2.24.3 (Apple Git-128)
-

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

@@ -1,17 +1,17 @@
-From dc397b652d9810f6f261070afbb8519f1c2964ee Mon Sep 17 00:00:00 2001
-From: skybber <lada.dvorak7@gmail.com>
-Date: Sun, 16 Dec 2018 09:55:31 +0100
-Subject: [PATCH 16/50] Add dcevm distro name
+From 5e66d1cd39dcae56adfa3a4785e8da47218d7b72 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/17] 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 b5a23138213..5c0a3242c80 100644
+index bb9d863c992..e462ab57217 100644
 --- a/make/autoconf/version-numbers
 +++ b/make/autoconf/version-numbers
-@@ -43,7 +43,7 @@ PRODUCT_NAME=OpenJDK
+@@ -44,7 +44,7 @@ PRODUCT_NAME=OpenJDK
  PRODUCT_SUFFIX="Runtime Environment"
  JDK_RC_PLATFORM_NAME=Platform
  COMPANY_NAME=N/A
@@ -21,5 +21,5 @@ index b5a23138213..5c0a3242c80 100644
  VENDOR_URL_BUG=https://bugreport.java.com/bugreport/
  VENDOR_URL_VM_BUG=https://bugreport.java.com/bugreport/crash.jsp
 -- 
-2.24.3 (Apple Git-128)
+2.23.0
 

jb/project/tools/patches/dcevm/0014-Add-codecache-flush-optimization-but-just-flush-all-.patch

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

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

@@ -0,0 +1,71 @@
+From 5b1408b47bd86a5bd2a4aa1f39705687efc73223 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/17] Fix G1 nmethod registration
+
+---
+ .../prims/jvmtiEnhancedRedefineClasses.cpp    | 19 ++++++++++++++++---
+ .../prims/jvmtiEnhancedRedefineClasses.hpp    |  3 ++-
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+index a8adfa5af47..4ee12b7021f 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.cpp
+@@ -217,7 +217,14 @@ void VM_EnhancedRedefineClasses::mark_as_scavengable(nmethod* nm) {
+   }
+ }
+ 
+-void VM_EnhancedRedefineClasses::mark_as_scavengable_g1(nmethod* nm) {
++void VM_EnhancedRedefineClasses::unregister_nmethod_g1(nmethod* nm) {
++  // It should work not only for G1 but also for another GCs, but this way is safer now
++  if (!nm->is_zombie() && !nm->is_unloaded()) {
++    Universe::heap()->unregister_nmethod(nm);
++  }
++}
++
++void VM_EnhancedRedefineClasses::register_nmethod_g1(nmethod* nm) {
+   // It should work not only for G1 but also for another GCs, but this way is safer now
+   if (!nm->is_zombie() && !nm->is_unloaded()) {
+     Universe::heap()->register_nmethod(nm);
+@@ -520,8 +527,9 @@ void VM_EnhancedRedefineClasses::doit() {
+     // For now, mark all nmethod's as scavengable that are not scavengable already
+     if (ScavengeRootsInCode) {
+       if (UseG1GC) {
+-        // this should work also for other GCs
+-        CodeCache::nmethods_do(mark_as_scavengable_g1);
++        // G1 holds references to nmethods in regions based on oops values. Since oops in nmethod can be changed in ChangePointers* closures
++        // we unregister nmethods from G1 heap, then closures are processed (oops are changed) and finally we register nmethod to G1 again
++        CodeCache::nmethods_do(unregister_nmethod_g1);
+       } else {
+         CodeCache::nmethods_do(mark_as_scavengable);
+       }
+@@ -544,6 +552,11 @@ void VM_EnhancedRedefineClasses::doit() {
+ 
+     Universe::root_oops_do(&oopClosureNoBarrier);
+ 
++    if (UseG1GC) {
++      // this should work also for other GCs
++      CodeCache::nmethods_do(register_nmethod_g1);
++    }
++
+   }
+   log_trace(redefine, class, obsolete, metadata)("After updating instances");
+ 
+diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+index 62a0fbf54d4..d00109a0b92 100644
+--- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
++++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
+@@ -116,7 +116,8 @@ class VM_EnhancedRedefineClasses: public VM_GC_Operation {
+ 
+   void rollback();
+   static void mark_as_scavengable(nmethod* nm);
+-  static void mark_as_scavengable_g1(nmethod* nm);
++  static void unregister_nmethod_g1(nmethod* nm);
++  static void register_nmethod_g1(nmethod* nm);
+   static void unpatch_bytecode(Method* method);
+   static void fix_invoke_method(Method* method);
+ 
+-- 
+2.23.0
+

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

@@ -0,0 +1,26 @@
+From c5bae0e9c9c0b0a6e05a966648fb2ddaf9a16564 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/17] 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 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,
+   return new (loader_data, size, MetaspaceObj::MethodType, THREAD) Method(cm, access_flags);
+ }
+ 
+-Method::Method(ConstMethod* xconst, AccessFlags access_flags) {
++Method::Method(ConstMethod* xconst, AccessFlags access_flags) :  _new_version(NULL),
++                                                                 _old_version(NULL) {
+   NoSafepointVerifier no_safepoint;
+   set_constMethod(xconst);
+   set_access_flags(access_flags);
+-- 
+2.23.0
+

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

@@ -0,0 +1,191 @@
+From 5504812403a0673c428fc5589cd94f2c3fea7616 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/17] Clear dcevm code separation
+
+---
+ src/hotspot/share/classfile/systemDictionary.cpp   |  4 ++--
+ src/hotspot/share/gc/serial/genMarkSweep.cpp       |  8 +++++---
+ src/hotspot/share/interpreter/linkResolver.cpp     | 14 ++++++++++----
+ .../instrumentation/jfrEventClassTransformer.cpp   |  2 +-
+ src/hotspot/share/oops/instanceKlass.cpp           | 10 ++++++----
+ src/hotspot/share/oops/method.cpp                  |  2 +-
+ src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp  |  2 +-
+ src/hotspot/share/runtime/reflection.cpp           |  2 +-
+ 8 files changed, 27 insertions(+), 17 deletions(-)
+
+diff --git a/src/hotspot/share/classfile/systemDictionary.cpp b/src/hotspot/share/classfile/systemDictionary.cpp
+index 791b49c68ad..011a14eab32 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,
+     MutexLocker mu(SystemDictionary_lock, THREAD);
+ 
+     Klass* check = find_class(h_name, k->class_loader_data());
+-    assert((check == k && !k->is_redefining()) || (k->is_redefining() && check == k->old_version()), "should be present in the dictionary");
++    assert(check == k && !k->is_redefining() || k->is_redefining() && check == k->old_version(), "should be present in the dictionary");
+   } );
+ 
+   return k;
+@@ -2153,7 +2153,7 @@ void SystemDictionary::check_constraints(unsigned int d_hash,
+       // also hold array classes.
+ 
+       assert(check->is_instance_klass(), "noninstance in systemdictionary");
+-      if ((defining == true) || ((k != check) && k->old_version() != check)) {
++      if ((defining == true) || (k != check && (!AllowEnhancedClassRedefinition || k->old_version() != check))) {
+         throwException = true;
+         ss.print("loader %s", loader_data->loader_name_and_id());
+         ss.print(" attempted duplicate %s definition for %s. (%s)",
+diff --git a/src/hotspot/share/gc/serial/genMarkSweep.cpp b/src/hotspot/share/gc/serial/genMarkSweep.cpp
+index b18682f9a12..590b5389b4d 100644
+--- a/src/hotspot/share/gc/serial/genMarkSweep.cpp
++++ b/src/hotspot/share/gc/serial/genMarkSweep.cpp
+@@ -343,7 +343,9 @@ void GenMarkSweep::mark_sweep_phase4() {
+ 
+   GenCompactClosure blk;
+   gch->generation_iterate(&blk, true);
+-  DcevmSharedGC::copy_rescued_objects_back(MarkSweep::_rescued_oops, true);
+-  DcevmSharedGC::clear_rescued_objects_resource(MarkSweep::_rescued_oops);
+-  MarkSweep::_rescued_oops = NULL;
++  if (AllowEnhancedClassRedefinition) {
++    DcevmSharedGC::copy_rescued_objects_back(MarkSweep::_rescued_oops, true);
++    DcevmSharedGC::clear_rescued_objects_resource(MarkSweep::_rescued_oops);
++    MarkSweep::_rescued_oops = NULL;
++  }
+ }
+diff --git a/src/hotspot/share/interpreter/linkResolver.cpp b/src/hotspot/share/interpreter/linkResolver.cpp
+index 9dc184d02f5..bff1c3627b0 100644
+--- a/src/hotspot/share/interpreter/linkResolver.cpp
++++ b/src/hotspot/share/interpreter/linkResolver.cpp
+@@ -295,8 +295,13 @@ void LinkResolver::check_klass_accessability(Klass* ref_klass, Klass* sel_klass,
+       return;  // no relevant check to do
+     }
+   }
+-  Reflection::VerifyClassAccessResults vca_result =
+-    Reflection::verify_class_access(ref_klass->newest_version(), InstanceKlass::cast(base_klass->newest_version()), true);
++  Klass* refKlassNewest = ref_klass;
++  Klass* baseKlassNewest = base_klass;
++  if (AllowEnhancedClassRedefinition) {
++    refKlassNewest = ref_klass->newest_version();
++    baseKlassNewest = base_klass->newest_version();
++  }
++  Reflection::VerifyClassAccessResults vca_result = Reflection::verify_class_access(refKlassNewest, InstanceKlass::cast(baseKlassNewest), true);
+   if (vca_result != Reflection::ACCESS_OK) {
+     ResourceMark rm(THREAD);
+     char* msg = Reflection::verify_class_access_msg(ref_klass,
+@@ -572,7 +577,8 @@ void LinkResolver::check_method_accessability(Klass* ref_klass,
+   // We'll check for the method name first, as that's most likely
+   // to be false (so we'll short-circuit out of these tests).
+   if (sel_method->name() == vmSymbols::clone_name() &&
+-      sel_klass->newest_version() == SystemDictionary::Object_klass()->newest_version() &&
++      ( !AllowEnhancedClassRedefinition && sel_klass == SystemDictionary::Object_klass() ||
++      AllowEnhancedClassRedefinition && sel_klass->newest_version() == SystemDictionary::Object_klass()->newest_version()) &&
+       resolved_klass->is_array_klass()) {
+     // We need to change "protected" to "public".
+     assert(flags.is_protected(), "clone not protected?");
+@@ -997,7 +1003,7 @@ void LinkResolver::resolve_field(fieldDescriptor& fd,
+       ResourceMark rm(THREAD);
+       stringStream ss;
+ 
+-      if (sel_klass != current_klass && sel_klass != current_klass->active_version()) {
++      if (sel_klass != current_klass && (!AllowEnhancedClassRedefinition || sel_klass != current_klass->active_version())) {
+         ss.print("Update to %s final field %s.%s attempted from a different class (%s) than the field's declaring class",
+                  is_static ? "static" : "non-static", resolved_klass->external_name(), fd.name()->as_C_string(),
+                 current_klass->external_name());
+diff --git a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
+index 8afe8985026..4e7b39406fa 100644
+--- a/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
++++ b/src/hotspot/share/jfr/instrumentation/jfrEventClassTransformer.cpp
+@@ -1467,7 +1467,7 @@ static InstanceKlass* create_new_instance_klass(InstanceKlass* ik, ClassFileStre
+                              NULL, // host klass
+                              NULL, // cp_patches
+                              ClassFileParser::INTERNAL, // internal visibility
+-							 false,
++                             false,
+                              THREAD);
+   if (HAS_PENDING_EXCEPTION) {
+     log_pending_exception(PENDING_EXCEPTION);
+diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
+index 4312c2c4ca9..7335f0cffc9 100644
+--- a/src/hotspot/share/oops/instanceKlass.cpp
++++ b/src/hotspot/share/oops/instanceKlass.cpp
+@@ -178,7 +178,9 @@ bool InstanceKlass::has_nest_member(InstanceKlass* k, TRAPS) const {
+       }
+ 
+       Klass* k2 = _constants->klass_at(cp_index, CHECK_false);
+-      k2 = k2->newest_version();
++      if (AllowEnhancedClassRedefinition) {
++        k2 = k2->newest_version();
++      }
+       if (k2 == k) {
+         log_trace(class, nestmates)("- class is listed as a nest member");
+         return true;
+@@ -837,7 +839,7 @@ bool InstanceKlass::link_class_impl(bool throw_verifyerror, TRAPS) {
+ #endif
+       set_init_state(linked);
+       // (DCEVM) Must check for old version in order to prevent infinite loops.
+-      if (JvmtiExport::should_post_class_prepare() && old_version() == NULL /* JVMTI deadlock otherwise */) {
++      if (JvmtiExport::should_post_class_prepare() && (!AllowEnhancedClassRedefinition || old_version() == NULL) /* JVMTI deadlock otherwise */) {
+         Thread *thread = THREAD;
+         assert(thread->is_Java_thread(), "thread->is_Java_thread()");
+         JvmtiExport::post_class_prepare((JavaThread *) thread, this);
+@@ -919,7 +921,7 @@ void InstanceKlass::initialize_impl(TRAPS) {
+     // that aren't expected to throw.  This would wreak havoc.  See 6320309.
+     // (DCEVM) Wait also for the old class version to be fully initialized.
+     while((is_being_initialized() && !is_reentrant_initialization(self))
+-        || (old_version() != NULL && InstanceKlass::cast(old_version())->is_being_initialized())) {
++        || (AllowEnhancedClassRedefinition && old_version() != NULL && InstanceKlass::cast(old_version())->is_being_initialized())) {
+         wait = true;
+       ol.waitUninterruptibly(CHECK);
+     }
+@@ -3617,7 +3619,7 @@ void InstanceKlass::verify_on(outputStream* st) {
+ 
+     guarantee(sib->is_klass(), "should be klass");
+     // TODO: (DCEVM) explain
+-    guarantee(sib->super() == super || super->newest_version() == SystemDictionary::Object_klass(), "siblings should have same superklass");
++    guarantee(sib->super() == super || AllowEnhancedClassRedefinition && super->newest_version() == SystemDictionary::Object_klass(), "siblings should have same superklass");
+   }
+ 
+   // Verify implementor fields requires the Compile_lock, but this is sometimes
+diff --git a/src/hotspot/share/oops/method.cpp b/src/hotspot/share/oops/method.cpp
+index a9556ecf0c4..6c7edaca67e 100644
+--- a/src/hotspot/share/oops/method.cpp
++++ b/src/hotspot/share/oops/method.cpp
+@@ -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) ???
+-  if (m != m->newest_version()) {
++  if (AllowEnhancedClassRedefinition && m != m->newest_version()) {
+     m = m->newest_version();
+   }
+   ClassLoaderData* cld = loader_data;
+diff --git a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
+index 60604c645ff..325bffb7ad0 100644
+--- a/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
++++ b/src/hotspot/share/prims/jvmtiGetLoadedClasses.cpp
+@@ -51,7 +51,7 @@ public:
+     //         the new version (SystemDictionary stores only new versions). But the LoadedClassesClosure's functionality was
+     //         changed in java8  where jvmtiLoadedClasses collects all classes from all classloaders, therefore we
+     //         must use new versions only.
+-    if (k->new_version()==NULL) {
++    if (AllowEnhancedClassRedefinition && k->new_version()==NULL) {
+       _classStack.push((jclass) _env->jni_reference(Handle(_cur_thread, k->java_mirror())));
+     }
+   }
+diff --git a/src/hotspot/share/runtime/reflection.cpp b/src/hotspot/share/runtime/reflection.cpp
+index ed789b0bc2b..06f60855655 100644
+--- a/src/hotspot/share/runtime/reflection.cpp
++++ b/src/hotspot/share/runtime/reflection.cpp
+@@ -660,7 +660,7 @@ bool Reflection::verify_member_access(const Klass* current_class,
+                                       TRAPS) {
+ 
+   // (DCEVM) Decide accessibility based on active version
+-  if (current_class != NULL) {
++  if (AllowEnhancedClassRedefinition && current_class != NULL) {
+     current_class = current_class->active_version();
+   }
+ 
+-- 
+2.23.0
+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,33 +0,0 @@
-From 5653e2a5f05a9693f934b0f9c4d9286c01576807 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Fri, 8 May 2020 21:07:50 +0200
-Subject: [PATCH 34/50] Fix 11.0.7 compilation issues
-
----
- src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-index 6cabdca9c27..ed44f0e27ce 100644
---- a/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-+++ b/src/hotspot/share/prims/jvmtiEnhancedRedefineClasses.hpp
-@@ -16,6 +16,8 @@
-  * 2 along with this work; if not, write to the Free Software Foundation,
-  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-  *
-+ *
-+ *
-  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-  * or visit www.oracle.com if you need additional information or have any
-  * questions.
-@@ -30,7 +32,6 @@
- #include "memory/resourceArea.hpp"
- #include "oops/objArrayKlass.hpp"
- #include "oops/objArrayOop.hpp"
--#include "runtime/vmOperations.hpp"
- #include "gc/shared/vmGCOperations.hpp"
- #include "../../../java.base/unix/native/include/jni_md.h"
- 
--- 
-2.24.3 (Apple Git-128)
-

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

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

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

@@ -1,141 +0,0 @@
-From 9f4b84339b55187b742682bd84fdb0e6e121917c Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sat, 16 May 2020 15:11:40 +0200
-Subject: [PATCH 36/50] Access com.sun.beans.util - HotswapAgent patch
-
----
- src/hotspot/share/runtime/arguments.cpp       |  2 ++
- .../sun/beans/introspect/package-info.java    | 26 +++++++++++++++++++
- .../classes/com/sun/beans/package-info.java   | 26 +++++++++++++++++++
- .../com/sun/beans/util/package-info.java      | 26 +++++++++++++++++++
- .../share/classes/module-info.java            |  3 +++
- 5 files changed, 83 insertions(+)
- create mode 100644 src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java
- create mode 100644 src/java.desktop/share/classes/com/sun/beans/package-info.java
- create mode 100644 src/java.desktop/share/classes/com/sun/beans/util/package-info.java
-
-diff --git a/src/hotspot/share/runtime/arguments.cpp b/src/hotspot/share/runtime/arguments.cpp
-index 0cdd8c88315..72580b384dd 100644
---- a/src/hotspot/share/runtime/arguments.cpp
-+++ b/src/hotspot/share/runtime/arguments.cpp
-@@ -4333,5 +4333,7 @@ void Arguments::setup_hotswap_agent() {
-   create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans=ALL-UNNAMED", addopens_count++);
-   // com.sun.beans.introspect.ClassInfo access
-   create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans.introspect=ALL-UNNAMED", addopens_count++);
-+  // com.sun.beans.introspect.util.Cache access
-+  create_numbered_property("jdk.module.addopens", "java.desktop/com.sun.beans.util=ALL-UNNAMED", addopens_count++);
- 
- }
-diff --git a/src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java b/src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java
-new file mode 100644
-index 00000000000..6636e4dd62a
---- /dev/null
-+++ b/src/java.desktop/share/classes/com/sun/beans/introspect/package-info.java
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.  Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.beans.introspect;
-diff --git a/src/java.desktop/share/classes/com/sun/beans/package-info.java b/src/java.desktop/share/classes/com/sun/beans/package-info.java
-new file mode 100644
-index 00000000000..5c097eeaa53
---- /dev/null
-+++ b/src/java.desktop/share/classes/com/sun/beans/package-info.java
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.  Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.beans;
-diff --git a/src/java.desktop/share/classes/com/sun/beans/util/package-info.java b/src/java.desktop/share/classes/com/sun/beans/util/package-info.java
-new file mode 100644
-index 00000000000..2d5d735ffa8
---- /dev/null
-+++ b/src/java.desktop/share/classes/com/sun/beans/util/package-info.java
-@@ -0,0 +1,26 @@
-+/*
-+ * Copyright (c) 1998, 2017, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.  Oracle designates this
-+ * particular file as subject to the "Classpath" exception as provided
-+ * by Oracle in the LICENSE file that accompanied this code.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ */
-+
-+package com.sun.beans.util;
-diff --git a/src/java.desktop/share/classes/module-info.java b/src/java.desktop/share/classes/module-info.java
-index f9cf021311f..e61ba7572cf 100644
---- a/src/java.desktop/share/classes/module-info.java
-+++ b/src/java.desktop/share/classes/module-info.java
-@@ -104,6 +104,9 @@ module java.desktop {
-     exports javax.swing.text.rtf;
-     exports javax.swing.tree;
-     exports javax.swing.undo;
-+    exports com.sun.beans;
-+    exports com.sun.beans.introspect;
-+    exports com.sun.beans.util;
- 
-     // qualified exports may be inserted at build time
-     // see make/GensrcModuleInfo.gmk
--- 
-2.24.3 (Apple Git-128)
-

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

@@ -1,29 +0,0 @@
-From 9a662b1367860920095efe79116ef9a2d53fc2c6 Mon Sep 17 00:00:00 2001
-From: Vladimir Dvorak <lada.dvorak7@gmail.com>
-Date: Sun, 17 May 2020 12:19:18 +0200
-Subject: [PATCH 37/50] Skip verifier only in AllowEnhancedClassRedefinition
-
----
- src/hotspot/share/oops/instanceKlass.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
-index c04bdf5abfc..e14aaee21c4 100644
---- a/src/hotspot/share/oops/instanceKlass.cpp
-+++ b/src/hotspot/share/oops/instanceKlass.cpp
-@@ -788,10 +788,10 @@ bool InstanceKlass::link_class_impl(bool throw_verifyerror, TRAPS) {
- 
-     if (!is_linked()) {
-       if (!is_rewritten()) {
--        // In cases, if class A is being redefined and class B->A (B is extended from A) and B is host class of anonymous class C
-+        // (DCEVM): If class A is being redefined and class B->A (B is extended from A) and B is host class of anonymous class C
-         // then second redefinition fails with cannot cast klass exception. So we currently turn off bytecode verification
-         // on redefinition.
--        if (!newest_version()->is_redefining()) {
-+        if (!AllowEnhancedClassRedefinition || !newest_version()->is_redefining()) {
-           bool verify_ok = verify_code(throw_verifyerror, THREAD);
-           if (!verify_ok) {
-             return false;
--- 
-2.24.3 (Apple Git-128)
-

jb/project/tools/patches/dcevm/0038-Use-original-code-for-adjust_method_entries-in-stand.patch

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -62,7 +62,7 @@ function create_jbr {
     --add-modules $(xargs < modules_tmp.list | sed s/" "//g) --output ${JBR_BUNDLE} || do_exit $?
   if [[ "${bundle_type}" == *jcef* ]] || [[ "${bundle_type}" == *dcevm* ]] || [[ "${bundle_type}" == fd ]]
   then
-    cp -R ${JCEF_PATH}/* ${JBR_BUNDLE}/bin || do_exit $?
+    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
@@ -136,7 +136,7 @@ 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
-  cp -R ${JCEF_PATH}/* ${JBRSDK_BUNDLE}/bin
+  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

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

@@ -51,6 +51,7 @@ function pack_jbr {
 
   JBR=$JBR_BASE_NAME-windows-x64-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 $?
 }

make/CompileJavaModules.gmk

@@ -321,7 +321,7 @@ jdk.jshell_COPY += .jsh .properties
 
 ################################################################################
 
-jdk.internal.le_COPY += .properties
+jdk.internal.le_COPY += .properties .caps .txt
 
 ################################################################################
 

make/CompileToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, 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
@@ -39,7 +39,6 @@ $(eval $(call IncludeCustomExtension, CompileTools.gmk))
 # Use += to be able to add to this from a custom extension
 BUILD_TOOLS_SRC_DIRS += \
     $(TOPDIR)/make/jdk/src/classes \
-    $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes \
     $(BUILDTOOLS_OUTPUTDIR)/interim_tzdb_classes \
     #
 
@@ -56,6 +55,7 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
     ADD_JAVAC_FLAGS := \
         --add-exports java.desktop/sun.awt=ALL-UNNAMED \
         --add-exports java.base/sun.text=ALL-UNNAMED \
+        --add-exports java.base/sun.security.util=ALL-UNNAMED \
         , \
 ))
 

make/CopyInterimCLDRConverter.gmk

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

make/Main.gmk

@@ -1,4 +1,4 @@
-#
+
 # Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -78,13 +78,9 @@ ifneq ($(CREATING_BUILDJDK), true)
   interim-rmic:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
 
-  interim-cldrconverter:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
-
-interim-tzdb:
+  interim-tzdb:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimTZDB.gmk)
 
-
   buildtools-jdk:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsJdk.gmk)
 
@@ -96,7 +92,7 @@ interim-tzdb:
 endif
 
 ALL_TARGETS += buildtools-langtools interim-langtools \
-    interim-rmic interim-cldrconverter interim-tzdb buildtools-jdk buildtools-modules \
+    interim-rmic interim-tzdb buildtools-jdk buildtools-modules \
     buildtools-hotspot
 
 ################################################################################
@@ -233,7 +229,7 @@ $(eval $(call DeclareRecipesForPhase, STATIC_LIBS, \
     TARGET_SUFFIX := static-libs, \
     FILE_PREFIX := Lib, \
     MAKE_SUBDIR := lib, \
-    CHECK_MODULES := $(STATIC_LIBS_MODULES), \
+    CHECK_MODULES := $(ALL_MODULES), \
     USE_WRAPPER := true, \
     EXTRA_ARGS := STATIC_LIBS=true, \
 ))
@@ -689,7 +685,7 @@ else
 
   interim-langtools: $(INTERIM_LANGTOOLS_GENSRC_TARGETS)
 
-  buildtools-jdk: interim-langtools interim-cldrconverter interim-tzdb
+  buildtools-jdk: interim-langtools interim-tzdb
 
   buildtools-hotspot: interim-langtools
 
@@ -721,10 +717,14 @@ else
 
   # If not already set, set the JVM variant target so that the JVM will be built.
   JVM_MAIN_LIB_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-libs
+  JVM_MAIN_GENSRC_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc
 
   # Building one JVM variant is enough to start building the other libs
   $(LIBS_TARGETS): $(JVM_MAIN_LIB_TARGETS)
 
+  # Static libs depend on hotspot gensrc
+  $(STATIC_LIBS_TARGETS): $(JVM_MAIN_GENSRC_TARGETS)
+
   $(LAUNCHER_TARGETS): java.base-libs
 
   ifeq ($(STATIC_BUILD), true)

make/RunTests.gmk

@@ -658,10 +658,14 @@ define SetupRunJtregTestBody
     $1_JTREG_LAUNCHER_OPTIONS += -Xmx$$($1_JTREG_MAX_MEM)
   endif
 
+  # Make sure the tmp dir is normalized as some tests will react badly otherwise
+  $1_TEST_TMP_DIR := $$(abspath $$($1_TEST_SUPPORT_DIR)/tmp)
+
   $1_JTREG_BASIC_OPTIONS += -$$($1_JTREG_TEST_MODE) \
       -verbose:$$(JTREG_VERBOSE) -retain:$$(JTREG_RETAIN) \
       -concurrency:$$($1_JTREG_JOBS) -timeoutFactor:$$(JTREG_TIMEOUT_FACTOR) \
-      -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE)
+      -vmoption:-XX:MaxRAMPercentage=$$($1_JTREG_MAX_RAM_PERCENTAGE) \
+      -vmoption:-Djava.io.tmpdir="$$($1_TEST_TMP_DIR)"
 
   $1_JTREG_BASIC_OPTIONS += -automatic -ignore:quiet
 
@@ -740,7 +744,8 @@ define SetupRunJtregTestBody
   run-test-$1: clean-workdir-$1 $$($1_AOT_TARGETS)
 	$$(call LogWarn)
 	$$(call LogWarn, Running test '$$($1_TEST)')
-	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR))
+	$$(call MakeDir, $$($1_TEST_RESULTS_DIR) $$($1_TEST_SUPPORT_DIR) \
+	    $$($1_TEST_TMP_DIR))
 	$$(call ExecuteWithLog, $$($1_TEST_SUPPORT_DIR)/jtreg, ( \
 	    $$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
 	        -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \

make/RunTestsPrebuilt.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2017, 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
@@ -237,7 +237,8 @@ else ifeq ($(OPENJDK_TARGET_OS), solaris)
 else ifeq ($(OPENJDK_TARGET_OS), windows)
   NUM_CORES := $(NUMBER_OF_PROCESSORS)
   MEMORY_SIZE := $(shell \
-      $(EXPR) `wmic computersystem get totalphysicalmemory -value | $(GREP) = \
+      $(EXPR) `wmic computersystem get totalphysicalmemory -value \
+          | $(GREP) = | $(SED) 's/\\r//g' \
           | $(CUT) -d "=" -f 2-` / 1024 / 1024 \
   )
 endif

make/StaticLibsImage.gmk

@@ -32,11 +32,13 @@ include $(SPEC)
 include MakeBase.gmk
 include Modules.gmk
 
+ALL_MODULES = $(call FindAllModules)
+
 ################################################################################
 
 TARGETS :=
 
-$(foreach m, $(STATIC_LIBS_MODULES), \
+$(foreach m, $(ALL_MODULES), \
   $(eval $(call SetupCopyFiles, COPY_STATIC_LIBS_$m, \
       FLATTEN := true, \
       SRC := $(SUPPORT_OUTPUTDIR)/native/$m, \

make/ToolsJdk.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, 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
@@ -74,6 +74,7 @@ TOOL_TZDB = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.tzdb.TzdbZoneRulesCompiler
 
 TOOL_BLACKLISTED_CERTS = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    --add-exports java.base/sun.security.util=ALL-UNNAMED \
     build.tools.blacklistedcertsconverter.BlacklistedCertsConverter
 
 TOOL_MAKEJAVASECURITY = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \

make/autoconf/basics.m4

@@ -641,17 +641,18 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   AC_MSG_RESULT([$TOPDIR])
   AC_SUBST(TOPDIR)
 
+  # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
+  BASIC_FIXUP_PATH(CURDIR)
+  BASIC_FIXUP_PATH(TOPDIR)
+
   if test "x$CUSTOM_ROOT" != x; then
+    BASIC_FIXUP_PATH(CUSTOM_ROOT)
     WORKSPACE_ROOT="${CUSTOM_ROOT}"
   else
     WORKSPACE_ROOT="${TOPDIR}"
   fi
   AC_SUBST(WORKSPACE_ROOT)
 
-  # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
-  BASIC_FIXUP_PATH(CURDIR)
-  BASIC_FIXUP_PATH(TOPDIR)
-
   # Locate the directory of this script.
   AUTOCONF_DIR=$TOPDIR/make/autoconf
 

make/autoconf/flags-cflags.m4

@@ -169,19 +169,7 @@ AC_DEFUN([FLAGS_SETUP_WARNINGS],
     gcc)
       DISABLE_WARNING_PREFIX="-Wno-"
       CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
-      # Repeate the check for the BUILD_CC and BUILD_CXX. Need to also reset
-      # CFLAGS since any target specific flags will likely not work with the
-      # build compiler
-      CC_OLD="$CC"
-      CXX_OLD="$CXX"
-      CC="$BUILD_CC"
-      CXX="$BUILD_CXX"
-      CFLAGS_OLD="$CFLAGS"
-      CFLAGS=""
       BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
-      CC="$CC_OLD"
-      CXX="$CXX_OLD"
-      CFLAGS="$CFLAGS_OLD"
       ;;
     clang)
       DISABLE_WARNING_PREFIX="-Wno-"
@@ -376,6 +364,17 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS],
 
   FLAGS_SETUP_CFLAGS_CPU_DEP([TARGET])
 
+  # Repeat the check for the BUILD_CC and BUILD_CXX. Need to also reset CFLAGS
+  # since any target specific flags will likely not work with the build compiler.
+  CC_OLD="$CC"
+  CXX_OLD="$CXX"
+  CFLAGS_OLD="$CFLAGS"
+  CXXFLAGS_OLD="$CXXFLAGS"
+  CC="$BUILD_CC"
+  CXX="$BUILD_CXX"
+  CFLAGS=""
+  CXXFLAGS=""
+
   FLAGS_OS=$OPENJDK_BUILD_OS
   FLAGS_OS_TYPE=$OPENJDK_BUILD_OS_TYPE
   FLAGS_CPU=$OPENJDK_BUILD_CPU
@@ -387,6 +386,11 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS],
 
   FLAGS_SETUP_CFLAGS_CPU_DEP([BUILD], [OPENJDK_BUILD_], [BUILD_])
 
+  CC="$CC_OLD"
+  CXX="$CXX_OLD"
+  CFLAGS="$CFLAGS_OLD"
+  CXXFLAGS="$CXXFLAGS_OLD"
+
   # Tests are only ever compiled for TARGET
   CFLAGS_TESTLIB="$CFLAGS_JDKLIB"
   CXXFLAGS_TESTLIB="$CXXFLAGS_JDKLIB"

make/autoconf/hotspot.m4

@@ -25,7 +25,7 @@
 
 # All valid JVM features, regardless of platform
 VALID_JVM_FEATURES="compiler1 compiler2 zero minimal dtrace jvmti jvmci \
-    graal vm-structs jni-check services management cmsgc epsilongc g1gc parallelgc serialgc zgc nmt cds \
+    graal vm-structs jni-check services management cmsgc epsilongc g1gc parallelgc serialgc shenandoahgc zgc nmt cds \
     static-build link-time-opt aot jfr"
 
 # Deprecated JVM features (these are ignored, but with a warning)
@@ -352,6 +352,19 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
     fi
   fi
 
+  # Only enable Shenandoah on supported arches, and only if requested
+  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
+      AC_MSG_RESULT([yes])
+    else
+      DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
+      AC_MSG_RESULT([no, platform not supported])
+    fi
+  else
+      DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
+  fi
+
   # Only enable ZGC on supported platforms
   AC_MSG_CHECKING([if zgc can be built])
   if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
@@ -363,7 +376,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
 
   # Disable unsupported GCs for Zero
   if HOTSPOT_CHECK_JVM_VARIANT(zero); then
-    DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES epsilongc g1gc zgc"
+    DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES epsilongc g1gc shenandoahgc zgc"
   fi
 
   # Turn on additional features based on other parts of configure
@@ -494,7 +507,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES],
   fi
 
   # All variants but minimal (and custom) get these features
-  NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc jni-check jvmti management nmt services vm-structs zgc"
+  NON_MINIMAL_FEATURES="$NON_MINIMAL_FEATURES cmsgc g1gc parallelgc serialgc epsilongc shenandoahgc jni-check jvmti management nmt services vm-structs zgc"
 
   AC_MSG_CHECKING([if cds should be enabled])
   if test "x$ENABLE_CDS" = "xtrue"; then

make/autoconf/lib-ffi.m4

@@ -85,6 +85,20 @@ AC_DEFUN_ONCE([LIB_SETUP_LIBFFI],
           [LIBFFI_FOUND=no]
       )
     fi
+    # on macos we need a special case for system's libffi as
+    # headers are located only in sdk in $SYSROOT and in ffi subfolder
+    if test "x$LIBFFI_FOUND" = xno; then
+      if test "x$SYSROOT" != "x"; then
+        AC_CHECK_HEADER([$SYSROOT/usr/include/ffi/ffi.h],
+            [
+              LIBFFI_FOUND=yes
+              LIBFFI_CFLAGS="-I${SYSROOT}/usr/include/ffi"
+              LIBFFI_LIBS=-lffi
+            ],
+            [LIBFFI_FOUND=no]
+        )
+      fi
+    fi
     if test "x$LIBFFI_FOUND" = xno; then
       HELP_MSG_MISSING_DEPENDENCY([ffi])
       AC_MSG_ERROR([Could not find libffi! $HELP_MSG])

make/autoconf/version-numbers

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, 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
@@ -28,12 +28,12 @@
 
 DEFAULT_VERSION_FEATURE=11
 DEFAULT_VERSION_INTERIM=0
-DEFAULT_VERSION_UPDATE=8
+DEFAULT_VERSION_UPDATE=9
 DEFAULT_VERSION_PATCH=0
 DEFAULT_VERSION_EXTRA1=0
 DEFAULT_VERSION_EXTRA2=0
 DEFAULT_VERSION_EXTRA3=0
-DEFAULT_VERSION_DATE=2020-07-14
+DEFAULT_VERSION_DATE=2020-10-20
 DEFAULT_VERSION_CLASSFILE_MAJOR=55  # "`$EXPR $DEFAULT_VERSION_FEATURE + 44`"
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="10 11"

make/common/Modules.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,7 @@ BOOT_MODULES += \
     jdk.management \
     jdk.management.jfr \
     jdk.management.agent \
+    jdk.naming.ldap \
     jdk.net \
     jdk.sctp \
     jdk.unsupported \
@@ -165,6 +166,7 @@ DOCS_MODULES += \
     jdk.management.agent \
     jdk.management.jfr \
     jdk.naming.dns \
+    jdk.naming.ldap \
     jdk.naming.rmi \
     jdk.net \
     jdk.pack \
@@ -197,21 +199,6 @@ HOTSPOT_MODULES := \
     jdk.internal.vm.compiler.management \
     #
 
-# The native dynamic libraries in these modules will also get built into static
-# libraries for consumption by downstream projects that need to statically link
-# the JDK libraries. Those static libraries are not part of the main JDK
-# distribution. 
-STATIC_LIBS_MODULES := \
-    java.base \
-    jdk.crypto.ec \
-    jdk.security.auth \
-    java.prefs \
-    java.security.jgss \
-    java.smartcardio \
-    jdk.crypto.cryptoki \
-    jdk.net \
-    #
-
 ################################################################################
 # Some platforms don't have the serviceability agent
 

make/common/TextFileProcessing.gmk

@@ -155,9 +155,10 @@ define SetupTextFileProcessingBody
     # Convert the REPLACEMENTS syntax ( A => B ; C => D ; ...) to a sed command
     # line (-e "s/A/B/g" -e "s/C/D/g" ...), basically by replacing '=>' with '/'
     # and ';' with '/g" -e "s/', and adjusting for edge cases.
+    # '&' has special meaning in sed so needs to be escaped.
     $1_REPLACEMENTS_COMMAND_LINE := $(SED) -e 's$$($1_SEP)$$(subst $$(SPACE);$$(SPACE),$$($1_SEP)g' \
         -e 's$$($1_SEP),$$(subst $$(SPACE)=>$$(SPACE),$$($1_SEP),$$(subst $$(SPACE)=>$$(SPACE);$$(SPACE),$$($1_SEP)$$($1_SEP)g' \
-        -e 's$$($1_SEP),$$(strip $$($1_REPLACEMENTS)))))$$($1_SEP)g'
+        -e 's$$($1_SEP),$$(subst &,\&,$$(strip $$($1_REPLACEMENTS))))))$$($1_SEP)g'
   else
     # We don't have any replacements, just pipe the file through cat.
     $1_REPLACEMENTS_COMMAND_LINE := $(CAT)

make/data/blacklistedcertsconverter/blacklisted.certs.pem

@@ -1,8 +1,7 @@
 #! java BlacklistedCertsConverter SHA-256
 
-# The line above must be the first line of the blacklisted.certs.pem
-# file inside src/share/lib/security/. It will be ignored if added in
-# src/closed/share/lib/security/blacklisted.certs.pem.
+# The line above must be the first line of this file. Do not
+# remove it.
 
 // Subject: CN=Digisign Server ID (Enrich),
 //          OU=457608-K,

make/data/bundle/JDK-Info.plist

@@ -22,6 +22,8 @@
         <string>????</string>
         <key>CFBundleVersion</key>
         <string>@@VERSION@@</string>
+        <key>NSMicrophoneUsageDescription</key>
+        <string>The application is requesting access to the microphone.</string>
         <key>JavaVM</key>
         <dict>
                 <key>JVMCapabilities</key>

make/data/bundle/JRE-Info.plist

@@ -22,6 +22,8 @@
         <string>????</string>
         <key>CFBundleVersion</key>
         <string>@@VERSION@@</string>
+        <key>NSMicrophoneUsageDescription</key>
+        <string>The application is requesting access to the microphone.</string>
         <key>JavaVM</key>
         <dict>
                 <key>JVMMinimumFrameworkVersion</key>

make/data/cacerts/entrustrootcag4

@@ -0,0 +1,43 @@
+Owner: CN=Entrust Root Certification Authority - G4, OU="(c) 2015 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
+Issuer: CN=Entrust Root Certification Authority - G4, OU="(c) 2015 Entrust, Inc. - for authorized use only", OU=See www.entrust.net/legal-terms, O="Entrust, Inc.", C=US
+Serial number: d9b5437fafa9390f000000005565ad58
+Valid from: Wed May 27 11:11:16 GMT 2015 until: Sun Dec 27 11:41:16 GMT 2037
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw
+gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL
+Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg
+MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw
+BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0
+MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1
+c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ
+bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ
+2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E
+T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j
+5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM
+C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T
+DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX
+wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A
+2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm
+nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
+dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl
+N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj
+c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS
+5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS
+Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr
+hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/
+B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI
+AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw
+H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+
+b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk
+2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol
+IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk
+5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY
+n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw==
+-----END CERTIFICATE-----

make/data/cacerts/sslrooteccca

@@ -0,0 +1,23 @@
+Owner: CN=SSL.com Root Certification Authority ECC, O=SSL Corporation, L=Houston, ST=Texas, C=US
+Issuer: CN=SSL.com Root Certification Authority ECC, O=SSL Corporation, L=Houston, ST=Texas, C=US
+Serial number: 75e6dfcbc1685ba8
+Valid from: Fri Feb 12 18:14:03 GMT 2016 until: Tue Feb 12 18:14:03 GMT 2041
+Signature algorithm name: SHA256withECDSA
+Subject Public Key Algorithm: 384-bit EC key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMC
+VVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9T
+U0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0
+aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEyMTgxNDAzWhcNNDEwMjEyMTgxNDAz
+WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hvdXN0
+b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNvbSBS
+b290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI
+7Z4INcgn64mMU1jrYor+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPg
+CemB+vNH06NjMGEwHQYDVR0OBBYEFILRhXMw5zUE044CkvvlpNHEIejNMA8GA1Ud
+EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTTjgKS++Wk0cQh6M0wDgYD
+VR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCWe+0F+S8T
+kdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+
+gA0z5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
+-----END CERTIFICATE-----

make/data/cacerts/sslrootevrsaca

@@ -0,0 +1,41 @@
+Owner: CN=SSL.com EV Root Certification Authority RSA R2, O=SSL Corporation, L=Houston, ST=Texas, C=US
+Issuer: CN=SSL.com EV Root Certification Authority RSA R2, O=SSL Corporation, L=Houston, ST=Texas, C=US
+Serial number: 56b629cd34bc78f6
+Valid from: Wed May 31 18:14:37 GMT 2017 until: Fri May 30 18:14:37 GMT 2042
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNV
+BAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UE
+CgwPU1NMIENvcnBvcmF0aW9uMTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMB4XDTE3MDUzMTE4MTQzN1oXDTQy
+MDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQIDAVUZXhhczEQMA4G
+A1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYDVQQD
+DC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvq
+M0fNTPl9fb69LT3w23jhhqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssuf
+OePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7wcXHswxzpY6IXFJ3vG2fThVUCAtZJycxa
+4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTOZw+oz12WGQvE43LrrdF9
+HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+B6KjBSYR
+aZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcA
+b9ZhCBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQ
+Gp8hLH94t2S42Oim9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQV
+PWKchjgGAGYS5Fl2WlPAApiiECtoRHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMO
+pgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+SlmJuwgUHfbSguPvuUCYHBBXtSu
+UDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48+qvWBkofZ6aY
+MBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
+HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa4
+9QaAJadz20ZpqJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBW
+s47LCp1Jjr+kxJG7ZhcFUZh1++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5
+Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nxY/hoLVUE0fKNsKTPvDxeH3jnpaAg
+cLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2GguDKBAdRUNf/ktUM
+79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDzOFSz
+/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXt
+ll9ldDz7CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEm
+Kf7GUmG6sXP/wwyc5WxqlD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKK
+QbNmC1r7fSOl8hqw/96bg5Qu0T/fkreRrwU7ZcegbLHNYhLDkBvjJc40vG93drEQ
+w/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1hlMYegouCRw2n5H9gooi
+S9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX9hwJ1C07
+mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
+-----END CERTIFICATE-----

make/data/cacerts/sslrootrsaca

@@ -0,0 +1,41 @@
+Owner: CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, ST=Texas, C=US
+Issuer: CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, ST=Texas, C=US
+Serial number: 7b2c9bd316803299
+Valid from: Fri Feb 12 17:39:39 GMT 2016 until: Tue Feb 12 17:39:39 GMT 2041
+Signature algorithm name: SHA256withRSA
+Subject Public Key Algorithm: 4096-bit RSA key
+Version: 3
+-----BEGIN CERTIFICATE-----
+MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UE
+BhMCVVMxDjAMBgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQK
+DA9TU0wgQ29ycG9yYXRpb24xMTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZp
+Y2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYwMjEyMTczOTM5WhcNNDEwMjEyMTcz
+OTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAOBgNVBAcMB0hv
+dXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
+bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcN
+AQEBBQADggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2R
+xFdHaxh3a3by/ZPkPQ/CFp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aX
+qhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcC
+C52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/geoeOy3ZExqysdBP+lSgQ3
+6YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkpk8zruFvh
+/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrF
+YD3ZfBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93E
+JNyAKoFBbZQ+yODJgUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVc
+US4cK38acijnALXRdMbX5J+tB5O2UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8
+ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi81xtZPCvM8hnIk2snYxnP/Okm
++Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4sbE6x/c+cCbqi
+M+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4G
+A1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGV
+cpNxJK1ok1iOMq8bs3AD/CUrdIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBc
+Hadm47GUBwwyOabqG7B52B2ccETjit3E+ZUfijhDPwGFpUenPUayvOUiaPd7nNgs
+PgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAslu1OJD7OAUN5F7kR/
+q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjqerQ0
+cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jr
+a6x+3uxjMxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90I
+H37hVZkLId6Tngr75qNJvTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/Y
+K9f1JmzJBjSWFupwWRoyeXkLtoh/D1JIPb9s2KJELtFOt3JY04kTlf5Eq/jXixtu
+nLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406ywKBjYZC6VWg3dGq2ktuf
+oYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NIWuuA8ShY
+Ic2wBlX7Jz9TkHCpBB5XJ7k=
+-----END CERTIFICATE-----

make/data/charsetmapping/MS950.map

@@ -23,10 +23,10 @@
 #    0xF9FD -> u256F -> 0xA2A3 
 #    0xA2CC -> u5341 -> 0xA451 
 #    0xA2CE -> u5345 -> 0xA4CA  
-#    0xF9F9 -> u2550 -> 0xA2A4
-#    0xF9E9 -> u255E -> 0xA2A5	
-#    0xF9EA -> u256A -> 0xA2A6	
-#    0xF9EB -> u2561 -> 0xA2A7
+#    0xA2A4 -> u2550 -> 0xF9F9
+#    0xA2A5 -> u255E -> 0xF9E9
+#    0xA2A6 -> u256A -> 0xF9EA
+#    0xA2A7 -> u2561 -> 0xF9EB
 #
 # Column #1 is the cp950 code (in hex)
 # Column #2 is the Unicode (in hex as 0xXXXX)

make/data/charsetmapping/MS950.nr

@@ -6,13 +6,13 @@
 # (we don't need a MS950.c2b, the entries of MS950.c2b-irreversible
 #  are added in MS950.b2c already)
 #
-0xF9FA  0x256D 
+0xA2A4  0x2550
+0xA2A5  0x255E
+0xA2A6  0x256A
+0xA2A7  0x2561
+0xA2CC  0x5341
+0xA2CE  0x5345
+0xF9FA  0x256D
 0xF9FB  0x256E
 0xF9FC  0x2570
 0xF9FD  0x256F
-0xA2CC  0x5341
-0xA2CE  0x5345
-0xF9F9  0x2550
-0xF9E9  0x255E
-0xF9EA  0x256A
-0xF9EB  0x2561

make/data/publicsuffixlist/VERSION

@@ -1,2 +1,2 @@
-Github: https://raw.githubusercontent.com/publicsuffix/list/33c1c788decfed1052089fa27e3005fe4088dec3/public_suffix_list.dat
-Date: 2019-09-28
+Github: https://raw.githubusercontent.com/publicsuffix/list/cbbba1d234670453df9c930dfbf510c0474d4301/public_suffix_list.dat
+Date: 2020-04-24

make/data/publicsuffixlist/public_suffix_list.dat

@@ -79,7 +79,6 @@ exchange.aero
 express.aero
 federation.aero
 flight.aero
-freight.aero
 fuel.aero
 gliding.aero
 government.aero
@@ -213,6 +212,7 @@ ac.at
 co.at
 gv.at
 or.at
+sth.ac.at
 
 // au : https://en.wikipedia.org/wiki/.au
 // http://www.auda.org.au/
@@ -241,7 +241,7 @@ wa.au
 // 3LDs
 act.edu.au
 catholic.edu.au
-eq.edu.au
+// eq.edu.au - Removed at the request of the Queensland Department of Education
 nsw.edu.au
 nt.edu.au
 qld.edu.au
@@ -719,11 +719,13 @@ gouv.ci
 *.ck
 !www.ck
 
-// cl : https://en.wikipedia.org/wiki/.cl
+// cl : https://www.nic.cl
+// Confirmed by .CL registry <hsalgado@nic.cl>
 cl
-gov.cl
-gob.cl
+aprendemas.cl
 co.cl
+gob.cl
+gov.cl
 mil.cl
 
 // cm : https://en.wikipedia.org/wiki/.cm plus bug 981927
@@ -982,8 +984,19 @@ fi
 // TODO: Check for updates (expected to be phased out around Q1/2009)
 aland.fi
 
-// fj : https://en.wikipedia.org/wiki/.fj
-*.fj
+// fj : http://domains.fj/
+// Submitted by registry <garth.miller@cocca.org.nz> 2020-02-11
+fj
+ac.fj
+biz.fj
+com.fj
+gov.fj
+info.fj
+mil.fj
+name.fj
+net.fj
+org.fj
+pro.fj
 
 // fk : https://en.wikipedia.org/wiki/.fk
 *.fk
@@ -1368,7 +1381,7 @@ it
 gov.it
 edu.it
 // Reserved geo-names (regions and provinces):
-// http://www.nic.it/sites/default/files/docs/Regulation_assignation_v7.1.pdf
+// https://www.nic.it/sites/default/files/archivio/docs/Regulation_assignation_v7.1.pdf
 // Regions
 abr.it
 abruzzo.it
@@ -5886,14 +5899,9 @@ gov.rs
 in.rs
 org.rs
 
-// ru : https://cctld.ru/en/domains/domens_ru/reserved/
+// ru : https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf
+// Submitted by George Georgievsky <gug@cctld.ru>
 ru
-ac.ru
-edu.ru
-gov.ru
-int.ru
-mil.ru
-test.ru
 
 // rw : https://www.ricta.org.rw/sites/default/files/resources/registry_registrar_contract_0.pdf
 rw
@@ -6038,9 +6046,12 @@ org.sn
 perso.sn
 univ.sn
 
-// so : http://www.soregistry.com/
+// so : http://sonic.so/policies/
 so
 com.so
+edu.so
+gov.so
+me.so
 net.so
 org.so
 
@@ -6510,7 +6521,7 @@ k12.ok.us
 k12.or.us
 k12.pa.us
 k12.pr.us
-k12.ri.us
+// k12.ri.us  Removed at request of Kim Cournoyer <netsupport@staff.ri.net>
 k12.sc.us
 // k12.sd.us  Bug 934131 - Removed at request of James Booze <James.Booze@k12.sd.us>
 k12.tn.us
@@ -6797,8 +6808,13 @@ yt
 مصر
 
 // xn--e1a4c ("eu", Cyrillic) : EU
+// https://eurid.eu
 ею
 
+// xn--qxa6a ("eu", Greek) : EU
+// https://eurid.eu
+ευ
+
 // xn--mgbah1a3hjkrd ("Mauritania", Arabic) : MR
 موريتانيا
 
@@ -6955,7 +6971,8 @@ yt
 ак.срб
 
 // xn--p1ai ("rf", Russian-Cyrillic) : RU
-// http://www.cctld.ru/en/docs/rulesrf.php
+// https://cctld.ru/files/pdf/docs/en/rules_ru-rf.pdf
+// Submitted by George Georgievsky <gug@cctld.ru>
 рф
 
 // xn--wgbl6a ("Qatar", Arabic) : QA
@@ -7075,7 +7092,7 @@ org.zw
 
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2019-09-26T16:43:02Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-04-02T18:20:31Z
 // This list is auto-generated, don't edit it manually.
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -7197,6 +7214,9 @@ alsace
 // alstom : 2015-07-30 ALSTOM
 alstom
 
+// amazon : 2019-12-19 Amazon Registry Services, Inc.
+amazon
+
 // americanexpress : 2015-07-31 American Express Travel Related Services Company, Inc.
 americanexpress
 
@@ -7296,7 +7316,7 @@ auto
 // autos : 2014-01-09 DERAutos, LLC
 autos
 
-// avianca : 2015-01-08 Aerovias del Continente Americano S.A. Avianca
+// avianca : 2015-01-08 Avianca Holdings S.A.
 avianca
 
 // aws : 2015-06-25 Amazon Registry Services, Inc.
@@ -7374,7 +7394,7 @@ bcn
 // beats : 2015-05-14 Beats Electronics, LLC
 beats
 
-// beauty : 2015-12-03 L'Oréal
+// beauty : 2015-12-03 XYZ.COM LLC
 beauty
 
 // beer : 2014-01-09 Minds + Machines Group Limited
@@ -7587,9 +7607,6 @@ careers
 // cars : 2014-11-13 Cars Registry Limited
 cars
 
-// cartier : 2014-06-23 Richemont DNS Inc.
-cartier
-
 // casa : 2013-11-21 Minds + Machines Group Limited
 casa
 
@@ -7668,9 +7685,6 @@ christmas
 // chrome : 2014-07-24 Charleston Road Registry Inc.
 chrome
 
-// chrysler : 2015-07-30 FCA US LLC.
-chrysler
-
 // church : 2014-02-06 Binky Moon, LLC
 church
 
@@ -7836,7 +7850,7 @@ cuisinella
 // cymru : 2014-05-08 Nominet UK
 cymru
 
-// cyou : 2015-01-22 Beijing Gamease Age Digital Technology Co., Ltd.
+// cyou : 2015-01-22 ShortDot SA
 cyou
 
 // dabur : 2014-02-06 Dabur India Limited
@@ -7950,9 +7964,6 @@ docs
 // doctor : 2016-06-02 Binky Moon, LLC
 doctor
 
-// dodge : 2015-07-30 FCA US LLC.
-dodge
-
 // dog : 2014-12-04 Binky Moon, LLC
 dog
 
@@ -8058,9 +8069,6 @@ eus
 // events : 2013-12-05 Binky Moon, LLC
 events
 
-// everbank : 2014-05-15 EverBank
-everbank
-
 // exchange : 2014-03-06 Binky Moon, LLC
 exchange
 
@@ -8334,7 +8342,7 @@ gmail
 // gmbh : 2016-01-29 Binky Moon, LLC
 gmbh
 
-// gmo : 2014-01-09 GMO Internet Pte. Ltd.
+// gmo : 2014-01-09 GMO Internet, Inc.
 gmo
 
 // gmx : 2014-04-24 1&1 Mail & Media GmbH
@@ -8409,7 +8417,7 @@ guitars
 // guru : 2013-08-27 Binky Moon, LLC
 guru
 
-// hair : 2015-12-03 L'Oréal
+// hair : 2015-12-03 XYZ.COM LLC
 hair
 
 // hamburg : 2014-02-20 Hamburg Top-Level-Domain GmbH
@@ -8745,9 +8753,6 @@ kyoto
 // lacaixa : 2014-01-09 Fundación Bancaria Caixa d’Estalvis i Pensions de Barcelona, “la Caixa”
 lacaixa
 
-// ladbrokes : 2015-08-06 LADBROKES INTERNATIONAL PLC
-ladbrokes
-
 // lamborghini : 2015-06-04 Automobili Lamborghini S.p.A.
 lamborghini
 
@@ -8760,9 +8765,6 @@ lancaster
 // lancia : 2015-07-31 Fiat Chrysler Automobiles N.V.
 lancia
 
-// lancome : 2015-07-23 L'Oréal
-lancome
-
 // land : 2013-09-10 Binky Moon, LLC
 land
 
@@ -8814,9 +8816,6 @@ lexus
 // lgbt : 2014-05-08 Afilias Limited
 lgbt
 
-// liaison : 2014-10-02 Liaison Technologies, Incorporated
-liaison
-
 // lidl : 2014-09-18 Schwarz Domains und Services GmbH & Co. KG
 lidl
 
@@ -8937,7 +8936,7 @@ maif
 // maison : 2013-12-05 Binky Moon, LLC
 maison
 
-// makeup : 2015-01-15 L'Oréal
+// makeup : 2015-01-15 XYZ.COM LLC
 makeup
 
 // man : 2014-12-04 MAN SE
@@ -9060,9 +9059,6 @@ money
 // monster : 2015-09-11 XYZ.COM LLC
 monster
 
-// mopar : 2015-07-30 FCA US LLC.
-mopar
-
 // mormon : 2013-12-05 IRI Domain Management, LLC ("Applicant")
 mormon
 
@@ -9084,9 +9080,6 @@ mov
 // movie : 2015-02-05 Binky Moon, LLC
 movie
 
-// movistar : 2014-10-16 Telefónica S.A.
-movistar
-
 // msd : 2015-07-23 MSD Registry Holdings, Inc.
 msd
 
@@ -9102,9 +9095,6 @@ mutual
 // nab : 2015-08-20 National Australia Bank Limited
 nab
 
-// nadex : 2014-12-11 Nadex Domains, Inc.
-nadex
-
 // nagoya : 2013-10-24 GMO Registry, Inc.
 nagoya
 
@@ -9345,9 +9335,6 @@ photos
 // physio : 2014-05-01 PhysBiz Pty Ltd
 physio
 
-// piaget : 2014-10-16 Richemont DNS Inc.
-piaget
-
 // pics : 2013-11-14 Uniregistry, Corp.
 pics
 
@@ -9459,7 +9446,7 @@ qpon
 // quebec : 2013-12-19 PointQuébec Inc
 quebec
 
-// quest : 2015-03-26 Quest ION Limited
+// quest : 2015-03-26 XYZ.COM LLC
 quest
 
 // qvc : 2015-07-30 QVC, Inc.
@@ -9789,7 +9776,7 @@ site
 // ski : 2015-04-09 Afilias Limited
 ski
 
-// skin : 2015-01-15 L'Oréal
+// skin : 2015-01-15 XYZ.COM LLC
 skin
 
 // sky : 2014-06-19 Sky International AG
@@ -9858,9 +9845,6 @@ spreadbetting
 // srl : 2015-05-07 InterNetX, Corp
 srl
 
-// srt : 2015-07-30 FCA US LLC.
-srt
-
 // stada : 2014-11-13 STADA Arzneimittel AG
 stada
 
@@ -9987,9 +9971,6 @@ tech
 // technology : 2013-09-13 Binky Moon, LLC
 technology
 
-// telefonica : 2014-10-16 Telefónica S.A.
-telefonica
-
 // temasek : 2014-08-07 Temasek Holdings (Private) Limited
 temasek
 
@@ -10083,7 +10064,7 @@ trading
 // training : 2013-11-07 Binky Moon, LLC
 training
 
-// travel :  Dog Beach, LLC
+// travel : 2015-10-09 Dog Beach, LLC
 travel
 
 // travelchannel : 2015-07-02 Lifestyle Domain Holdings, Inc.
@@ -10122,9 +10103,6 @@ ubank
 // ubs : 2014-12-11 UBS AG
 ubs
 
-// uconnect : 2015-07-30 FCA US LLC.
-uconnect
-
 // unicom : 2015-10-15 China United Network Communications Corporation Limited
 unicom
 
@@ -10194,9 +10172,6 @@ visa
 // vision : 2013-12-05 Binky Moon, LLC
 vision
 
-// vistaprint : 2014-09-18 Vistaprint Limited
-vistaprint
-
 // viva : 2014-11-07 Saudi Telecom Company
 viva
 
@@ -10245,9 +10220,6 @@ wang
 // wanggou : 2014-12-18 Amazon Registry Services, Inc.
 wanggou
 
-// warman : 2015-06-18 Weir Group IP Limited
-warman
-
 // watch : 2013-11-14 Binky Moon, LLC
 watch
 
@@ -10362,7 +10334,7 @@ xin
 // xn--3bst00m : 2013-09-13 Eagle Horizon Limited
 集团
 
-// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED
+// xn--3ds443g : 2013-09-08 TLD REGISTRY LIMITED OY
 在线
 
 // xn--3oq18vl8pn36a : 2015-07-02 Volkswagen (China) Investment Co., Ltd.
@@ -10377,7 +10349,7 @@ xin
 // xn--45q11c : 2013-11-21 Zodiac Gemini Ltd
 八卦
 
-// xn--4gbrim : 2013-10-04 Suhub Electronic Establishment
+// xn--4gbrim : 2013-10-04 Fans TLD Limited
 موقع
 
 // xn--55qw42g : 2013-11-08 China Organizational Name Administration Center
@@ -10437,10 +10409,13 @@ xin
 // xn--cck2b3b : 2015-02-26 Amazon Registry Services, Inc.
 ストア
 
+// xn--cckwcxetd : 2019-12-19 Amazon Registry Services, Inc.
+アマゾン
+
 // xn--cg4bki : 2013-09-27 SAMSUNG SDS CO., LTD
 삼성
 
-// xn--czr694b : 2014-01-16 Dot Trademark TLD Holding Company Limited
+// xn--czr694b : 2014-01-16 Internet DotTrademark Organisation Limited
 商标
 
 // xn--czrs0t : 2013-12-19 Binky Moon, LLC
@@ -10458,16 +10433,13 @@ xin
 // xn--efvy88h : 2014-08-22 Guangzhou YU Wei Information Technology Co., Ltd.
 新闻
 
-// xn--estv75g : 2015-02-19 Industrial and Commercial Bank of China Limited
-工行
-
 // xn--fct429k : 2015-04-09 Amazon Registry Services, Inc.
 家電
 
 // xn--fhbei : 2015-01-15 VeriSign Sarl
 كوم
 
-// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED
+// xn--fiq228c5hs : 2013-09-08 TLD REGISTRY LIMITED OY
 中文网
 
 // xn--fiq64b : 2013-10-14 CITIC Group Corporation
@@ -10497,7 +10469,7 @@ xin
 // xn--i1b6b1a6a2e : 2013-11-14 Public Interest Registry
 संगठन
 
-// xn--imr513n : 2014-12-11 Dot Trademark TLD Holding Company Limited
+// xn--imr513n : 2014-12-11 Internet DotTrademark Organisation Limited
 餐厅
 
 // xn--io0a7i : 2013-11-14 China Internet Network Information Center (CNNIC)
@@ -10506,6 +10478,9 @@ xin
 // xn--j1aef : 2015-01-15 VeriSign Sarl
 ком
 
+// xn--jlq480n2rg : 2019-12-19 Amazon Registry Services, Inc.
+亚马逊
+
 // xn--jlq61u9w7b : 2015-01-08 Nokia Corporation
 诺基亚
 
@@ -10566,7 +10541,7 @@ xin
 // xn--nyqy26a : 2014-11-07 Stable Tone Limited
 健康
 
-// xn--otu796d : 2017-08-06 Dot Trademark TLD Holding Company Limited
+// xn--otu796d : 2017-08-06 Jiang Yu Liang Cai Technology Company Limited
 招聘
 
 // xn--p1acf : 2013-12-12 Rusnames Limited
@@ -10641,7 +10616,7 @@ yahoo
 // yamaxun : 2014-12-18 Amazon Registry Services, Inc.
 yamaxun
 
-// yandex : 2014-04-10 YANDEX, LLC
+// yandex : 2014-04-10 Yandex Europe B.V.
 yandex
 
 // yodobashi : 2014-11-20 YODOBASHI CAMERA CO.,LTD.
@@ -10691,6 +10666,12 @@ cc.ua
 inf.ua
 ltd.ua
 
+// Adobe : https://www.adobe.com/
+// Submitted by Ian Boston <boston@adobe.com>
+adobeaemcloud.com
+adobeaemcloud.net
+*.dev.adobeaemcloud.com
+
 // Agnat sp. z o.o. : https://domena.pl
 // Submitted by Przemyslaw Plewa <it-admin@domena.pl>
 beep.pl
@@ -10808,6 +10789,10 @@ s3-website.eu-west-2.amazonaws.com
 s3-website.eu-west-3.amazonaws.com
 s3-website.us-east-2.amazonaws.com
 
+// Amsterdam Wireless: https://www.amsterdamwireless.nl/
+// Submitted by Imre Jonk <hostmaster@amsterdamwireless.nl>
+amsw.nl
+
 // Amune : https://amune.org/
 // Submitted by Team Amune <cert@amune.org>
 t3l3p0rt.net
@@ -10842,12 +10827,6 @@ sweetpepper.org
 // Submitted by Vincent Tseng <vincenttseng@asustor.com>
 myasustor.com
 
-// Automattic Inc. : https://automattic.com/
-// Submitted by Alex Concha <alex.concha@automattic.com>
-go-vip.co
-go-vip.net
-wpcomstaging.com
-
 // AVM : https://avm.de
 // Submitted by Andreas Weise <a.weise@avm.de>
 myfritz.net
@@ -10984,8 +10963,9 @@ certmgr.org
 xenapponazure.com
 
 // Civilized Discourse Construction Kit, Inc. : https://www.discourse.org/
-// Submitted by Rishabh Nambiar <rishabh.nambiar@discourse.org>
+// Submitted by Rishabh Nambiar & Michael Brown <team@discourse.org>
 discourse.group
+discourse.team
 
 // ClearVox : http://www.clearvox.nl/
 // Submitted by Leon Rowland <leon@clearvox.nl>
@@ -11000,6 +10980,10 @@ cleverapps.io
 *.lcl.dev
 *.stg.dev
 
+// Clic2000 : https://clic2000.fr
+// Submitted by Mathilde Blanchemanche <mathilde@clic2000.fr>
+clic2000.net
+
 // Cloud66 : https://www.cloud66.com/
 // Submitted by Khash Sajadi <khash@cloud66.com>
 c66.me
@@ -11082,6 +11066,15 @@ co.no
 webhosting.be
 hosting-cluster.nl
 
+// Coordination Center for TLD RU and XN--P1AI : https://cctld.ru/en/domains/domens_ru/reserved/
+// Submitted by George Georgievsky <gug@cctld.ru>
+ac.ru
+edu.ru
+gov.ru
+int.ru
+mil.ru
+test.ru
+
 // COSIMO GmbH : http://www.cosimo.de
 // Submitted by Rene Marticke <rmarticke@cosimo.de>
 dyn.cosidns.de
@@ -11106,6 +11099,18 @@ realm.cz
 // Submitted by Jonathan Rudenberg <jonathan@cupcake.io>
 cupcake.is
 
+// Curv UG : https://curv-labs.de/
+// Submitted by Marvin Wiesner <Marvin@curv-labs.de>
+curv.dev
+
+// Customer OCI - Oracle Dyn https://cloud.oracle.com/home https://dyn.com/dns/
+// Submitted by Gregory Drake <support@dyn.com>
+// Note: This is intended to also include customer-oci.com due to wildcards implicitly including the current label
+*.customer-oci.com
+*.oci.customer-oci.com
+*.ocp.customer-oci.com
+*.ocs.customer-oci.com
+
 // cyon GmbH : https://www.cyon.ch/
 // Submitted by Dominic Luechinger <dol@cyon.ch>
 cyon.link
@@ -11133,11 +11138,23 @@ firm.dk
 reg.dk
 store.dk
 
+// dappnode.io : https://dappnode.io/
+// Submitted by Abel Boldu / DAppNode Team <community@dappnode.io>
+dyndns.dappnode.io
+
 // dapps.earth : https://dapps.earth/
 // Submitted by Daniil Burdakov <icqkill@gmail.com>
 *.dapps.earth
 *.bzz.dapps.earth
 
+// Dark, Inc. : https://darklang.com
+// Submitted by Paul Biggar <ops@darklang.com>
+builtwithdark.com
+
+// Datawire, Inc : https://www.datawire.io
+// Submitted by Richard Li <secalert@datawire.io>
+edgestack.me
+
 // Debian : https://www.debian.org/
 // Submitted by Peter Palfrader / Debian Sysadmin Team <dsa-publicsuffixlist@debian.org>
 debian.net
@@ -11511,6 +11528,10 @@ dynv6.net
 // Submitted by Vladimir Dudr <info@e4you.cz>
 e4.cz
 
+// En root‽ : https://en-root.org
+// Submitted by Emmanuel Raviart <emmanuel@raviart.com>
+en-root.fr
+
 // Enalean SAS: https://www.enalean.com
 // Submitted by Thomas Cottier <thomas.cottier@enalean.com>
 mytuleap.com
@@ -11603,6 +11624,10 @@ twmail.org
 mymailer.com.tw
 url.tw
 
+// Fabrica Technologies, Inc. : https://www.fabrica.dev/
+// Submitted by Eric Jiang <eric@fabrica.dev>
+onfabrica.com
+
 // Facebook, Inc.
 // Submitted by Peter Ruibal <public-suffix@fb.com>
 apps.fbsbx.com
@@ -11686,6 +11711,7 @@ vologda.su
 // Fancy Bits, LLC : http://getchannels.com
 // Submitted by Aman Gupta <aman@getchannels.com>
 channelsdvr.net
+u.channelsdvr.net
 
 // Fastly Inc. : http://www.fastly.com/
 // Submitted by Fastly Security <security@fastly.com>
@@ -11704,6 +11730,10 @@ global.ssl.fastly.net
 // Submitted by Likhachev Vasiliy <lihachev@fastvps.ru>
 fastpanel.direct
 fastvps-server.com
+myfast.space
+myfast.host
+fastvps.site
+fastvps.host
 
 // Featherhead : https://featherhead.xyz/
 // Submitted by Simon Menke <simon@featherhead.xyz>
@@ -11717,6 +11747,13 @@ cloud.fedoraproject.org
 app.os.fedoraproject.org
 app.os.stg.fedoraproject.org
 
+// FearWorks Media Ltd. : https://fearworksmedia.co.uk
+// submitted by Keith Fairley <domains@fearworksmedia.co.uk>
+conn.uk
+copro.uk
+couk.me
+ukco.me
+
 // Fermax : https://fermax.com/
 // submitted by Koen Van Isterdael <k.vanisterdael@fermax.be>
 mydobiss.com
@@ -11737,9 +11774,12 @@ firebaseapp.com
 
 // Flynn : https://flynn.io
 // Submitted by Jonathan Rudenberg <jonathan@flynn.io>
-flynnhub.com
 flynnhosting.net
 
+// Frederik Braun https://frederik-braun.com
+// Submitted by Frederik Braun <fb@frederik-braun.com>
+0e.vc
+
 // Freebox : http://www.freebox.fr
 // Submitted by Romain Fliedel <rfliedel@freebox.fr>
 freebox-os.com
@@ -11773,8 +11813,9 @@ service.gov.uk
 gehirn.ne.jp
 usercontent.jp
 
-// Gentlent, Limited : https://www.gentlent.com
-// Submitted by Tom Klein <tklein@gentlent.com>
+// Gentlent, Inc. : https://www.gentlent.com
+// Submitted by Tom Klein <tom@gentlent.com>
+gentapps.com
 lab.ms
 
 // GitHub, Inc.
@@ -11819,6 +11860,7 @@ a.run.app
 web.app
 *.0emm.com
 appspot.com
+*.r.appspot.com
 blogspot.ae
 blogspot.al
 blogspot.am
@@ -11903,6 +11945,14 @@ publishproxy.com
 withgoogle.com
 withyoutube.com
 
+// Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
+// Submitted by Aaron Marais <its_me@aaronleem.co.za>
+graphox.us
+
+// Group 53, LLC : https://www.group53.com
+// Submitted by Tyler Todd <noc@nova53.net>
+awsmppl.com
+
 // Hakaran group: http://hakaran.cz
 // Submited by Arseniy Sokolov <security@hakaran.cz>
 fin.ci
@@ -11952,6 +12002,7 @@ col.ng
 firm.ng
 gen.ng
 ltd.ng
+ngo.ng
 ng.school
 sch.so
 
@@ -12028,8 +12079,9 @@ pixolino.com
 ipifony.net
 
 // IServ GmbH : https://iserv.eu
-// Submitted by Kim-Alexander Brodowski <kim.brodowski@iserv.eu>
+// Submitted by Kim-Alexander Brodowski <info@iserv.eu>
 mein-iserv.de
+schulserver.de
 test-iserv.de
 iserv.dev
 
@@ -12072,6 +12124,10 @@ uni5.net
 // Submitted by Roy Keene <rkeene@knightpoint.com>
 knightpoint.systems
 
+// KUROKU LTD : https://kuroku.ltd/
+// Submitted by DisposaBoy <security@oya.to>
+oya.to
+
 // .KRD : http://nic.krd/data/krd/Registration%20Policy.pdf
 co.krd
 edu.krd
@@ -12211,8 +12267,8 @@ eu.meteorapp.com
 co.pl
 
 // Microsoft Corporation : http://microsoft.com
-// Submitted by Justin Luk <juluk@microsoft.com>
-azurecontainer.io
+// Submitted by Mostafa Elzeiny <moelzein@microsoft.com>
+*.azurecontainer.io
 azurewebsites.net
 azure-mobile.net
 cloudapp.net
@@ -12258,6 +12314,7 @@ nctu.me
 // Netlify : https://www.netlify.com
 // Submitted by Jessica Parsons <jessica@netlify.com>
 bitballoon.com
+netlify.app
 netlify.com
 
 // Neustar Inc.
@@ -12415,12 +12472,13 @@ pcloud.host
 nyc.mn
 
 // NymNom : https://nymnom.com/
-// Submitted by Dave McCormack <dave.mccormack@nymnom.com>
+// Submitted by NymNom <psl@nymnom.com>
 nom.ae
 nom.af
 nom.ai
 nom.al
 nym.by
+nom.bz
 nym.bz
 nom.cl
 nym.ec
@@ -12442,6 +12500,7 @@ nom.li
 nym.li
 nym.lt
 nym.lu
+nom.lv
 nym.me
 nom.mk
 nym.mn
@@ -12466,6 +12525,10 @@ nom.uy
 nom.vc
 nom.vg
 
+// Observable, Inc. : https://observablehq.com
+// Submitted by Mike Bostock <dns@observablehq.com>
+static.observableusercontent.com
+
 // Octopodal Solutions, LLC. : https://ulterius.io/
 // Submitted by Andrew Sampson <andrew@ulterius.io>
 cya.gg
@@ -12486,6 +12549,10 @@ opencraft.hosting
 // Submitted by Yngve Pettersen <yngve@opera.com>
 operaunite.com
 
+// Oursky Limited : https://skygear.io/
+// Submited by Skygear Developer <hello@skygear.io>
+skygearapp.com
+
 // OutSystems
 // Submitted by Duarte Santos <domain-admin@outsystemscloud.com>
 outsystemscloud.com
@@ -12528,6 +12595,10 @@ gotpantheon.com
 // Submitted by Steve Leung <steveleung@peplink.com>
 mypep.link
 
+// Perspecta : https://perspecta.com/
+// Submitted by Kenneth Van Alstyne <kvanalstyne@perspecta.com>
+perspecta.cloud
+
 // Planet-Work : https://www.planet-work.com/
 // Submitted by Frédéric VANNIÈRE <f.vanniere@planet-work.com>
 on-web.fr
@@ -12537,6 +12608,12 @@ on-web.fr
 *.platform.sh
 *.platformsh.site
 
+// Platter: https://platter.dev
+// Submitted by Patrick Flor <patrick@platter.dev>
+platter-app.com
+platter-app.dev
+platterp.us
+
 // Port53 : https://port53.io/
 // Submitted by Maximilian Schieder <maxi@zeug.co>
 dyn53.io
@@ -12578,6 +12655,10 @@ pubtls.org
 // Submitted by Xavier De Cock <xdecock@gmail.com>
 qualifioapp.com
 
+// QuickBackend: https://www.quickbackend.com
+// Submitted by Dani Biro <dani@pymet.com>
+qbuser.com
+
 // Redstar Consultants : https://www.redstarconsultants.com/
 // Submitted by Jons Slemmer <jons@redstarconsultants.com>
 instantcloud.cn
@@ -12590,6 +12671,11 @@ ras.ru
 // Submitted by Daniel Dent (https://www.danieldent.com/)
 qa2.com
 
+// QCX
+// Submitted by Cassandra Beelen <cassandra@beelen.one>
+qcx.io
+*.sys.qcx.io
+
 // QNAP System Inc : https://www.qnap.com
 // Submitted by Nick Chang <nickchang@qnap.com>
 dev-myqnapcloud.com
@@ -12612,6 +12698,7 @@ rackmaze.net
 
 // Rancher Labs, Inc : https://rancher.com
 // Submitted by Vincent Fiduccia <domains@rancher.com>
+*.on-k3s.io
 *.on-rancher.cloud
 *.on-rio.io
 
@@ -12665,6 +12752,10 @@ logoip.com
 // Submitted by Hanno Böck <hanno@schokokeks.org>
 schokokeks.net
 
+// Scottish Government: https://www.gov.scot
+// Submitted by Martin Ellis <martin.ellis@gov.scot>
+gov.scot
+
 // Scry Security : http://www.scrysec.com
 // Submitted by Shante Adam <shante@skyhat.io>
 scrysec.com
@@ -12682,6 +12773,10 @@ my-firewall.org
 myfirewall.org
 spdns.org
 
+// Senseering GmbH : https://www.senseering.de
+// Submitted by Felix Mönckemeyer <f.moenckemeyer@senseering.de>
+senseering.net
+
 // Service Online LLC : http://drs.ua/
 // Submitted by Serhii Bulakh <support@drs.ua>
 biz.ua
@@ -12700,6 +12795,10 @@ myshopblocks.com
 // Submitted by Craig McMahon <craig@shopitcommerce.com>
 shopitsite.com
 
+// shopware AG : https://shopware.com
+// Submitted by Jens Küper <cloud@shopware.com>
+shopware.store
+
 // Siemens Mobility GmbH
 // Submitted by Oliver Graebner <security@mo-siemens.io>
 mo-siemens.io
@@ -12732,6 +12831,10 @@ static.land
 dev.static.land
 sites.static.land
 
+// Sony Interactive Entertainment LLC : https://sie.com/
+// Submitted by David Coles <david.coles@sony.com>
+playstation-cloud.com
+
 // SourceLair PC : https://www.sourcelair.com
 // Submitted by Antonis Kalipetis <akalipetis@sourcelair.com>
 apps.lair.io
@@ -12906,6 +13009,11 @@ inc.hk
 virtualuser.de
 virtual-user.de
 
+// urown.net : https://urown.net
+// Submitted by Hostmaster <hostmaster@urown.net>
+urown.cloud
+dnsupdate.info
+
 // .US
 // Submitted by Ed Moore <Ed.Moore@lib.de.us>
 lib.de.us
@@ -12926,6 +13034,10 @@ v-info.info
 // Submitted by Nathan van Bakel <info@voorloper.com>
 voorloper.cloud
 
+// V.UA Domain Administrator : https://domain.v.ua/
+// Submitted by Serhii Rostilo <sergey@rostilo.kiev.ua>
+v.ua
+
 // Waffle Computer Inc., Ltd. : https://docs.waffleinfo.com
 // Submitted by Masayuki Note <masa@blade.wafflecell.com>
 wafflecell.com
@@ -12945,8 +13057,23 @@ wedeploy.sh
 remotewd.com
 
 // Wikimedia Labs : https://wikitech.wikimedia.org
-// Submitted by Yuvi Panda <yuvipanda@wikimedia.org>
+// Submitted by Arturo Borrero Gonzalez <aborrero@wikimedia.org>
 wmflabs.org
+toolforge.org
+wmcloud.org
+
+// WISP : https://wisp.gg
+// Submitted by Stepan Fedotov <stepan@wisp.gg>
+panel.gg
+daemon.panel.gg
+
+// WoltLab GmbH : https://www.woltlab.com
+// Submitted by Tim Düsterhus <security@woltlab.cloud>
+myforum.community
+community-pro.de
+diskussionsbereich.de
+community-pro.net
+meinforum.net
 
 // XenonCloud GbR: https://xenoncloud.net
 // Submitted by Julian Uphoff <publicsuffixlist@xenoncloud.net>
@@ -13010,7 +13137,10 @@ bss.design
 // Submitted by Emil Stahl <esp@zitcom.dk>
 basicserver.io
 virtualserver.io
-site.builder.nu
 enterprisecloud.nu
 
+// Mintere : https://mintere.com/
+// Submitted by Ben Aubin <security@mintere.com>
+mintere.site
+
 // ===END PRIVATE DOMAINS===

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -632,10 +632,37 @@ class name java/security/cert/X509CRL
 class name java/security/cert/X509Certificate
 -method name verify descriptor (Ljava/security/PublicKey;Ljava/security/Provider;)V
 
+class name java/security/interfaces/RSAKey
+-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
+
 -class name java/security/spec/DSAGenParameterSpec
 
 class name java/security/spec/MGF1ParameterSpec
 -field name SHA224 descriptor Ljava/security/spec/MGF1ParameterSpec;
+-field name SHA512_224 descriptor Ljava/security/spec/MGF1ParameterSpec;
+-field name SHA512_256 descriptor Ljava/security/spec/MGF1ParameterSpec;
+
+class name java/security/spec/PSSParameterSpec
+-field name TRAILER_FIELD_BC descriptor I
+-method name toString descriptor ()Ljava/lang/String;
+
+class name java/security/spec/RSAKeyGenParameterSpec
+-method name <init> descriptor (ILjava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
+-method name getKeyParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
+
+class name java/security/spec/RSAMultiPrimePrivateCrtKeySpec
+-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;[Ljava/security/spec/RSAOtherPrimeInfo;Ljava/security/spec/AlgorithmParameterSpec;)V
+
+class name java/security/spec/RSAPrivateCrtKeySpec
+-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
+
+class name java/security/spec/RSAPrivateKeySpec
+-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
+-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
+
+class name java/security/spec/RSAPublicKeySpec
+-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
+-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
 
 class name java/text/Collator
 -method name getInstance descriptor (Ljava/util/Locale;)Ljava/text/Collator;
@@ -1457,6 +1484,14 @@ method name newUpdater descriptor (Ljava/lang/Class;Ljava/lang/Class;Ljava/lang/
 
 -class name java/util/function/UnaryOperator
 
+class name java/util/jar/Attributes$Name
+-field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name;
+-field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name;
+-field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name;
+field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name; flags 19
+field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name; flags 19
+field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name; flags 19
+
 class name java/util/jar/JarFile
 -method name stream descriptor ()Ljava/util/stream/Stream;
 
@@ -1535,6 +1570,9 @@ class name java/util/zip/ZipEntry
 class name java/util/zip/ZipFile
 -method name stream descriptor ()Ljava/util/stream/Stream;
 
+class name javax/crypto/SealedObject
+header extends java/lang/Object implements java/io/Serializable flags 21
+
 class name javax/crypto/SecretKey
 header extends java/lang/Object implements java/security/Key flags 601
 
@@ -1559,6 +1597,12 @@ class name javax/net/ssl/ExtendedSSLSession
 
 -class name javax/net/ssl/SNIServerName
 
+class name javax/net/ssl/SSLEngine
+-method name getApplicationProtocol descriptor ()Ljava/lang/String;
+-method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String;
+-method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V
+-method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction;
+
 class name javax/net/ssl/SSLParameters
 -method name setServerNames descriptor (Ljava/util/List;)V
 -method name getServerNames descriptor ()Ljava/util/List;
@@ -1566,6 +1610,14 @@ class name javax/net/ssl/SSLParameters
 -method name getSNIMatchers descriptor ()Ljava/util/Collection;
 -method name setUseCipherSuitesOrder descriptor (Z)V
 -method name getUseCipherSuitesOrder descriptor ()Z
+-method name getApplicationProtocols descriptor ()[Ljava/lang/String;
+-method name setApplicationProtocols descriptor ([Ljava/lang/String;)V
+
+class name javax/net/ssl/SSLSocket
+-method name getApplicationProtocol descriptor ()Ljava/lang/String;
+-method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String;
+-method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V
+-method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction;
 
 class name javax/net/ssl/SSLSocketFactory
 -method name createSocket descriptor (Ljava/net/Socket;Ljava/io/InputStream;Z)Ljava/net/Socket;

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -8200,6 +8200,7 @@ method name getW descriptor ()Ljava/security/spec/ECPoint; flags 401
 class name java/security/interfaces/RSAKey
 header extends java/lang/Object flags 601 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
 method name getModulus descriptor ()Ljava/math/BigInteger; flags 401
+method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
 
 class name java/security/interfaces/RSAMultiPrimePrivateCrtKey
 header extends java/lang/Object implements java/security/interfaces/RSAPrivateKey flags 601 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -8363,6 +8364,8 @@ field name SHA224 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
 field name SHA256 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
 field name SHA384 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
 field name SHA512 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
+field name SHA512_224 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
+field name SHA512_256 descriptor Ljava/security/spec/MGF1ParameterSpec; flags 19
 method name <init> descriptor (Ljava/lang/String;)V flags 1
 method name getDigestAlgorithm descriptor ()Ljava/lang/String; flags 1
 
@@ -8375,6 +8378,7 @@ method name getFormat descriptor ()Ljava/lang/String; flags 11
 class name java/security/spec/PSSParameterSpec
 header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
 field name DEFAULT descriptor Ljava/security/spec/PSSParameterSpec; flags 19
+field name TRAILER_FIELD_BC descriptor I constantValue 1 flags 19
 method name <init> descriptor (Ljava/lang/String;Ljava/lang/String;Ljava/security/spec/AlgorithmParameterSpec;II)V flags 1
 method name <init> descriptor (I)V flags 1
 method name getDigestAlgorithm descriptor ()Ljava/lang/String; flags 1
@@ -8382,6 +8386,7 @@ method name getMGFAlgorithm descriptor ()Ljava/lang/String; flags 1
 method name getMGFParameters descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
 method name getSaltLength descriptor ()I flags 1
 method name getTrailerField descriptor ()I flags 1
+method name toString descriptor ()Ljava/lang/String; flags 1
 
 class name java/security/spec/RSAKeyGenParameterSpec
 header extends java/lang/Object implements java/security/spec/AlgorithmParameterSpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -8390,6 +8395,8 @@ field name F4 descriptor Ljava/math/BigInteger; flags 19
 method name <init> descriptor (ILjava/math/BigInteger;)V flags 1
 method name getKeysize descriptor ()I flags 1
 method name getPublicExponent descriptor ()Ljava/math/BigInteger; flags 1
+method name <init> descriptor (ILjava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
+method name getKeyParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
 
 class name java/security/spec/RSAMultiPrimePrivateCrtKeySpec
 header extends java/security/spec/RSAPrivateKeySpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -8401,6 +8408,7 @@ method name getPrimeExponentP descriptor ()Ljava/math/BigInteger; flags 1
 method name getPrimeExponentQ descriptor ()Ljava/math/BigInteger; flags 1
 method name getCrtCoefficient descriptor ()Ljava/math/BigInteger; flags 1
 method name getOtherPrimeInfo descriptor ()[Ljava/security/spec/RSAOtherPrimeInfo; flags 1
+method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;[Ljava/security/spec/RSAOtherPrimeInfo;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
 
 class name java/security/spec/RSAOtherPrimeInfo
 header extends java/lang/Object flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -8418,18 +8426,23 @@ method name getPrimeQ descriptor ()Ljava/math/BigInteger; flags 1
 method name getPrimeExponentP descriptor ()Ljava/math/BigInteger; flags 1
 method name getPrimeExponentQ descriptor ()Ljava/math/BigInteger; flags 1
 method name getCrtCoefficient descriptor ()Ljava/math/BigInteger; flags 1
+method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
 
 class name java/security/spec/RSAPrivateKeySpec
 header extends java/lang/Object implements java/security/spec/KeySpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
 method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;)V flags 1
 method name getModulus descriptor ()Ljava/math/BigInteger; flags 1
 method name getPrivateExponent descriptor ()Ljava/math/BigInteger; flags 1
+method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
+method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
 
 class name java/security/spec/RSAPublicKeySpec
 header extends java/lang/Object implements java/security/spec/KeySpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
 method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;)V flags 1
 method name getModulus descriptor ()Ljava/math/BigInteger; flags 1
 method name getPublicExponent descriptor ()Ljava/math/BigInteger; flags 1
+method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V flags 1
+method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec; flags 1
 
 class name java/security/spec/X509EncodedKeySpec
 header extends java/security/spec/EncodedKeySpec flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -10429,6 +10442,7 @@ method name values descriptor ()[Ljava/time/chrono/JapaneseEra; flags 9
 method name getValue descriptor ()I flags 1
 method name range descriptor (Ljava/time/temporal/TemporalField;)Ljava/time/temporal/ValueRange; flags 1
 method name toString descriptor ()Ljava/lang/String; flags 1
+method name getDisplayName descriptor (Ljava/time/format/TextStyle;Ljava/util/Locale;)Ljava/lang/String; flags 1
 
 class name java/time/chrono/MinguoChronology
 header extends java/time/chrono/AbstractChronology implements java/io/Serializable flags 31 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -15563,15 +15577,15 @@ field name MAIN_CLASS descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name SEALED descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name EXTENSION_LIST descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name EXTENSION_NAME descriptor Ljava/util/jar/Attributes$Name; flags 19
-field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name IMPLEMENTATION_TITLE descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name IMPLEMENTATION_VERSION descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name IMPLEMENTATION_VENDOR descriptor Ljava/util/jar/Attributes$Name; flags 19
-field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name; flags 19
-field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name SPECIFICATION_TITLE descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name SPECIFICATION_VERSION descriptor Ljava/util/jar/Attributes$Name; flags 19
 field name SPECIFICATION_VENDOR descriptor Ljava/util/jar/Attributes$Name; flags 19
+field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
+field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
+field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
 method name <init> descriptor (Ljava/lang/String;)V flags 1
 method name equals descriptor (Ljava/lang/Object;)Z flags 1
 method name hashCode descriptor ()I flags 1
@@ -16698,6 +16712,7 @@ method name <init> descriptor ()V flags 1
 
 class name javax/crypto/SealedObject
 header extends java/lang/Object implements java/io/Serializable flags 21
+innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
 field name encodedParams descriptor [B flags 4
 method name <init> descriptor (Ljava/io/Serializable;Ljavax/crypto/Cipher;)V thrownTypes java/io/IOException,javax/crypto/IllegalBlockSizeException flags 1
 method name <init> descriptor (Ljavax/crypto/SealedObject;)V flags 4
@@ -17086,6 +17101,10 @@ method name setEnableSessionCreation descriptor (Z)V flags 401
 method name getEnableSessionCreation descriptor ()Z flags 401
 method name getSSLParameters descriptor ()Ljavax/net/ssl/SSLParameters; flags 1
 method name setSSLParameters descriptor (Ljavax/net/ssl/SSLParameters;)V flags 1
+method name getApplicationProtocol descriptor ()Ljava/lang/String; flags 1
+method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String; flags 1
+method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V flags 1 signature (Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;)V
+method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction; flags 1 signature ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
 
 class name javax/net/ssl/SSLEngineResult
 header extends java/lang/Object flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -17156,6 +17175,8 @@ method name setSNIMatchers descriptor (Ljava/util/Collection;)V flags 11 signatu
 method name getSNIMatchers descriptor ()Ljava/util/Collection; flags 11 signature ()Ljava/util/Collection<Ljavax/net/ssl/SNIMatcher;>;
 method name setUseCipherSuitesOrder descriptor (Z)V flags 11
 method name getUseCipherSuitesOrder descriptor ()Z flags 11
+method name getApplicationProtocols descriptor ()[Ljava/lang/String; flags 1
+method name setApplicationProtocols descriptor ([Ljava/lang/String;)V flags 1
 
 class name javax/net/ssl/SSLPeerUnverifiedException
 header extends javax/net/ssl/SSLException flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I1)
@@ -17272,6 +17293,10 @@ method name setEnableSessionCreation descriptor (Z)V flags 401
 method name getEnableSessionCreation descriptor ()Z flags 401
 method name getSSLParameters descriptor ()Ljavax/net/ssl/SSLParameters; flags 1
 method name setSSLParameters descriptor (Ljavax/net/ssl/SSLParameters;)V flags 1
+method name getApplicationProtocol descriptor ()Ljava/lang/String; flags 1
+method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String; flags 1
+method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V flags 1 signature (Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;)V
+method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction; flags 1 signature ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
 
 class name javax/net/ssl/SSLSocketFactory
 header extends javax/net/SocketFactory flags 421 classAnnotations @Ljdk/Profile+Annotation;(value=I1)

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -2083,13 +2083,42 @@ method name equals descriptor (Ljava/lang/Object;)Z flags 1
 method name toString descriptor ()Ljava/lang/String; flags 1
 method name clone descriptor ()Ljava/lang/Object; thrownTypes java/lang/CloneNotSupportedException flags 1041
 
+class name java/security/interfaces/RSAKey
+-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
+
 class name java/security/spec/EncodedKeySpec
 method name <init> descriptor ([BLjava/lang/String;)V flags 4
 method name getAlgorithm descriptor ()Ljava/lang/String; flags 1
 
+class name java/security/spec/MGF1ParameterSpec
+-field name SHA512_224 descriptor Ljava/security/spec/MGF1ParameterSpec;
+-field name SHA512_256 descriptor Ljava/security/spec/MGF1ParameterSpec;
+
 class name java/security/spec/PKCS8EncodedKeySpec
 method name <init> descriptor ([BLjava/lang/String;)V flags 1
 
+class name java/security/spec/PSSParameterSpec
+-field name TRAILER_FIELD_BC descriptor I
+-method name toString descriptor ()Ljava/lang/String;
+
+class name java/security/spec/RSAKeyGenParameterSpec
+-method name <init> descriptor (ILjava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
+-method name getKeyParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
+
+class name java/security/spec/RSAMultiPrimePrivateCrtKeySpec
+-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;[Ljava/security/spec/RSAOtherPrimeInfo;Ljava/security/spec/AlgorithmParameterSpec;)V
+
+class name java/security/spec/RSAPrivateCrtKeySpec
+-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
+
+class name java/security/spec/RSAPrivateKeySpec
+-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
+-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
+
+class name java/security/spec/RSAPublicKeySpec
+-method name <init> descriptor (Ljava/math/BigInteger;Ljava/math/BigInteger;Ljava/security/spec/AlgorithmParameterSpec;)V
+-method name getParams descriptor ()Ljava/security/spec/AlgorithmParameterSpec;
+
 class name java/security/spec/X509EncodedKeySpec
 method name <init> descriptor ([BLjava/lang/String;)V flags 1
 
@@ -2224,9 +2253,6 @@ innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang
 class name java/time/chrono/IsoChronology
 method name epochSecond descriptor (IIIIIILjava/time/ZoneOffset;)J flags 1
 
-class name java/time/chrono/JapaneseEra
-method name getDisplayName descriptor (Ljava/time/format/TextStyle;Ljava/util/Locale;)Ljava/lang/String; flags 1
-
 class name java/time/format/DateTimeFormatter
 header extends java/lang/Object flags 31
 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
@@ -3221,12 +3247,6 @@ header extends java/lang/Object implements java/util/function/Function flags 601
 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
 
 class name java/util/jar/Attributes$Name
--field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name;
--field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name;
--field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name;
-field name EXTENSION_INSTALLATION descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
-field name IMPLEMENTATION_VENDOR_ID descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
-field name IMPLEMENTATION_URL descriptor Ljava/util/jar/Attributes$Name; flags 19 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;
 field name MULTI_RELEASE descriptor Ljava/util/jar/Attributes$Name; flags 19
 
 class name java/util/jar/JarFile
@@ -3381,6 +3401,9 @@ method name finalize descriptor ()V thrownTypes java/io/IOException flags 4 depr
 class name javax/crypto/ExemptionMechanism
 -method name finalize descriptor ()V
 
+class name javax/crypto/SealedObject
+header extends java/lang/Object implements java/io/Serializable flags 21
+
 class name javax/net/ssl/ExtendedSSLSession
 method name getStatusResponses descriptor ()Ljava/util/List; flags 1 signature ()Ljava/util/List<[B>;
 
@@ -3388,12 +3411,6 @@ class name javax/net/ssl/HandshakeCompletedEvent
 -method name getPeerCertificateChain descriptor ()[Ljavax/security/cert/X509Certificate;
 method name getPeerCertificateChain descriptor ()[Ljavax/security/cert/X509Certificate; thrownTypes javax/net/ssl/SSLPeerUnverifiedException flags 1 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
 
-class name javax/net/ssl/SSLEngine
-method name getApplicationProtocol descriptor ()Ljava/lang/String; flags 1
-method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String; flags 1
-method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V flags 1 signature (Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;)V
-method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction; flags 1 signature ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLEngine;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
-
 class name javax/net/ssl/SSLEngineResult
 header extends java/lang/Object flags 21
 innerclass innerClass javax/net/ssl/SSLEngineResult$HandshakeStatus outerClass javax/net/ssl/SSLEngineResult innerClassName HandshakeStatus flags 4019
@@ -3409,19 +3426,11 @@ method name setEnableRetransmissions descriptor (Z)V flags 1
 method name getEnableRetransmissions descriptor ()Z flags 1
 method name setMaximumPacketSize descriptor (I)V flags 1
 method name getMaximumPacketSize descriptor ()I flags 1
-method name getApplicationProtocols descriptor ()[Ljava/lang/String; flags 1
-method name setApplicationProtocols descriptor ([Ljava/lang/String;)V flags 1
 
 class name javax/net/ssl/SSLSession
 -method name getPeerCertificateChain descriptor ()[Ljavax/security/cert/X509Certificate;
 method name getPeerCertificateChain descriptor ()[Ljavax/security/cert/X509Certificate; thrownTypes javax/net/ssl/SSLPeerUnverifiedException flags 401 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="9")
 
-class name javax/net/ssl/SSLSocket
-method name getApplicationProtocol descriptor ()Ljava/lang/String; flags 1
-method name getHandshakeApplicationProtocol descriptor ()Ljava/lang/String; flags 1
-method name setHandshakeApplicationProtocolSelector descriptor (Ljava/util/function/BiFunction;)V flags 1 signature (Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;)V
-method name getHandshakeApplicationProtocolSelector descriptor ()Ljava/util/function/BiFunction; flags 1 signature ()Ljava/util/function/BiFunction<Ljavax/net/ssl/SSLSocket;Ljava/util/List<Ljava/lang/String;>;Ljava/lang/String;>;
-
 class name javax/security/auth/Policy
 header extends java/lang/Object flags 421 deprecated true runtimeAnnotations @Ljava/lang/Deprecated;(since="1.4")
 

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -77,6 +77,9 @@ class name javax/swing/ImageIcon
 field name component descriptor Ljava/awt/Component; flags 1c
 field name tracker descriptor Ljava/awt/MediaTracker; flags 1c
 
+class name javax/swing/JComboBox
+-method name processKeyBinding descriptor (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z
+
 class name javax/swing/JComponent
 field name accessibleContext descriptor Ljavax/accessibility/AccessibleContext; flags 4
 -method name hide descriptor ()V
@@ -90,8 +93,12 @@ field name accessibleFocusHandler descriptor Ljava/awt/event/FocusListener; flag
 class name javax/swing/JDesktopPane
 -method name remove descriptor (Ljava/awt/Component;)V
 
-class name javax/swing/JViewport
--method name addNotify descriptor ()V
+class name javax/swing/JList$AccessibleJList$AccessibleJListChild
+method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction; flags 1
+
+class name javax/swing/plaf/basic/BasicRadioButtonUI
+-method name installListeners descriptor (Ljavax/swing/AbstractButton;)V
+-method name uninstallListeners descriptor (Ljavax/swing/AbstractButton;)V
 
 class name javax/swing/tree/DefaultMutableTreeNode
 -method name setParent descriptor (Ljavax/swing/tree/MutableTreeNode;)V

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -13524,6 +13524,7 @@ method name getItemAt descriptor (I)Ljava/lang/Object; flags 1 signature (I)TE;
 method name createDefaultKeySelectionManager descriptor ()Ljavax/swing/JComboBox$KeySelectionManager; flags 4
 method name paramString descriptor ()Ljava/lang/String; flags 4
 method name getAccessibleContext descriptor ()Ljavax/accessibility/AccessibleContext; flags 1
+method name processKeyBinding descriptor (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z flags 4
 
 class name javax/swing/JComboBox$AccessibleJComboBox
 header extends javax/swing/JComponent$AccessibleJComponent implements javax/accessibility/AccessibleAction,javax/accessibility/AccessibleSelection flags 21
@@ -14604,7 +14605,6 @@ method name getAccessibleChild descriptor (I)Ljavax/accessibility/Accessible; fl
 method name getLocale descriptor ()Ljava/util/Locale; flags 1
 method name addPropertyChangeListener descriptor (Ljava/beans/PropertyChangeListener;)V flags 1
 method name removePropertyChangeListener descriptor (Ljava/beans/PropertyChangeListener;)V flags 1
-method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction; flags 1
 method name getAccessibleComponent descriptor ()Ljavax/accessibility/AccessibleComponent; flags 1
 method name getAccessibleSelection descriptor ()Ljavax/accessibility/AccessibleSelection; flags 1
 method name getAccessibleText descriptor ()Ljavax/accessibility/AccessibleText; flags 1
@@ -16720,7 +16720,6 @@ method name updateUI descriptor ()V flags 1
 method name getUIClassID descriptor ()Ljava/lang/String; flags 1
 method name addImpl descriptor (Ljava/awt/Component;Ljava/lang/Object;I)V flags 4
 method name remove descriptor (Ljava/awt/Component;)V flags 1
-method name addNotify descriptor ()V flags 1
 method name scrollRectToVisible descriptor (Ljava/awt/Rectangle;)V flags 1
 method name setBorder descriptor (Ljavax/swing/border/Border;)V flags 11
 method name getInsets descriptor ()Ljava/awt/Insets; flags 11
@@ -20281,6 +20280,8 @@ method name getDefaultIcon descriptor ()Ljavax/swing/Icon; flags 1
 method name paint descriptor (Ljava/awt/Graphics;Ljavax/swing/JComponent;)V flags 21
 method name paintFocus descriptor (Ljava/awt/Graphics;Ljava/awt/Rectangle;Ljava/awt/Dimension;)V flags 4
 method name getPreferredSize descriptor (Ljavax/swing/JComponent;)Ljava/awt/Dimension; flags 1
+method name installListeners descriptor (Ljavax/swing/AbstractButton;)V flags 4
+method name uninstallListeners descriptor (Ljavax/swing/AbstractButton;)V flags 4
 
 class name javax/swing/plaf/basic/BasicRootPaneUI
 header extends javax/swing/plaf/RootPaneUI implements java/beans/PropertyChangeListener flags 21 classAnnotations @Ljdk/Profile+Annotation;(value=I4)

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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 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
@@ -2524,7 +2524,6 @@ method name getPopupMenuListeners descriptor ()[Ljavax/swing/event/PopupMenuList
 method name setAction descriptor (Ljavax/swing/Action;)V flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(visualUpdate=Ztrue,description="the\u005C;u0020;Action\u005C;u0020;instance\u005C;u0020;connected\u005C;u0020;with\u005C;u0020;this\u005C;u0020;ActionEvent\u005C;u0020;source")
 method name getSelectedObjects descriptor ()[Ljava/lang/Object; flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(bound=Zfalse)
 method name setEnabled descriptor (Z)V flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(description="The\u005C;u0020;enabled\u005C;u0020;state\u005C;u0020;of\u005C;u0020;the\u005C;u0020;component.",preferred=Ztrue)
-method name processKeyBinding descriptor (Ljavax/swing/KeyStroke;Ljava/awt/event/KeyEvent;IZ)Z flags 4
 method name setKeySelectionManager descriptor (Ljavax/swing/JComboBox$KeySelectionManager;)V flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(expert=Ztrue,bound=Zfalse,description="The\u005C;u0020;objects\u005C;u0020;that\u005C;u0020;changes\u005C;u0020;the\u005C;u0020;selection\u005C;u0020;when\u005C;u0020;a\u005C;u0020;key\u005C;u0020;is\u005C;u0020;pressed.")
 method name getItemCount descriptor ()I flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(bound=Zfalse)
 method name getAccessibleContext descriptor ()Ljavax/accessibility/AccessibleContext; flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(bound=Zfalse)
@@ -3039,6 +3038,7 @@ class name javax/swing/JList$AccessibleJList$AccessibleJListChild
 header extends javax/accessibility/AccessibleContext implements javax/accessibility/Accessible,javax/accessibility/AccessibleComponent,javax/accessibility/AccessibleAction flags 21
 innerclass innerClass javax/swing/JList$AccessibleJList outerClass javax/swing/JList innerClassName AccessibleJList flags 4
 innerclass innerClass javax/swing/JList$AccessibleJList$AccessibleJListChild outerClass javax/swing/JList$AccessibleJList innerClassName AccessibleJListChild flags 4
+method name getAccessibleAction descriptor ()Ljavax/accessibility/AccessibleAction; flags 1
 method name doAccessibleAction descriptor (I)Z flags 1
 method name getAccessibleActionDescription descriptor (I)Ljava/lang/String; flags 1
 method name getAccessibleActionCount descriptor ()I flags 1
@@ -3907,7 +3907,6 @@ innerclass innerClass javax/swing/JViewport$AccessibleJViewport outerClass javax
 innerclass innerClass javax/swing/JViewport$ViewListener outerClass javax/swing/JViewport innerClassName ViewListener flags 4
 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
 -method name setUI descriptor (Ljavax/swing/plaf/ViewportUI;)V
--method name addNotify descriptor ()V
 -method name getInsets descriptor (Ljava/awt/Insets;)Ljava/awt/Insets;
 -method name setScrollMode descriptor (I)V
 method name setUI descriptor (Ljavax/swing/plaf/ViewportUI;)V flags 1 runtimeAnnotations @Ljava/beans/BeanProperty;(hidden=Ztrue,visualUpdate=Ztrue,description="The\u005C;u0020;UI\u005C;u0020;object\u005C;u0020;that\u005C;u0020;implements\u005C;u0020;the\u005C;u0020;Component's\u005C;u0020;LookAndFeel.")
@@ -4402,8 +4401,6 @@ innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang
 class name javax/swing/plaf/basic/BasicRadioButtonUI
 header extends javax/swing/plaf/basic/BasicToggleButtonUI flags 21
 innerclass innerClass java/lang/invoke/MethodHandles$Lookup outerClass java/lang/invoke/MethodHandles innerClassName Lookup flags 19
-method name installListeners descriptor (Ljavax/swing/AbstractButton;)V flags 4
-method name uninstallListeners descriptor (Ljavax/swing/AbstractButton;)V flags 4
 
 class name javax/swing/plaf/basic/BasicScrollBarUI
 header extends javax/swing/plaf/ScrollBarUI implements java/awt/LayoutManager,javax/swing/SwingConstants flags 21

make/data/symbols/symbols

@@ -27,7 +27,7 @@
 # ##########################################################
 #
 #command used to generate this file:
-#build.tools.symbolgenerator.CreateSymbols build-description-incremental symbols include.list
+#build.tools.symbolgenerator.CreateSymbols build-description-incremental-file symbols include.list 8 jdk8-updated.classes <none> --normalize-method-flags
 #
 generate platforms 6:7:8:9:A
 platform version 8 files java.activation-8.sym.txt:java.base-8.sym.txt:java.compiler-8.sym.txt:java.corba-8.sym.txt:java.datatransfer-8.sym.txt:java.desktop-8.sym.txt:java.instrument-8.sym.txt:java.logging-8.sym.txt:java.management-8.sym.txt:java.management.rmi-8.sym.txt:java.naming-8.sym.txt:java.prefs-8.sym.txt:java.rmi-8.sym.txt:java.scripting-8.sym.txt:java.security.jgss-8.sym.txt:java.security.sasl-8.sym.txt:java.sql-8.sym.txt:java.sql.rowset-8.sym.txt:java.transaction-8.sym.txt:java.xml-8.sym.txt:java.xml.bind-8.sym.txt:java.xml.crypto-8.sym.txt:java.xml.ws-8.sym.txt:java.xml.ws.annotation-8.sym.txt:jdk.httpserver-8.sym.txt:jdk.management-8.sym.txt:jdk.scripting.nashorn-8.sym.txt:jdk.sctp-8.sym.txt:jdk.security.auth-8.sym.txt:jdk.security.jgss-8.sym.txt

make/gensrc/GensrcMisc.gmk

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, 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
@@ -27,6 +27,12 @@
 # Install the launcher name, release version string, full version
 # string and the runtime name into the VersionProps.java file.
 
+ifeq ($(COMPANY_NAME), N/A)
+  VENDOR=Oracle Corporation
+else
+  VENDOR=$(COMPANY_NAME)
+endif
+
 $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
     SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/java/lang/VersionProps.java.template, \
     OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/VersionProps.java, \
@@ -41,7 +47,7 @@ $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
         @@VERSION_OPT@@ => $(VERSION_OPT) ; \
         @@VERSION_DATE@@ => $(VERSION_DATE) ; \
         @@VENDOR_VERSION_STRING@@ => $(VENDOR_VERSION_STRING) ; \
-        @@VENDOR@@ => $(COMPANY_NAME) ; \
+        @@VENDOR@@ => $(VENDOR) ; \
         @@VENDOR_URL@@ => $(VENDOR_URL) ; \
         @@VENDOR_URL_BUG@@ => $(VENDOR_URL_BUG) ; \
         @@VENDOR_URL_VM_BUG@@ => $(VENDOR_URL_VM_BUG), \

make/hotspot/gensrc/GensrcAdlc.gmk

@@ -62,6 +62,10 @@ ifeq ($(call check-jvm-feature, compiler2), true)
 
   ADLC_CFLAGS += -I$(TOPDIR)/src/hotspot/share
 
+  ifneq ($(call check-jvm-feature, shenandoahgc), true)
+    ADLC_CFLAGS += -DINCLUDE_SHENANDOAHGC=0
+  endif
+
   $(eval $(call SetupNativeCompilation, BUILD_ADLC, \
       NAME := adlc, \
       TYPE := EXECUTABLE, \
@@ -136,6 +140,12 @@ ifeq ($(call check-jvm-feature, compiler2), true)
       $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH).ad \
     )))
 
+  ifeq ($(call check-jvm-feature, shenandoahgc), true)
+    AD_SRC_FILES += $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
+        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/gc/shenandoah/shenandoah_$(HOTSPOT_TARGET_CPU).ad \
+      )))
+  endif
+
   SINGLE_AD_SRCFILE := $(ADLC_SUPPORT_DIR)/all-ad-src.ad
 
   INSERT_FILENAME_AWK_SCRIPT := \

make/hotspot/lib/JvmFeatures.gmk

@@ -166,6 +166,11 @@ ifneq ($(call check-jvm-feature, zgc), true)
   JVM_EXCLUDE_PATTERNS += gc/z
 endif
 
+ifneq ($(call check-jvm-feature, shenandoahgc), true)
+  JVM_CFLAGS_FEATURES += -DINCLUDE_SHENANDOAHGC=0
+  JVM_EXCLUDE_PATTERNS += gc/shenandoah
+endif
+
 ifneq ($(call check-jvm-feature, jfr), true)
   JVM_CFLAGS_FEATURES += -DINCLUDE_JFR=0
   JVM_EXCLUDE_PATTERNS += jfr

make/hotspot/lib/JvmOverrideFiles.gmk

@@ -36,6 +36,10 @@ ifeq ($(TOOLCHAIN_TYPE), gcc)
   BUILD_LIBJVM_assembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
   BUILD_LIBJVM_cardTableBarrierSetAssembler_x86.cpp_CXXFLAGS := -Wno-maybe-uninitialized
   BUILD_LIBJVM_interp_masm_x86.cpp_CXXFLAGS := -Wno-uninitialized
+  ifeq ($(DEBUG_LEVEL), release)
+    # Need extra inlining to collapse all marking code into the hot marking loop
+    BUILD_LIBJVM_shenandoahConcurrentMark.cpp_CXXFLAGS := --param inline-unit-growth=1000
+  endif
 endif
 
 LIBJVM_FDLIBM_COPY_OPT_FLAG := $(CXX_O_FLAG_NONE)
@@ -132,9 +136,6 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
     # NOTE: The old build tested clang version to make sure this workaround
     # for the clang bug was still needed.
     BUILD_LIBJVM_loopTransform.cpp_CXXFLAGS := $(CXX_O_FLAG_NONE)
-    ifneq ($(DEBUG_LEVEL), slowdebug)
-      BUILD_LIBJVM_unsafe.cpp_CXXFLAGS := -O1
-    endif
 
     # The following files are compiled at various optimization
     # levels due to optimization issues encountered at the
@@ -150,7 +151,6 @@ else ifeq ($(OPENJDK_TARGET_OS), macosx)
         sharedRuntimeTrig.cpp \
         sharedRuntimeTrans.cpp \
         loopTransform.cpp \
-        unsafe.cpp \
         jvmciCompilerToVM.cpp \
         #
   endif

make/hotspot/symbols/symbols-linux

@@ -22,6 +22,7 @@
 #
 
 JVM_handle_linux_signal
+JVM_IsUseContainerSupport
 numa_error
 numa_warn
 sysThreadAvailableStackWithSlack

make/jdk/src/classes/build/tools/blacklistedcertsconverter/BlacklistedCertsConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -25,14 +25,24 @@
 
 package build.tools.blacklistedcertsconverter;
 
+import java.io.IOException;
+import java.math.BigInteger;
 import java.security.MessageDigest;
+import java.security.PublicKey;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.security.interfaces.ECPublicKey;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
+import sun.security.util.DerInputStream;
+import sun.security.util.DerOutputStream;
+import sun.security.util.DerValue;
 
 /**
  * Converts blacklisted.certs.pem from System.in to blacklisted.certs in
@@ -75,8 +85,8 @@ public class BlacklistedCertsConverter {
         // Output sorted so that it's easy to locate an entry.
         Set<String> fingerprints = new TreeSet<>();
         for (Certificate cert: certs) {
-            fingerprints.add(
-                    getCertificateFingerPrint(mdAlg, (X509Certificate)cert));
+            fingerprints.addAll(
+                getCertificateFingerPrints(mdAlg, (X509Certificate)cert));
         }
 
         for (String s: fingerprints) {
@@ -97,17 +107,90 @@ public class BlacklistedCertsConverter {
     }
 
     /**
-     * Gets the requested finger print of the certificate.
+     * Computes the possible fingerprints of the certificate.
      */
-    private static String getCertificateFingerPrint(
+    private static List<String> getCertificateFingerPrints(
             String mdAlg, X509Certificate cert) throws Exception {
-        byte[] encCertInfo = cert.getEncoded();
-        MessageDigest md = MessageDigest.getInstance(mdAlg);
-        byte[] digest = md.digest(encCertInfo);
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < digest.length; i++) {
-            byte2hex(digest[i], buf);
+        List<String> fingerprints = new ArrayList<>();
+        for (byte[] encoding : altEncodings(cert)) {
+            MessageDigest md = MessageDigest.getInstance(mdAlg);
+            byte[] digest = md.digest(encoding);
+            StringBuffer buf = new StringBuffer();
+            for (int i = 0; i < digest.length; i++) {
+                byte2hex(digest[i], buf);
+            }
+            fingerprints.add(buf.toString());
         }
-        return buf.toString();
+        return fingerprints;
+    }
+
+    private static List<byte[]> altEncodings(X509Certificate c)
+            throws Exception {
+        List<byte[]> result = new ArrayList<>();
+
+        DerValue d = new DerValue(c.getEncoded());
+        DerValue[] seq = new DerValue[3];
+        // tbsCertificate
+        seq[0] = d.data.getDerValue();
+        // signatureAlgorithm
+        seq[1] = d.data.getDerValue();
+        // signature
+        seq[2] = d.data.getDerValue();
+
+        List<DerValue> algIds = Arrays.asList(seq[1], altAlgId(seq[1]));
+
+        List<DerValue> sigs;
+        PublicKey p = c.getPublicKey();
+        if (p instanceof ECPublicKey) {
+            ECPublicKey ep = (ECPublicKey) p;
+            BigInteger mod = ep.getParams().getOrder();
+            sigs = Arrays.asList(seq[2], altSig(mod, seq[2]));
+        } else {
+            sigs = Arrays.asList(seq[2]);
+        }
+
+        for (DerValue algId : algIds) {
+            for (DerValue sig : sigs) {
+                DerOutputStream tmp = new DerOutputStream();
+                tmp.putDerValue(seq[0]);
+                tmp.putDerValue(algId);
+                tmp.putDerValue(sig);
+                DerOutputStream tmp2 = new DerOutputStream();
+                tmp2.write(DerValue.tag_Sequence, tmp);
+                result.add(tmp2.toByteArray());
+            }
+        }
+        return result;
+    }
+
+    private static DerValue altSig(BigInteger mod, DerValue sig)
+            throws IOException {
+        byte[] sigBits = sig.getBitString();
+        DerInputStream in =
+            new DerInputStream(sigBits, 0, sigBits.length, false);
+        DerValue[] values = in.getSequence(2);
+        BigInteger r = values[0].getBigInteger();
+        BigInteger s = values[1].getBigInteger();
+        BigInteger s2 = s.negate().mod(mod);
+        DerOutputStream out = new DerOutputStream();
+        out.putInteger(r);
+        out.putInteger(s2);
+        DerOutputStream tmp = new DerOutputStream();
+        tmp.putBitString(new DerValue(DerValue.tag_Sequence,
+                out.toByteArray()).toByteArray());
+        return new DerValue(tmp.toByteArray());
+    }
+
+    private static DerValue altAlgId(DerValue algId) throws IOException {
+        DerInputStream in = algId.toDerInputStream();
+        DerOutputStream bytes = new DerOutputStream();
+        bytes.putOID(in.getOID());
+        // encode parameters as NULL if not present or omit if NULL
+        if (in.available() == 0) {
+            bytes.putNull();
+        }
+        DerOutputStream tmp = new DerOutputStream();
+        tmp.write(DerValue.tag_Sequence, bytes);
+        return new DerValue(tmp.toByteArray());
     }
 }