Mercurial > hg > graal-jvmci-8
diff src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp @ 22294:d86b226e331a
Enable derived oop processing by the GC with JVMCI
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Tue, 21 Jul 2015 15:00:07 -0700 |
| parents | 7848fc12602b |
| children | c28cb37b2e1d |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Tue Jul 21 14:55:47 2015 +0200 +++ b/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp Tue Jul 21 15:00:07 2015 -0700 @@ -194,7 +194,9 @@ allocate_stacks(); - COMPILER2_PRESENT(DerivedPointerTable::clear()); +#if defined(COMPILER2) || defined(JVMCI) + DerivedPointerTable::clear(); +#endif ref_processor()->enable_discovery(true /*verify_disabled*/, true /*verify_no_refs*/); ref_processor()->setup_policy(clear_all_softrefs); @@ -203,9 +205,11 @@ mark_sweep_phase2(); +#if defined(COMPILER2) || defined(JVMCI) // Don't add any more derived pointers during phase3 - COMPILER2_PRESENT(assert(DerivedPointerTable::is_active(), "Sanity")); - COMPILER2_PRESENT(DerivedPointerTable::set_active(false)); + assert(DerivedPointerTable::is_active(), "Sanity"); + DerivedPointerTable::set_active(false); +#endif mark_sweep_phase3(); @@ -254,7 +258,9 @@ CodeCache::gc_epilogue(); JvmtiExport::gc_epilogue(); - COMPILER2_PRESENT(DerivedPointerTable::update_pointers()); +#if defined(COMPILER2) || defined(JVMCI) + DerivedPointerTable::update_pointers(); +#endif ref_processor()->enqueue_discovered_references(NULL);