8262903: [macos_aarch64] Thread::current() called on detached thread

Author: AntonKozlov

src/hotspot/share/gc/shared/barrierSetNMethod.cpp

@@ -51,7 +51,7 @@ bool BarrierSetNMethod::supports_entry_barrier(nmethod* nm) {
 int BarrierSetNMethod::nmethod_stub_entry_barrier(address* return_address_ptr) {
   // Enable WXWrite: the function is called directly from nmethod_entry_barrier
   // stub.
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite));
+  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXWrite, Thread::current()));
 
   address return_address = *return_address_ptr;
   CodeBlob* cb = CodeCache::find_blob(return_address);

src/hotspot/share/prims/unsafe.cpp

@@ -459,14 +459,14 @@ UNSAFE_LEAF (void, Unsafe_WriteBack0(JNIEnv *env, jobject unsafe, jlong line)) {
   }
 #endif
 
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec));
+  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, Thread::current()));
   assert(StubRoutines::data_cache_writeback() != NULL, "sanity");
   (StubRoutines::DataCacheWriteback_stub())(addr_from_java(line));
 } UNSAFE_END
 
 static void doWriteBackSync0(bool is_pre)
 {
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec));
+  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, Thread::current()));
   assert(StubRoutines::data_cache_writeback_sync() != NULL, "sanity");
   (StubRoutines::DataCacheWritebackSync_stub())(is_pre);
 }

src/hotspot/share/runtime/interfaceSupport.inline.hpp

@@ -336,7 +336,8 @@ class VMNativeEntryWrapper {
 
 #define VM_LEAF_BASE(result_type, header)                            \
   debug_only(NoHandleMark __hm;)                                     \
-  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite));                  \
+  MACOS_AARCH64_ONLY(ThreadWXEnable __wx(WXWrite,                    \
+                                         Thread::current()));        \
   os::verify_stack_alignment();                                      \
   /* begin of body */
 

src/hotspot/share/runtime/safefetch.inline.hpp

@@ -32,13 +32,13 @@
 // to be valid. If the load causes a fault, the error value is returned.
 inline int SafeFetch32(int* adr, int errValue) {
   assert(StubRoutines::SafeFetch32_stub(), "stub not yet generated");
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec));
+  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, Thread::current()));
   return StubRoutines::SafeFetch32_stub()(adr, errValue);
 }
 
 inline intptr_t SafeFetchN(intptr_t* adr, intptr_t errValue) {
   assert(StubRoutines::SafeFetchN_stub(), "stub not yet generated");
-  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec));
+  MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, Thread::current()));
   return StubRoutines::SafeFetchN_stub()(adr, errValue);
 }
 

src/hotspot/share/runtime/threadWXSetters.inline.hpp

@@ -32,12 +32,14 @@ class ThreadWXEnable  {
   Thread* _thread;
   WXMode _old_mode;
 public:
-  ThreadWXEnable(WXMode new_mode, Thread* thread = NULL) :
-    _thread(thread ? thread : Thread::current()),
-    _old_mode(_thread->enable_wx(new_mode))
+  ThreadWXEnable(WXMode new_mode, Thread* thread) :
+    _thread(thread),
+    _old_mode(_thread ? _thread->enable_wx(new_mode) : WXWrite)
   { }
   ~ThreadWXEnable() {
-    _thread->enable_wx(_old_mode);
+    if (_thread) {
+      _thread->enable_wx(_old_mode);
+    }
   }
 };
 #endif // __APPLE__ && AARCH64