Skip to content

Commit 75d3e60

Browse files
Copilotrcj1
andauthored
Remove obsolete DacDbi APIs and simplify RCW cached type query path (#126962)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: rcj1 <77995559+rcj1@users.noreply.github.com> Co-authored-by: Rachel <rachel.jarvi@gmail.com>
1 parent 84696c7 commit 75d3e60

File tree

9 files changed

+2
-211
lines changed

9 files changed

+2
-211
lines changed

src/coreclr/debug/daccess/dacdbiimpl.cpp

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3905,18 +3905,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::IsRcw(VMPTR_Object vmObject, OUT
39053905
#endif // FEATURE_COMINTEROP
39063906
}
39073907

3908-
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetRcwCachedInterfaceTypes(VMPTR_Object vmObject, VMPTR_AppDomain vmAppDomain, BOOL bIInspectableOnly, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pDacInterfaces)
3909-
{
3910-
HRESULT hr = S_OK;
3911-
EX_TRY
3912-
{
3913-
// Legacy WinRT API.
3914-
pDacInterfaces->Alloc(0);
3915-
}
3916-
EX_CATCH_HRESULT(hr);
3917-
return hr;
3918-
}
3919-
39203908
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetRcwCachedInterfacePointers(VMPTR_Object vmObject, BOOL bIInspectableOnly, OUT DacDbiArrayList<CORDB_ADDRESS> * pDacItfPtrs)
39213909
{
39223910
#ifdef FEATURE_COMINTEROP
@@ -6214,25 +6202,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetObject(CORDB_ADDRESS ptr, OUT
62146202
return hr;
62156203
}
62166204

6217-
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::EnableNGENPolicy(CorDebugNGENPolicy ePolicy)
6218-
{
6219-
return E_NOTIMPL;
6220-
}
6221-
6222-
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::SetNGENCompilerFlags(DWORD dwFlags)
6223-
{
6224-
DD_ENTER_MAY_THROW;
6225-
6226-
return CORDBG_E_NGEN_NOT_SUPPORTED;
6227-
}
6228-
6229-
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetNGENCompilerFlags(DWORD *pdwFlags)
6230-
{
6231-
DD_ENTER_MAY_THROW;
6232-
6233-
return CORDBG_E_NGEN_NOT_SUPPORTED;
6234-
}
6235-
62366205
typedef DPTR(OBJECTREF) PTR_ObjectRef;
62376206

62386207
// Create a VMPTR_Object from an address which points to a reference to an object
@@ -7895,13 +7864,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetPEFileMDInternalRW(VMPTR_PEAss
78957864
return S_OK;
78967865
}
78977866

7898-
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetReJitInfo(VMPTR_Module vmModule, mdMethodDef methodTk, OUT VMPTR_ReJitInfo* pvmReJitInfo)
7899-
{
7900-
DD_ENTER_MAY_THROW;
7901-
_ASSERTE(!"You shouldn't be calling this - use GetActiveRejitILCodeVersionNode instead");
7902-
return S_OK;
7903-
}
7904-
79057867
#ifdef FEATURE_CODE_VERSIONING
79067868
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetActiveRejitILCodeVersionNode(VMPTR_Module vmModule, mdMethodDef methodTk, OUT VMPTR_ILCodeVersionNode* pVmILCodeVersionNode)
79077869
{
@@ -7999,13 +7961,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetILCodeVersionNodeData(VMPTR_IL
79997961
}
80007962
#endif // FEATURE_CODE_VERSIONING
80017963

8002-
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetReJitInfoByAddress(VMPTR_MethodDesc vmMethod, CORDB_ADDRESS codeStartAddress, OUT VMPTR_ReJitInfo* pvmReJitInfo)
8003-
{
8004-
DD_ENTER_MAY_THROW;
8005-
_ASSERTE(!"You shouldn't be calling this - use GetNativeCodeVersionNode instead");
8006-
return S_OK;
8007-
}
8008-
80097964
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::AreOptimizationsDisabled(VMPTR_Module vmModule, mdMethodDef methodTk, OUT BOOL* pOptimizationsDisabled)
80107965
{
80117966
DD_ENTER_MAY_THROW;
@@ -8027,20 +7982,6 @@ HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::AreOptimizationsDisabled(VMPTR_Mo
80277982
return S_OK;
80287983
}
80297984

8030-
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetSharedReJitInfo(VMPTR_ReJitInfo vmReJitInfo, OUT VMPTR_SharedReJitInfo* pvmSharedReJitInfo)
8031-
{
8032-
DD_ENTER_MAY_THROW;
8033-
_ASSERTE(!"You shouldn't be calling this - use GetILCodeVersionNode instead");
8034-
return S_OK;
8035-
}
8036-
8037-
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetSharedReJitInfoData(VMPTR_SharedReJitInfo vmSharedReJitInfo, DacSharedReJitInfo* pData)
8038-
{
8039-
DD_ENTER_MAY_THROW;
8040-
_ASSERTE(!"You shouldn't be calling this - use GetILCodeVersionNodeData instead");
8041-
return S_OK;
8042-
}
8043-
80447985
HRESULT STDMETHODCALLTYPE DacDbiInterfaceImpl::GetDefinesBitField(ULONG32 *pDefines)
80457986
{
80467987
DD_ENTER_MAY_THROW;

src/coreclr/debug/daccess/dacdbiimpl.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,13 @@ class DacDbiInterfaceImpl :
148148
HRESULT STDMETHODCALLTYPE GetArrayLayout(COR_TYPEID id, COR_ARRAY_LAYOUT *pLayout);
149149
HRESULT STDMETHODCALLTYPE GetGCHeapInformation(OUT COR_HEAPINFO * pHeapInfo);
150150
HRESULT STDMETHODCALLTYPE GetPEFileMDInternalRW(VMPTR_PEAssembly vmPEAssembly, OUT TADDR* pAddrMDInternalRW);
151-
HRESULT STDMETHODCALLTYPE GetReJitInfo(VMPTR_Module vmModule, mdMethodDef methodTk, OUT VMPTR_ReJitInfo* pReJitInfo);
152151
#ifdef FEATURE_CODE_VERSIONING
153152
HRESULT STDMETHODCALLTYPE GetActiveRejitILCodeVersionNode(VMPTR_Module vmModule, mdMethodDef methodTk, OUT VMPTR_ILCodeVersionNode* pVmILCodeVersionNode);
154153
HRESULT STDMETHODCALLTYPE GetNativeCodeVersionNode(VMPTR_MethodDesc vmMethod, CORDB_ADDRESS codeStartAddress, OUT VMPTR_NativeCodeVersionNode* pVmNativeCodeVersionNode);
155154
HRESULT STDMETHODCALLTYPE GetILCodeVersionNode(VMPTR_NativeCodeVersionNode vmNativeCodeVersionNode, VMPTR_ILCodeVersionNode* pVmILCodeVersionNode);
156155
HRESULT STDMETHODCALLTYPE GetILCodeVersionNodeData(VMPTR_ILCodeVersionNode vmILCodeVersionNode, DacSharedReJitInfo* pData);
157156
#endif // FEATURE_CODE_VERSIONING
158-
HRESULT STDMETHODCALLTYPE GetReJitInfoByAddress(VMPTR_MethodDesc vmMethod, CORDB_ADDRESS codeStartAddress, OUT VMPTR_ReJitInfo* pReJitInfo);
159157
HRESULT STDMETHODCALLTYPE AreOptimizationsDisabled(VMPTR_Module vmModule, mdMethodDef methodTk, OUT BOOL* pOptimizationsDisabled);
160-
HRESULT STDMETHODCALLTYPE GetSharedReJitInfo(VMPTR_ReJitInfo vmReJitInfo, VMPTR_SharedReJitInfo* pSharedReJitInfo);
161-
HRESULT STDMETHODCALLTYPE GetSharedReJitInfoData(VMPTR_SharedReJitInfo sharedReJitInfo, DacSharedReJitInfo* pData);
162158
HRESULT STDMETHODCALLTYPE GetDefinesBitField(ULONG32 *pDefines);
163159
HRESULT STDMETHODCALLTYPE GetMDStructuresVersion(ULONG32* pMDStructuresVersion);
164160
HRESULT STDMETHODCALLTYPE EnableGCNotificationEvents(BOOL fEnable);
@@ -333,11 +329,6 @@ class DacDbiInterfaceImpl :
333329

334330
HRESULT STDMETHODCALLTYPE MetadataUpdatesApplied(OUT BOOL * pResult);
335331

336-
// retrieves the list of COM interfaces implemented by vmObject, as it is known at
337-
// the time of the call (the list may change as new interface types become available
338-
// in the runtime)
339-
HRESULT STDMETHODCALLTYPE GetRcwCachedInterfaceTypes(VMPTR_Object vmObject, VMPTR_AppDomain vmAppDomain, BOOL bIInspectableOnly, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pDacInterfaces);
340-
341332
// retrieves the list of interfaces pointers implemented by vmObject, as it is known at
342333
// the time of the call (the list may change as new interface types become available
343334
// in the runtime)
@@ -901,16 +892,6 @@ class DacDbiInterfaceImpl :
901892
// Creates a VMPTR of an Object from a target address
902893
HRESULT STDMETHODCALLTYPE GetObject(CORDB_ADDRESS ptr, OUT VMPTR_Object * pRetVal);
903894

904-
// sets state in the native binder
905-
HRESULT STDMETHODCALLTYPE EnableNGENPolicy(CorDebugNGENPolicy ePolicy);
906-
907-
// Sets the NGEN compiler flags. This restricts NGEN to only use images with certain
908-
// types of pregenerated code.
909-
HRESULT STDMETHODCALLTYPE SetNGENCompilerFlags(DWORD dwFlags);
910-
911-
// Gets the NGEN compiler flags currently in effect.
912-
HRESULT STDMETHODCALLTYPE GetNGENCompilerFlags(DWORD *pdwFlags);
913-
914895
// Creates a VMPTR of an Object from a target address pointing to an OBJECTREF
915896
HRESULT STDMETHODCALLTYPE GetObjectFromRefPtr(CORDB_ADDRESS ptr, OUT VMPTR_Object * pRetVal);
916897

src/coreclr/debug/di/divalue.cpp

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2785,37 +2785,7 @@ HRESULT CordbObjectValue::GetCachedInterfaceTypes(
27852785
EX_TRY
27862786
{
27872787
*ppInterfacesEnum = NULL;
2788-
2789-
NewArrayHolder<CordbType*> pItfs(NULL);
2790-
2791-
// retrieve interface types
2792-
DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> dacInterfaces;
2793-
2794-
IDacDbiInterface* pDAC = GetProcess()->GetDAC();
2795-
2796-
CORDB_ADDRESS objAddr = m_valueHome.GetAddress();
2797-
VMPTR_Object vmObj;
2798-
IfFailThrow(pDAC->GetObject(objAddr, &vmObj));
2799-
2800-
// retrieve type info from LS
2801-
IfFailThrow(pDAC->GetRcwCachedInterfaceTypes(vmObj, m_appdomain->GetADToken(),
2802-
bIInspectableOnly, &dacInterfaces));
2803-
2804-
// synthesize CordbType instances
2805-
int cItfs = dacInterfaces.Count();
2806-
if (cItfs > 0)
2807-
{
2808-
pItfs = new CordbType*[cItfs];
2809-
for (int n = 0; n < cItfs; ++n)
2810-
{
2811-
hr = CordbType::TypeDataToType(m_appdomain,
2812-
&(dacInterfaces[n]),
2813-
&pItfs[n]);
2814-
}
2815-
}
2816-
2817-
// build a type enumerator
2818-
CordbTypeEnum* pTypeEnum = CordbTypeEnum::Build(m_appdomain, GetProcess()->GetContinueNeuterList(), cItfs, pItfs);
2788+
CordbTypeEnum* pTypeEnum = CordbTypeEnum::Build(m_appdomain, GetProcess()->GetContinueNeuterList(), 0, (CordbType**)nullptr);
28192789
if ( pTypeEnum == NULL )
28202790
{
28212791
IfFailThrow(E_OUTOFMEMORY);

src/coreclr/debug/di/process.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15357,16 +15357,7 @@ HRESULT CordbProcess::GetDesiredNGENCompilerFlags(DWORD *pdwFlags )
1535715357
FAIL_IF_NEUTERED(this);
1535815358
VALIDATE_POINTER_TO_OBJECT(pdwFlags, DWORD*);
1535915359
*pdwFlags = 0;
15360-
15361-
CordbProcess *pProcess = GetProcess();
15362-
ATT_REQUIRE_STOPPED_MAY_FAIL(pProcess);
15363-
HRESULT hr = S_OK;
15364-
EX_TRY
15365-
{
15366-
hr = pProcess->GetDAC()->GetNGENCompilerFlags(pdwFlags);
15367-
}
15368-
EX_CATCH_HRESULT(hr);
15369-
return hr;
15360+
return CORDBG_E_NGEN_NOT_SUPPORTED;
1537015361
}
1537115362

1537215363
//-----------------------------------------------------------------------------

src/coreclr/debug/inc/dacdbiinterface.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1848,11 +1848,6 @@ IDacDbiInterface : public IUnknown
18481848
// Check whether the argument is a runtime callable wrapper.
18491849
virtual HRESULT STDMETHODCALLTYPE IsRcw(VMPTR_Object vmObject, OUT BOOL * pResult) = 0;
18501850

1851-
// retrieves the list of COM interfaces implemented by vmObject, as it is known at
1852-
// the time of the call (the list may change as new interface types become available
1853-
// in the runtime)
1854-
virtual HRESULT STDMETHODCALLTYPE GetRcwCachedInterfaceTypes(VMPTR_Object vmObject, VMPTR_AppDomain vmAppDomain, BOOL bIInspectableOnly, OUT DacDbiArrayList<DebuggerIPCE_ExpandedTypeData> * pDacInterfaces) = 0;
1855-
18561851
// retrieves the list of interfaces pointers implemented by vmObject, as it is known at
18571852
// the time of the call (the list may change as new interface types become available
18581853
// in the runtime)
@@ -1996,8 +1991,6 @@ IDacDbiInterface : public IUnknown
19961991
// Return Value:
19971992
// S_OK on success; otherwise, an appropriate failure HRESULT.
19981993
//
1999-
virtual HRESULT STDMETHODCALLTYPE EnableNGENPolicy(CorDebugNGENPolicy ePolicy) = 0;
2000-
20011994
// Sets the NGEN compiler flags. This restricts NGEN to only use images with certain
20021995
// types of pregenerated code. With respect to debugging this is used to specify that
20031996
// the NGEN image must be debuggable aka non-optimized code. Note that these flags
@@ -2020,8 +2013,6 @@ IDacDbiInterface : public IUnknown
20202013
// Return Value:
20212014
// S_OK on success; otherwise, an appropriate failure HRESULT.
20222015
//
2023-
virtual HRESULT STDMETHODCALLTYPE SetNGENCompilerFlags(DWORD dwFlags) = 0;
2024-
20252016
// Gets the NGEN compiler flags currently in effect. This accounts for settings that
20262017
// were caused by SetDesiredNGENCompilerFlags as well as other configuration sources.
20272018
// See SetDesiredNGENCompilerFlags for more info
@@ -2032,8 +2023,6 @@ IDacDbiInterface : public IUnknown
20322023
// Return Value:
20332024
// S_OK on success; otherwise, an appropriate failure HRESULT.
20342025
//
2035-
virtual HRESULT STDMETHODCALLTYPE GetNGENCompilerFlags(DWORD *pdwFlags) = 0;
2036-
20372026
// Create a VMPTR_OBJECTHANDLE from a CORDB_ADDRESS pointing to an object handle
20382027
//
20392028
// Arguments:
@@ -2277,8 +2266,6 @@ IDacDbiInterface : public IUnknown
22772266
// S_OK regardless of whether a rejit request is active or not, as long as the answer is certain
22782267
// error HRESULTs such as CORDBG_READ_VIRTUAL_FAILURE are possible
22792268
//
2280-
virtual HRESULT STDMETHODCALLTYPE GetReJitInfo(VMPTR_Module vmModule, mdMethodDef methodTk, OUT VMPTR_ReJitInfo* pReJitInfo) = 0;
2281-
22822269
// DEPRECATED - use GetNativeCodeVersionNode
22832270
// Retrieves the ReJitInfo for a given MethodDesc/code address, if it exists.
22842271
//
@@ -2294,8 +2281,6 @@ IDacDbiInterface : public IUnknown
22942281
// S_OK regardless of whether a rejit request is active or not, as long as the answer is certain
22952282
// error HRESULTs such as CORDBG_READ_VIRTUAL_FAILURE are possible
22962283
//
2297-
virtual HRESULT STDMETHODCALLTYPE GetReJitInfoByAddress(VMPTR_MethodDesc vmMethod, CORDB_ADDRESS codeStartAddress, OUT VMPTR_ReJitInfo* pReJitInfo) = 0;
2298-
22992284
// DEPRECATED - use GetILCodeVersion
23002285
// Retrieves the SharedReJitInfo for a given ReJitInfo.
23012286
//
@@ -2308,8 +2293,6 @@ IDacDbiInterface : public IUnknown
23082293
// S_OK if no error
23092294
// error HRESULTs such as CORDBG_READ_VIRTUAL_FAILURE are possible
23102295
//
2311-
virtual HRESULT STDMETHODCALLTYPE GetSharedReJitInfo(VMPTR_ReJitInfo vmReJitInfo, VMPTR_SharedReJitInfo* pSharedReJitInfo) = 0;
2312-
23132296
// DEPRECATED - use GetILCodeVersionData
23142297
// Retrieves useful data from a SharedReJitInfo such as IL code and IL mapping.
23152298
//
@@ -2322,8 +2305,6 @@ IDacDbiInterface : public IUnknown
23222305
// S_OK if no error
23232306
// error HRESULTs such as CORDBG_READ_VIRTUAL_FAILURE are possible
23242307
//
2325-
virtual HRESULT STDMETHODCALLTYPE GetSharedReJitInfoData(VMPTR_SharedReJitInfo sharedReJitInfo, DacSharedReJitInfo* pData) = 0;
2326-
23272308
// Retrieves a bool indicating whether or not a method's optimizations have been disabled
23282309
// defined in Debugger::IsMethodDeoptimized
23292310
//

src/coreclr/inc/dacdbi.idl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,6 @@ interface IDacDbiInterface : IUnknown
350350
HRESULT IsExceptionObject([in] VMPTR_Object vmObject, [out] BOOL * pResult);
351351
HRESULT GetStackFramesFromException([in] VMPTR_Object vmObject, [out] DacDbiArrayList_DacExceptionCallStackData * pDacStackFrames);
352352
HRESULT IsRcw([in] VMPTR_Object vmObject, [out] BOOL * pResult);
353-
HRESULT GetRcwCachedInterfaceTypes([in] VMPTR_Object vmObject, [in] VMPTR_AppDomain vmAppDomain, [in] BOOL bIInspectableOnly, [out] DacDbiArrayList_ExpandedTypeData * pDacInterfaces);
354353
HRESULT GetRcwCachedInterfacePointers([in] VMPTR_Object vmObject, [in] BOOL bIInspectableOnly, [out] DacDbiArrayList_CORDB_ADDRESS * pDacItfPtrs);
355354
HRESULT GetCachedWinRTTypesForIIDs([in] VMPTR_AppDomain vmAppDomain, [in] DacDbiArrayList_GUID * pIids, [out] DacDbiArrayList_ExpandedTypeData * pTypes);
356355
HRESULT GetCachedWinRTTypes([in] VMPTR_AppDomain vmAppDomain, [out] DacDbiArrayList_GUID * piids, [out] DacDbiArrayList_ExpandedTypeData * pTypes);
@@ -372,11 +371,6 @@ interface IDacDbiInterface : IUnknown
372371
HRESULT GetObjectFromRefPtr([in] CORDB_ADDRESS ptr, [out] VMPTR_Object * pRetVal);
373372
HRESULT GetObject([in] CORDB_ADDRESS ptr, [out] VMPTR_Object * pRetVal);
374373

375-
// NGEN
376-
HRESULT EnableNGENPolicy([in] CorDebugNGENPolicy ePolicy);
377-
HRESULT SetNGENCompilerFlags([in] DWORD dwFlags);
378-
HRESULT GetNGENCompilerFlags([out] DWORD * pdwFlags);
379-
380374
// VM Object Handle
381375
HRESULT GetVmObjectHandle([in] CORDB_ADDRESS handleAddress, [out] VMPTR_OBJECTHANDLE * pRetVal);
382376
HRESULT IsVmObjectHandleValid([in] VMPTR_OBJECTHANDLE vmHandle, [out] BOOL * pResult);
@@ -433,13 +427,6 @@ interface IDacDbiInterface : IUnknown
433427
// PE File
434428
HRESULT GetPEFileMDInternalRW([in] VMPTR_PEAssembly vmPEAssembly, [out] TADDR * pAddrMDInternalRW);
435429

436-
// ReJit
437-
HRESULT GetReJitInfo([in] VMPTR_Module vmModule, [in] mdMethodDef methodTk, [out] VMPTR_ReJitInfo * pReJitInfo);
438-
// Note: Named GetReJitInfoByAddress in IDL because COM does not support overloads.
439-
// Corresponds to the second GetReJitInfo overload in dacdbiinterface.h.
440-
HRESULT GetReJitInfoByAddress([in] VMPTR_MethodDesc vmMethod, [in] CORDB_ADDRESS codeStartAddress, [out] VMPTR_ReJitInfo * pReJitInfo);
441-
HRESULT GetSharedReJitInfo([in] VMPTR_ReJitInfo vmReJitInfo, [out] VMPTR_SharedReJitInfo * pSharedReJitInfo);
442-
HRESULT GetSharedReJitInfoData([in] VMPTR_SharedReJitInfo sharedReJitInfo, [out] struct DacSharedReJitInfo * pData);
443430
HRESULT AreOptimizationsDisabled([in] VMPTR_Module vmModule, [in] mdMethodDef methodTk, [out] BOOL * pOptimizationsDisabled);
444431

445432
// Defines

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -824,9 +824,6 @@ public int GetStackFramesFromException(ulong vmObject, nint pDacStackFrames)
824824
public int IsRcw(ulong vmObject, Interop.BOOL* pResult)
825825
=> _legacy is not null ? _legacy.IsRcw(vmObject, pResult) : HResults.E_NOTIMPL;
826826

827-
public int GetRcwCachedInterfaceTypes(ulong vmObject, ulong vmAppDomain, Interop.BOOL bIInspectableOnly, nint pDacInterfaces)
828-
=> _legacy is not null ? _legacy.GetRcwCachedInterfaceTypes(vmObject, vmAppDomain, bIInspectableOnly, pDacInterfaces) : HResults.E_NOTIMPL;
829-
830827
public int GetRcwCachedInterfacePointers(ulong vmObject, Interop.BOOL bIInspectableOnly, nint pDacItfPtrs)
831828
=> _legacy is not null ? _legacy.GetRcwCachedInterfacePointers(vmObject, bIInspectableOnly, pDacItfPtrs) : HResults.E_NOTIMPL;
832829

@@ -900,15 +897,6 @@ public int GetObject(ulong ptr, ulong* pRetVal)
900897
return hr;
901898
}
902899

903-
public int EnableNGENPolicy(int ePolicy)
904-
=> HResults.E_NOTIMPL;
905-
906-
public int SetNGENCompilerFlags(uint dwFlags)
907-
=> _legacy is not null ? _legacy.SetNGENCompilerFlags(dwFlags) : HResults.E_NOTIMPL;
908-
909-
public int GetNGENCompilerFlags(uint* pdwFlags)
910-
=> _legacy is not null ? _legacy.GetNGENCompilerFlags(pdwFlags) : HResults.E_NOTIMPL;
911-
912900
public int GetVmObjectHandle(ulong handleAddress, ulong* pRetVal)
913901
{
914902
*pRetVal = handleAddress;
@@ -1217,18 +1205,6 @@ public int GetGCHeapInformation(COR_HEAPINFO* pHeapInfo)
12171205
public int GetPEFileMDInternalRW(ulong vmPEAssembly, ulong* pAddrMDInternalRW)
12181206
=> _legacy is not null ? _legacy.GetPEFileMDInternalRW(vmPEAssembly, pAddrMDInternalRW) : HResults.E_NOTIMPL;
12191207

1220-
public int GetReJitInfo(ulong vmModule, uint methodTk, ulong* pReJitInfo)
1221-
=> _legacy is not null ? _legacy.GetReJitInfo(vmModule, methodTk, pReJitInfo) : HResults.E_NOTIMPL;
1222-
1223-
public int GetReJitInfoByAddress(ulong vmMethod, ulong codeStartAddress, ulong* pReJitInfo)
1224-
=> _legacy is not null ? _legacy.GetReJitInfoByAddress(vmMethod, codeStartAddress, pReJitInfo) : HResults.E_NOTIMPL;
1225-
1226-
public int GetSharedReJitInfo(ulong vmReJitInfo, ulong* pSharedReJitInfo)
1227-
=> _legacy is not null ? _legacy.GetSharedReJitInfo(vmReJitInfo, pSharedReJitInfo) : HResults.E_NOTIMPL;
1228-
1229-
public int GetSharedReJitInfoData(ulong sharedReJitInfo, DacDbiSharedReJitInfo* pData)
1230-
=> _legacy is not null ? _legacy.GetSharedReJitInfoData(sharedReJitInfo, pData) : HResults.E_NOTIMPL;
1231-
12321208
public int AreOptimizationsDisabled(ulong vmModule, uint methodTk, Interop.BOOL* pOptimizationsDisabled)
12331209
=> _legacy is not null ? _legacy.AreOptimizationsDisabled(vmModule, methodTk, pOptimizationsDisabled) : HResults.E_NOTIMPL;
12341210

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,6 @@ public unsafe partial interface IDacDbiInterface
420420
[PreserveSig]
421421
int IsRcw(ulong vmObject, Interop.BOOL* pResult);
422422

423-
[PreserveSig]
424-
int GetRcwCachedInterfaceTypes(ulong vmObject, ulong vmAppDomain, Interop.BOOL bIInspectableOnly, nint pDacInterfaces);
425-
426423
[PreserveSig]
427424
int GetRcwCachedInterfacePointers(ulong vmObject, Interop.BOOL bIInspectableOnly, nint pDacItfPtrs);
428425

@@ -459,15 +456,6 @@ public unsafe partial interface IDacDbiInterface
459456
[PreserveSig]
460457
int GetObject(ulong ptr, ulong* pRetVal);
461458

462-
[PreserveSig]
463-
int EnableNGENPolicy(int ePolicy);
464-
465-
[PreserveSig]
466-
int SetNGENCompilerFlags(uint dwFlags);
467-
468-
[PreserveSig]
469-
int GetNGENCompilerFlags(uint* pdwFlags);
470-
471459
[PreserveSig]
472460
int GetVmObjectHandle(ulong handleAddress, ulong* pRetVal);
473461

@@ -552,19 +540,6 @@ public unsafe partial interface IDacDbiInterface
552540
[PreserveSig]
553541
int GetPEFileMDInternalRW(ulong vmPEAssembly, ulong* pAddrMDInternalRW);
554542

555-
[PreserveSig]
556-
int GetReJitInfo(ulong vmModule, uint methodTk, ulong* pReJitInfo);
557-
558-
[PreserveSig]
559-
// DEPRECATED - use GetNativeCodeVersionNode
560-
int GetReJitInfoByAddress(ulong vmMethod, ulong codeStartAddress, ulong* pReJitInfo);
561-
562-
[PreserveSig]
563-
int GetSharedReJitInfo(ulong vmReJitInfo, ulong* pSharedReJitInfo);
564-
565-
[PreserveSig]
566-
int GetSharedReJitInfoData(ulong sharedReJitInfo, DacDbiSharedReJitInfo* pData);
567-
568543
[PreserveSig]
569544
int AreOptimizationsDisabled(ulong vmModule, uint methodTk, Interop.BOOL* pOptimizationsDisabled);
570545

0 commit comments

Comments
 (0)