Merge remote-tracking branch 'origin/main' into cdac-precode-stubs

src/coreclr/debug/runtimeinfo/datadescriptor.h

@@ -347,6 +347,12 @@ CDAC_TYPE_BEGIN(CodePointer)
 CDAC_TYPE_SIZE(sizeof(PCODE))
 CDAC_TYPE_END(CodePointer)
 
+CDAC_TYPE_BEGIN(MethodDescVersioningState)
+CDAC_TYPE_INDETERMINATE(MethodDescVersioningState)
+CDAC_TYPE_FIELD(MethodDescVersioningState, /*pointer*/, NativeCodeVersionNode, cdac_data<MethodDescVersioningState>::NativeCodeVersionNode)
+CDAC_TYPE_FIELD(MethodDescVersioningState, /*uint8*/, Flags, cdac_data<MethodDescVersioningState>::Flags)
+CDAC_TYPE_END(MethodDescVersioningState)
+
 CDAC_TYPE_BEGIN(PrecodeMachineDescriptor)
 CDAC_TYPE_INDETERMINATE(PrecodeMachineDescriptor)
 CDAC_TYPE_FIELD(PrecodeMachineDescriptor, /*uintptr*/, CodePointerToInstrPointerMask, offsetof(PrecodeMachineDescriptor, CodePointerToInstrPointerMask))

src/native/managed/cdacreader/Microsoft.Diagnostics.DataContractReader.Abstractions/ContractRegistry.cs

@@ -44,6 +44,9 @@ internal abstract class ContractRegistry
     /// </summary>
     public abstract IExecutionManager ExecutionManager { get; }
     /// <summary>
+    /// Gets an instance of the CodeVersions contract for the target.
+    /// </summary>
+    public abstract ICodeVersions CodeVersions { get; }
     /// Gets an instance of the PrecodeStubs contract for the target.
     /// </summary>
     public abstract IPrecodeStubs PrecodeStubs { get; }

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

@@ -33,6 +33,7 @@ public CachingContractRegistry(Target target, TryGetContractVersionDelegate tryG
             [typeof(IRuntimeTypeSystem)] = new RuntimeTypeSystemFactory(),
             [typeof(IDacStreams)] = new DacStreamsFactory(),
             [typeof(IExecutionManager)] = new ExecutionManagerFactory(),
+            [typeof(ICodeVersions)] = new CodeVersionsFactory(),
             [typeof(IPrecodeStubs)] = new PrecodeStubsFactory(),
         };
         configureFactories?.Invoke(_factories);
@@ -46,6 +47,7 @@ public CachingContractRegistry(Target target, TryGetContractVersionDelegate tryG
     public override IRuntimeTypeSystem RuntimeTypeSystem => GetContract<IRuntimeTypeSystem>();
     public override IDacStreams DacStreams => GetContract<IDacStreams>();
     public override IExecutionManager ExecutionManager => GetContract<IExecutionManager>();
+    public override ICodeVersions CodeVersions => GetContract<ICodeVersions>();
     public override IPrecodeStubs PrecodeStubs => GetContract<IPrecodeStubs>();
 
     private TContract GetContract<TContract>() where TContract : IContract

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

@@ -210,6 +210,7 @@ public TestRegistry() { }
         internal Lazy<Contracts.IRuntimeTypeSystem>? RuntimeTypeSystemContract { get; set; }
         internal Lazy<Contracts.IDacStreams>? DacStreamsContract { get; set; }
         internal Lazy<Contracts.IExecutionManager> ExecutionManagerContract { get; set; }
+        internal Lazy<Contracts.ICodeVersions>? CodeVersionsContract { get; set; }
         internal Lazy<Contracts.IPrecodeStubs>? PrecodeStubsContract { get; set; }
 
         public override Contracts.IException Exception => ExceptionContract.Value ?? throw new NotImplementedException();
@@ -220,6 +221,7 @@ public TestRegistry() { }
         public override Contracts.IRuntimeTypeSystem RuntimeTypeSystem => RuntimeTypeSystemContract.Value ?? throw new NotImplementedException();
         public override Contracts.IDacStreams DacStreams => DacStreamsContract.Value ?? throw new NotImplementedException();
         public override Contracts.IExecutionManager ExecutionManager => ExecutionManagerContract.Value ?? throw new NotImplementedException();
+        public override Contracts.ICodeVersions CodeVersions => CodeVersionsContract.Value ?? throw new NotImplementedException();
         public override Contracts.IPrecodeStubs PrecodeStubs => PrecodeStubsContract.Value ?? throw new NotImplementedException();
     }