Skip to content

Emit leaner cctor context for preinitialized types #83065

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
MichalStrehovsky merged 1 commit into from
Mar 7, 2023
Merged

Emit leaner cctor context for preinitialized types #83065

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
9 changes: 7 additions & 2 deletions src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/NonGCStaticsNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,19 +167,24 @@ protected override ObjectData GetDehydratableData(NodeFactory factory, bool relo
builder.EmitZeros(classConstructorContextStorageSize - GetClassConstructorContextSize(_type.Context.Target));

// Emit the actual StaticClassConstructionContext
MethodDesc cctorMethod = _type.GetStaticConstructor();
builder.EmitPointerReloc(factory.ExactCallableAddress(cctorMethod));

// If we're emitting the cctor context, but the type is actually preinitialized, emit the
// cctor context as already executed.
if (!HasLazyStaticConstructor)
{
// Pointer to the cctor: we don't care - emit as zero
builder.EmitZeroPointer();

// Constructor executed
// TODO-NICE: introduce a named constant and also use it in the runner in CoreLib
builder.EmitInt(1);
}
else
{
// Emit pointer to the cctor
MethodDesc cctorMethod = _type.GetStaticConstructor();
builder.EmitPointerReloc(factory.ExactCallableAddress(cctorMethod));

// Constructor didn't execute
builder.EmitInt(0);
}
Expand Down