src/os/windows/vm/os_windows.cpp

*** 2502,2520 ****
--- 2502,2522 ----
    // Check to see if we caught the safepoint code in the
    // process of write protecting the memory serialization page.
    // It write enables the page immediately after protecting it
    // so just return.
    if (exception_code == EXCEPTION_ACCESS_VIOLATION) {
+     if(t != NULL && t->is_Java_thread()) {
        JavaThread* thread = (JavaThread*) t;
        PEXCEPTION_RECORD exceptionRecord = exceptionInfo->ExceptionRecord;
        address addr = (address) exceptionRecord->ExceptionInformation[1];
        if (os::is_memory_serialize_page(thread, addr)) {
          // Block current thread until the memory serialize page permission restored.
          os::block_on_serialize_page_trap();
          return EXCEPTION_CONTINUE_EXECUTION;
        }
      }
+   }
  
    if ((exception_code == EXCEPTION_ACCESS_VIOLATION) &&
        VM_Version::is_cpuinfo_segv_addr(pc)) {
      // Verify that OS save/restore AVX registers.
      return Handle_Exception(exceptionInfo, VM_Version::cpuinfo_cont_addr());
*** 2562,2572 ****
          return Handle_Exception(exceptionInfo,
                                  SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::STACK_OVERFLOW));
        }
  #endif
        if (thread->stack_guards_enabled()) {
!         if (_thread_in_Java) {
            frame fr;
            PEXCEPTION_RECORD exceptionRecord = exceptionInfo->ExceptionRecord;
            address addr = (address) exceptionRecord->ExceptionInformation[1];
            if (os::win32::get_frame_at_stack_banging_point(thread, exceptionInfo, pc, &fr)) {
              assert(fr.is_java_frame(), "Must be a Java frame");
--- 2564,2574 ----
          return Handle_Exception(exceptionInfo,
                                  SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::STACK_OVERFLOW));
        }
  #endif
        if (thread->stack_guards_enabled()) {
!         if (in_java) {
            frame fr;
            PEXCEPTION_RECORD exceptionRecord = exceptionInfo->ExceptionRecord;
            address addr = (address) exceptionRecord->ExceptionInformation[1];
            if (os::win32::get_frame_at_stack_banging_point(thread, exceptionInfo, pc, &fr)) {
              assert(fr.is_java_frame(), "Must be a Java frame");
*** 2574,2583 ****
--- 2576,2586 ----
            }
          }
          // Yellow zone violation.  The o/s has unprotected the first yellow
          // zone page for us.  Note:  must call disable_stack_yellow_zone to
          // update the enabled status, even if the zone contains only one page.
+         assert(thread->thread_state() != _thread_in_vm, "Undersized StackShadowPages");
          thread->disable_stack_yellow_reserved_zone();
          // If not in java code, return and hope for the best.
          return in_java
              ? Handle_Exception(exceptionInfo, SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::STACK_OVERFLOW))
              :  EXCEPTION_CONTINUE_EXECUTION;