Skip to content

[release/9.0] Add the _requiresAlign8 bool to the compare and mangled name for GCStaticEETypeNode.cs #107701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotas merged 1 commit into from
Sep 11, 2024
Merged

[release/9.0] Add the _requiresAlign8 bool to the compare and mangled name for GCStaticEETypeNode.cs #107701

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GCStaticEETypeNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
}
}