--- old/src/hotspot/os/windows/os_windows.cpp 2017-11-14 05:51:58.744434840 -0800 +++ new/src/hotspot/os/windows/os_windows.cpp 2017-11-14 05:51:58.391402095 -0800 @@ -2487,6 +2487,19 @@ } // /EXCEPTION_ACCESS_VIOLATION // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + if (exception_code == EXCEPTION_IN_PAGE_ERROR) { + CodeBlob* cb; + CompiledMethod* nm; + JavaThread* thread = (JavaThread*)t; + if (in_java) { + cb = CodeCache::find_blob_unsafe(pc); + nm = (cb != NULL) ? cb->as_compiled_method_or_null() : NULL; + } + if (thread->doing_unsafe_access() || (nm != NULL && nm->has_unsafe_access())) { + return Handle_Exception(exceptionInfo, SharedRuntime::handle_unsafe_access(thread, (address)Assembler::locate_next_instruction(pc))); + } + } + if (in_java) { switch (exception_code) { case EXCEPTION_INT_DIVIDE_BY_ZERO: