# HG changeset patch
# User johnc
# Date 1360035627 28800
# Node ID 84304a77c4e3ab6b53724aeb0eb785b12dc4a9e9
# Parent  f2f0cf0f5444f484c1add9058b50b6c006989e84# Parent  06fd03af6ce4debe80a24437fbf5ac6d8a32deea
Merge

diff -r f2f0cf0f5444 -r 84304a77c4e3 src/share/vm/runtime/thread.cpp
--- a/src/share/vm/runtime/thread.cpp	Mon Feb 04 13:26:04 2013 -0800
+++ b/src/share/vm/runtime/thread.cpp	Mon Feb 04 19:40:27 2013 -0800
@@ -1500,7 +1500,7 @@
   } else {
     _jni_attach_state = _not_attaching_via_jni;
   }
-  assert(_deferred_card_mark.is_empty(), "Default MemRegion ctor");
+  assert(deferred_card_mark().is_empty(), "Default MemRegion ctor");
   _safepoint_visible = false;
 }
 
@@ -1896,9 +1896,16 @@
     JvmtiExport::cleanup_thread(this);
   }
 
+  // We must flush any deferred card marks before removing a thread from
+  // the list of active threads.
+  Universe::heap()->flush_deferred_store_barrier(this);
+  assert(deferred_card_mark().is_empty(), "Should have been flushed");
+
 #ifndef SERIALGC
-  // We must flush G1-related buffers before removing a thread from
-  // the list of active threads.
+  // We must flush the G1-related buffers before removing a thread
+  // from the list of active threads. We must do this after any deferred
+  // card marks have been flushed (above) so that any entries that are
+  // added to the thread's dirty card queue as a result are not lost.
   if (UseG1GC) {
     flush_barrier_queues();
   }