src/hotspot/os/windows/os_windows.cpp

*** 2507,2517 ****
              return EXCEPTION_CONTINUE_EXECUTION;
            } else
  #endif
            {
              // Null pointer exception.
!             if (!MacroAssembler::needs_explicit_null_check((intptr_t)addr)) {
                address stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
                if (stub != NULL) return Handle_Exception(exceptionInfo, stub);
              }
              report_error(t, exception_code, pc, exceptionInfo->ExceptionRecord,
                           exceptionInfo->ContextRecord);
--- 2507,2517 ----
              return EXCEPTION_CONTINUE_EXECUTION;
            } else
  #endif
            {
              // Null pointer exception.
!             if (MacroAssembler::uses_implicit_null_check((void*)addr)) {
                address stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
                if (stub != NULL) return Handle_Exception(exceptionInfo, stub);
              }
              report_error(t, exception_code, pc, exceptionInfo->ExceptionRecord,
                           exceptionInfo->ContextRecord);