fix bugs

Author: Max Charlamb

src/coreclr/debug/runtimeinfo/datadescriptor.cpp

@@ -13,6 +13,10 @@
 #include "methodtable.h"
 #include "threads.h"
 
+#ifdef HAVE_GCCOVER
+#include "gccover.h"
+#endif // HAVE_GCCOVER
+
 // begin blob definition
 
 extern "C"

src/coreclr/debug/runtimeinfo/datadescriptor.h

@@ -531,7 +531,8 @@ CDAC_TYPE_END(ProfControlBlock)
 
 #ifdef HAVE_GCCOVER
 CDAC_TYPE_BEGIN(GCCoverageInfo)
-CDAC_TYPE_FIELD(GCCoverageInfo, /*pointer*/, SavedCode, offsetof(GCCoverageInfo, SavedCode))
+CDAC_TYPE_INDETERMINATE(GCCoverageInfo)
+CDAC_TYPE_FIELD(GCCoverageInfo, /*pointer*/, SavedCode, offsetof(GCCoverageInfo, savedCode))
 CDAC_TYPE_END(GCCoverageInfo)
 #endif // HAVE_GCCOVER
 

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

@@ -7,6 +7,8 @@ namespace Microsoft.Diagnostics.DataContractReader.Contracts;
 
 internal interface IGCCover : IContract
 {
+    static string IContract.Name { get; } = nameof(GCCover);
+
     public virtual TargetPointer? GetGCCoverageInfo(NativeCodeVersionHandle codeVersionHandle) => throw new NotImplementedException();
 }
 

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

@@ -20,7 +20,7 @@ public MethodDesc(Target target, TargetPointer address)
         CodeData = target.ReadPointer(address + (ulong)type.Fields[nameof(CodeData)].Offset);
         if (type.Fields.ContainsKey(nameof(GCCoverageInfo)))
         {
-            GCCoverageInfo = target.Read<byte>(address + (ulong)type.Fields[nameof(GCCoverageInfo)].Offset);
+            GCCoverageInfo = target.ReadPointer(address + (ulong)type.Fields[nameof(GCCoverageInfo)].Offset);
         }
     }
 

src/native/managed/cdacreader/Microsoft.Diagnostics.DataContractReader/CachingContractRegistry.cs

@@ -37,6 +37,7 @@ public CachingContractRegistry(Target target, TryGetContractVersionDelegate tryG
             [typeof(IPlatformMetadata)] = new PlatformMetadataFactory(),
             [typeof(IPrecodeStubs)] = new PrecodeStubsFactory(),
             [typeof(IReJIT)] = new ReJITFactory(),
+            [typeof(IGCCover)] = new GCCoverFactory(),
         };
         configureFactories?.Invoke(_factories);
     }