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

AntonKozlov · AntonKozlov · commit f6fb01b24f52 · 2021-03-10T07:06:31.000-08:00
diff --git a/src/hotspot/share/gc/shared/barrierSetNMethod.cpp b/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);
diff --git a/src/hotspot/share/prims/unsafe.cpp b/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);
 }
diff --git a/src/hotspot/share/runtime/interfaceSupport.inline.hpp b/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 */
 
diff --git a/src/hotspot/share/runtime/safefetch.inline.hpp b/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);
 }
 
diff --git a/src/hotspot/share/runtime/threadWXSetters.inline.hpp b/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

Original file line number	Diff line number	Diff line change
`@@ -459,14 +459,14 @@ UNSAFE_LEAF (void, Unsafe_WriteBack0(JNIEnv *env, jobject unsafe, jlong line)) {`
`459`	`459`	`}`
`460`	`460`	`#endif`
`461`	`461`
`462`		`- MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec));`
	`462`	`+ MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, Thread::current()));`
`463`	`463`	`assert(StubRoutines::data_cache_writeback() != NULL, "sanity");`
`464`	`464`	`(StubRoutines::DataCacheWriteback_stub())(addr_from_java(line));`
`465`	`465`	`} UNSAFE_END`
`466`	`466`
`467`	`467`	`static void doWriteBackSync0(bool is_pre)`
`468`	`468`	`{`
`469`		`- MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec));`
	`469`	`+ MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, Thread::current()));`
`470`	`470`	`assert(StubRoutines::data_cache_writeback_sync() != NULL, "sanity");`
`471`	`471`	`(StubRoutines::DataCacheWritebackSync_stub())(is_pre);`
`472`	`472`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,13 @@`
`32`	`32`	`// to be valid. If the load causes a fault, the error value is returned.`
`33`	`33`	`inline int SafeFetch32(int* adr, int errValue) {`
`34`	`34`	`assert(StubRoutines::SafeFetch32_stub(), "stub not yet generated");`
`35`		`- MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec));`
	`35`	`+ MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, Thread::current()));`
`36`	`36`	`return StubRoutines::SafeFetch32_stub()(adr, errValue);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`inline intptr_t SafeFetchN(intptr_t* adr, intptr_t errValue) {`
`40`	`40`	`assert(StubRoutines::SafeFetchN_stub(), "stub not yet generated");`
`41`		`- MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec));`
	`41`	`+ MACOS_AARCH64_ONLY(ThreadWXEnable wx(WXExec, Thread::current()));`
`42`	`42`	`return StubRoutines::SafeFetchN_stub()(adr, errValue);`
`43`	`43`	`}`
`44`	`44`