1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Thu Feb 07 18:40:45 2013 -0800 1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp Sun Feb 10 21:15:16 2013 +0100 1.3 @@ -37,6 +37,7 @@ 1.4 #include "memory/barrierSet.hpp" 1.5 #include "memory/memRegion.hpp" 1.6 #include "memory/sharedHeap.hpp" 1.7 +#include "utilities/stack.hpp" 1.8 1.9 // A "G1CollectedHeap" is an implementation of a java heap for HotSpot. 1.10 // It uses the "Garbage First" heap organization and algorithm, which 1.11 @@ -877,10 +878,9 @@ 1.12 // forwarding pointers to themselves. Reset them. 1.13 void remove_self_forwarding_pointers(); 1.14 1.15 - // When one is non-null, so is the other. Together, they each pair is 1.16 - // an object with a preserved mark, and its mark value. 1.17 - GrowableArray<oop>* _objs_with_preserved_marks; 1.18 - GrowableArray<markOop>* _preserved_marks_of_objs; 1.19 + // Together, these store an object with a preserved mark, and its mark value. 1.20 + Stack<oop, mtGC> _objs_with_preserved_marks; 1.21 + Stack<markOop, mtGC> _preserved_marks_of_objs; 1.22 1.23 // Preserve the mark of "obj", if necessary, in preparation for its mark 1.24 // word being overwritten with a self-forwarding-pointer.