src/share/vm/gc/g1/g1CollectedHeap.cpp

rev 13280 : imported patch CollectedHeap_register_nmethod
rev 13281 : [mq]: CollectedHeap_register_nmethod_v2

*** 5417,5436 ****
    void do_oop(oop* p)       { do_oop_work(p); }
    void do_oop(narrowOop* p) { do_oop_work(p); }
  };
  
  void G1CollectedHeap::register_nmethod(nmethod* nm) {
!   CollectedHeap::register_nmethod(nm);
! 
    guarantee(nm != NULL, "sanity");
    RegisterNMethodOopClosure reg_cl(this, nm);
    nm->oops_do(&reg_cl);
  }
  
  void G1CollectedHeap::unregister_nmethod(nmethod* nm) {
!   CollectedHeap::unregister_nmethod(nm);
! 
    guarantee(nm != NULL, "sanity");
    UnregisterNMethodOopClosure reg_cl(this, nm);
    nm->oops_do(&reg_cl, true);
  }
  
--- 5417,5434 ----
    void do_oop(oop* p)       { do_oop_work(p); }
    void do_oop(narrowOop* p) { do_oop_work(p); }
  };
  
  void G1CollectedHeap::register_nmethod(nmethod* nm) {
!   assert_locked_or_safepoint(CodeCache_lock);
    guarantee(nm != NULL, "sanity");
    RegisterNMethodOopClosure reg_cl(this, nm);
    nm->oops_do(&reg_cl);
  }
  
  void G1CollectedHeap::unregister_nmethod(nmethod* nm) {
!   assert_locked_or_safepoint(CodeCache_lock);
    guarantee(nm != NULL, "sanity");
    UnregisterNMethodOopClosure reg_cl(this, nm);
    nm->oops_do(&reg_cl, true);
  }