add _requiresAlign8 to company and mangled name (#107701)

Co-authored-by: yowl <scott.waye@hubse.com>
dotnet · Sep 11, 2024 · 9abc5de · 9abc5de
1 parent 8dc3e06
commit 9abc5de
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GCStaticEETypeNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GCStaticEETypeNode.cs
@@ -44,6 +44,10 @@ protected override ObjectNodeSection GetDehydratedSection(NodeFactory factory)
         public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb)
         {
             sb.Append("__GCStaticEEType_"u8).Append(_gcMap.ToString());
+            if (_requiresAlign8)
+            {
+                sb.Append("_align8"u8);
+            }
         }
 
         int ISymbolDefinitionNode.Offset
@@ -107,7 +111,14 @@ protected override ObjectData GetDehydratableData(NodeFactory factory, bool relo
 
         public override int CompareToImpl(ISortableNode other, CompilerComparer comparer)
         {
-            return _gcMap.CompareTo(((GCStaticEETypeNode)other)._gcMap);
+            GCStaticEETypeNode otherGCStaticEETypeNode = (GCStaticEETypeNode)other;
+            int mapCompare = _gcMap.CompareTo(otherGCStaticEETypeNode._gcMap);
+            if (mapCompare == 0)
+            {
+                return _requiresAlign8.CompareTo(otherGCStaticEETypeNode._requiresAlign8);
+            }
+
+            return mapCompare;
         }
     }
 }