src/share/vm/classfile/classFileParser.cpp

rev 6853 : 8046070: Class Data Sharing clean up and refactoring
Summary: Cleaned up CDS to be more configurable, maintainable and extensible
Reviewed-by: dholmes, coleenp, acorn, mchung

*** 29,38 ****
--- 29,41 ----
  #include "classfile/classLoaderData.inline.hpp"
  #include "classfile/defaultMethods.hpp"
  #include "classfile/javaClasses.hpp"
  #include "classfile/symbolTable.hpp"
  #include "classfile/systemDictionary.hpp"
+ #if INCLUDE_CDS
+ #include "classfile/systemDictionaryShared.hpp"
+ #endif
  #include "classfile/verificationType.hpp"
  #include "classfile/verifier.hpp"
  #include "classfile/vmSymbols.hpp"
  #include "memory/allocation.hpp"
  #include "memory/gcLocker.hpp"
*** 58,67 ****
--- 61,71 ----
  #include "runtime/timer.hpp"
  #include "services/classLoadingService.hpp"
  #include "services/threadService.hpp"
  #include "utilities/array.hpp"
  #include "utilities/globalDefinitions.hpp"
+ #include "utilities/ostream.hpp"
  
  // We generally try to create the oops directly when parsing, rather than
  // allocating temporary data structures and copying the bytes twice. A
  // temporary area is only needed when parsing utf8 entries in the constant
  // pool and when parsing line number tables.
*** 3784,3794 ****
--- 3788,3806 ----
    _cp_patches = cp_patches;
  
    instanceKlassHandle nullHandle;
  
    // Figure out whether we can skip format checking (matching classic VM behavior)
+   if (DumpSharedSpaces) {
+     // verify == true means it's a 'remote' class (i.e., non-boot class)
+     // Verification decision is based on BytecodeVerificationRemote flag
+     // for those classes.
+     _need_verify = (verify) ? BytecodeVerificationRemote :
+                               BytecodeVerificationLocal;
+   } else {
      _need_verify = Verifier::should_verify_for(class_loader(), verify);
+   }
  
    // Set the verify flag in stream
    cfs->set_verify(_need_verify);
  
    // Save the class file name for easier error message printing.
*** 3803,3812 ****
--- 3815,3836 ----
  
    // Version numbers
    u2 minor_version = cfs->get_u2_fast();
    u2 major_version = cfs->get_u2_fast();
  
+   if (DumpSharedSpaces && major_version < JAVA_1_5_VERSION) {
+     ResourceMark rm;
+     warning("Pre JDK 1.5 class not supported by CDS: %u.%u %s",
+             major_version,  minor_version, name->as_C_string());
+     Exceptions::fthrow(
+       THREAD_AND_LOCATION,
+       vmSymbols::java_lang_UnsupportedClassVersionError(),
+       "Unsupported major.minor version for dump time %u.%u",
+       major_version,
+       minor_version);
+   }
+ 
    // Check version numbers - we check this even with verifier off
    if (!is_supported_version(major_version, minor_version)) {
      if (name == NULL) {
        Exceptions::fthrow(
          THREAD_AND_LOCATION,
*** 3910,3919 ****
--- 3934,3955 ----
      if (TraceClassLoadingPreorder) {
        tty->print("[Loading %s", (name != NULL) ? name->as_klass_external_name() : "NoName");
        if (cfs->source() != NULL) tty->print(" from %s", cfs->source());
        tty->print_cr("]");
      }
+ #if INCLUDE_CDS
+     if (DumpLoadedClassList != NULL && cfs->source() != NULL && classlist_file->is_open()) {
+       // Only dump the classes that can be stored into CDS archive
+       if (SystemDictionaryShared::is_sharing_possible(loader_data)) {
+         if (name != NULL) {
+           ResourceMark rm(THREAD);
+           classlist_file->print_cr("%s", name->as_C_string());
+           classlist_file->flush();
+         }
+       }
+     }
+ #endif
  
      u2 super_class_index = cfs->get_u2_fast();
      instanceKlassHandle super_klass = parse_super_class(super_class_index,
                                                          CHECK_NULL);