src/share/vm/classfile/javaClasses.cpp

rev 11545 : imported patch webrev.01
rev 11546 : imported patch webrev.02

*** 867,884 ****
  void java_lang_Class::fixup_module_field(KlassHandle k, Handle module) {
    assert(_module_offset != 0, "must have been computed already");
    java_lang_Class::set_module(k->java_mirror(), module());
  }
  
  int  java_lang_Class::oop_size(oop java_class) {
    assert(_oop_size_offset != 0, "must be set");
!   return java_class->int_field(_oop_size_offset);
! }
! void java_lang_Class::set_oop_size(oop java_class, int size) {
!   assert(_oop_size_offset != 0, "must be set");
!   java_class->int_field_put(_oop_size_offset, size);
  }
  int  java_lang_Class::static_oop_field_count(oop java_class) {
    assert(_static_oop_field_count_offset != 0, "must be set");
    return java_class->int_field(_static_oop_field_count_offset);
  }
  void java_lang_Class::set_static_oop_field_count(oop java_class, int size) {
--- 867,884 ----
  void java_lang_Class::fixup_module_field(KlassHandle k, Handle module) {
    assert(_module_offset != 0, "must have been computed already");
    java_lang_Class::set_module(k->java_mirror(), module());
  }
  
+ // Note, oop_size is set in CollectedHeap::class_allocate()
  int  java_lang_Class::oop_size(oop java_class) {
    assert(_oop_size_offset != 0, "must be set");
!   int size = java_class->int_field(_oop_size_offset);
!   assert(size > 0, "size not set or stomped on: %d", size);
!   return size;
  }
+ 
  int  java_lang_Class::static_oop_field_count(oop java_class) {
    assert(_static_oop_field_count_offset != 0, "must be set");
    return java_class->int_field(_static_oop_field_count_offset);
  }
  void java_lang_Class::set_static_oop_field_count(oop java_class, int size) {