diff --git a/src/coreclr/debug/ee/controller.cpp b/src/coreclr/debug/ee/controller.cpp index 25dc4b6543376..94714b9457063 100644 --- a/src/coreclr/debug/ee/controller.cpp +++ b/src/coreclr/debug/ee/controller.cpp @@ -4724,43 +4724,6 @@ TP_RESULT DebuggerPatchSkip::TriggerExceptionHook(Thread *thread, CONTEXT * cont if (IsSingleStep(exception->ExceptionCode)) { -#ifndef TARGET_UNIX - // Check if the current IP is anywhere near the exception dispatcher logic. - // If it is, ignore the exception, as the real exception is coming next. - static FARPROC pExcepDispProc = NULL; - - if (!pExcepDispProc) - { - HMODULE hNtDll = WszGetModuleHandle(W("ntdll.dll")); - - if (hNtDll != NULL) - { - pExcepDispProc = GetProcAddress(hNtDll, "KiUserExceptionDispatcher"); - - if (!pExcepDispProc) - pExcepDispProc = (FARPROC)(size_t)(-1); - } - else - pExcepDispProc = (FARPROC)(size_t)(-1); - } - - _ASSERTE(pExcepDispProc != NULL); - - if ((size_t)pExcepDispProc != (size_t)(-1)) - { - LPVOID pExcepDispEntryPoint = pExcepDispProc; - - if ((size_t)GetIP(context) > (size_t)pExcepDispEntryPoint && - (size_t)GetIP(context) <= ((size_t)pExcepDispEntryPoint + MAX_INSTRUCTION_LENGTH * 2 + 1)) - { - LOG((LF_CORDB, LL_INFO10000, - "Bypass instruction not redirected. Landed in exception dispatcher.\n")); - - return (TPR_IGNORE_AND_STOP); - } - } -#endif // TARGET_UNIX - // If the IP is close to the skip patch start, or if we were skipping over a call, then assume the IP needs // adjusting. if (m_instrAttrib.m_fIsCall ||