[release/8.0] Properly handle debugger-enumerating interior pointers and enregistered refs (#92360)

github-actions[bot] · leculver · hoyosjs · web-flow · commit 1757497f3724 · 2023-09-21T02:25:17.000-07:00
* Fix issue with enregistered values

* Fix assert and enregistered ref reporting

* Fix issue from merge

---------

Co-authored-by: Lee Culver &lt;leculver@microsoft.com&gt;
Co-authored-by: Juan Sebastian Hoyos Ayala &lt;juan.hoyos@microsoft.com&gt;
Co-authored-by: Juan Hoyos &lt;19413848+hoyosjs@users.noreply.github.com&gt;
diff --git a/src/coreclr/debug/daccess/dacdbiimpl.cpp b/src/coreclr/debug/daccess/dacdbiimpl.cpp
@@ -7788,8 +7788,9 @@ HRESULT DacStackReferenceWalker::Next(ULONG count, DacGcReference stackRefs[], U
         stackRefs[i].i64ExtraData = 0;
 
         const SOSStackRefData &sosStackRef = mList.Get(i);
-        if (sosStackRef.Flags & GC_CALL_INTERIOR)
+        if (sosStackRef.Flags & GC_CALL_INTERIOR || sosStackRef.Address == 0)
         {
+            // Direct pointer case - interior pointer, Frame ref, or enregistered var.
             stackRefs[i].pObject = CLRDATA_ADDRESS_TO_TADDR(sosStackRef.Object) | 1;
         }
         else
diff --git a/src/coreclr/debug/di/rsclass.cpp b/src/coreclr/debug/di/rsclass.cpp
@@ -132,6 +132,7 @@ HRESULT CordbClass::GetStaticFieldValue(mdFieldDef fieldDef,
     IMetaDataImport * pImport = NULL;
     EX_TRY
     {
+        RSLockHolder lockHolder(GetProcess()->GetProcessLock());
         pImport = GetModule()->GetMetaDataImporter(); // throws
 
         // Validate the token.
@@ -1191,4 +1192,3 @@ HRESULT CordbClass::SearchFieldInfo(
     // Well, the field doesn't even belong to this class...
     ThrowHR(E_INVALIDARG);
 }
-

Original file line number	Diff line number	Diff line change
`@@ -7788,8 +7788,9 @@ HRESULT DacStackReferenceWalker::Next(ULONG count, DacGcReference stackRefs[], U`
`7788`	`7788`	`stackRefs[i].i64ExtraData = 0;`
`7789`	`7789`
`7790`	`7790`	`const SOSStackRefData &sosStackRef = mList.Get(i);`
`7791`		`- if (sosStackRef.Flags & GC_CALL_INTERIOR)`
	`7791`	`+ if (sosStackRef.Flags & GC_CALL_INTERIOR \|\| sosStackRef.Address == 0)`
`7792`	`7792`	`{`
	`7793`	`+ // Direct pointer case - interior pointer, Frame ref, or enregistered var.`
`7793`	`7794`	`stackRefs[i].pObject = CLRDATA_ADDRESS_TO_TADDR(sosStackRef.Object) \| 1;`
`7794`	`7795`	`}`
`7795`	`7796`	`else`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,7 @@ HRESULT CordbClass::GetStaticFieldValue(mdFieldDef fieldDef,`
`132`	`132`	`IMetaDataImport * pImport = NULL;`
`133`	`133`	`EX_TRY`
`134`	`134`	`{`
	`135`	`+ RSLockHolder lockHolder(GetProcess()->GetProcessLock());`
`135`	`136`	`pImport = GetModule()->GetMetaDataImporter(); // throws`
`136`	`137`
`137`	`138`	`// Validate the token.`
`@@ -1191,4 +1192,3 @@ HRESULT CordbClass::SearchFieldInfo(`
`1191`	`1192`	`// Well, the field doesn't even belong to this class...`
`1192`	`1193`	`ThrowHR(E_INVALIDARG);`
`1193`	`1194`	`}`
`1194`		`-`