comparison src/share/vm/gc_implementation/g1/concurrentMark.cpp @ 2436:8f1042ff784d

7020042: G1: Partially remove fix for 6994628 Summary: Disable reference discovery and processing during concurrent marking by disabling fix for 6994628. Reviewed-by: tonyp, ysr
author johnc
date Fri, 18 Feb 2011 10:07:34 -0800
parents 371bbc844bf1
children cd8e33b2a8ad
comparison
equal deleted inserted replaced
2435:371bbc844bf1 2436:8f1042ff784d
3201 CMOopClosure(G1CollectedHeap* g1h, 3201 CMOopClosure(G1CollectedHeap* g1h,
3202 ConcurrentMark* cm, 3202 ConcurrentMark* cm,
3203 CMTask* task) 3203 CMTask* task)
3204 : _g1h(g1h), _cm(cm), _task(task) 3204 : _g1h(g1h), _cm(cm), _task(task)
3205 { 3205 {
3206 _ref_processor = g1h->ref_processor(); 3206 assert(_ref_processor == NULL, "should be initialized to NULL");
3207 assert(_ref_processor != NULL, "should not be NULL"); 3207
3208 if (G1UseConcMarkReferenceProcessing) {
3209 _ref_processor = g1h->ref_processor();
3210 assert(_ref_processor != NULL, "should not be NULL");
3211 }
3208 } 3212 }
3209 }; 3213 };
3210 3214
3211 void CMTask::setup_for_region(HeapRegion* hr) { 3215 void CMTask::setup_for_region(HeapRegion* hr) {
3212 // Separated the asserts so that we know which one fires. 3216 // Separated the asserts so that we know which one fires.