--- a/hotspot/src/os/windows/vm/os_windows.cpp	Thu Jul 04 14:56:49 2013 -0700
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Thu Jun 20 15:02:05 2013 +0200
@@ -2317,6 +2317,11 @@
 #endif
   Thread* t = ThreadLocalStorage::get_thread_slow();          // slow & steady
 
+  // Handle SafeFetch32 and SafeFetchN exceptions.
+  if (StubRoutines::is_safefetch_fault(pc)) {
+    return Handle_Exception(exceptionInfo, StubRoutines::continuation_for_safefetch_fault(pc));
+  }
+
 #ifndef _WIN64
   // Execution protection violation - win32 running on AMD64 only
   // Handled first to avoid misdiagnosis as a "normal" access violation;