Add support for pre-compiling interop type maps in crossgen2

src/coreclr/inc/readytorun.h

@@ -20,7 +20,7 @@
 // If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
 // and handle pending work.
 #define READYTORUN_MAJOR_VERSION 18
-#define READYTORUN_MINOR_VERSION 0x0002
+#define READYTORUN_MINOR_VERSION 0x0003
 
 #define MINIMUM_READYTORUN_MAJOR_VERSION 18
 
@@ -53,6 +53,7 @@
 // R2R Version 17.1 adds the READYTORUN_FLAG_PLATFORM_NATIVE_IMAGE flag to specify that the R2R image pointed to by OwnerCompositeExecutable is in the platform native format.
 // R2R Version 18 updates fields layout algorithm
 // R2R Version 18.2 adds InitClass and InitInstClass helpers
+// R2R Version 18.3 adds the ExternalTypeMaps, ProxyTypeMaps, TypeMapAssemblyTargets sections
 
 struct READYTORUN_CORE_HEADER
 {
@@ -118,6 +119,9 @@ enum class ReadyToRunSectionType : uint32_t
  MethodIsGenericMap = 121, // Added in V9.0
  EnclosingTypeMap = 122, // Added in V9.0
  TypeGenericInfoMap = 123, // Added in V9.0
+ ExternalTypeMaps = 124, // Added in V18.3
+ ProxyTypeMaps = 125, // Added in V18.3
+ TypeMapAssemblyTargets = 126, // Added in V18.3
 
  // If you add a new section consider whether it is a breaking or non-breaking change.
  // Usually it is non-breaking, but if it is preferable to have older runtimes fail

src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
  static const uint32_t Signature = 0x00525452; // 'RTR'
 
  static const uint32_t CurrentMajorVersion = 18;
- static const uint32_t CurrentMinorVersion = 2;
+ static const uint32_t CurrentMinorVersion = 3;
 };
 
 struct ReadyToRunHeader

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.NativeAot.cs

@@ -23,7 +23,7 @@ public static IReadOnlyDictionary<string, Type> CreateExternalTypeMap(RuntimeTyp
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ExternalTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ExternalTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -66,7 +66,7 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ProxyTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ProxyTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -104,14 +104,13 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  throw ReflectionCoreExecution.ExecutionEnvironment.CreateMissingMetadataException(typeMapGroup);
  }
 
- private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReflectionMapBlob blob, out NativeReader reader)
+ private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReadyToRunSectionType sectionType, out NativeReader reader)
  {
- byte* pBlob;
- uint cbBlob;
+ byte* pBlob = (byte*)RuntimeImports.RhGetModuleSection(module, sectionType, out int length);
 
- if (RuntimeImports.RhFindBlob(module, (uint)blob, &pBlob, &cbBlob))
+ if (pBlob != null)
  {
- reader = new NativeReader(pBlob, cbBlob);
+ reader = new NativeReader(pBlob, (uint)length);
  return true;
  }
 

src/coreclr/tools/Common/Compiler/DependencyAnalysis/SortableDependencyNode.cs

@@ -61,7 +61,7 @@ protected internal enum ObjectNodeOrder
  //
  Win32ResourcesNode,
  CorHeaderNode,
-ReadyToRunHeaderNode,
+GlobalHeaderNode,
  ReadyToRunAssemblyHeaderNode,
  ImportSectionsTableNode,
  ImportSectionNode,

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExternalTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ExternalTypeMapObjectNode.cs

@@ -12,7 +12,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-internal sealed class ExternalTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+public sealed class ExternalTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -26,7 +26,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IExternalTypeMapNode externalTypeMap in factory.TypeMapManager.GetExternalTypeMaps())
+ foreach (IExternalTypeMapNode externalTypeMap in manager.GetExternalTypeMaps())
  {
  typeMapGroupHashTable.Append((uint)externalTypeMap.TypeMapGroup.GetHashCode(), externalTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
  }
@@ -42,7 +42,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ExternalTypeMapObjectNode;

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IExternalTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IExternalTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IExternalTypeMapNode : IDependencyNode, ISortableNode
+internal interface IExternalTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
  IExternalTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/Common/Compiler/INativeFormatTypeReferenceProvider.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Internal.NativeFormat;
+using Internal.TypeSystem;
+
+namespace ILCompiler.DependencyAnalysis
+{
+ public interface INativeFormatTypeReferenceProvider
+ {
+ internal Vertex EncodeReferenceToType(NativeWriter writer, TypeDesc type);
+ internal Vertex EncodeReferenceToMethod(NativeWriter writer, MethodDesc method);
+ }
+}

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IProxyTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IProxyTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IProxyTypeMapNode : IDependencyNode, ISortableNode
+internal interface IProxyTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
- IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factor);
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
+ IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ProxyTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ProxyTypeMapObjectNode.cs

@@ -13,7 +13,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
- internal sealed class ProxyTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+ internal sealed class ProxyTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -27,7 +27,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IProxyTypeMapNode proxyTypeMap in factory.TypeMapManager.GetProxyTypeMaps())
+ foreach (IProxyTypeMapNode proxyTypeMap in manager.GetProxyTypeMaps())
  {
  TypeDesc typeMapGroup = proxyTypeMap.TypeMapGroup;
  typeMapGroupHashTable.Append((uint)typeMapGroup.GetHashCode(), proxyTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
@@ -44,7 +44,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ProxyTypeMapObjectNode;

src/coreclr/tools/Common/Compiler/TypeMapManager.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Reflection.Metadata;
+using ILCompiler.DependencyAnalysis;
+#if READYTORUN
+using ILCompiler.DependencyAnalysis.ReadyToRun;
+#endif
+using ILCompiler.DependencyAnalysisFramework;
+using Internal.Runtime;
+using Internal.TypeSystem;
+
+namespace ILCompiler
+{
+
+ /// <summary>
+ /// This class is responsible for managing emitted data for type maps.
+ /// </summary>
+ public abstract class TypeMapManager : ICompilationRootProvider
+ {
+ public virtual void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory> graph)
+ {
+ }
+
+ internal abstract IEnumerable<IExternalTypeMapNode> GetExternalTypeMaps();
+
+ internal abstract IEnumerable<IProxyTypeMapNode> GetProxyTypeMaps();
+
+ public abstract void AddCompilationRoots(IRootingServiceProvider rootProvider);
+
+ protected abstract bool IsEmpty { get; }
+
+ public virtual void AddToReadyToRunHeader(ReadyToRunHeaderNode header, NodeFactory nodeFactory, INativeFormatTypeReferenceProvider commonFixupsTableNode)
+ {
+ if (IsEmpty)
+ {
+ return; // No type maps to emit
+ }
+
+ header.Add(ReadyToRunSectionType.ExternalTypeMaps, new ExternalTypeMapObjectNode(this, commonFixupsTableNode));
+ header.Add(ReadyToRunSectionType.ProxyTypeMaps, new ProxyTypeMapObjectNode(this, commonFixupsTableNode));
+ }
+ }
+}

src/coreclr/inc/readytorun.h

@@ -20,7 +20,7 @@
 // If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
 // and handle pending work.
 #define READYTORUN_MAJOR_VERSION 18
-#define READYTORUN_MINOR_VERSION 0x0002
+#define READYTORUN_MINOR_VERSION 0x0003
 
 #define MINIMUM_READYTORUN_MAJOR_VERSION 18
 
@@ -53,6 +53,7 @@
 // R2R Version 17.1 adds the READYTORUN_FLAG_PLATFORM_NATIVE_IMAGE flag to specify that the R2R image pointed to by OwnerCompositeExecutable is in the platform native format.
 // R2R Version 18 updates fields layout algorithm
 // R2R Version 18.2 adds InitClass and InitInstClass helpers
+// R2R Version 18.3 adds the ExternalTypeMaps, ProxyTypeMaps, TypeMapAssemblyTargets sections
 
 struct READYTORUN_CORE_HEADER
 {
@@ -118,6 +119,9 @@ enum class ReadyToRunSectionType : uint32_t
  MethodIsGenericMap = 121, // Added in V9.0
  EnclosingTypeMap = 122, // Added in V9.0
  TypeGenericInfoMap = 123, // Added in V9.0
+ ExternalTypeMaps = 124, // Added in V18.3
+ ProxyTypeMaps = 125, // Added in V18.3
+ TypeMapAssemblyTargets = 126, // Added in V18.3
 
  // If you add a new section consider whether it is a breaking or non-breaking change.
  // Usually it is non-breaking, but if it is preferable to have older runtimes fail

src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
  static const uint32_t Signature = 0x00525452; // 'RTR'
 
  static const uint32_t CurrentMajorVersion = 18;
- static const uint32_t CurrentMinorVersion = 2;
+ static const uint32_t CurrentMinorVersion = 3;
 };
 
 struct ReadyToRunHeader

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.NativeAot.cs

@@ -23,7 +23,7 @@ public static IReadOnlyDictionary<string, Type> CreateExternalTypeMap(RuntimeTyp
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ExternalTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ExternalTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -66,7 +66,7 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ProxyTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ProxyTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -104,14 +104,13 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  throw ReflectionCoreExecution.ExecutionEnvironment.CreateMissingMetadataException(typeMapGroup);
  }
 
- private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReflectionMapBlob blob, out NativeReader reader)
+ private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReadyToRunSectionType sectionType, out NativeReader reader)
  {
- byte* pBlob;
- uint cbBlob;
+ byte* pBlob = (byte*)RuntimeImports.RhGetModuleSection(module, sectionType, out int length);
 
- if (RuntimeImports.RhFindBlob(module, (uint)blob, &pBlob, &cbBlob))
+ if (pBlob != null)
  {
- reader = new NativeReader(pBlob, cbBlob);
+ reader = new NativeReader(pBlob, (uint)length);
  return true;
  }
 

src/coreclr/tools/Common/Compiler/DependencyAnalysis/SortableDependencyNode.cs

@@ -61,7 +61,7 @@ protected internal enum ObjectNodeOrder
  //
  Win32ResourcesNode,
  CorHeaderNode,
-ReadyToRunHeaderNode,
+GlobalHeaderNode,
  ReadyToRunAssemblyHeaderNode,
  ImportSectionsTableNode,
  ImportSectionNode,

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExternalTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ExternalTypeMapObjectNode.cs

@@ -12,7 +12,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-internal sealed class ExternalTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+public sealed class ExternalTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -26,7 +26,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IExternalTypeMapNode externalTypeMap in factory.TypeMapManager.GetExternalTypeMaps())
+ foreach (IExternalTypeMapNode externalTypeMap in manager.GetExternalTypeMaps())
  {
  typeMapGroupHashTable.Append((uint)externalTypeMap.TypeMapGroup.GetHashCode(), externalTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
  }
@@ -42,7 +42,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ExternalTypeMapObjectNode;

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IExternalTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IExternalTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IExternalTypeMapNode : IDependencyNode, ISortableNode
+internal interface IExternalTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
  IExternalTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/Common/Compiler/INativeFormatTypeReferenceProvider.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Internal.NativeFormat;
+using Internal.TypeSystem;
+
+namespace ILCompiler.DependencyAnalysis
+{
+ public interface INativeFormatTypeReferenceProvider
+ {
+ internal Vertex EncodeReferenceToType(NativeWriter writer, TypeDesc type);
+ internal Vertex EncodeReferenceToMethod(NativeWriter writer, MethodDesc method);
+ }
+}

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IProxyTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IProxyTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IProxyTypeMapNode : IDependencyNode, ISortableNode
+internal interface IProxyTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
- IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factor);
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
+ IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ProxyTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ProxyTypeMapObjectNode.cs

@@ -13,7 +13,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
- internal sealed class ProxyTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+ internal sealed class ProxyTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -27,7 +27,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IProxyTypeMapNode proxyTypeMap in factory.TypeMapManager.GetProxyTypeMaps())
+ foreach (IProxyTypeMapNode proxyTypeMap in manager.GetProxyTypeMaps())
  {
  TypeDesc typeMapGroup = proxyTypeMap.TypeMapGroup;
  typeMapGroupHashTable.Append((uint)typeMapGroup.GetHashCode(), proxyTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
@@ -44,7 +44,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ProxyTypeMapObjectNode;

src/coreclr/tools/Common/Compiler/TypeMapManager.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Reflection.Metadata;
+using ILCompiler.DependencyAnalysis;
+#if READYTORUN
+using ILCompiler.DependencyAnalysis.ReadyToRun;
+#endif
+using ILCompiler.DependencyAnalysisFramework;
+using Internal.Runtime;
+using Internal.TypeSystem;
+
+namespace ILCompiler
+{
+
+ /// <summary>
+ /// This class is responsible for managing emitted data for type maps.
+ /// </summary>
+ public abstract class TypeMapManager : ICompilationRootProvider
+ {
+ public virtual void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory> graph)
+ {
+ }
+
+ internal abstract IEnumerable<IExternalTypeMapNode> GetExternalTypeMaps();
+
+ internal abstract IEnumerable<IProxyTypeMapNode> GetProxyTypeMaps();
+
+ public abstract void AddCompilationRoots(IRootingServiceProvider rootProvider);
+
+ protected abstract bool IsEmpty { get; }
+
+ public virtual void AddToReadyToRunHeader(ReadyToRunHeaderNode header, NodeFactory nodeFactory, INativeFormatTypeReferenceProvider commonFixupsTableNode)
+ {
+ if (IsEmpty)
+ {
+ return; // No type maps to emit
+ }
+
+ header.Add(ReadyToRunSectionType.ExternalTypeMaps, new ExternalTypeMapObjectNode(this, commonFixupsTableNode));
+ header.Add(ReadyToRunSectionType.ProxyTypeMaps, new ProxyTypeMapObjectNode(this, commonFixupsTableNode));
+ }
+ }
+}

src/coreclr/inc/readytorun.h

@@ -20,7 +20,7 @@
 // If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
 // and handle pending work.
 #define READYTORUN_MAJOR_VERSION 18
-#define READYTORUN_MINOR_VERSION 0x0002
+#define READYTORUN_MINOR_VERSION 0x0003
 
 #define MINIMUM_READYTORUN_MAJOR_VERSION 18
 
@@ -53,6 +53,7 @@
 // R2R Version 17.1 adds the READYTORUN_FLAG_PLATFORM_NATIVE_IMAGE flag to specify that the R2R image pointed to by OwnerCompositeExecutable is in the platform native format.
 // R2R Version 18 updates fields layout algorithm
 // R2R Version 18.2 adds InitClass and InitInstClass helpers
+// R2R Version 18.3 adds the ExternalTypeMaps, ProxyTypeMaps, TypeMapAssemblyTargets sections
 
 struct READYTORUN_CORE_HEADER
 {
@@ -118,6 +119,9 @@ enum class ReadyToRunSectionType : uint32_t
  MethodIsGenericMap = 121, // Added in V9.0
  EnclosingTypeMap = 122, // Added in V9.0
  TypeGenericInfoMap = 123, // Added in V9.0
+ ExternalTypeMaps = 124, // Added in V18.3
+ ProxyTypeMaps = 125, // Added in V18.3
+ TypeMapAssemblyTargets = 126, // Added in V18.3
 
  // If you add a new section consider whether it is a breaking or non-breaking change.
  // Usually it is non-breaking, but if it is preferable to have older runtimes fail

src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
  static const uint32_t Signature = 0x00525452; // 'RTR'
 
  static const uint32_t CurrentMajorVersion = 18;
- static const uint32_t CurrentMinorVersion = 2;
+ static const uint32_t CurrentMinorVersion = 3;
 };
 
 struct ReadyToRunHeader

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.NativeAot.cs

@@ -23,7 +23,7 @@ public static IReadOnlyDictionary<string, Type> CreateExternalTypeMap(RuntimeTyp
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ExternalTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ExternalTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -66,7 +66,7 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ProxyTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ProxyTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -104,14 +104,13 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  throw ReflectionCoreExecution.ExecutionEnvironment.CreateMissingMetadataException(typeMapGroup);
  }
 
- private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReflectionMapBlob blob, out NativeReader reader)
+ private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReadyToRunSectionType sectionType, out NativeReader reader)
  {
- byte* pBlob;
- uint cbBlob;
+ byte* pBlob = (byte*)RuntimeImports.RhGetModuleSection(module, sectionType, out int length);
 
- if (RuntimeImports.RhFindBlob(module, (uint)blob, &pBlob, &cbBlob))
+ if (pBlob != null)
  {
- reader = new NativeReader(pBlob, cbBlob);
+ reader = new NativeReader(pBlob, (uint)length);
  return true;
  }
 

src/coreclr/tools/Common/Compiler/DependencyAnalysis/SortableDependencyNode.cs

@@ -61,7 +61,7 @@ protected internal enum ObjectNodeOrder
  //
  Win32ResourcesNode,
  CorHeaderNode,
-ReadyToRunHeaderNode,
+GlobalHeaderNode,
  ReadyToRunAssemblyHeaderNode,
  ImportSectionsTableNode,
  ImportSectionNode,

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExternalTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ExternalTypeMapObjectNode.cs

@@ -12,7 +12,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-internal sealed class ExternalTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+public sealed class ExternalTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -26,7 +26,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IExternalTypeMapNode externalTypeMap in factory.TypeMapManager.GetExternalTypeMaps())
+ foreach (IExternalTypeMapNode externalTypeMap in manager.GetExternalTypeMaps())
  {
  typeMapGroupHashTable.Append((uint)externalTypeMap.TypeMapGroup.GetHashCode(), externalTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
  }
@@ -42,7 +42,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ExternalTypeMapObjectNode;

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IExternalTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IExternalTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IExternalTypeMapNode : IDependencyNode, ISortableNode
+internal interface IExternalTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
  IExternalTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/Common/Compiler/INativeFormatTypeReferenceProvider.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Internal.NativeFormat;
+using Internal.TypeSystem;
+
+namespace ILCompiler.DependencyAnalysis
+{
+ public interface INativeFormatTypeReferenceProvider
+ {
+ internal Vertex EncodeReferenceToType(NativeWriter writer, TypeDesc type);
+ internal Vertex EncodeReferenceToMethod(NativeWriter writer, MethodDesc method);
+ }
+}

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IProxyTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IProxyTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IProxyTypeMapNode : IDependencyNode, ISortableNode
+internal interface IProxyTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
- IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factor);
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
+ IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ProxyTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ProxyTypeMapObjectNode.cs

@@ -13,7 +13,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
- internal sealed class ProxyTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+ internal sealed class ProxyTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -27,7 +27,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IProxyTypeMapNode proxyTypeMap in factory.TypeMapManager.GetProxyTypeMaps())
+ foreach (IProxyTypeMapNode proxyTypeMap in manager.GetProxyTypeMaps())
  {
  TypeDesc typeMapGroup = proxyTypeMap.TypeMapGroup;
  typeMapGroupHashTable.Append((uint)typeMapGroup.GetHashCode(), proxyTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
@@ -44,7 +44,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ProxyTypeMapObjectNode;

src/coreclr/tools/Common/Compiler/TypeMapManager.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Reflection.Metadata;
+using ILCompiler.DependencyAnalysis;
+#if READYTORUN
+using ILCompiler.DependencyAnalysis.ReadyToRun;
+#endif
+using ILCompiler.DependencyAnalysisFramework;
+using Internal.Runtime;
+using Internal.TypeSystem;
+
+namespace ILCompiler
+{
+
+ /// <summary>
+ /// This class is responsible for managing emitted data for type maps.
+ /// </summary>
+ public abstract class TypeMapManager : ICompilationRootProvider
+ {
+ public virtual void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory> graph)
+ {
+ }
+
+ internal abstract IEnumerable<IExternalTypeMapNode> GetExternalTypeMaps();
+
+ internal abstract IEnumerable<IProxyTypeMapNode> GetProxyTypeMaps();
+
+ public abstract void AddCompilationRoots(IRootingServiceProvider rootProvider);
+
+ protected abstract bool IsEmpty { get; }
+
+ public virtual void AddToReadyToRunHeader(ReadyToRunHeaderNode header, NodeFactory nodeFactory, INativeFormatTypeReferenceProvider commonFixupsTableNode)
+ {
+ if (IsEmpty)
+ {
+ return; // No type maps to emit
+ }
+
+ header.Add(ReadyToRunSectionType.ExternalTypeMaps, new ExternalTypeMapObjectNode(this, commonFixupsTableNode));
+ header.Add(ReadyToRunSectionType.ProxyTypeMaps, new ProxyTypeMapObjectNode(this, commonFixupsTableNode));
+ }
+ }
+}

src/coreclr/inc/readytorun.h

@@ -20,7 +20,7 @@
 // If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
 // and handle pending work.
 #define READYTORUN_MAJOR_VERSION 18
-#define READYTORUN_MINOR_VERSION 0x0002
+#define READYTORUN_MINOR_VERSION 0x0003
 
 #define MINIMUM_READYTORUN_MAJOR_VERSION 18
 
@@ -53,6 +53,7 @@
 // R2R Version 17.1 adds the READYTORUN_FLAG_PLATFORM_NATIVE_IMAGE flag to specify that the R2R image pointed to by OwnerCompositeExecutable is in the platform native format.
 // R2R Version 18 updates fields layout algorithm
 // R2R Version 18.2 adds InitClass and InitInstClass helpers
+// R2R Version 18.3 adds the ExternalTypeMaps, ProxyTypeMaps, TypeMapAssemblyTargets sections
 
 struct READYTORUN_CORE_HEADER
 {
@@ -118,6 +119,9 @@ enum class ReadyToRunSectionType : uint32_t
  MethodIsGenericMap = 121, // Added in V9.0
  EnclosingTypeMap = 122, // Added in V9.0
  TypeGenericInfoMap = 123, // Added in V9.0
+ ExternalTypeMaps = 124, // Added in V18.3
+ ProxyTypeMaps = 125, // Added in V18.3
+ TypeMapAssemblyTargets = 126, // Added in V18.3
 
  // If you add a new section consider whether it is a breaking or non-breaking change.
  // Usually it is non-breaking, but if it is preferable to have older runtimes fail

src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
  static const uint32_t Signature = 0x00525452; // 'RTR'
 
  static const uint32_t CurrentMajorVersion = 18;
- static const uint32_t CurrentMinorVersion = 2;
+ static const uint32_t CurrentMinorVersion = 3;
 };
 
 struct ReadyToRunHeader

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.NativeAot.cs

@@ -23,7 +23,7 @@ public static IReadOnlyDictionary<string, Type> CreateExternalTypeMap(RuntimeTyp
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ExternalTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ExternalTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -66,7 +66,7 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ProxyTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ProxyTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -104,14 +104,13 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  throw ReflectionCoreExecution.ExecutionEnvironment.CreateMissingMetadataException(typeMapGroup);
  }
 
- private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReflectionMapBlob blob, out NativeReader reader)
+ private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReadyToRunSectionType sectionType, out NativeReader reader)
  {
- byte* pBlob;
- uint cbBlob;
+ byte* pBlob = (byte*)RuntimeImports.RhGetModuleSection(module, sectionType, out int length);
 
- if (RuntimeImports.RhFindBlob(module, (uint)blob, &pBlob, &cbBlob))
+ if (pBlob != null)
  {
- reader = new NativeReader(pBlob, cbBlob);
+ reader = new NativeReader(pBlob, (uint)length);
  return true;
  }
 

src/coreclr/tools/Common/Compiler/DependencyAnalysis/SortableDependencyNode.cs

@@ -61,7 +61,7 @@ protected internal enum ObjectNodeOrder
  //
  Win32ResourcesNode,
  CorHeaderNode,
-ReadyToRunHeaderNode,
+GlobalHeaderNode,
  ReadyToRunAssemblyHeaderNode,
  ImportSectionsTableNode,
  ImportSectionNode,

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExternalTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ExternalTypeMapObjectNode.cs

@@ -12,7 +12,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-internal sealed class ExternalTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+public sealed class ExternalTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -26,7 +26,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IExternalTypeMapNode externalTypeMap in factory.TypeMapManager.GetExternalTypeMaps())
+ foreach (IExternalTypeMapNode externalTypeMap in manager.GetExternalTypeMaps())
  {
  typeMapGroupHashTable.Append((uint)externalTypeMap.TypeMapGroup.GetHashCode(), externalTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
  }
@@ -42,7 +42,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ExternalTypeMapObjectNode;

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IExternalTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IExternalTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IExternalTypeMapNode : IDependencyNode, ISortableNode
+internal interface IExternalTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
  IExternalTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/Common/Compiler/INativeFormatTypeReferenceProvider.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Internal.NativeFormat;
+using Internal.TypeSystem;
+
+namespace ILCompiler.DependencyAnalysis
+{
+ public interface INativeFormatTypeReferenceProvider
+ {
+ internal Vertex EncodeReferenceToType(NativeWriter writer, TypeDesc type);
+ internal Vertex EncodeReferenceToMethod(NativeWriter writer, MethodDesc method);
+ }
+}

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IProxyTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IProxyTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IProxyTypeMapNode : IDependencyNode, ISortableNode
+internal interface IProxyTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
- IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factor);
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
+ IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ProxyTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ProxyTypeMapObjectNode.cs

@@ -13,7 +13,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
- internal sealed class ProxyTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+ internal sealed class ProxyTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -27,7 +27,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IProxyTypeMapNode proxyTypeMap in factory.TypeMapManager.GetProxyTypeMaps())
+ foreach (IProxyTypeMapNode proxyTypeMap in manager.GetProxyTypeMaps())
  {
  TypeDesc typeMapGroup = proxyTypeMap.TypeMapGroup;
  typeMapGroupHashTable.Append((uint)typeMapGroup.GetHashCode(), proxyTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
@@ -44,7 +44,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ProxyTypeMapObjectNode;

src/coreclr/tools/Common/Compiler/TypeMapManager.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Reflection.Metadata;
+using ILCompiler.DependencyAnalysis;
+#if READYTORUN
+using ILCompiler.DependencyAnalysis.ReadyToRun;
+#endif
+using ILCompiler.DependencyAnalysisFramework;
+using Internal.Runtime;
+using Internal.TypeSystem;
+
+namespace ILCompiler
+{
+
+ /// <summary>
+ /// This class is responsible for managing emitted data for type maps.
+ /// </summary>
+ public abstract class TypeMapManager : ICompilationRootProvider
+ {
+ public virtual void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory> graph)
+ {
+ }
+
+ internal abstract IEnumerable<IExternalTypeMapNode> GetExternalTypeMaps();
+
+ internal abstract IEnumerable<IProxyTypeMapNode> GetProxyTypeMaps();
+
+ public abstract void AddCompilationRoots(IRootingServiceProvider rootProvider);
+
+ protected abstract bool IsEmpty { get; }
+
+ public virtual void AddToReadyToRunHeader(ReadyToRunHeaderNode header, NodeFactory nodeFactory, INativeFormatTypeReferenceProvider commonFixupsTableNode)
+ {
+ if (IsEmpty)
+ {
+ return; // No type maps to emit
+ }
+
+ header.Add(ReadyToRunSectionType.ExternalTypeMaps, new ExternalTypeMapObjectNode(this, commonFixupsTableNode));
+ header.Add(ReadyToRunSectionType.ProxyTypeMaps, new ProxyTypeMapObjectNode(this, commonFixupsTableNode));
+ }
+ }
+}

src/coreclr/inc/readytorun.h

@@ -20,7 +20,7 @@
 // If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
 // and handle pending work.
 #define READYTORUN_MAJOR_VERSION 18
-#define READYTORUN_MINOR_VERSION 0x0002
+#define READYTORUN_MINOR_VERSION 0x0003
 
 #define MINIMUM_READYTORUN_MAJOR_VERSION 18
 
@@ -53,6 +53,7 @@
 // R2R Version 17.1 adds the READYTORUN_FLAG_PLATFORM_NATIVE_IMAGE flag to specify that the R2R image pointed to by OwnerCompositeExecutable is in the platform native format.
 // R2R Version 18 updates fields layout algorithm
 // R2R Version 18.2 adds InitClass and InitInstClass helpers
+// R2R Version 18.3 adds the ExternalTypeMaps, ProxyTypeMaps, TypeMapAssemblyTargets sections
 
 struct READYTORUN_CORE_HEADER
 {
@@ -118,6 +119,9 @@ enum class ReadyToRunSectionType : uint32_t
  MethodIsGenericMap = 121, // Added in V9.0
  EnclosingTypeMap = 122, // Added in V9.0
  TypeGenericInfoMap = 123, // Added in V9.0
+ ExternalTypeMaps = 124, // Added in V18.3
+ ProxyTypeMaps = 125, // Added in V18.3
+ TypeMapAssemblyTargets = 126, // Added in V18.3
 
  // If you add a new section consider whether it is a breaking or non-breaking change.
  // Usually it is non-breaking, but if it is preferable to have older runtimes fail

src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
  static const uint32_t Signature = 0x00525452; // 'RTR'
 
  static const uint32_t CurrentMajorVersion = 18;
- static const uint32_t CurrentMinorVersion = 2;
+ static const uint32_t CurrentMinorVersion = 3;
 };
 
 struct ReadyToRunHeader

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.NativeAot.cs

@@ -23,7 +23,7 @@ public static IReadOnlyDictionary<string, Type> CreateExternalTypeMap(RuntimeTyp
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ExternalTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ExternalTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -66,7 +66,7 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ProxyTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ProxyTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -104,14 +104,13 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  throw ReflectionCoreExecution.ExecutionEnvironment.CreateMissingMetadataException(typeMapGroup);
  }
 
- private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReflectionMapBlob blob, out NativeReader reader)
+ private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReadyToRunSectionType sectionType, out NativeReader reader)
  {
- byte* pBlob;
- uint cbBlob;
+ byte* pBlob = (byte*)RuntimeImports.RhGetModuleSection(module, sectionType, out int length);
 
- if (RuntimeImports.RhFindBlob(module, (uint)blob, &pBlob, &cbBlob))
+ if (pBlob != null)
  {
- reader = new NativeReader(pBlob, cbBlob);
+ reader = new NativeReader(pBlob, (uint)length);
  return true;
  }
 

src/coreclr/tools/Common/Compiler/DependencyAnalysis/SortableDependencyNode.cs

@@ -61,7 +61,7 @@ protected internal enum ObjectNodeOrder
  //
  Win32ResourcesNode,
  CorHeaderNode,
-ReadyToRunHeaderNode,
+GlobalHeaderNode,
  ReadyToRunAssemblyHeaderNode,
  ImportSectionsTableNode,
  ImportSectionNode,

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExternalTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ExternalTypeMapObjectNode.cs

@@ -12,7 +12,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-internal sealed class ExternalTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+public sealed class ExternalTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -26,7 +26,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IExternalTypeMapNode externalTypeMap in factory.TypeMapManager.GetExternalTypeMaps())
+ foreach (IExternalTypeMapNode externalTypeMap in manager.GetExternalTypeMaps())
  {
  typeMapGroupHashTable.Append((uint)externalTypeMap.TypeMapGroup.GetHashCode(), externalTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
  }
@@ -42,7 +42,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ExternalTypeMapObjectNode;

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IExternalTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IExternalTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IExternalTypeMapNode : IDependencyNode, ISortableNode
+internal interface IExternalTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
  IExternalTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/Common/Compiler/INativeFormatTypeReferenceProvider.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Internal.NativeFormat;
+using Internal.TypeSystem;
+
+namespace ILCompiler.DependencyAnalysis
+{
+ public interface INativeFormatTypeReferenceProvider
+ {
+ internal Vertex EncodeReferenceToType(NativeWriter writer, TypeDesc type);
+ internal Vertex EncodeReferenceToMethod(NativeWriter writer, MethodDesc method);
+ }
+}

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IProxyTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IProxyTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IProxyTypeMapNode : IDependencyNode, ISortableNode
+internal interface IProxyTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
- IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factor);
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
+ IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ProxyTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ProxyTypeMapObjectNode.cs

@@ -13,7 +13,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
- internal sealed class ProxyTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+ internal sealed class ProxyTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -27,7 +27,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IProxyTypeMapNode proxyTypeMap in factory.TypeMapManager.GetProxyTypeMaps())
+ foreach (IProxyTypeMapNode proxyTypeMap in manager.GetProxyTypeMaps())
  {
  TypeDesc typeMapGroup = proxyTypeMap.TypeMapGroup;
  typeMapGroupHashTable.Append((uint)typeMapGroup.GetHashCode(), proxyTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
@@ -44,7 +44,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ProxyTypeMapObjectNode;

src/coreclr/tools/Common/Compiler/TypeMapManager.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Reflection.Metadata;
+using ILCompiler.DependencyAnalysis;
+#if READYTORUN
+using ILCompiler.DependencyAnalysis.ReadyToRun;
+#endif
+using ILCompiler.DependencyAnalysisFramework;
+using Internal.Runtime;
+using Internal.TypeSystem;
+
+namespace ILCompiler
+{
+
+ /// <summary>
+ /// This class is responsible for managing emitted data for type maps.
+ /// </summary>
+ public abstract class TypeMapManager : ICompilationRootProvider
+ {
+ public virtual void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory> graph)
+ {
+ }
+
+ internal abstract IEnumerable<IExternalTypeMapNode> GetExternalTypeMaps();
+
+ internal abstract IEnumerable<IProxyTypeMapNode> GetProxyTypeMaps();
+
+ public abstract void AddCompilationRoots(IRootingServiceProvider rootProvider);
+
+ protected abstract bool IsEmpty { get; }
+
+ public virtual void AddToReadyToRunHeader(ReadyToRunHeaderNode header, NodeFactory nodeFactory, INativeFormatTypeReferenceProvider commonFixupsTableNode)
+ {
+ if (IsEmpty)
+ {
+ return; // No type maps to emit
+ }
+
+ header.Add(ReadyToRunSectionType.ExternalTypeMaps, new ExternalTypeMapObjectNode(this, commonFixupsTableNode));
+ header.Add(ReadyToRunSectionType.ProxyTypeMaps, new ProxyTypeMapObjectNode(this, commonFixupsTableNode));
+ }
+ }
+}

src/coreclr/inc/readytorun.h

@@ -20,7 +20,7 @@
 // If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
 // and handle pending work.
 #define READYTORUN_MAJOR_VERSION 18
-#define READYTORUN_MINOR_VERSION 0x0002
+#define READYTORUN_MINOR_VERSION 0x0003
 
 #define MINIMUM_READYTORUN_MAJOR_VERSION 18
 
@@ -53,6 +53,7 @@
 // R2R Version 17.1 adds the READYTORUN_FLAG_PLATFORM_NATIVE_IMAGE flag to specify that the R2R image pointed to by OwnerCompositeExecutable is in the platform native format.
 // R2R Version 18 updates fields layout algorithm
 // R2R Version 18.2 adds InitClass and InitInstClass helpers
+// R2R Version 18.3 adds the ExternalTypeMaps, ProxyTypeMaps, TypeMapAssemblyTargets sections
 
 struct READYTORUN_CORE_HEADER
 {
@@ -118,6 +119,9 @@ enum class ReadyToRunSectionType : uint32_t
  MethodIsGenericMap = 121, // Added in V9.0
  EnclosingTypeMap = 122, // Added in V9.0
  TypeGenericInfoMap = 123, // Added in V9.0
+ ExternalTypeMaps = 124, // Added in V18.3
+ ProxyTypeMaps = 125, // Added in V18.3
+ TypeMapAssemblyTargets = 126, // Added in V18.3
 
  // If you add a new section consider whether it is a breaking or non-breaking change.
  // Usually it is non-breaking, but if it is preferable to have older runtimes fail

src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
  static const uint32_t Signature = 0x00525452; // 'RTR'
 
  static const uint32_t CurrentMajorVersion = 18;
- static const uint32_t CurrentMinorVersion = 2;
+ static const uint32_t CurrentMinorVersion = 3;
 };
 
 struct ReadyToRunHeader

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.NativeAot.cs

@@ -23,7 +23,7 @@ public static IReadOnlyDictionary<string, Type> CreateExternalTypeMap(RuntimeTyp
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ExternalTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ExternalTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -66,7 +66,7 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ProxyTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ProxyTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -104,14 +104,13 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  throw ReflectionCoreExecution.ExecutionEnvironment.CreateMissingMetadataException(typeMapGroup);
  }
 
- private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReflectionMapBlob blob, out NativeReader reader)
+ private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReadyToRunSectionType sectionType, out NativeReader reader)
  {
- byte* pBlob;
- uint cbBlob;
+ byte* pBlob = (byte*)RuntimeImports.RhGetModuleSection(module, sectionType, out int length);
 
- if (RuntimeImports.RhFindBlob(module, (uint)blob, &pBlob, &cbBlob))
+ if (pBlob != null)
  {
- reader = new NativeReader(pBlob, cbBlob);
+ reader = new NativeReader(pBlob, (uint)length);
  return true;
  }
 

src/coreclr/tools/Common/Compiler/DependencyAnalysis/SortableDependencyNode.cs

@@ -61,7 +61,7 @@ protected internal enum ObjectNodeOrder
  //
  Win32ResourcesNode,
  CorHeaderNode,
-ReadyToRunHeaderNode,
+GlobalHeaderNode,
  ReadyToRunAssemblyHeaderNode,
  ImportSectionsTableNode,
  ImportSectionNode,

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExternalTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ExternalTypeMapObjectNode.cs

@@ -12,7 +12,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-internal sealed class ExternalTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+public sealed class ExternalTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -26,7 +26,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IExternalTypeMapNode externalTypeMap in factory.TypeMapManager.GetExternalTypeMaps())
+ foreach (IExternalTypeMapNode externalTypeMap in manager.GetExternalTypeMaps())
  {
  typeMapGroupHashTable.Append((uint)externalTypeMap.TypeMapGroup.GetHashCode(), externalTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
  }
@@ -42,7 +42,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ExternalTypeMapObjectNode;

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IExternalTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IExternalTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IExternalTypeMapNode : IDependencyNode, ISortableNode
+internal interface IExternalTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
  IExternalTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/Common/Compiler/INativeFormatTypeReferenceProvider.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Internal.NativeFormat;
+using Internal.TypeSystem;
+
+namespace ILCompiler.DependencyAnalysis
+{
+ public interface INativeFormatTypeReferenceProvider
+ {
+ internal Vertex EncodeReferenceToType(NativeWriter writer, TypeDesc type);
+ internal Vertex EncodeReferenceToMethod(NativeWriter writer, MethodDesc method);
+ }
+}

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IProxyTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IProxyTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IProxyTypeMapNode : IDependencyNode, ISortableNode
+internal interface IProxyTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
- IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factor);
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
+ IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ProxyTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ProxyTypeMapObjectNode.cs

@@ -13,7 +13,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
- internal sealed class ProxyTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+ internal sealed class ProxyTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -27,7 +27,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IProxyTypeMapNode proxyTypeMap in factory.TypeMapManager.GetProxyTypeMaps())
+ foreach (IProxyTypeMapNode proxyTypeMap in manager.GetProxyTypeMaps())
  {
  TypeDesc typeMapGroup = proxyTypeMap.TypeMapGroup;
  typeMapGroupHashTable.Append((uint)typeMapGroup.GetHashCode(), proxyTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
@@ -44,7 +44,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ProxyTypeMapObjectNode;

src/coreclr/tools/Common/Compiler/TypeMapManager.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Reflection.Metadata;
+using ILCompiler.DependencyAnalysis;
+#if READYTORUN
+using ILCompiler.DependencyAnalysis.ReadyToRun;
+#endif
+using ILCompiler.DependencyAnalysisFramework;
+using Internal.Runtime;
+using Internal.TypeSystem;
+
+namespace ILCompiler
+{
+
+ /// <summary>
+ /// This class is responsible for managing emitted data for type maps.
+ /// </summary>
+ public abstract class TypeMapManager : ICompilationRootProvider
+ {
+ public virtual void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory> graph)
+ {
+ }
+
+ internal abstract IEnumerable<IExternalTypeMapNode> GetExternalTypeMaps();
+
+ internal abstract IEnumerable<IProxyTypeMapNode> GetProxyTypeMaps();
+
+ public abstract void AddCompilationRoots(IRootingServiceProvider rootProvider);
+
+ protected abstract bool IsEmpty { get; }
+
+ public virtual void AddToReadyToRunHeader(ReadyToRunHeaderNode header, NodeFactory nodeFactory, INativeFormatTypeReferenceProvider commonFixupsTableNode)
+ {
+ if (IsEmpty)
+ {
+ return; // No type maps to emit
+ }
+
+ header.Add(ReadyToRunSectionType.ExternalTypeMaps, new ExternalTypeMapObjectNode(this, commonFixupsTableNode));
+ header.Add(ReadyToRunSectionType.ProxyTypeMaps, new ProxyTypeMapObjectNode(this, commonFixupsTableNode));
+ }
+ }
+}

src/coreclr/inc/readytorun.h

@@ -20,7 +20,7 @@
 // If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
 // and handle pending work.
 #define READYTORUN_MAJOR_VERSION 18
-#define READYTORUN_MINOR_VERSION 0x0002
+#define READYTORUN_MINOR_VERSION 0x0003
 
 #define MINIMUM_READYTORUN_MAJOR_VERSION 18
 
@@ -53,6 +53,7 @@
 // R2R Version 17.1 adds the READYTORUN_FLAG_PLATFORM_NATIVE_IMAGE flag to specify that the R2R image pointed to by OwnerCompositeExecutable is in the platform native format.
 // R2R Version 18 updates fields layout algorithm
 // R2R Version 18.2 adds InitClass and InitInstClass helpers
+// R2R Version 18.3 adds the ExternalTypeMaps, ProxyTypeMaps, TypeMapAssemblyTargets sections
 
 struct READYTORUN_CORE_HEADER
 {
@@ -118,6 +119,9 @@ enum class ReadyToRunSectionType : uint32_t
  MethodIsGenericMap = 121, // Added in V9.0
  EnclosingTypeMap = 122, // Added in V9.0
  TypeGenericInfoMap = 123, // Added in V9.0
+ ExternalTypeMaps = 124, // Added in V18.3
+ ProxyTypeMaps = 125, // Added in V18.3
+ TypeMapAssemblyTargets = 126, // Added in V18.3
 
  // If you add a new section consider whether it is a breaking or non-breaking change.
  // Usually it is non-breaking, but if it is preferable to have older runtimes fail

src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
  static const uint32_t Signature = 0x00525452; // 'RTR'
 
  static const uint32_t CurrentMajorVersion = 18;
- static const uint32_t CurrentMinorVersion = 2;
+ static const uint32_t CurrentMinorVersion = 3;
 };
 
 struct ReadyToRunHeader

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.NativeAot.cs

@@ -23,7 +23,7 @@ public static IReadOnlyDictionary<string, Type> CreateExternalTypeMap(RuntimeTyp
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ExternalTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ExternalTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -66,7 +66,7 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ProxyTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ProxyTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -104,14 +104,13 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  throw ReflectionCoreExecution.ExecutionEnvironment.CreateMissingMetadataException(typeMapGroup);
  }
 
- private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReflectionMapBlob blob, out NativeReader reader)
+ private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReadyToRunSectionType sectionType, out NativeReader reader)
  {
- byte* pBlob;
- uint cbBlob;
+ byte* pBlob = (byte*)RuntimeImports.RhGetModuleSection(module, sectionType, out int length);
 
- if (RuntimeImports.RhFindBlob(module, (uint)blob, &pBlob, &cbBlob))
+ if (pBlob != null)
  {
- reader = new NativeReader(pBlob, cbBlob);
+ reader = new NativeReader(pBlob, (uint)length);
  return true;
  }
 

src/coreclr/tools/Common/Compiler/DependencyAnalysis/SortableDependencyNode.cs

@@ -61,7 +61,7 @@ protected internal enum ObjectNodeOrder
  //
  Win32ResourcesNode,
  CorHeaderNode,
-ReadyToRunHeaderNode,
+GlobalHeaderNode,
  ReadyToRunAssemblyHeaderNode,
  ImportSectionsTableNode,
  ImportSectionNode,

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExternalTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ExternalTypeMapObjectNode.cs

@@ -12,7 +12,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-internal sealed class ExternalTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+public sealed class ExternalTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -26,7 +26,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IExternalTypeMapNode externalTypeMap in factory.TypeMapManager.GetExternalTypeMaps())
+ foreach (IExternalTypeMapNode externalTypeMap in manager.GetExternalTypeMaps())
  {
  typeMapGroupHashTable.Append((uint)externalTypeMap.TypeMapGroup.GetHashCode(), externalTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
  }
@@ -42,7 +42,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ExternalTypeMapObjectNode;

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IExternalTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IExternalTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IExternalTypeMapNode : IDependencyNode, ISortableNode
+internal interface IExternalTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
  IExternalTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/Common/Compiler/INativeFormatTypeReferenceProvider.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Internal.NativeFormat;
+using Internal.TypeSystem;
+
+namespace ILCompiler.DependencyAnalysis
+{
+ public interface INativeFormatTypeReferenceProvider
+ {
+ internal Vertex EncodeReferenceToType(NativeWriter writer, TypeDesc type);
+ internal Vertex EncodeReferenceToMethod(NativeWriter writer, MethodDesc method);
+ }
+}

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IProxyTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IProxyTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IProxyTypeMapNode : IDependencyNode, ISortableNode
+internal interface IProxyTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
- IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factor);
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
+ IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ProxyTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ProxyTypeMapObjectNode.cs

@@ -13,7 +13,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
- internal sealed class ProxyTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+ internal sealed class ProxyTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -27,7 +27,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IProxyTypeMapNode proxyTypeMap in factory.TypeMapManager.GetProxyTypeMaps())
+ foreach (IProxyTypeMapNode proxyTypeMap in manager.GetProxyTypeMaps())
  {
  TypeDesc typeMapGroup = proxyTypeMap.TypeMapGroup;
  typeMapGroupHashTable.Append((uint)typeMapGroup.GetHashCode(), proxyTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
@@ -44,7 +44,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ProxyTypeMapObjectNode;

src/coreclr/tools/Common/Compiler/TypeMapManager.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Reflection.Metadata;
+using ILCompiler.DependencyAnalysis;
+#if READYTORUN
+using ILCompiler.DependencyAnalysis.ReadyToRun;
+#endif
+using ILCompiler.DependencyAnalysisFramework;
+using Internal.Runtime;
+using Internal.TypeSystem;
+
+namespace ILCompiler
+{
+
+ /// <summary>
+ /// This class is responsible for managing emitted data for type maps.
+ /// </summary>
+ public abstract class TypeMapManager : ICompilationRootProvider
+ {
+ public virtual void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory> graph)
+ {
+ }
+
+ internal abstract IEnumerable<IExternalTypeMapNode> GetExternalTypeMaps();
+
+ internal abstract IEnumerable<IProxyTypeMapNode> GetProxyTypeMaps();
+
+ public abstract void AddCompilationRoots(IRootingServiceProvider rootProvider);
+
+ protected abstract bool IsEmpty { get; }
+
+ public virtual void AddToReadyToRunHeader(ReadyToRunHeaderNode header, NodeFactory nodeFactory, INativeFormatTypeReferenceProvider commonFixupsTableNode)
+ {
+ if (IsEmpty)
+ {
+ return; // No type maps to emit
+ }
+
+ header.Add(ReadyToRunSectionType.ExternalTypeMaps, new ExternalTypeMapObjectNode(this, commonFixupsTableNode));
+ header.Add(ReadyToRunSectionType.ProxyTypeMaps, new ProxyTypeMapObjectNode(this, commonFixupsTableNode));
+ }
+ }
+}

src/coreclr/inc/readytorun.h

@@ -20,7 +20,7 @@
 // If you update this, ensure you run `git grep MINIMUM_READYTORUN_MAJOR_VERSION`
 // and handle pending work.
 #define READYTORUN_MAJOR_VERSION 18
-#define READYTORUN_MINOR_VERSION 0x0002
+#define READYTORUN_MINOR_VERSION 0x0003
 
 #define MINIMUM_READYTORUN_MAJOR_VERSION 18
 
@@ -53,6 +53,7 @@
 // R2R Version 17.1 adds the READYTORUN_FLAG_PLATFORM_NATIVE_IMAGE flag to specify that the R2R image pointed to by OwnerCompositeExecutable is in the platform native format.
 // R2R Version 18 updates fields layout algorithm
 // R2R Version 18.2 adds InitClass and InitInstClass helpers
+// R2R Version 18.3 adds the ExternalTypeMaps, ProxyTypeMaps, TypeMapAssemblyTargets sections
 
 struct READYTORUN_CORE_HEADER
 {
@@ -118,6 +119,9 @@ enum class ReadyToRunSectionType : uint32_t
  MethodIsGenericMap = 121, // Added in V9.0
  EnclosingTypeMap = 122, // Added in V9.0
  TypeGenericInfoMap = 123, // Added in V9.0
+ ExternalTypeMaps = 124, // Added in V18.3
+ ProxyTypeMaps = 125, // Added in V18.3
+ TypeMapAssemblyTargets = 126, // Added in V18.3
 
  // If you add a new section consider whether it is a breaking or non-breaking change.
  // Usually it is non-breaking, but if it is preferable to have older runtimes fail

src/coreclr/nativeaot/Runtime/inc/ModuleHeaders.h

@@ -12,7 +12,7 @@ struct ReadyToRunHeaderConstants
  static const uint32_t Signature = 0x00525452; // 'RTR'
 
  static const uint32_t CurrentMajorVersion = 18;
- static const uint32_t CurrentMinorVersion = 2;
+ static const uint32_t CurrentMinorVersion = 3;
 };
 
 struct ReadyToRunHeader

src/coreclr/nativeaot/System.Private.CoreLib/src/System/Runtime/InteropServices/TypeMapLazyDictionary.NativeAot.cs

@@ -23,7 +23,7 @@ public static IReadOnlyDictionary<string, Type> CreateExternalTypeMap(RuntimeTyp
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ExternalTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ExternalTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -66,7 +66,7 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  RuntimeTypeHandle typeMapGroupHandle = typeMapGroup.TypeHandle;
  foreach (TypeManagerHandle module in RuntimeAugments.GetLoadedModules())
  {
- if (!TryGetNativeReaderForBlob(module, ReflectionMapBlob.ProxyTypeMap, out NativeReader externalTypeMapReader))
+ if (!TryGetNativeReaderForBlob(module, ReadyToRunSectionType.ProxyTypeMaps, out NativeReader externalTypeMapReader))
  {
  continue;
  }
@@ -104,14 +104,13 @@ public static IReadOnlyDictionary<Type, Type> CreateProxyTypeMap(RuntimeType typ
  throw ReflectionCoreExecution.ExecutionEnvironment.CreateMissingMetadataException(typeMapGroup);
  }
 
- private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReflectionMapBlob blob, out NativeReader reader)
+ private static unsafe bool TryGetNativeReaderForBlob(TypeManagerHandle module, ReadyToRunSectionType sectionType, out NativeReader reader)
  {
- byte* pBlob;
- uint cbBlob;
+ byte* pBlob = (byte*)RuntimeImports.RhGetModuleSection(module, sectionType, out int length);
 
- if (RuntimeImports.RhFindBlob(module, (uint)blob, &pBlob, &cbBlob))
+ if (pBlob != null)
  {
- reader = new NativeReader(pBlob, cbBlob);
+ reader = new NativeReader(pBlob, (uint)length);
  return true;
  }
 

src/coreclr/tools/Common/Compiler/DependencyAnalysis/SortableDependencyNode.cs

@@ -61,7 +61,7 @@ protected internal enum ObjectNodeOrder
  //
  Win32ResourcesNode,
  CorHeaderNode,
-ReadyToRunHeaderNode,
+GlobalHeaderNode,
  ReadyToRunAssemblyHeaderNode,
  ImportSectionsTableNode,
  ImportSectionNode,

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExternalTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ExternalTypeMapObjectNode.cs

@@ -12,7 +12,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-internal sealed class ExternalTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+public sealed class ExternalTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -26,7 +26,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IExternalTypeMapNode externalTypeMap in factory.TypeMapManager.GetExternalTypeMaps())
+ foreach (IExternalTypeMapNode externalTypeMap in manager.GetExternalTypeMaps())
  {
  typeMapGroupHashTable.Append((uint)externalTypeMap.TypeMapGroup.GetHashCode(), externalTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
  }
@@ -42,7 +42,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ExternalTypeMapObjectNode;

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IExternalTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IExternalTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IExternalTypeMapNode : IDependencyNode, ISortableNode
+internal interface IExternalTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
  IExternalTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/Common/Compiler/INativeFormatTypeReferenceProvider.cs

@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Internal.NativeFormat;
+using Internal.TypeSystem;
+
+namespace ILCompiler.DependencyAnalysis
+{
+ public interface INativeFormatTypeReferenceProvider
+ {
+ internal Vertex EncodeReferenceToType(NativeWriter writer, TypeDesc type);
+ internal Vertex EncodeReferenceToMethod(NativeWriter writer, MethodDesc method);
+ }
+}

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/IProxyTypeMapNode.cs → src/coreclr/tools/Common/Compiler/IProxyTypeMapNode.cs

@@ -10,12 +10,13 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
-public interface IProxyTypeMapNode : IDependencyNode, ISortableNode
+internal interface IProxyTypeMapNode : IDependencyNode, ISortableNode
  {
  TypeDesc TypeMapGroup { get; }
 
- Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, ExternalReferencesTableNode externalReferences);
-
- IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factor);
+ Vertex CreateTypeMap(NodeFactory factory, NativeWriter writer, Section section, INativeFormatTypeReferenceProvider externalReferences);
+#if !READYTORUN
+ IProxyTypeMapNode ToAnalysisBasedNode(NodeFactory factory);
+#endif
  }
 }

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ProxyTypeMapObjectNode.cs → src/coreclr/tools/Common/Compiler/ProxyTypeMapObjectNode.cs

@@ -13,7 +13,7 @@
 
 namespace ILCompiler.DependencyAnalysis
 {
- internal sealed class ProxyTypeMapObjectNode(ExternalReferencesTableNode externalReferences) : ObjectNode, ISymbolDefinitionNode
+ internal sealed class ProxyTypeMapObjectNode(TypeMapManager manager, INativeFormatTypeReferenceProvider externalReferences) : ObjectNode, ISymbolDefinitionNode
  {
  public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  {
@@ -27,7 +27,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
  Section hashTableSection = writer.NewSection();
  hashTableSection.Place(typeMapGroupHashTable);
 
- foreach (IProxyTypeMapNode proxyTypeMap in factory.TypeMapManager.GetProxyTypeMaps())
+ foreach (IProxyTypeMapNode proxyTypeMap in manager.GetProxyTypeMaps())
  {
  TypeDesc typeMapGroup = proxyTypeMap.TypeMapGroup;
  typeMapGroupHashTable.Append((uint)typeMapGroup.GetHashCode(), proxyTypeMap.CreateTypeMap(factory, writer, hashTableSection, externalReferences));
@@ -44,7 +44,7 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
 
  public int Offset => 0;
  public override bool IsShareable => false;
- public override ObjectNodeSection GetSection(NodeFactory factory) => externalReferences.GetSection(factory);
+ public override ObjectNodeSection GetSection(NodeFactory factory) => ObjectNodeSection.ReadOnlyDataSection;
  protected internal override int Phase => (int)ObjectNodePhase.Ordered;
 
  public override int ClassCode => (int)ObjectNodeOrder.ProxyTypeMapObjectNode;

src/coreclr/tools/Common/Compiler/TypeMapManager.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Reflection.Metadata;
+using ILCompiler.DependencyAnalysis;
+#if READYTORUN
+using ILCompiler.DependencyAnalysis.ReadyToRun;
+#endif
+using ILCompiler.DependencyAnalysisFramework;
+using Internal.Runtime;
+using Internal.TypeSystem;
+
+namespace ILCompiler
+{
+
+ /// <summary>
+ /// This class is responsible for managing emitted data for type maps.
+ /// </summary>
+ public abstract class TypeMapManager : ICompilationRootProvider
+ {
+ public virtual void AttachToDependencyGraph(DependencyAnalyzerBase<NodeFactory> graph)
+ {
+ }
+
+ internal abstract IEnumerable<IExternalTypeMapNode> GetExternalTypeMaps();
+
+ internal abstract IEnumerable<IProxyTypeMapNode> GetProxyTypeMaps();
+
+ public abstract void AddCompilationRoots(IRootingServiceProvider rootProvider);
+
+ protected abstract bool IsEmpty { get; }
+
+ public virtual void AddToReadyToRunHeader(ReadyToRunHeaderNode header, NodeFactory nodeFactory, INativeFormatTypeReferenceProvider commonFixupsTableNode)
+ {
+ if (IsEmpty)
+ {
+ return; // No type maps to emit
+ }
+
+ header.Add(ReadyToRunSectionType.ExternalTypeMaps, new ExternalTypeMapObjectNode(this, commonFixupsTableNode));
+ header.Add(ReadyToRunSectionType.ProxyTypeMaps, new ProxyTypeMapObjectNode(this, commonFixupsTableNode));
+ }
+ }
+}