src/hotspot/share/oops/klass.cpp

*** 550,560 ****
  void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
    assert(is_klass(), "ensure C++ vtable is restored");
    assert(is_shared(), "must be set");
    JFR_ONLY(RESTORE_ID(this);)
    if (log_is_enabled(Trace, cds, unshareable)) {
!     ResourceMark rm;
      log_trace(cds, unshareable)("restore: %s", external_name());
    }
  
    // If an exception happened during CDS restore, some of these fields may already be
    // set.  We leave the class on the CLD list, even if incomplete so that we don't
--- 550,560 ----
  void Klass::restore_unshareable_info(ClassLoaderData* loader_data, Handle protection_domain, TRAPS) {
    assert(is_klass(), "ensure C++ vtable is restored");
    assert(is_shared(), "must be set");
    JFR_ONLY(RESTORE_ID(this);)
    if (log_is_enabled(Trace, cds, unshareable)) {
!     ResourceMark rm(THREAD);
      log_trace(cds, unshareable)("restore: %s", external_name());
    }
  
    // If an exception happened during CDS restore, some of these fields may already be
    // set.  We leave the class on the CLD list, even if incomplete so that we don't
*** 583,593 ****
    }
    // Obtain java.lang.Module, if available
    Handle module_handle(THREAD, ((module_entry != NULL) ? module_entry->module() : (oop)NULL));
  
    if (this->has_raw_archived_mirror()) {
!     ResourceMark rm;
      log_debug(cds, mirror)("%s has raw archived mirror", external_name());
      if (HeapShared::open_archive_heap_region_mapped()) {
        bool present = java_lang_Class::restore_archived_mirror(this, loader, module_handle,
                                                                protection_domain,
                                                                CHECK);
--- 583,593 ----
    }
    // Obtain java.lang.Module, if available
    Handle module_handle(THREAD, ((module_entry != NULL) ? module_entry->module() : (oop)NULL));
  
    if (this->has_raw_archived_mirror()) {
!     ResourceMark rm(THREAD);
      log_debug(cds, mirror)("%s has raw archived mirror", external_name());
      if (HeapShared::open_archive_heap_region_mapped()) {
        bool present = java_lang_Class::restore_archived_mirror(this, loader, module_handle,
                                                                protection_domain,
                                                                CHECK);