1.1 --- a/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp Mon Jul 21 09:41:06 2014 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/g1ParScanThreadState.cpp Mon Jul 21 09:41:06 2014 +0200
1.3 @@ -30,10 +30,6 @@
1.4 #include "oops/oop.pcgc.inline.hpp"
1.5 #include "runtime/prefetch.inline.hpp"
1.6
1.7 -#ifdef _MSC_VER // the use of 'this' below gets a warning, make it go away
1.8 -#pragma warning( disable:4355 ) // 'this' : used in base member initializer list
1.9 -#endif // _MSC_VER
1.10 -
1.11 G1ParScanThreadState::G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num, ReferenceProcessor* rp)
1.12 : _g1h(g1h),
1.13 _refs(g1h->task_queue(queue_num)),
1.14 @@ -44,9 +40,10 @@
1.15 _term_attempts(0),
1.16 _surviving_alloc_buffer(g1h->desired_plab_sz(GCAllocForSurvived)),
1.17 _tenured_alloc_buffer(g1h->desired_plab_sz(GCAllocForTenured)),
1.18 - _age_table(false), _scanner(g1h, this, rp),
1.19 + _age_table(false), _scanner(g1h, rp),
1.20 _strong_roots_time(0), _term_time(0),
1.21 _alloc_buffer_waste(0), _undo_waste(0) {
1.22 + _scanner.set_par_scan_thread_state(this);
1.23 // we allocate G1YoungSurvRateNumRegions plus one entries, since
1.24 // we "sacrifice" entry 0 to keep track of surviving bytes for
1.25 // non-young regions (where the age is -1)
