Skip to content

Commit 2e71ad4

Browse files
author
Mike McLaughlin
authored
[release/6.0] Fix crash when VS4Mac is debugging VS4Mac arm64 (#64086)
* Fix crash when VS4Mac is debugging VS4Mac arm64 Issue: #64011 # Customer Impact VS4Mac crashes when debugging VS4Mac. # Testing VS4Mac team verified that it no longer crashes. # Risk Low. * Code review feedback. Add better comment
1 parent 5ab70d3 commit 2e71ad4

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/coreclr/debug/daccess/dacdbiimpl.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5469,6 +5469,12 @@ GENERICS_TYPE_TOKEN DacDbiInterfaceImpl::ResolveExactGenericArgsToken(DWORD
54695469

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

0 commit comments

Comments
 (0)