diff --git a/src/coreclr/debug/daccess/dacdbiimpl.cpp b/src/coreclr/debug/daccess/dacdbiimpl.cpp index 9589ab545c846b..baf957d807e7f8 100644 --- a/src/coreclr/debug/daccess/dacdbiimpl.cpp +++ b/src/coreclr/debug/daccess/dacdbiimpl.cpp @@ -3853,31 +3853,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetRcwCachedInterfacePointers(VMP #endif // FEATURE_COMINTEROP } -HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetCachedWinRTTypesForIIDs(VMPTR_AppDomain vmAppDomain, DacDbiArrayList * pIids, OUT DacDbiArrayList * pTypes) -{ - if (pIids == NULL || pTypes == NULL) - return E_POINTER; - - HRESULT hr = S_OK; - EX_TRY - { - pTypes->Alloc(0); - } - EX_CATCH_HRESULT(hr); - return hr; -} - -HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetCachedWinRTTypes(VMPTR_AppDomain vmAppDomain, OUT DacDbiArrayList * piids, OUT DacDbiArrayList * pTypes) -{ - HRESULT hr = S_OK; - EX_TRY - { - pTypes->Alloc(0); - } - EX_CATCH_HRESULT(hr); - return hr; -} - //----------------------------------------------------------------------------- // DacDbiInterfaceImpl::FindField // Finds information for a particular class field diff --git a/src/coreclr/debug/daccess/dacdbiimpl.h b/src/coreclr/debug/daccess/dacdbiimpl.h index 0ab6e206045b49..6b118b6d3d199a 100644 --- a/src/coreclr/debug/daccess/dacdbiimpl.h +++ b/src/coreclr/debug/daccess/dacdbiimpl.h @@ -325,15 +325,6 @@ class DacDbiInterfaceImpl : // in the runtime) HRESULT STDMETHODCALLTYPE GetRcwCachedInterfacePointers(VMPTR_Object vmObject, BOOL bIInspectableOnly, OUT DacDbiArrayList * pDacItfPtrs); - // retrieves a list of interface types corresponding to the passed in - // list of IIDs. the interface types are retrieved from an app domain - // IID / Type cache, that is updated as new types are loaded. will - // have NULL entries corresponding to unknown IIDs in "iids" - HRESULT STDMETHODCALLTYPE GetCachedWinRTTypesForIIDs(VMPTR_AppDomain vmAppDomain, DacDbiArrayList * pIids, OUT DacDbiArrayList * pTypes); - - // retrieves the whole app domain cache of IID / Type mappings. - HRESULT STDMETHODCALLTYPE GetCachedWinRTTypes(VMPTR_AppDomain vmAppDomain, OUT DacDbiArrayList * piids, OUT DacDbiArrayList * pTypes); - private: // Helper to enumerate all possible memory ranges help by a loader allocator. void EnumerateMemRangesForLoaderAllocator( diff --git a/src/coreclr/debug/inc/dacdbiinterface.h b/src/coreclr/debug/inc/dacdbiinterface.h index f9ac174a7ee3e7..3e2cfa6061d336 100644 --- a/src/coreclr/debug/inc/dacdbiinterface.h +++ b/src/coreclr/debug/inc/dacdbiinterface.h @@ -1788,16 +1788,6 @@ IDacDbiInterface : public IUnknown // in the runtime) virtual HRESULT STDMETHODCALLTYPE GetRcwCachedInterfacePointers(VMPTR_Object vmObject, BOOL bIInspectableOnly, OUT DacDbiArrayList * pDacItfPtrs) = 0; - // retrieves a list of interface types corresponding to the passed in - // list of IIDs. the interface types are retrieved from an app domain - // IID / Type cache, that is updated as new types are loaded. will - // have NULL entries corresponding to unknown IIDs in "iids" - virtual HRESULT STDMETHODCALLTYPE GetCachedWinRTTypesForIIDs(VMPTR_AppDomain vmAppDomain, DacDbiArrayList * pIids, OUT DacDbiArrayList * pTypes) = 0; - - // retrieves the whole app domain cache of IID / Type mappings. - virtual HRESULT STDMETHODCALLTYPE GetCachedWinRTTypes(VMPTR_AppDomain vmAppDomain, OUT DacDbiArrayList * piids, OUT DacDbiArrayList * pTypes) = 0; - - // ---------------------------------------------------------------------------- // functions to get information about reference/handle referents for ICDValue // ---------------------------------------------------------------------------- diff --git a/src/coreclr/inc/dacdbi.idl b/src/coreclr/inc/dacdbi.idl index 914a317a5f285c..871864038a1711 100644 --- a/src/coreclr/inc/dacdbi.idl +++ b/src/coreclr/inc/dacdbi.idl @@ -342,8 +342,6 @@ interface IDacDbiInterface : IUnknown HRESULT GetStackFramesFromException([in] VMPTR_Object vmObject, [out] DacDbiArrayList_DacExceptionCallStackData * pDacStackFrames); HRESULT IsRcw([in] VMPTR_Object vmObject, [out] BOOL * pResult); HRESULT GetRcwCachedInterfacePointers([in] VMPTR_Object vmObject, [in] BOOL bIInspectableOnly, [out] DacDbiArrayList_CORDB_ADDRESS * pDacItfPtrs); - HRESULT GetCachedWinRTTypesForIIDs([in] VMPTR_AppDomain vmAppDomain, [in] DacDbiArrayList_GUID * pIids, [out] DacDbiArrayList_ExpandedTypeData * pTypes); - HRESULT GetCachedWinRTTypes([in] VMPTR_AppDomain vmAppDomain, [out] DacDbiArrayList_GUID * piids, [out] DacDbiArrayList_ExpandedTypeData * pTypes); // Object Data HRESULT GetTypedByRefInfo([in] CORDB_ADDRESS pTypedByRef, [out] struct DebuggerIPCE_ObjectData * pObjectData); diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Dbi/DacDbiImpl.cs b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Dbi/DacDbiImpl.cs index 2a421ca104f9ac..fb4f3b55ff6dc2 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Dbi/DacDbiImpl.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Dbi/DacDbiImpl.cs @@ -762,12 +762,6 @@ public int IsRcw(ulong vmObject, Interop.BOOL* pResult) public int GetRcwCachedInterfacePointers(ulong vmObject, Interop.BOOL bIInspectableOnly, nint pDacItfPtrs) => _legacy is not null ? _legacy.GetRcwCachedInterfacePointers(vmObject, bIInspectableOnly, pDacItfPtrs) : HResults.E_NOTIMPL; - public int GetCachedWinRTTypesForIIDs(ulong vmAppDomain, nint pIids, nint pTypes) - => _legacy is not null ? _legacy.GetCachedWinRTTypesForIIDs(vmAppDomain, pIids, pTypes) : HResults.E_NOTIMPL; - - public int GetCachedWinRTTypes(ulong vmAppDomain, nint piids, nint pTypes) - => _legacy is not null ? _legacy.GetCachedWinRTTypes(vmAppDomain, piids, pTypes) : HResults.E_NOTIMPL; - public int GetTypedByRefInfo(ulong pTypedByRef, nint pObjectData) => _legacy is not null ? _legacy.GetTypedByRefInfo(pTypedByRef, pObjectData) : HResults.E_NOTIMPL; diff --git a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Dbi/IDacDbiInterface.cs b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Dbi/IDacDbiInterface.cs index 50a46d033330b3..d26605e3b86f5a 100644 --- a/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Dbi/IDacDbiInterface.cs +++ b/src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/Dbi/IDacDbiInterface.cs @@ -411,12 +411,6 @@ public unsafe partial interface IDacDbiInterface [PreserveSig] int GetRcwCachedInterfacePointers(ulong vmObject, Interop.BOOL bIInspectableOnly, nint pDacItfPtrs); - [PreserveSig] - int GetCachedWinRTTypesForIIDs(ulong vmAppDomain, nint pIids, nint pTypes); - - [PreserveSig] - int GetCachedWinRTTypes(ulong vmAppDomain, nint piids, nint pTypes); - [PreserveSig] int GetTypedByRefInfo(ulong pTypedByRef, nint pObjectData);