From 9abc5de8ae1adb8eacec95f44bfaa8c61c8be489 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 16:15:00 -0700 Subject: [PATCH] add _requiresAlign8 to company and mangled name (#107701) Co-authored-by: yowl --- .../DependencyAnalysis/GCStaticEETypeNode.cs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 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 index 9e2c0d74220f6..b4130083ec8ec 100644 --- 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; } } }