diff src/share/vm/gc_interface/collectedHeap.cpp @ 22447:ecbf949a9dcd

replace JVMCIDeferredInitBarriers with ReduceInitialCardMarks
author Doug Simon <doug.simon@oracle.com>
date Fri, 21 Aug 2015 11:14:48 +0200
parents c28cb37b2e1d
children
line wrap: on
line diff
--- a/src/share/vm/gc_interface/collectedHeap.cpp	Fri Aug 21 11:05:48 2015 +0200
+++ b/src/share/vm/gc_interface/collectedHeap.cpp	Fri Aug 21 11:14:48 2015 +0200
@@ -214,12 +214,9 @@
 void CollectedHeap::pre_initialize() {
   // Used for ReduceInitialCardMarks (when COMPILER2 is used);
   // otherwise remains unused.
-#ifdef COMPILER2
+#if defined(COMPILER2) || INCLUDE_JVMCI
   _defer_initial_card_mark =    ReduceInitialCardMarks && can_elide_tlab_store_barriers()
                              && (DeferInitialCardMark || card_mark_must_follow_store());
-#elif INCLUDE_JVMCI
-  _defer_initial_card_mark =   JVMCIDeferredInitBarriers && can_elide_tlab_store_barriers()
-                               && (DeferInitialCardMark || card_mark_must_follow_store());
 #else
   assert(_defer_initial_card_mark == false, "Who would set it?");
 #endif