--- a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Wed May 04 17:47:05 2016 +0300
+++ b/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Wed May 04 15:32:26 2016 -0400
@@ -503,8 +503,7 @@
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);
+ stub = StubRoutines::handler_for_unsafe_access();
}
}
@@ -521,8 +520,7 @@
if (cb != NULL) {
CompiledMethod* nm = cb->as_compiled_method_or_null();
if (nm != NULL && nm->has_unsafe_access()) {
- address next_pc = Assembler::locate_next_instruction(pc);
- stub = SharedRuntime::handle_unsafe_access(thread, next_pc);
+ stub = StubRoutines::handler_for_unsafe_access();
}
}
}