src/hotspot/share/classfile/classLoader.cpp

*** 72,82 ****
  #include "services/threadService.hpp"
  #include "utilities/events.hpp"
  #include "utilities/hashtable.inline.hpp"
  #include "utilities/macros.hpp"
  #if INCLUDE_CDS
- #include "classfile/sharedClassUtil.hpp"
  #include "classfile/sharedPathsMiscInfo.hpp"
  #endif
  
  // Entry points in zip.dll for loading zip/jar file entries
  
--- 72,81 ----
*** 660,670 ****
  void* ClassLoader::get_shared_paths_misc_info() {
    return _shared_paths_misc_info->buffer();
  }
  
  bool ClassLoader::check_shared_paths_misc_info(void *buf, int size) {
!   SharedPathsMiscInfo* checker = SharedClassUtil::allocate_shared_paths_misc_info((char*)buf, size);
    bool result = checker->check();
    delete checker;
    return result;
  }
  
--- 659,669 ----
  void* ClassLoader::get_shared_paths_misc_info() {
    return _shared_paths_misc_info->buffer();
  }
  
  bool ClassLoader::check_shared_paths_misc_info(void *buf, int size) {
!   SharedPathsMiscInfo* checker = new SharedPathsMiscInfo((char*)buf, size);
    bool result = checker->check();
    delete checker;
    return result;
  }
  
*** 1406,1417 ****
  
    const char* const file_name = file_name_for_class_name(class_name,
                                                           name->utf8_length());
    assert(file_name != NULL, "invariant");
  
-   ClassLoaderExt::Context context(class_name, file_name, THREAD);
- 
    // Lookup stream for parsing .class file
    ClassFileStream* stream = NULL;
    s2 classpath_index = 0;
    ClassPathEntry* e = NULL;
  
--- 1405,1414 ----
*** 1480,1490 ****
  
    if (NULL == stream) {
      return NULL;
    }
  
!   stream->set_verify(context.should_verify(classpath_index));
  
    ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
    Handle protection_domain;
  
    InstanceKlass* result = KlassFactory::create_from_stream(stream,
--- 1477,1487 ----
  
    if (NULL == stream) {
      return NULL;
    }
  
!   stream->set_verify(ClassLoaderExt::should_verify(classpath_index));
  
    ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
    Handle protection_domain;
  
    InstanceKlass* result = KlassFactory::create_from_stream(stream,
*** 1628,1639 ****
    const char* const class_name = ik->name()->as_C_string();
    const char* const file_name = file_name_for_class_name(class_name,
                                                           ik->name()->utf8_length());
    assert(file_name != NULL, "invariant");
  
!   ClassLoaderExt::Context context(class_name, file_name, CATCH);
!   context.record_result(ik->name(), classpath_index, ik, THREAD);
  }
  #endif // INCLUDE_CDS
  
  // Initialize the class loader's access to methods in libzip.  Parse and
  // process the boot classpath into a list ClassPathEntry objects.  Once
--- 1625,1635 ----
    const char* const class_name = ik->name()->as_C_string();
    const char* const file_name = file_name_for_class_name(class_name,
                                                           ik->name()->utf8_length());
    assert(file_name != NULL, "invariant");
  
!   ClassLoaderExt::record_result(classpath_index, ik, THREAD);
  }
  #endif // INCLUDE_CDS
  
  // Initialize the class loader's access to methods in libzip.  Parse and
  // process the boot classpath into a list ClassPathEntry objects.  Once
*** 1699,1709 ****
    // lookup jimage library entry points
    load_jimage_library();
  #if INCLUDE_CDS
    // initialize search path
    if (DumpSharedSpaces) {
!     _shared_paths_misc_info = SharedClassUtil::allocate_shared_paths_misc_info();
    }
  #endif
    setup_bootstrap_search_path();
  }
  
--- 1695,1705 ----
    // lookup jimage library entry points
    load_jimage_library();
  #if INCLUDE_CDS
    // initialize search path
    if (DumpSharedSpaces) {
!     _shared_paths_misc_info = new SharedPathsMiscInfo();
    }
  #endif
    setup_bootstrap_search_path();
  }