[cDAC] LegacyHandle on IEnum should be nuint (#128711)

Author: rcj1

src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/ClrDataMethodDefinition.cs

@@ -122,7 +122,7 @@ int IXCLRDataMethodDefinition.StartEnumInstances(IXCLRDataAppDomain? appDomain,
             if (methodDescAddr != TargetPointer.Null)
             {
                 SOSDacImpl.EnumMethodInstances emi = new(_target, methodDescAddr, TargetPointer.Null);
-                emi.LegacyHandle = legacyHandle;
+                emi.LegacyHandle = (nuint)legacyHandle;
 
                 hr = emi.Start();
                 if (hr == HResults.S_OK)
@@ -181,7 +181,7 @@ int IXCLRDataMethodDefinition.EnumInstance(ulong* handle, DacComNullableByRef<IX
             DacComNullableByRef<IXCLRDataMethodInstance> legacyMethodOut = new(isNullRef: false);
             hrLocal = _legacyImpl.EnumInstance(&legacyHandle, legacyMethodOut);
             legacyMethod = legacyMethodOut.Interface;
-            emi.LegacyHandle = legacyHandle;
+            emi.LegacyHandle = (nuint)legacyHandle;
         }
 
         try
@@ -236,7 +236,7 @@ int IXCLRDataMethodDefinition.EndEnumInstances(ulong handle)
             ((IEnum<MethodDescHandle>)emi).Dispose();
             gcHandle.Free();
 
-            if (_legacyImpl is not null && emi.LegacyHandle != TargetPointer.Null)
+            if (_legacyImpl is not null && emi.LegacyHandle != 0)
             {
                 int hrLocal = _legacyImpl.EndEnumInstances(emi.LegacyHandle);
                 if (hrLocal < 0)

src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/ClrDataModule.cs

@@ -128,9 +128,9 @@ internal sealed class EnumMethodDefinitions : IEnum<uint>
         private TypeDefinitionHandle? _typeHandle;
         private string? _methodName;
         public IEnumerator<uint> Enumerator { get; set; } = Enumerable.Empty<uint>().GetEnumerator();
-        public TargetPointer LegacyHandle { get; set; } = TargetPointer.Null;
+        public nuint LegacyHandle { get; set; } = 0;
 
-        public EnumMethodDefinitions(MetadataReader reader, uint flags, TargetPointer legacyHandle)
+        public EnumMethodDefinitions(MetadataReader reader, uint flags, nuint legacyHandle)
         {
             _reader = reader;
             _flags = flags;
@@ -300,7 +300,7 @@ int IXCLRDataModule.StartEnumMethodDefinitionsByName(char* name, uint flags, ulo
             Contracts.ModuleHandle moduleHandle = loader.GetModuleHandleFromModulePtr(_address);
             MetadataReader reader = _target.Contracts.EcmaMetadata.GetMetadata(moduleHandle)!;
 
-            EnumMethodDefinitions emd = new(reader, flags, handleLocal);
+            EnumMethodDefinitions emd = new(reader, flags, (nuint)handleLocal);
             emd.Start(fullName);
             *handle = (ulong)((IEnum<uint>)emd).GetHandle();
         }
@@ -346,7 +346,7 @@ int IXCLRDataModule.EnumMethodDefinitionByName(ulong* handle, DacComNullableByRe
             DacComNullableByRef<IXCLRDataMethodDefinition> legacyMethodOut = new(isNullRef: false);
             hrLocal = _legacyModule.EnumMethodDefinitionByName(&legacyHandle, legacyMethodOut);
             legacyMethod = legacyMethodOut.Interface;
-            emd.LegacyHandle = legacyHandle;
+            emd.LegacyHandle = (nuint)legacyHandle;
         }
 
         try
@@ -393,7 +393,7 @@ int IXCLRDataModule.EndEnumMethodDefinitionsByName(ulong handle)
             return ex.HResult;
         }
 
-        if (_legacyModule != null && emd.LegacyHandle != TargetPointer.Null)
+        if (_legacyModule != null && emd.LegacyHandle != 0)
         {
             int hrLocal = _legacyModule.EndEnumMethodDefinitionsByName(emd.LegacyHandle);
             if (hrLocal < 0)

src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/IEnum.cs

@@ -7,7 +7,7 @@ namespace Microsoft.Diagnostics.DataContractReader.Legacy;
 internal interface IEnum<T>
 {
     IEnumerator<T> Enumerator { get; }
-    TargetPointer LegacyHandle { get; }
+    nuint LegacyHandle { get; }
     void Dispose() => Enumerator.Dispose();
     long GetHandle()
     {

src/native/managed/cdac/Microsoft.Diagnostics.DataContractReader.Legacy/SOSDacImpl.IXCLRDataProcess.cs

@@ -255,7 +255,7 @@ internal sealed class EnumMethodInstances : IEnum<MethodDescHandle>
         private readonly IRuntimeTypeSystem _rts;
         private readonly ICodeVersions _cv;
         public IEnumerator<MethodDescHandle> Enumerator { get; set; } = Enumerable.Empty<MethodDescHandle>().GetEnumerator();
-        public TargetPointer LegacyHandle { get; set; } = TargetPointer.Null;
+        public nuint LegacyHandle { get; set; } = 0;
 
         public EnumMethodInstances(Target target, TargetPointer methodDesc, TargetPointer appDomain)
         {
@@ -469,7 +469,7 @@ int IXCLRDataProcess.StartEnumMethodInstancesByAddress(ClrDataAddress address, I
                 eman.GetMethodDesc(cbh) is TargetPointer methodDesc)
             {
                 EnumMethodInstances emi = new(_target, methodDesc, TargetPointer.Null);
-                emi.LegacyHandle = handleLocal;
+                emi.LegacyHandle = (nuint)handleLocal;
 
                 hr = emi.Start();
                 if (hr == HResults.S_OK)
@@ -523,7 +523,7 @@ int IXCLRDataProcess.EnumMethodInstanceByAddress(ulong* handle, DacComNullableBy
             DacComNullableByRef<IXCLRDataMethodInstance> legacyMethodOut = new(isNullRef: false);
             hrLocal = _legacyProcess.EnumMethodInstanceByAddress(&legacyHandle, legacyMethodOut);
             legacyMethod = legacyMethodOut.Interface;
-            emi.LegacyHandle = legacyHandle;
+            emi.LegacyHandle = (nuint)legacyHandle;
         }
 
         try
@@ -582,7 +582,7 @@ int IXCLRDataProcess.EndEnumMethodInstancesByAddress(ulong handle)
         if (gcHandle.Target is not EnumMethodInstances emi) return HResults.E_INVALIDARG;
         gcHandle.Free();
 
-        if (_legacyProcess != null && emi.LegacyHandle != TargetPointer.Null)
+        if (_legacyProcess != null && emi.LegacyHandle != 0)
         {
             int hrLocal = _legacyProcess.EndEnumMethodInstancesByAddress(emi.LegacyHandle);
             if (hrLocal < 0)

src/native/managed/cdac/tests/EnumMethodDefinitionsTests.cs

@@ -175,7 +175,7 @@ public void EnumMethodsByName_ReturnsExpectedCount(string fullName, uint flags,
         fixed (byte* ptr = s_metadataBytes)
         {
             var reader = new MetadataReader(ptr, s_metadataBytes.Length);
-            var emd = new ClrDataModule.EnumMethodDefinitions(reader, flags, TargetPointer.Null);
+            var emd = new ClrDataModule.EnumMethodDefinitions(reader, flags, 0);
             emd.Start(fullName);
 
             int count = 0;
@@ -200,7 +200,7 @@ public void EnumMethodsByName_ThrowsForUnresolvableInput(string fullName)
         fixed (byte* ptr = s_metadataBytes)
         {
             var reader = new MetadataReader(ptr, s_metadataBytes.Length);
-            var emd = new ClrDataModule.EnumMethodDefinitions(reader, 0, TargetPointer.Null);
+            var emd = new ClrDataModule.EnumMethodDefinitions(reader, 0, 0);
 
             Assert.Throws<ArgumentException>(() => emd.Start(fullName));
         }