src/share/vm/gc/g1/g1CollectedHeap.inline.hpp

rev 12906 : [mq]: gc_interface

*** 23,36 ****
   */
  
  #ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
  #define SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
  
  #include "gc/g1/g1CollectedHeap.hpp"
  #include "gc/g1/g1CollectorState.hpp"
  #include "gc/g1/g1ConcurrentMark.inline.hpp"
- #include "gc/g1/g1SATBCardTableModRefBS.hpp"
  #include "gc/g1/heapRegionManager.inline.hpp"
  #include "gc/g1/heapRegionSet.inline.hpp"
  #include "gc/shared/taskqueue.hpp"
  #include "runtime/orderAccess.inline.hpp"
  
--- 23,36 ----
   */
  
  #ifndef SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
  #define SHARE_VM_GC_G1_G1COLLECTEDHEAP_INLINE_HPP
  
+ #include "gc/g1/g1BarrierSet.hpp"
  #include "gc/g1/g1CollectedHeap.hpp"
  #include "gc/g1/g1CollectorState.hpp"
  #include "gc/g1/g1ConcurrentMark.inline.hpp"
  #include "gc/g1/heapRegionManager.inline.hpp"
  #include "gc/g1/heapRegionSet.inline.hpp"
  #include "gc/shared/taskqueue.hpp"
  #include "runtime/orderAccess.inline.hpp"
  
*** 125,135 ****
  
    HeapWord* end = start + word_size;
    assert(containing_hr->is_in(end - 1), "it should also contain end - 1");
  
    MemRegion mr(start, end);
!   g1_barrier_set()->g1_mark_as_young(mr);
  }
  
  inline RefToScanQueue* G1CollectedHeap::task_queue(uint i) const {
    return _task_queues->queue(i);
  }
--- 125,135 ----
  
    HeapWord* end = start + word_size;
    assert(containing_hr->is_in(end - 1), "it should also contain end - 1");
  
    MemRegion mr(start, end);
!   g1_card_table()->g1_mark_as_young(mr);
  }
  
  inline RefToScanQueue* G1CollectedHeap::task_queue(uint i) const {
    return _task_queues->queue(i);
  }
*** 239,257 ****
      return false;
    }
    return heap_region_containing(obj)->is_young();
  }
  
- // We don't need barriers for initializing stores to objects
- // in the young gen: for the SATB pre-barrier, there is no
- // pre-value that needs to be remembered; for the remembered-set
- // update logging post-barrier, we don't maintain remembered set
- // information for young gen objects.
- inline bool G1CollectedHeap::can_elide_initializing_store_barrier(oop new_obj) {
-   return is_in_young(new_obj);
- }
- 
  inline bool G1CollectedHeap::is_obj_dead(const oop obj) const {
    if (obj == NULL) {
      return false;
    }
    return is_obj_dead(obj, heap_region_containing(obj));
--- 239,248 ----