1.1 --- a/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp Tue Sep 28 09:51:37 2010 -0700
1.2 +++ b/src/share/vm/gc_implementation/parallelScavenge/psCompactionManager.hpp Tue Sep 28 15:56:15 2010 -0700
1.3 @@ -80,10 +80,9 @@
1.4 // type of TaskQueue.
1.5 RegionTaskQueue _region_stack;
1.6
1.7 -#if 1 // does this happen enough to need a per thread stack?
1.8 - GrowableArray<Klass*>* _revisit_klass_stack;
1.9 - GrowableArray<DataLayout*>* _revisit_mdo_stack;
1.10 -#endif
1.11 + Stack<Klass*> _revisit_klass_stack;
1.12 + Stack<DataLayout*> _revisit_mdo_stack;
1.13 +
1.14 static ParMarkBitMap* _mark_bitmap;
1.15
1.16 Action _action;
1.17 @@ -113,10 +112,7 @@
1.18 inline static ParCompactionManager* manager_array(int index);
1.19
1.20 ParCompactionManager();
1.21 - ~ParCompactionManager();
1.22
1.23 - void allocate_stacks();
1.24 - void deallocate_stacks();
1.25 ParMarkBitMap* mark_bitmap() { return _mark_bitmap; }
1.26
1.27 // Take actions in preparation for a compaction.
1.28 @@ -129,11 +125,8 @@
1.29 bool should_verify_only();
1.30 bool should_reset_only();
1.31
1.32 -#if 1
1.33 - // Probably stays as a growable array
1.34 - GrowableArray<Klass*>* revisit_klass_stack() { return _revisit_klass_stack; }
1.35 - GrowableArray<DataLayout*>* revisit_mdo_stack() { return _revisit_mdo_stack; }
1.36 -#endif
1.37 + Stack<Klass*>* revisit_klass_stack() { return &_revisit_klass_stack; }
1.38 + Stack<DataLayout*>* revisit_mdo_stack() { return &_revisit_mdo_stack; }
1.39
1.40 // Save for later processing. Must not fail.
1.41 inline void push(oop obj) { _marking_stack.push(obj); }
1.42 @@ -162,10 +155,6 @@
1.43 // Process tasks remaining on any stack
1.44 void drain_region_stacks();
1.45
1.46 - // Debugging support
1.47 -#ifdef ASSERT
1.48 - bool stacks_have_been_allocated();
1.49 -#endif
1.50 };
1.51
1.52 inline ParCompactionManager* ParCompactionManager::manager_array(int index) {
