@@ -180,11 +180,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(); SignalHandlerMark shm(t); // Note: it's not uncommon that JNI code uses signal/sigset to install // then restore certain signal handler (e.g. to temporarily block SIGPIPE,