Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/coreclr/vm/exinfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,15 @@ void ExInfo::MakeCallbacksRelatedToHandler(
if (fIsFilterHandler)
{
m_EHClauseInfo.SetEHClauseType(COR_PRF_CLAUSE_FILTER);
EEToDebuggerExceptionInterfaceWrapper::ExceptionFilter(pMD, (TADDR) dwHandlerStartPC, pEHClause->FilterOffset, (BYTE*)sf.SP);

// Suppress the debugger filter notification for the runtime helper that invokes
// the main program entrypoint (Environment.CallEntryPoint). This method has
// a filter clause that may return false, but the debugger intercepts at the notification
// before the filter evaluates, preventing the exception from propagating as unhandled.
if (pMD != g_pEnvironmentCallEntryPointMethodDesc)
{
EEToDebuggerExceptionInterfaceWrapper::ExceptionFilter(pMD, (TADDR) dwHandlerStartPC, pEHClause->FilterOffset, (BYTE*)sf.SP);
}

EEToProfilerExceptionInterfaceWrapper::ExceptionSearchFilterEnter(pMD);
ETW::ExceptionLog::ExceptionFilterBegin(pMD, (PVOID)dwHandlerStartPC);
Expand Down
Loading