Skip to content

[release/6.0] Fix crash when VS4Mac is debugging VS4Mac arm64 #64086

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
safern merged 2 commits into from
Feb 7, 2022
Merged

[release/6.0] Fix crash when VS4Mac is debugging VS4Mac arm64 #64086

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9015228
Fix crash when VS4Mac is debugging VS4Mac arm64
Jan 21, 2022
e87c751
Code review feedback. Add better comment
Jan 21, 2022
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/debug/daccess/dacdbiimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5469,6 +5469,12 @@ GENERICS_TYPE_TOKEN DacDbiInterfaceImpl::ResolveExactGenericArgsToken(DWORD

if (dwExactGenericArgsTokenIndex == 0)
{
// In a rare case of VS4Mac debugging VS4Mac ARM64 optimized code we get a null generics argument token. This workaround
// should only cause us to degrade generic types from exact type parameters to approximate or canonical type parameters.
if (rawToken == 0)
{
return rawToken;
}
// In this case the real generics type token is the MethodTable of the "this" object.
// Note that we want the target address here.

Expand Down