Hooking up the baseline TOC logic so that the compiler would reuse ordinals of a baseline build when provided with one during exportations.

Cleanup dead code.

[tfs-changeset: 1703636]

1 files changed, 6 insertions, 4 deletions

diff --git a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MrtProcessedExportAddressTableNode.cs b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MrtProcessedExportAddressTableNode.cs
index 50c3e3a8f..0be12b938 100644
--- a/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MrtProcessedExportAddressTableNode.cs
+++ b/src/ILCompiler.Compiler/src/Compiler/DependencyAnalysis/MrtProcessedExportAddressTableNode.cs
@@ -24,7 +24,8 @@ namespace ILCompiler.DependencyAnalysis
             _factory = factory;
         }
 
-        public event Action<int, IExportableSymbolNode> ReportExportedItem;
+        public event Func<uint, IExportableSymbolNode, bool> ReportExportedItem;
+        public event Func<uint> GetInitialExportOrdinal;
 
         public void AddExportableSymbol(IExportableSymbolNode exportableSymbol)
         {
@@ -75,12 +76,13 @@ namespace ILCompiler.DependencyAnalysis
             builder.EmitInt(1); // Export table version 1
             builder.EmitInt(symbolNodes.Length); // Count of exported symbols in this table
 
-            int index = 1;
+            uint index = GetInitialExportOrdinal == null ? 1 : GetInitialExportOrdinal();
             foreach (ISortableSymbolNode symbol in symbolNodes)
             {
                 builder.EmitReloc(symbol, RelocType.IMAGE_REL_BASED_REL32);
-                ReportExportedItem?.Invoke(index, (IExportableSymbolNode)symbol);
-                index++;
+                bool? baselineOrdinalFound = ReportExportedItem?.Invoke(index, (IExportableSymbolNode)symbol);
+                if (baselineOrdinalFound.HasValue && !baselineOrdinalFound.Value)
+                    index++;
             }
 
             return builder.ToObjectData();