1.1 --- a/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp Mon Apr 22 10:10:09 2013 +0200
1.2 +++ b/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp Mon Apr 22 20:27:36 2013 +0200
1.3 @@ -308,17 +308,16 @@
1.4 sh->process_strong_roots(true, // activate StrongRootsScope
1.5 false, // not scavenging.
1.6 SharedHeap::SO_AllClasses,
1.7 - &GenMarkSweep::adjust_root_pointer_closure,
1.8 + &GenMarkSweep::adjust_pointer_closure,
1.9 NULL, // do not touch code cache here
1.10 &GenMarkSweep::adjust_klass_closure);
1.11
1.12 assert(GenMarkSweep::ref_processor() == g1h->ref_processor_stw(), "Sanity");
1.13 - g1h->ref_processor_stw()->weak_oops_do(&GenMarkSweep::adjust_root_pointer_closure);
1.14 + g1h->ref_processor_stw()->weak_oops_do(&GenMarkSweep::adjust_pointer_closure);
1.15
1.16 // Now adjust pointers in remaining weak roots. (All of which should
1.17 // have been cleared if they pointed to non-surviving objects.)
1.18 - g1h->g1_process_weak_roots(&GenMarkSweep::adjust_root_pointer_closure,
1.19 - &GenMarkSweep::adjust_pointer_closure);
1.20 + g1h->g1_process_weak_roots(&GenMarkSweep::adjust_pointer_closure);
1.21
1.22 GenMarkSweep::adjust_marks();
1.23
