src/share/vm/gc_implementation/shared/markSweep.cpp

changeset 3900
d2a62e0f25eb
parent 2708
1d1603768966
child 4037
da91efe96a93
     1.1 --- a/src/share/vm/gc_implementation/shared/markSweep.cpp	Wed Jun 27 15:23:36 2012 +0200
     1.2 +++ b/src/share/vm/gc_implementation/shared/markSweep.cpp	Thu Jun 28 17:03:16 2012 -0400
     1.3 @@ -30,13 +30,13 @@
     1.4  #include "oops/objArrayKlass.inline.hpp"
     1.5  #include "oops/oop.inline.hpp"
     1.6  
     1.7 -Stack<oop>              MarkSweep::_marking_stack;
     1.8 -Stack<DataLayout*>      MarkSweep::_revisit_mdo_stack;
     1.9 -Stack<Klass*>           MarkSweep::_revisit_klass_stack;
    1.10 -Stack<ObjArrayTask>     MarkSweep::_objarray_stack;
    1.11 +Stack<oop, mtGC>              MarkSweep::_marking_stack;
    1.12 +Stack<DataLayout*, mtGC>      MarkSweep::_revisit_mdo_stack;
    1.13 +Stack<Klass*, mtGC>           MarkSweep::_revisit_klass_stack;
    1.14 +Stack<ObjArrayTask, mtGC>     MarkSweep::_objarray_stack;
    1.15  
    1.16 -Stack<oop>              MarkSweep::_preserved_oop_stack;
    1.17 -Stack<markOop>          MarkSweep::_preserved_mark_stack;
    1.18 +Stack<oop, mtGC>              MarkSweep::_preserved_oop_stack;
    1.19 +Stack<markOop, mtGC>          MarkSweep::_preserved_mark_stack;
    1.20  size_t                  MarkSweep::_preserved_count = 0;
    1.21  size_t                  MarkSweep::_preserved_count_max = 0;
    1.22  PreservedMark*          MarkSweep::_preserved_marks = NULL;
    1.23 @@ -166,7 +166,7 @@
    1.24    }
    1.25  
    1.26    // deal with the overflow stack
    1.27 -  StackIterator<oop> iter(_preserved_oop_stack);
    1.28 +  StackIterator<oop, mtGC> iter(_preserved_oop_stack);
    1.29    while (!iter.is_empty()) {
    1.30      oop* p = iter.next_addr();
    1.31      adjust_pointer(p);

mercurial