1499 if (is_attaching_via_jni) { |
1499 if (is_attaching_via_jni) { |
1500 _jni_attach_state = _attaching_via_jni; |
1500 _jni_attach_state = _attaching_via_jni; |
1501 } else { |
1501 } else { |
1502 _jni_attach_state = _not_attaching_via_jni; |
1502 _jni_attach_state = _not_attaching_via_jni; |
1503 } |
1503 } |
1504 assert(_deferred_card_mark.is_empty(), "Default MemRegion ctor"); |
1504 assert(deferred_card_mark().is_empty(), "Default MemRegion ctor"); |
1505 _safepoint_visible = false; |
1505 _safepoint_visible = false; |
1506 } |
1506 } |
1507 |
1507 |
1508 bool JavaThread::reguard_stack(address cur_sp) { |
1508 bool JavaThread::reguard_stack(address cur_sp) { |
1509 if (_stack_guard_state != stack_guard_yellow_disabled) { |
1509 if (_stack_guard_state != stack_guard_yellow_disabled) { |
1895 |
1895 |
1896 if (JvmtiEnv::environments_might_exist()) { |
1896 if (JvmtiEnv::environments_might_exist()) { |
1897 JvmtiExport::cleanup_thread(this); |
1897 JvmtiExport::cleanup_thread(this); |
1898 } |
1898 } |
1899 |
1899 |
|
1900 // We must flush any deferred card marks before removing a thread from |
|
1901 // the list of active threads. |
|
1902 Universe::heap()->flush_deferred_store_barrier(this); |
|
1903 assert(deferred_card_mark().is_empty(), "Should have been flushed"); |
|
1904 |
1900 #if INCLUDE_ALL_GCS |
1905 #if INCLUDE_ALL_GCS |
1901 // We must flush G1-related buffers before removing a thread from |
1906 // We must flush the G1-related buffers before removing a thread |
1902 // the list of active threads. |
1907 // from the list of active threads. We must do this after any deferred |
|
1908 // card marks have been flushed (above) so that any entries that are |
|
1909 // added to the thread's dirty card queue as a result are not lost. |
1903 if (UseG1GC) { |
1910 if (UseG1GC) { |
1904 flush_barrier_queues(); |
1911 flush_barrier_queues(); |
1905 } |
1912 } |
1906 #endif // INCLUDE_ALL_GCS |
1913 #endif // INCLUDE_ALL_GCS |
1907 |
1914 |