src/hotspot/share/memory/universe.cpp

*** 278,288 ****
    Klass* ok = SystemDictionary::Object_klass();
  #if INCLUDE_CDS
    if (UseSharedSpaces) {
      ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
      assert(k->super() == ok, "u3");
!     k->restore_unshareable_info(loader_data, Handle(), CHECK);
    } else
  #endif
    {
      k->initialize_supers(ok, NULL, CHECK);
    }
--- 278,292 ----
    Klass* ok = SystemDictionary::Object_klass();
  #if INCLUDE_CDS
    if (UseSharedSpaces) {
      ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
      assert(k->super() == ok, "u3");
!     if (k->is_instance_klass()) {
!       InstanceKlass::cast(k)->restore_unshareable_info(loader_data, Handle(), NULL, CHECK);
!     } else {
!       ArrayKlass::cast(k)->restore_unshareable_info(loader_data, Handle(), CHECK);
!     }
    } else
  #endif
    {
      k->initialize_supers(ok, NULL, CHECK);
    }