Mercurial > hg > truffle

diff src/share/vm/gc_interface/collectedHeap.cpp @ 1194:34fb2662f6c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6920090: G1: Disable ReduceInitialCardMarks at least until 6920109 is fixed Summary: G1 now answers "no" to the query can_elide_initializing_store_barrier() in the product build. A debug flag allows alternate behaviour in debug builds. Reviewed-by: iveresov, tonyp
author ysr
date Tue, 26 Jan 2010 16:52:29 -0800
parents 7b0e9cba0307
children 15190cbcabe9
line wrap: on
line diff
--- a/src/share/vm/gc_interface/collectedHeap.cpp	Mon Jan 25 18:03:29 2010 -0500
+++ b/src/share/vm/gc_interface/collectedHeap.cpp	Tue Jan 26 16:52:29 2010 -0800
@@ -66,7 +66,8 @@
   // Used for ReduceInitialCardMarks (when COMPILER2 is used);
   // otherwise remains unused.
 #ifdef COMPLER2
-  _defer_initial_card_mark = ReduceInitialCardMarks && (DeferInitialCardMark || card_mark_must_follow_store());
+  _defer_initial_card_mark =    ReduceInitialCardMarks && can_elide_tlab_store_barriers()
+                             && (DeferInitialCardMark || card_mark_must_follow_store());
 #else
   assert(_defer_initial_card_mark == false, "Who would set it?");
 #endif