src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp

rev 6480 : imported patch 8035400-move-g1parscanthreadstate-into-own-files
rev 6481 : imported patch 8035400-2-bengt-fixes
rev 6482 : imported patch 8035401-fix-visibility-of-g1parscanthreadstate
rev 6483 : imported patch 8035401-3-fix-constructor
rev 6484 : [mq]: 8035401-2-another-inline-try
rev 6485 : [mq]: 8040977-g1-crashes-with-G1DeferredRSUpdate-disabled

*** 28,54 ****
  #include "gc_implementation/g1/g1ParScanThreadState.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/oop.pcgc.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  
- #ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away
- #pragma warning( disable:4355 ) // 'this' : used in base member initializer list
- #endif // _MSC_VER
- 
  G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num, ReferenceProcessor* rp)
    : _g1h(g1h),
      _refs(g1h->task_queue(queue_num)),
      _dcq(&g1h->dirty_card_queue_set()),
      _ct_bs(g1h->g1_barrier_set()),
      _g1_rem(g1h->g1_rem_set()),
      _hash_seed(17), _queue_num(queue_num),
      _term_attempts(0),
      _surviving_alloc_buffer(g1h->desired_plab_sz(GCAllocForSurvived)),
      _tenured_alloc_buffer(g1h->desired_plab_sz(GCAllocForTenured)),
!     _age_table(false), _scanner(g1h, this, rp),
      _strong_roots_time(0), _term_time(0),
      _alloc_buffer_waste(0), _undo_waste(0) {
    // we allocate G1YoungSurvRateNumRegions plus one entries, since
    // we "sacrifice" entry 0 to keep track of surviving bytes for
    // non-young regions (where the age is -1)
    // We also add a few elements at the beginning and at the end in
    // an attempt to eliminate cache contention
--- 28,51 ----
  #include "gc_implementation/g1/g1ParScanThreadState.inline.hpp"
  #include "oops/oop.inline.hpp"
  #include "oops/oop.pcgc.inline.hpp"
  #include "runtime/prefetch.inline.hpp"
  
  G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num, ReferenceProcessor* rp)
    : _g1h(g1h),
      _refs(g1h->task_queue(queue_num)),
      _dcq(&g1h->dirty_card_queue_set()),
      _ct_bs(g1h->g1_barrier_set()),
      _g1_rem(g1h->g1_rem_set()),
      _hash_seed(17), _queue_num(queue_num),
      _term_attempts(0),
      _surviving_alloc_buffer(g1h->desired_plab_sz(GCAllocForSurvived)),
      _tenured_alloc_buffer(g1h->desired_plab_sz(GCAllocForTenured)),
!     _age_table(false), _scanner(g1h, rp),
      _strong_roots_time(0), _term_time(0),
      _alloc_buffer_waste(0), _undo_waste(0) {
+   _scanner.set_par_scan_thread_state(this);
    // we allocate G1YoungSurvRateNumRegions plus one entries, since
    // we "sacrifice" entry 0 to keep track of surviving bytes for
    // non-young regions (where the age is -1)
    // We also add a few elements at the beginning and at the end in
    // an attempt to eliminate cache contention