--- a/hotspot/src/share/vm/runtime/stubRoutines.hpp	Wed May 04 17:47:05 2016 +0300
+++ b/hotspot/src/share/vm/runtime/stubRoutines.hpp	Wed May 04 15:32:26 2016 -0400
@@ -111,6 +111,7 @@
   static address _throw_NullPointerException_at_call_entry;
   static address _throw_StackOverflowError_entry;
   static address _throw_delayed_StackOverflowError_entry;
+  static address _handler_for_unsafe_access_entry;
 
   static address _atomic_xchg_entry;
   static address _atomic_xchg_ptr_entry;
@@ -287,6 +288,10 @@
   static address throw_StackOverflowError_entry()          { return _throw_StackOverflowError_entry; }
   static address throw_delayed_StackOverflowError_entry()  { return _throw_delayed_StackOverflowError_entry; }
 
+  // Exceptions during unsafe access - should throw Java exception rather
+  // than crash.
+  static address handler_for_unsafe_access()               { return _handler_for_unsafe_access_entry; }
+
   static address atomic_xchg_entry()                       { return _atomic_xchg_entry; }
   static address atomic_xchg_ptr_entry()                   { return _atomic_xchg_ptr_entry; }
   static address atomic_store_entry()                      { return _atomic_store_entry; }