Skip to content

Commit 07e85b6

Browse files
elinor-funghez2010
authored andcommitted
[cdac] Fix ISOSDacInterface13.TraverseLoaderHeap parameter type (dotnet#110678)
1 parent 15e01d4 commit 07e85b6

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/native/managed/cdacreader/src/Legacy/ISOSDacInterface.cs

+1-8
Original file line numberDiff line numberDiff line change
@@ -556,19 +556,12 @@ internal unsafe partial interface ISOSDacInterface12
556556
int GetGlobalAllocationContext(ulong* allocPtr, ulong* allocLimit);
557557
}
558558

559-
internal struct VISITHEAP
560-
{
561-
public ulong blockData;
562-
public nuint blockSize;
563-
public Interop.BOOL blockIsCurrentBlock;
564-
}
565-
566559
[GeneratedComInterface]
567560
[Guid("3176a8ed-597b-4f54-a71f-83695c6a8c5e")]
568561
internal unsafe partial interface ISOSDacInterface13
569562
{
570563
[PreserveSig]
571-
int TraverseLoaderHeap(ulong loaderHeapAddr, /*LoaderHeapKind*/ int kind, VISITHEAP pCallback);
564+
int TraverseLoaderHeap(ulong loaderHeapAddr, /*LoaderHeapKind*/ int kind, /*VISITHEAP*/ delegate* unmanaged<ulong, nuint, Interop.BOOL> pCallback);
572565
[PreserveSig]
573566
int GetDomainLoaderAllocator(ulong domainAddress, ulong* pLoaderAllocator);
574567
[PreserveSig]

src/native/managed/cdacreader/src/Legacy/SOSDacImpl.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1412,7 +1412,7 @@ int ISOSDacInterface12.GetGlobalAllocationContext(ulong* allocPtr, ulong* allocL
14121412
#endregion ISOSDacInterface12
14131413

14141414
#region ISOSDacInterface13
1415-
int ISOSDacInterface13.TraverseLoaderHeap(ulong loaderHeapAddr, /*LoaderHeapKind*/ int kind, VISITHEAP pCallback)
1415+
int ISOSDacInterface13.TraverseLoaderHeap(ulong loaderHeapAddr, /*LoaderHeapKind*/ int kind, /*VISITHEAP*/ delegate* unmanaged<ulong, nuint, Interop.BOOL> pCallback)
14161416
=> _legacyImpl13 is not null ? _legacyImpl13.TraverseLoaderHeap(loaderHeapAddr, kind, pCallback) : HResults.E_NOTIMPL;
14171417
int ISOSDacInterface13.GetDomainLoaderAllocator(ulong domainAddress, ulong* pLoaderAllocator)
14181418
=> _legacyImpl13 is not null ? _legacyImpl13.GetDomainLoaderAllocator(domainAddress, pLoaderAllocator) : HResults.E_NOTIMPL;

0 commit comments

Comments
 (0)