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

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

*** 61,70 ****
--- 61,71 ----
  class HeapRegionRemSetIterator;
  class ConcurrentMark;
  class ConcurrentMarkThread;
  class ConcurrentG1Refine;
  class GenerationCounters;
+ class nmethod;
  
  typedef OverflowTaskQueue<StarTask, mtGC>         RefToScanQueue;
  typedef GenericTaskQueueSet<RefToScanQueue, mtGC> RefToScanQueueSet;
  
  typedef int RegionIdx_t;   // needs to hold [ 0..max_regions() )
*** 1627,1636 ****
--- 1628,1659 ----
    // element on the list points to itself.
    HeapRegion* _dirty_cards_region_list;
    void push_dirty_cards_region(HeapRegion* hr);
    HeapRegion* pop_dirty_cards_region();
  
+   // Optimized nmethod scanning support routines
+ 
+   // Register the given nmethod with the G1 heap
+   virtual void register_nmethod(nmethod* nm);
+ 
+   // 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();
+ 
    // Verification
  
    // The following is just to alert the verification code
    // that a full collection has occurred and that the
    // remembered sets are no longer up to date.