truffle: src/share/vm/runtime/thread.cpp comparison

Merge

comparison

equal deleted inserted replaced

-:df8462fbe585
+:1135141fb97e
 if (is_attaching_via_jni) {
 _jni_attach_state = _attaching_via_jni;
 } 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;
 }
 bool JavaThread::reguard_stack(address cur_sp) {
 if (_stack_guard_state != stack_guard_yellow_disabled) {
 if (JvmtiEnv::environments_might_exist()) {
 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");
 #if INCLUDE_ALL_GCS
-// We must flush G1-related buffers before removing a thread from
+// We must flush the G1-related buffers before removing a thread
-// the list of active threads.
+// 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();
 }
 #endif // INCLUDE_ALL_GCS

Mercurial > hg > truffle