1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Fri Jun 29 17:12:15 2012 -0700 1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Mon Jul 02 13:11:28 2012 -0400 1.3 @@ -62,8 +62,8 @@ 1.4 class ConcurrentG1Refine; 1.5 class GenerationCounters; 1.6 1.7 -typedef OverflowTaskQueue<StarTask> RefToScanQueue; 1.8 -typedef GenericTaskQueueSet<RefToScanQueue> RefToScanQueueSet; 1.9 +typedef OverflowTaskQueue<StarTask, mtGC> RefToScanQueue; 1.10 +typedef GenericTaskQueueSet<RefToScanQueue, mtGC> RefToScanQueueSet; 1.11 1.12 typedef int RegionIdx_t; // needs to hold [ 0..max_regions() ) 1.13 typedef int CardIdx_t; // needs to hold [ 0..CardsPerRegion ) 1.14 @@ -74,7 +74,7 @@ 1.15 GCAllocPurposeCount 1.16 }; 1.17 1.18 -class YoungList : public CHeapObj { 1.19 +class YoungList : public CHeapObj<mtGC> { 1.20 private: 1.21 G1CollectedHeap* _g1h; 1.22 1.23 @@ -1772,7 +1772,7 @@ 1.24 G1ParScanThreadState(G1CollectedHeap* g1h, uint queue_num); 1.25 1.26 ~G1ParScanThreadState() { 1.27 - FREE_C_HEAP_ARRAY(size_t, _surviving_young_words_base); 1.28 + FREE_C_HEAP_ARRAY(size_t, _surviving_young_words_base, mtGC); 1.29 } 1.30 1.31 RefToScanQueue* refs() { return _refs; }