Mercurial > hg > graal-compiler

diff src/share/vm/memory/genCollectedHeap.cpp @ 22295: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/memory/genCollectedHeap.cpp	Tue Jul 21 14:55:47 2015 +0200
+++ b/src/share/vm/memory/genCollectedHeap.cpp	Tue Jul 21 15:00:07 2015 -0700
@@ -452,7 +452,9 @@
           }
           Universe::verify(" VerifyBeforeGC:");
         }
-        COMPILER2_PRESENT(DerivedPointerTable::clear());
+#if defined(COMPILER2) || defined(JVMCI)
+        DerivedPointerTable::clear();
+#endif
 
         if (!must_restore_marks_for_biased_locking &&
             _gens[i]->performs_in_place_marking()) {
@@ -512,7 +514,9 @@
           }
         }
 
-        COMPILER2_PRESENT(DerivedPointerTable::update_pointers());
+#if defined(COMPILER2) || defined(JVMCI)
+        DerivedPointerTable::update_pointers();
+#endif
 
         _gens[i]->stat_record()->accumulated_time.stop();
 
@@ -1220,7 +1224,7 @@
 };
 
 void GenCollectedHeap::gc_epilogue(bool full) {
-#ifdef COMPILER2
+#if defined(COMPILER2) || defined(JVMCI)
   assert(DerivedPointerTable::is_empty(), "derived pointer present");
   size_t actual_gap = pointer_delta((HeapWord*) (max_uintx-3), *(end_addr()));
   guarantee(actual_gap > (size_t)FastAllocateSizeLimit, "inline allocation wraps");