Mercurial > hg > graal-jvmci-8

diff src/share/vm/gc_implementation/g1/g1MarkSweep.cpp @ 22294:d86b226e331a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/g1/g1MarkSweep.cpp	Tue Jul 21 14:55:47 2015 +0200
+++ b/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp	Tue Jul 21 15:00:07 2015 -0700
@@ -89,8 +89,10 @@
 
   mark_sweep_phase2();
 
+#if defined(COMPILER2) || defined(JVMCI)
   // Don't add any more derived pointers during phase3
-  COMPILER2_PRESENT(DerivedPointerTable::set_active(false));
+  DerivedPointerTable::set_active(false);
+#endif
 
   mark_sweep_phase3();
 
@@ -170,7 +172,9 @@
 
   if (VerifyDuringGC) {
     HandleMark hm;  // handle scope
-    COMPILER2_PRESENT(DerivedPointerTableDeactivate dpt_deact);
+#if defined(COMPILER2) || defined(JVMCI)
+    DerivedPointerTableDeactivate dpt_deact;
+#endif
     Universe::heap()->prepare_for_verify();
     // Note: we can verify only the heap here. When an object is
     // marked, the previous value of the mark word (including