--- a/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp	Fri Oct 16 00:01:49 2015 +0000
+++ b/hotspot/src/share/vm/gc/g1/g1ParScanThreadState.cpp	Thu Oct 15 10:10:13 2015 -0400
@@ -43,10 +43,9 @@
     _worker_id(worker_id),
     _tenuring_threshold(g1h->g1_policy()->tenuring_threshold()),
     _age_table(false),
-    _scanner(g1h),
+    _scanner(g1h, this),
     _old_gen_is_full(false)
 {
-  _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)