[cDAC] Resolve breaking change caused by removing ThunkHeap descriptor (#113737)

Author: max-charlamb

src/native/managed/cdacreader/Microsoft.Diagnostics.DataContractReader.Abstractions/Contracts/ILoader.cs

@@ -44,7 +44,6 @@ public interface ILoader : IContract
     public virtual string GetFileName(ModuleHandle handle) => throw new NotImplementedException();
 
     public virtual TargetPointer GetLoaderAllocator(ModuleHandle handle) => throw new NotImplementedException();
-    public virtual TargetPointer GetThunkHeap(ModuleHandle handle) => throw new NotImplementedException();
     public virtual TargetPointer GetILBase(ModuleHandle handle) => throw new NotImplementedException();
     public virtual ModuleLookupTables GetLookupTables(ModuleHandle handle) => throw new NotImplementedException();
 

src/native/managed/cdacreader/Microsoft.Diagnostics.DataContractReader.Contracts/Contracts/Loader_1.cs

@@ -56,12 +56,6 @@ TargetPointer ILoader.GetLoaderAllocator(ModuleHandle handle)
         return module.LoaderAllocator;
     }
 
-    TargetPointer ILoader.GetThunkHeap(ModuleHandle handle)
-    {
-        Data.Module module = _target.ProcessedData.GetOrAdd<Data.Module>(handle.Address);
-        return module.ThunkHeap;
-    }
-
     TargetPointer ILoader.GetILBase(ModuleHandle handle)
     {
         Data.Module module = _target.ProcessedData.GetOrAdd<Data.Module>(handle.Address);

src/native/managed/cdacreader/Microsoft.Diagnostics.DataContractReader.Contracts/Data/Module.cs

@@ -21,7 +21,6 @@ public Module(Target target, TargetPointer address)
         Assembly = target.ReadPointer(address + (ulong)type.Fields[nameof(Assembly)].Offset);
         Base = target.ReadPointer(address + (ulong)type.Fields[nameof(Base)].Offset);
         LoaderAllocator = target.ReadPointer(address + (ulong)type.Fields[nameof(LoaderAllocator)].Offset);
-        ThunkHeap = target.ReadPointer(address + (ulong)type.Fields[nameof(ThunkHeap)].Offset);
         DynamicMetadata = target.ReadPointer(address + (ulong)type.Fields[nameof(DynamicMetadata)].Offset);
         Path = target.ReadPointer(address + (ulong)type.Fields[nameof(Path)].Offset);
         FileName = target.ReadPointer(address + (ulong)type.Fields[nameof(FileName)].Offset);
@@ -40,7 +39,6 @@ public Module(Target target, TargetPointer address)
     public uint Flags { get; init; }
     public TargetPointer Base { get; init; }
     public TargetPointer LoaderAllocator { get; init; }
-    public TargetPointer ThunkHeap { get; init; }
     public TargetPointer DynamicMetadata { get; init; }
     public TargetPointer Path { get; init; }
     public TargetPointer FileName { get; init; }

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

@@ -844,7 +844,6 @@ int ISOSDacInterface.GetModuleData(ulong moduleAddr, DacpModuleData* data)
             data->metadataSize = readOnlyMetadata.Size;
 
             data->LoaderAllocator = contract.GetLoaderAllocator(handle);
-            data->ThunkHeap = contract.GetThunkHeap(handle);
 
             Target.TypeInfo lookupMapTypeInfo = _target.GetTypeInfo(DataType.ModuleLookupMap);
             ulong tableDataOffset = (ulong)lookupMapTypeInfo.Fields[Constants.FieldNames.ModuleLookupMap.TableData].Offset;
@@ -861,6 +860,7 @@ int ISOSDacInterface.GetModuleData(ulong moduleAddr, DacpModuleData* data)
             data->dwModuleID = 0;
             data->dwBaseClassIndex = 0;
             data->dwModuleIndex = 0;
+            data->ThunkHeap = 0;
         }
         catch (global::System.Exception e)
         {

src/native/managed/cdacreader/tests/MockDescriptors/MockDescriptors.cs

@@ -132,7 +132,6 @@ internal record TypeFields
             new(nameof(Data.Module.Flags), DataType.uint32),
             new(nameof(Data.Module.Base), DataType.pointer),
             new(nameof(Data.Module.LoaderAllocator), DataType.pointer),
-            new(nameof(Data.Module.ThunkHeap), DataType.pointer),
             new(nameof(Data.Module.DynamicMetadata), DataType.pointer),
             new(nameof(Data.Module.Path), DataType.pointer),
             new(nameof(Data.Module.FileName), DataType.pointer),