Skip to content

Commit f68ea32

Browse files
Copilotrcj1
andauthored
Remove DacDbi GetCachedWinRTTypes APIs from native and cDAC (#127040)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: rcj1 <77995559+rcj1@users.noreply.github.com>
1 parent 30125a7 commit f68ea32

File tree

6 files changed

+0
-58
lines changed

6 files changed

+0
-58
lines changed

src/coreclr/debug/daccess/dacdbiimpl.cpp

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3853,31 +3853,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetRcwCachedInterfacePointers(VMP
38533853
#endif // FEATURE_COMINTEROP
38543854
}
38553855

3856-
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetCachedWinRTTypesForIIDs(VMPTR_AppDomain vmAppDomain, DacDbiArrayList<GUID> * pIids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes)
3857-
{
3858-
if (pIids == NULL || pTypes == NULL)
3859-
return E_POINTER;
3860-
3861-
HRESULT hr = S_OK;
3862-
EX_TRY
3863-
{
3864-
pTypes->Alloc(0);
3865-
}
3866-
EX_CATCH_HRESULT(hr);
3867-
return hr;
3868-
}
3869-
3870-
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetCachedWinRTTypes(VMPTR_AppDomain vmAppDomain, OUT DacDbiArrayList<GUID> * piids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes)
3871-
{
3872-
HRESULT hr = S_OK;
3873-
EX_TRY
3874-
{
3875-
pTypes->Alloc(0);
3876-
}
3877-
EX_CATCH_HRESULT(hr);
3878-
return hr;
3879-
}
3880-
38813856
//-----------------------------------------------------------------------------
38823857
// DacDbiInterfaceImpl::FindField
38833858
// Finds information for a particular class field

src/coreclr/debug/daccess/dacdbiimpl.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -325,15 +325,6 @@ class DacDbiInterfaceImpl :
325325
// in the runtime)
326326
HRESULT STDMETHODCALLTYPE GetRcwCachedInterfacePointers(VMPTR_Object vmObject, BOOL bIInspectableOnly, OUT DacDbiArrayList<CORDB_ADDRESS> * pDacItfPtrs);
327327

328-
// retrieves a list of interface types corresponding to the passed in
329-
// list of IIDs. the interface types are retrieved from an app domain
330-
// IID / Type cache, that is updated as new types are loaded. will
331-
// have NULL entries corresponding to unknown IIDs in "iids"
332-
HRESULT STDMETHODCALLTYPE GetCachedWinRTTypesForIIDs(VMPTR_AppDomain vmAppDomain, DacDbiArrayList<GUID> * pIids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes);
333-
334-
// retrieves the whole app domain cache of IID / Type mappings.
335-
HRESULT STDMETHODCALLTYPE GetCachedWinRTTypes(VMPTR_AppDomain vmAppDomain, OUT DacDbiArrayList<GUID> * piids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes);
336-
337328
private:
338329
// Helper to enumerate all possible memory ranges help by a loader allocator.
339330
void EnumerateMemRangesForLoaderAllocator(

src/coreclr/debug/inc/dacdbiinterface.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1788,16 +1788,6 @@ IDacDbiInterface : public IUnknown
17881788
// in the runtime)
17891789
virtual HRESULT STDMETHODCALLTYPE GetRcwCachedInterfacePointers(VMPTR_Object vmObject, BOOL bIInspectableOnly, OUT DacDbiArrayList<CORDB_ADDRESS> * pDacItfPtrs) = 0;
17901790

1791-
// retrieves a list of interface types corresponding to the passed in
1792-
// list of IIDs. the interface types are retrieved from an app domain
1793-
// IID / Type cache, that is updated as new types are loaded. will
1794-
// have NULL entries corresponding to unknown IIDs in "iids"
1795-
virtual HRESULT STDMETHODCALLTYPE GetCachedWinRTTypesForIIDs(VMPTR_AppDomain vmAppDomain, DacDbiArrayList<GUID> * pIids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes) = 0;
1796-
1797-
// retrieves the whole app domain cache of IID / Type mappings.
1798-
virtual HRESULT STDMETHODCALLTYPE GetCachedWinRTTypes(VMPTR_AppDomain vmAppDomain, OUT DacDbiArrayList<GUID> * piids, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pTypes) = 0;
1799-
1800-
18011791
// ----------------------------------------------------------------------------
18021792
// functions to get information about reference/handle referents for ICDValue
18031793
// ----------------------------------------------------------------------------

src/coreclr/inc/dacdbi.idl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,6 @@ interface IDacDbiInterface : IUnknown
342342
HRESULT GetStackFramesFromException([in] VMPTR_Object vmObject, [out] DacDbiArrayList_DacExceptionCallStackData * pDacStackFrames);
343343
HRESULT IsRcw([in] VMPTR_Object vmObject, [out] BOOL * pResult);
344344
HRESULT GetRcwCachedInterfacePointers([in] VMPTR_Object vmObject, [in] BOOL bIInspectableOnly, [out] DacDbiArrayList_CORDB_ADDRESS * pDacItfPtrs);
345-
HRESULT GetCachedWinRTTypesForIIDs([in] VMPTR_AppDomain vmAppDomain, [in] DacDbiArrayList_GUID * pIids, [out] DacDbiArrayList_ExpandedTypeData * pTypes);
346-
HRESULT GetCachedWinRTTypes([in] VMPTR_AppDomain vmAppDomain, [out] DacDbiArrayList_GUID * piids, [out] DacDbiArrayList_ExpandedTypeData * pTypes);
347345

348346
// Object Data
349347
HRESULT GetTypedByRefInfo([in] CORDB_ADDRESS pTypedByRef, [out] struct DebuggerIPCE_ObjectData * pObjectData);

src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Dbi/DacDbiImpl.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -795,12 +795,6 @@ public int IsRcw(ulong vmObject, Interop.BOOL* pResult)
795795
public int GetRcwCachedInterfacePointers(ulong vmObject, Interop.BOOL bIInspectableOnly, nint pDacItfPtrs)
796796
=> _legacy is not null ? _legacy.GetRcwCachedInterfacePointers(vmObject, bIInspectableOnly, pDacItfPtrs) : HResults.E_NOTIMPL;
797797

798-
public int GetCachedWinRTTypesForIIDs(ulong vmAppDomain, nint pIids, nint pTypes)
799-
=> _legacy is not null ? _legacy.GetCachedWinRTTypesForIIDs(vmAppDomain, pIids, pTypes) : HResults.E_NOTIMPL;
800-
801-
public int GetCachedWinRTTypes(ulong vmAppDomain, nint piids, nint pTypes)
802-
=> _legacy is not null ? _legacy.GetCachedWinRTTypes(vmAppDomain, piids, pTypes) : HResults.E_NOTIMPL;
803-
804798
public int GetTypedByRefInfo(ulong pTypedByRef, nint pObjectData)
805799
=> _legacy is not null ? _legacy.GetTypedByRefInfo(pTypedByRef, pObjectData) : HResults.E_NOTIMPL;
806800

src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Dbi/IDacDbiInterface.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -411,12 +411,6 @@ public unsafe partial interface IDacDbiInterface
411411
[PreserveSig]
412412
int GetRcwCachedInterfacePointers(ulong vmObject, Interop.BOOL bIInspectableOnly, nint pDacItfPtrs);
413413

414-
[PreserveSig]
415-
int GetCachedWinRTTypesForIIDs(ulong vmAppDomain, nint pIids, nint pTypes);
416-
417-
[PreserveSig]
418-
int GetCachedWinRTTypes(ulong vmAppDomain, nint piids, nint pTypes);
419-
420414
[PreserveSig]
421415
int GetTypedByRefInfo(ulong pTypedByRef, nint pObjectData);
422416

0 commit comments

Comments
 (0)