Skip to content

Fix VS debugger issues with funceval and secondary threads #102470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 21, 2024
Merged

Fix VS debugger issues with funceval and secondary threads #102470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e6b912
Fix VS debugger issues with funceval and secondary threads
janvorli May 17, 2024
ecc0bf2
Fix too strong assert
janvorli May 21, 2024
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
4 changes: 2 additions & 2 deletions src/coreclr/vm/excep.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7901,10 +7901,10 @@ LONG NotifyOfCHFFilterWrapper(
(pThread->GetExceptionState()->GetContextRecord() == NULL) ||
(GetSP(pThread->GetExceptionState()->GetContextRecord()) != GetSP(pExceptionInfo->ContextRecord) ) )
{
LOG((LF_EH, LL_INFO1000, "NotifyOfCHFFilterWrapper: not sending notices. pThread: %0x8", pThread));
LOG((LF_EH, LL_INFO1000, "NotifyOfCHFFilterWrapper: not sending notices. pThread: %p", pThread));
if (pThread)
{
LOG((LF_EH, LL_INFO1000, ", Thread SP: %0x8, Exception SP: %08x",
LOG((LF_EH, LL_INFO1000, ", Thread SP: %p, Exception SP: %p",
pThread->GetExceptionState()->GetContextRecord() ? GetSP(pThread->GetExceptionState()->GetContextRecord()) : NULL,
pExceptionInfo->ContextRecord ? GetSP(pExceptionInfo->ContextRecord) : NULL ));
}
Expand Down
20 changes: 20 additions & 0 deletions src/coreclr/vm/exceptionhandling.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8217,6 +8217,26 @@ static void NotifyExceptionPassStarted(StackFrameIterator *pThis, Thread *pThrea
pExInfo->m_ExceptionFlags.SetUnwindHasStarted();
EEToDebuggerExceptionInterfaceWrapper::ManagedExceptionUnwindBegin(pThread);
}
else
{
// The debugger explicitly checks that the notification refers to a FuncEvalFrame in case an exception becomes unhandled in a func eval.
// We need to do the notification here before we start propagating the exception through native frames, since that will remove
// all managed frames from the stack and the debugger would not see the failure location.
if (pThis->GetFrameState() == StackFrameIterator::SFITER_FRAME_FUNCTION)
{
Frame* pFrame = pThis->m_crawl.GetFrame();
// If the frame is ProtectValueClassFrame, move to the next one as we want to report the FuncEvalFrame
if (pFrame->GetVTablePtr() == ProtectValueClassFrame::GetMethodFrameVPtr())
{
pFrame = pFrame->PtrNextFrame();
_ASSERTE(pFrame != FRAME_TOP);
}
if ((pFrame->GetVTablePtr() == FuncEvalFrame::GetMethodFrameVPtr()) || (pFrame->GetVTablePtr() == DebuggerU2MCatchHandlerFrame::GetMethodFrameVPtr()))
{
EEToDebuggerExceptionInterfaceWrapper::NotifyOfCHFFilter((EXCEPTION_POINTERS *)&pExInfo->m_ptrs, pFrame);
}
}
}
}
}

Expand Down