src/share/vm/oops/instanceKlassKlass.cpp

rev 421 : [mq]: anonk.patch

*** 79,88 ****
--- 79,89 ----
    MarkSweep::mark_and_push(ik->adr_class_loader());
    MarkSweep::mark_and_push(ik->adr_source_file_name());
    MarkSweep::mark_and_push(ik->adr_source_debug_extension());
    MarkSweep::mark_and_push(ik->adr_inner_classes());
    MarkSweep::mark_and_push(ik->adr_protection_domain());
+   MarkSweep::mark_and_push(ik->adr_host_klass());
    MarkSweep::mark_and_push(ik->adr_signers());
    MarkSweep::mark_and_push(ik->adr_generic_signature());
    MarkSweep::mark_and_push(ik->adr_class_annotations());
    MarkSweep::mark_and_push(ik->adr_fields_annotations());
    MarkSweep::mark_and_push(ik->adr_methods_annotations());
*** 118,127 ****
--- 119,129 ----
    PSParallelCompact::mark_and_push(cm, ik->adr_class_loader());
    PSParallelCompact::mark_and_push(cm, ik->adr_source_file_name());
    PSParallelCompact::mark_and_push(cm, ik->adr_source_debug_extension());
    PSParallelCompact::mark_and_push(cm, ik->adr_inner_classes());
    PSParallelCompact::mark_and_push(cm, ik->adr_protection_domain());
+   PSParallelCompact::mark_and_push(cm, ik->adr_host_klass());
    PSParallelCompact::mark_and_push(cm, ik->adr_signers());
    PSParallelCompact::mark_and_push(cm, ik->adr_generic_signature());
    PSParallelCompact::mark_and_push(cm, ik->adr_class_annotations());
    PSParallelCompact::mark_and_push(cm, ik->adr_fields_annotations());
    PSParallelCompact::mark_and_push(cm, ik->adr_methods_annotations());
*** 157,166 ****
--- 159,169 ----
    blk->do_oop(ik->adr_transitive_interfaces());
    blk->do_oop(ik->adr_fields());
    blk->do_oop(ik->adr_constants());
    blk->do_oop(ik->adr_class_loader());
    blk->do_oop(ik->adr_protection_domain());
+   blk->do_oop(ik->adr_host_klass());
    blk->do_oop(ik->adr_signers());
    blk->do_oop(ik->adr_source_file_name());
    blk->do_oop(ik->adr_source_debug_extension());
    blk->do_oop(ik->adr_inner_classes());
    for (int i = 0; i < instanceKlass::implementors_limit; i++) {
*** 209,218 ****
--- 212,223 ----
    if (mr.contains(adr)) blk->do_oop(adr);
    adr = ik->adr_class_loader();
    if (mr.contains(adr)) blk->do_oop(adr);
    adr = ik->adr_protection_domain();
    if (mr.contains(adr)) blk->do_oop(adr);
+   adr = ik->adr_host_klass();
+   if (mr.contains(adr)) blk->do_oop(adr);
    adr = ik->adr_signers();
    if (mr.contains(adr)) blk->do_oop(adr);
    adr = ik->adr_source_file_name();
    if (mr.contains(adr)) blk->do_oop(adr);
    adr = ik->adr_source_debug_extension();
*** 258,267 ****
--- 263,273 ----
    MarkSweep::adjust_pointer(ik->adr_transitive_interfaces());
    MarkSweep::adjust_pointer(ik->adr_fields());
    MarkSweep::adjust_pointer(ik->adr_constants());
    MarkSweep::adjust_pointer(ik->adr_class_loader());
    MarkSweep::adjust_pointer(ik->adr_protection_domain());
+   MarkSweep::adjust_pointer(ik->adr_host_klass());
    MarkSweep::adjust_pointer(ik->adr_signers());
    MarkSweep::adjust_pointer(ik->adr_source_file_name());
    MarkSweep::adjust_pointer(ik->adr_source_debug_extension());
    MarkSweep::adjust_pointer(ik->adr_inner_classes());
    for (int i = 0; i < instanceKlass::implementors_limit; i++) {
*** 293,302 ****
--- 299,313 ----
    oop* pd_addr = ik->adr_protection_domain();
    if (PSScavenge::should_scavenge(pd_addr)) {
      pm->claim_or_forward_breadth(pd_addr);
    }
  
+   oop* hk_addr = ik->adr_host_klass();
+   if (PSScavenge::should_scavenge(hk_addr)) {
+     pm->claim_or_forward_breadth(hk_addr);
+   }
+ 
    oop* sg_addr = ik->adr_signers();
    if (PSScavenge::should_scavenge(sg_addr)) {
      pm->claim_or_forward_breadth(sg_addr);
    }
  
*** 316,325 ****
--- 327,341 ----
    oop* pd_addr = ik->adr_protection_domain();
    if (PSScavenge::should_scavenge(pd_addr)) {
      pm->claim_or_forward_depth(pd_addr);
    }
  
+   oop* hk_addr = ik->adr_host_klass();
+   if (PSScavenge::should_scavenge(hk_addr)) {
+     pm->claim_or_forward_depth(hk_addr);
+   }
+ 
    oop* sg_addr = ik->adr_signers();
    if (PSScavenge::should_scavenge(sg_addr)) {
      pm->claim_or_forward_depth(sg_addr);
    }
  
*** 419,428 ****
--- 435,445 ----
      ik->init_implementor();
      ik->set_fields(NULL);
      ik->set_constants(NULL);
      ik->set_class_loader(NULL);
      ik->set_protection_domain(NULL);
+     ik->set_host_klass(NULL);
      ik->set_signers(NULL);
      ik->set_source_file_name(NULL);
      ik->set_source_debug_extension(NULL);
      ik->set_inner_classes(NULL);
      ik->set_static_oop_field_size(0);
*** 524,533 ****
--- 541,551 ----
    st->print(" - local interfaces:  "); ik->local_interfaces()->print_value_on(st);      st->cr();
    st->print(" - trans. interfaces: "); ik->transitive_interfaces()->print_value_on(st); st->cr();
    st->print(" - constants:         "); ik->constants()->print_value_on(st);         st->cr();
    st->print(" - class loader:      "); ik->class_loader()->print_value_on(st);      st->cr();
    st->print(" - protection domain: "); ik->protection_domain()->print_value_on(st); st->cr();
+   st->print(" - host class: ");        ik->host_klass()->print_value_on(st);        st->cr();
    st->print(" - signers:           "); ik->signers()->print_value_on(st);           st->cr();
    if (ik->source_file_name() != NULL) {
      st->print(" - source file:       ");
      ik->source_file_name()->print_value_on(st);
      st->cr();
*** 624,634 ****
      // Avoid redundant verifies
      if (ik->_verify_count == Universe::verify_count()) return;
      ik->_verify_count = Universe::verify_count();
  #endif
      // Verify that klass is present in SystemDictionary
!     if (ik->is_loaded()) {
        symbolHandle h_name (thread, ik->name());
        Handle h_loader (thread, ik->class_loader());
        Handle h_obj(thread, obj);
        SystemDictionary::verify_obj_klass_present(h_obj, h_name, h_loader);
      }
--- 642,652 ----
      // Avoid redundant verifies
      if (ik->_verify_count == Universe::verify_count()) return;
      ik->_verify_count = Universe::verify_count();
  #endif
      // Verify that klass is present in SystemDictionary
!     if (ik->is_loaded() && !ik->is_anonymous()) {
        symbolHandle h_name (thread, ik->name());
        Handle h_loader (thread, ik->class_loader());
        Handle h_obj(thread, obj);
        SystemDictionary::verify_obj_klass_present(h_obj, h_name, h_loader);
      }
*** 762,771 ****
--- 780,792 ----
        guarantee(ik->source_debug_extension()->is_symbol(), "should be symbol");
      }
      if (ik->protection_domain() != NULL) {
        guarantee(ik->protection_domain()->is_oop(),  "should be oop");
      }
+     if (ik->host_klass() != NULL) {
+       guarantee(ik->host_klass()->is_oop(),  "should be oop");
+     }
      if (ik->signers() != NULL) {
        guarantee(ik->signers()->is_objArray(),       "should be obj array");
      }
      if (ik->generic_signature() != NULL) {
        guarantee(ik->generic_signature()->is_perm(),   "should be in permspace");