--- old/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.cpp	2017-11-14 05:52:05.566067583 -0800
+++ new/src/hotspot/os_cpu/solaris_sparc/os_solaris_sparc.cpp	2017-11-14 05:52:05.212034744 -0800
@@ -436,10 +436,8 @@
     }
 
 
-    if (thread->thread_state() == _thread_in_vm) {
-      if (sig == SIGBUS && thread->doing_unsafe_access()) {
-        stub = SharedRuntime::handle_unsafe_access(thread, npc);
-      }
+    if (sig == SIGBUS && thread->doing_unsafe_access()) {
+      stub = SharedRuntime::handle_unsafe_access(thread, npc);
     }
 
     else if (thread->thread_state() == _thread_in_Java) {