src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp

@@ -403,11 +403,11 @@
                         siginfo_t* info,
                         void* ucVoid,
                         int abort_if_unrecognized) {
   ucontext_t* uc = (ucontext_t*) ucVoid;
 
-  Thread* t = ThreadLocalStorage::get_thread_slow();
+  Thread* t = Thread::current_or_null_safe();
 
   // Must do this before SignalHandlerMark, if crash protection installed we will longjmp away
   // (no destructors can be run)
   os::WatcherThreadCrashProtection::check_crash_protection(sig, t);