src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp

rev 4801 : imported patch code-movement
rev 4802 : imported patch optimize-nmethod-scanning
rev 4803 : imported patch thomas-comments

*** 1637,1651 ****
  
    // Unregister the given nmethod from the G1 heap
    virtual void unregister_nmethod(nmethod* nm);
  
    // Migrate the nmethods in the code root lists of the regions
!   // in the collection set to regions in to-space
    void migrate_strong_code_roots();
  
!   // During an initial mark pause, mark the strong code roots that
!   // point into the heap.
    void mark_strong_code_roots(uint worker_id);
  
    // Rebuild the stong code root lists for each region
    // after a full GC
    void rebuild_strong_code_roots();
--- 1637,1653 ----
  
    // Unregister the given nmethod from the G1 heap
    virtual void unregister_nmethod(nmethod* nm);
  
    // Migrate the nmethods in the code root lists of the regions
!   // in the collection set to regions in to-space. In the event
!   // of an evacuation failure, nmethods that reference objects
!   // that were not successfullly evacuated are not migrated.
    void migrate_strong_code_roots();
  
!   // During an initial mark pause, mark all the code roots that
!   // point into regions *not* in the collection set.
    void mark_strong_code_roots(uint worker_id);
  
    // Rebuild the stong code root lists for each region
    // after a full GC
    void rebuild_strong_code_roots();