1.1 --- a/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp Wed Jun 27 15:23:36 2012 +0200 1.2 +++ b/src/share/vm/gc_implementation/parNew/parNewGeneration.hpp Thu Jun 28 17:03:16 2012 -0400 1.3 @@ -41,7 +41,7 @@ 1.4 // in genOopClosures.inline.hpp. 1.5 1.6 typedef Padded<OopTaskQueue> ObjToScanQueue; 1.7 -typedef GenericTaskQueueSet<ObjToScanQueue> ObjToScanQueueSet; 1.8 +typedef GenericTaskQueueSet<ObjToScanQueue, mtGC> ObjToScanQueueSet; 1.9 1.10 class ParKeepAliveClosure: public DefNewGeneration::KeepAliveClosure { 1.11 private: 1.12 @@ -59,7 +59,7 @@ 1.13 friend class ParScanThreadStateSet; 1.14 private: 1.15 ObjToScanQueue *_work_queue; 1.16 - Stack<oop>* const _overflow_stack; 1.17 + Stack<oop, mtGC>* const _overflow_stack; 1.18 1.19 ParGCAllocBuffer _to_space_alloc_buffer; 1.20 1.21 @@ -127,7 +127,7 @@ 1.22 ParScanThreadState(Space* to_space_, ParNewGeneration* gen_, 1.23 Generation* old_gen_, int thread_num_, 1.24 ObjToScanQueueSet* work_queue_set_, 1.25 - Stack<oop>* overflow_stacks_, 1.26 + Stack<oop, mtGC>* overflow_stacks_, 1.27 size_t desired_plab_sz_, 1.28 ParallelTaskTerminator& term_); 1.29 1.30 @@ -151,7 +151,7 @@ 1.31 void trim_queues(int max_size); 1.32 1.33 // Private overflow stack usage 1.34 - Stack<oop>* overflow_stack() { return _overflow_stack; } 1.35 + Stack<oop, mtGC>* overflow_stack() { return _overflow_stack; } 1.36 bool take_from_overflow_stack(); 1.37 void push_on_overflow_stack(oop p); 1.38 1.39 @@ -312,7 +312,7 @@ 1.40 ObjToScanQueueSet* _task_queues; 1.41 1.42 // Per-worker-thread local overflow stacks 1.43 - Stack<oop>* _overflow_stacks; 1.44 + Stack<oop, mtGC>* _overflow_stacks; 1.45 1.46 // Desired size of survivor space plab's 1.47 PLABStats _plab_stats;