src/share/vm/classfile/systemDictionary.cpp

*** 123,139 ****
  // Parallel class loading check
  
  bool SystemDictionary::is_parallelCapable(Handle class_loader) {
    if (UnsyncloadClass || class_loader.is_null()) return true;
    if (AlwaysLockClassLoader) return false;
!   return java_lang_Class::parallelCapable(class_loader());
  }
  // ----------------------------------------------------------------------------
  // ParallelDefineClass flag does not apply to bootclass loader
  bool SystemDictionary::is_parallelDefine(Handle class_loader) {
     if (class_loader.is_null()) return false;
!    if (AllowParallelDefineClass && java_lang_Class::parallelCapable(class_loader())) {
       return true;
     }
     return false;
  }
  // ----------------------------------------------------------------------------
--- 123,139 ----
  // Parallel class loading check
  
  bool SystemDictionary::is_parallelCapable(Handle class_loader) {
    if (UnsyncloadClass || class_loader.is_null()) return true;
    if (AlwaysLockClassLoader) return false;
!   return java_lang_ClassLoader::parallelCapable(class_loader());
  }
  // ----------------------------------------------------------------------------
  // ParallelDefineClass flag does not apply to bootclass loader
  bool SystemDictionary::is_parallelDefine(Handle class_loader) {
     if (class_loader.is_null()) return false;
!    if (AllowParallelDefineClass && java_lang_ClassLoader::parallelCapable(class_loader())) {
       return true;
     }
     return false;
  }
  // ----------------------------------------------------------------------------
*** 1951,1961 ****
    // Preload commonly used klasses
    WKID scan = FIRST_WKID;
    // first do Object, String, Class
    initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
  
!   debug_only(instanceKlass::verify_class_klass_nonstatic_oop_maps(WK_KLASS(Class_klass)));
  
    // Fixup mirrors for classes loaded before java.lang.Class.
    // These calls iterate over the objects currently in the perm gen
    // so calling them at this point is matters (not before when there
    // are fewer objects and not later after there are more objects
--- 1951,1961 ----
    // Preload commonly used klasses
    WKID scan = FIRST_WKID;
    // first do Object, String, Class
    initialize_wk_klasses_through(WK_KLASS_ENUM_NAME(Class_klass), scan, CHECK);
  
!   java_lang_Class::compute_offsets();
  
    // Fixup mirrors for classes loaded before java.lang.Class.
    // These calls iterate over the objects currently in the perm gen
    // so calling them at this point is matters (not before when there
    // are fewer objects and not later after there are more objects
*** 2734,2744 ****
        class_size += ik->methods()->size();
        class_size += ik->constants()->size();
        class_size += ik->local_interfaces()->size();
        class_size += ik->transitive_interfaces()->size();
        // We do not have to count implementors, since we only store one!
!       class_size += ik->fields()->size();
      }
    }
  
    static void do_method(methodOop m) {
      nmethods++;
--- 2734,2744 ----
        class_size += ik->methods()->size();
        class_size += ik->constants()->size();
        class_size += ik->local_interfaces()->size();
        class_size += ik->transitive_interfaces()->size();
        // We do not have to count implementors, since we only store one!
!       class_size += ik->all_fields_count() * FieldInfo::field_slots;
      }
    }
  
    static void do_method(methodOop m) {
      nmethods++;