Skip to content

[NativeAOT] Emit managed thread-static storage layouts in Unix DWARF #133636

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

Open
max-charlamb wants to merge 2 commits into
base: main
Choose a base branch
from
+43 −10
Open

[NativeAOT] Emit managed thread-static storage layouts in Unix DWARF #133636

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f23eee
Emit NativeAOT Unix thread-static storage layouts
max-charlamb Sep 11, 2026
3391a55
Unify thread-static field descriptors
Sep 21, 2026
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
53 changes: 43 additions & 10 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/UserDefinedTypeDescriptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,13 @@ private uint GetClassTypeIndex(TypeDesc type, bool needsCompleteType)

if (fieldDesc.IsStatic)
{
if (fieldDesc.IsThreadStatic)
threadStaticFields.Add(field);
else if (fieldDesc.HasGCStaticBase)
gcStaticFields.Add(field);
else
nonGcStaticFields.Add(field);

if (NodeFactory.Target.OperatingSystem != TargetOS.Windows)
{
StaticDataFieldDescriptor staticDesc = new StaticDataFieldDescriptor
Expand All @@ -695,15 +702,10 @@ private uint GetClassTypeIndex(TypeDesc type, bool needsCompleteType)
staticDesc.IsStaticDataInObject = 0;
}

// The DWARF writer pairs static declarations and locations by index.
fieldsDescs.Add(field);
staticsDescs.Add(staticDesc);
Comment thread
max-charlamb marked this conversation as resolved.
}

if (fieldDesc.IsThreadStatic)
threadStaticFields.Add(field);
else if (fieldDesc.HasGCStaticBase)
gcStaticFields.Add(field);
else
nonGcStaticFields.Add(field);
}
else
{
Expand All @@ -719,9 +721,7 @@ private uint GetClassTypeIndex(TypeDesc type, bool needsCompleteType)
}
else
{
fieldsDescs.AddRange(nonGcStaticFields);
fieldsDescs.AddRange(gcStaticFields);
fieldsDescs.AddRange(threadStaticFields);
EmitThreadStaticFieldRegionType(defType, threadStaticFields);
}

DataFieldDescriptor[] fields = new DataFieldDescriptor[fieldsDescs.Count];
Expand Down Expand Up @@ -844,6 +844,39 @@ private void InsertStaticFieldRegionMember(List<DataFieldDescriptor> fieldDescs,
}
}

private void EmitThreadStaticFieldRegionType(
DefType defType,
List<DataFieldDescriptor> staticFields)
{
if (staticFields.Count == 0)
return;

LayoutInt regionSize = defType.ThreadGcStaticFieldSize;
ulong emittedRegionSize = regionSize.IsIndeterminate ? 0 : (ulong)regionSize.AsInt;

ClassFieldsTypeDescriptor fieldsDescriptor = new ClassFieldsTypeDescriptor
{
Size = emittedRegionSize,
FieldsCount = staticFields.Count
};

ClassTypeDescriptor classTypeDescriptor = new ClassTypeDescriptor
{
IsStruct = 0,
Name = Utf8String.Concat(
"__type"u8,
NodeFactory.NameMangler.NodeMangler.ThreadStatics(defType).AsSpan()),
BaseClassId = GetTypeIndex(defType.Context.GetWellKnownType(WellKnownType.Object), true),
InstanceSize = emittedRegionSize
};

_objectWriter.GetCompleteClassTypeIndex(
classTypeDescriptor,
fieldsDescriptor,
staticFields.ToArray(),
null);
}

private uint GetPrimitiveTypeIndex(TypeDesc type)
{
Debug.Assert(type.IsPrimitive, "it is not a primitive type");
Expand Down