Skip to content
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.

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

Handle struct marshal stubs in ILStubManager::TraceManager. #36249

Merged
merged 1 commit into from
May 12, 2020
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
6 changes: 6 additions & 0 deletions src/coreclr/src/vm/stubmgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1844,6 +1844,12 @@ BOOL ILStubManager::TraceManager(Thread *thread,
trace->InitForUnmanaged(target);
}
#endif // FEATURE_COMINTEROP
else if (pStubMD->IsStructMarshalStub())
{
// There's no "target" for struct marshalling stubs
// so we have nowhere to tell the debugger to move the breakpoint.
return FALSE;
AaronRobinsonMSFT marked this conversation as resolved.
Show resolved Hide resolved
}
else
{
// This is either direct forward P/Invoke or a CLR-to-COM call, the argument is MD
Expand Down