src/hotspot/os_cpu/solaris_x86/os_solaris_x86.cpp

@@ -514,16 +514,14 @@
     if ((sig == SIGSEGV) && VM_Version::is_cpuinfo_segv_addr(pc)) {
       // Verify that OS save/restore AVX registers.
       stub = VM_Version::cpuinfo_cont_addr();
     }
 
-    if (thread->thread_state() == _thread_in_vm) {
       if (sig == SIGBUS && info->si_code == BUS_OBJERR && thread->doing_unsafe_access()) {
         address next_pc = Assembler::locate_next_instruction(pc);
         stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
       }
-    }
 
     if (thread->thread_state() == _thread_in_Java) {
       // Support Safepoint Polling
       if ( sig == SIGSEGV && os::is_poll_address((address)info->si_addr)) {
         stub = SharedRuntime::get_poll_stub(pc);