src/share/vm/gc_implementation/parNew/parNewGeneration.hpp

*** 93,102 ****
--- 93,105 ----
    Generation* _old_gen;
    Generation* old_gen() { return _old_gen; }
  
    HeapWord *_young_old_boundary;
  
+   ParNewTracer* _gc_tracer;
+   ParNewTracer* gc_tracer() { return _gc_tracer; }
+ 
    int _hash_seed;
    int _thread_num;
    ageTable _ageTable;
  
    bool _to_space_full;
*** 130,139 ****
--- 133,143 ----
    ParScanThreadState(Space* to_space_, ParNewGeneration* gen_,
                       Generation* old_gen_, int thread_num_,
                       ObjToScanQueueSet* work_queue_set_,
                       Stack<oop, mtGC>* overflow_stacks_,
                       size_t desired_plab_sz_,
+                      ParNewTracer* gc_tracer,
                       ParallelTaskTerminator& term_);
  
   public:
    ageTable* age_table() {return &_ageTable;}
  
*** 163,178 ****
  
    int* hash_seed()  { return &_hash_seed; }
    int  thread_num() { return _thread_num; }
  
    // Allocate a to-space block of size "sz", or else return NULL.
!   HeapWord* alloc_in_to_space_slow(size_t word_sz);
  
!   HeapWord* alloc_in_to_space(size_t word_sz) {
      HeapWord* obj = to_space_alloc_buffer()->allocate_aligned(word_sz, SurvivorAlignmentInBytes);
      if (obj != NULL) return obj;
!     else return alloc_in_to_space_slow(word_sz);
    }
  
    HeapWord* young_old_boundary() { return _young_old_boundary; }
  
    void set_young_old_boundary(HeapWord *boundary) {
--- 167,182 ----
  
    int* hash_seed()  { return &_hash_seed; }
    int  thread_num() { return _thread_num; }
  
    // Allocate a to-space block of size "sz", or else return NULL.
!   HeapWord* alloc_in_to_space_slow(size_t word_sz, oop const old, uint age);
  
!   HeapWord* alloc_in_to_space(size_t word_sz, oop const old, uint age) {
      HeapWord* obj = to_space_alloc_buffer()->allocate_aligned(word_sz, SurvivorAlignmentInBytes);
      if (obj != NULL) return obj;
!     else return alloc_in_to_space_slow(word_sz, old, age);
    }
  
    HeapWord* young_old_boundary() { return _young_old_boundary; }
  
    void set_young_old_boundary(HeapWord *boundary) {