src/hotspot/share/classfile/classLoaderExt.cpp

*** 29,39 ****
  #include "classfile/classLoader.inline.hpp"
  #include "classfile/classLoaderExt.hpp"
  #include "classfile/classLoaderData.inline.hpp"
  #include "classfile/klassFactory.hpp"
  #include "classfile/modules.hpp"
- #include "classfile/sharedClassUtil.hpp"
  #include "classfile/sharedPathsMiscInfo.hpp"
  #include "classfile/systemDictionaryShared.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/filemap.hpp"
--- 29,38 ----
*** 55,66 ****
  bool ClassLoaderExt::_has_platform_classes = false;
  
  void ClassLoaderExt::append_boot_classpath(ClassPathEntry* new_entry) {
  #if INCLUDE_CDS
    warning("Sharing is only supported for boot loader classes because bootstrap classpath has been appended");
!   FileMapHeaderExt* header = (FileMapHeaderExt*)FileMapInfo::current_info()->header();
!   header->set_has_platform_or_app_classes(false);
  #endif
    ClassLoader::add_to_boot_append_entries(new_entry);
  }
  
  void ClassLoaderExt::setup_app_search_path() {
--- 54,64 ----
  bool ClassLoaderExt::_has_platform_classes = false;
  
  void ClassLoaderExt::append_boot_classpath(ClassPathEntry* new_entry) {
  #if INCLUDE_CDS
    warning("Sharing is only supported for boot loader classes because bootstrap classpath has been appended");
!   FileMapInfo::current_info()->header()->set_has_platform_or_app_classes(false);
  #endif
    ClassLoader::add_to_boot_append_entries(new_entry);
  }
  
  void ClassLoaderExt::setup_app_search_path() {
*** 226,240 ****
  void ClassLoaderExt::setup_search_paths() {
    shared_paths_misc_info()->record_app_offset();
    ClassLoaderExt::setup_app_search_path();
  }
  
! Thread* ClassLoaderExt::Context::_dump_thread = NULL;
! 
! void ClassLoaderExt::record_result(ClassLoaderExt::Context *context,
!                                    Symbol* class_name,
!                                    const s2 classpath_index,
                                     InstanceKlass* result,
                                     TRAPS) {
    assert(DumpSharedSpaces, "Sanity");
  
    // We need to remember where the class comes from during dumping.
--- 224,234 ----
  void ClassLoaderExt::setup_search_paths() {
    shared_paths_misc_info()->record_app_offset();
    ClassLoaderExt::setup_app_search_path();
  }
  
! void ClassLoaderExt::record_result(const s2 classpath_index,
                                     InstanceKlass* result,
                                     TRAPS) {
    assert(DumpSharedSpaces, "Sanity");
  
    // We need to remember where the class comes from during dumping.