# HG changeset patch
# User Christos Kotselidis <christos.kotselidis@oracle.com>
# Date 1382369801 -7200
# Node ID 249c54db027617e9294c9d594cb71132bb9b22f6
# Parent  d00c31d8394fa395e2342a8b8f7404d2acc8dc00# Parent  98caa3872d83a3fc044000385c4c076a573f5015
Merge

diff -r 98caa3872d83 -r 249c54db0276 src/share/vm/gc_interface/collectedHeap.cpp
--- a/src/share/vm/gc_interface/collectedHeap.cpp	Mon Oct 21 16:07:32 2013 +0200
+++ b/src/share/vm/gc_interface/collectedHeap.cpp	Mon Oct 21 17:36:41 2013 +0200
@@ -506,7 +506,7 @@
          " to threads list is doomed to failure!");
   for (JavaThread *thread = Threads::first(); thread; thread = thread->next()) {
      if (use_tlab) thread->tlab().make_parsable(retire_tlabs);
-#ifdef COMPILER2
+#if defined(COMPILER2) || defined(GRAAL)
      // The deferred store barriers must all have been flushed to the
      // card-table (or other remembered set structure) before GC starts
      // processing the card-table (or other remembered set).