Skip to content

Don't excessively generate default constructors #73683

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
Aug 11, 2022
Merged

Don't excessively generate default constructors #73683

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/CanonicalEETypeNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,10 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
}

// Keep track of the default constructor map dependency for this type if it has a default constructor
// We only do this for reflection blocked types because dataflow analysis is responsible for
// generating default constructors for Activator.CreateInstance in other cases.
MethodDesc defaultCtor = closestDefType.GetDefaultConstructor();
if (defaultCtor != null)
if (defaultCtor != null && factory.MetadataManager.IsReflectionBlocked(defaultCtor))
{
dependencyList.Add(new DependencyListEntry(
factory.CanonicalEntrypoint(defaultCtor),
Expand Down
6 changes: 4 additions & 2 deletions ...oreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ConstructedEETypeNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,13 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
factory.InteropStubManager.AddInterestingInteropConstructedTypeDependencies(ref dependencyList, factory, _type);

// Keep track of the default constructor map dependency for this type if it has a default constructor
// We only do this for reflection blocked types because dataflow analysis is responsible for
// generating default constructors for Activator.CreateInstance in other cases.
MethodDesc defaultCtor = closestDefType.GetDefaultConstructor();
if (defaultCtor != null)
if (defaultCtor != null && factory.MetadataManager.IsReflectionBlocked(defaultCtor))
{
dependencyList.Add(new DependencyListEntry(
factory.CanonicalEntrypoint(defaultCtor),
factory.CanonicalEntrypoint(defaultCtor),
"DefaultConstructorNode"));
}

Expand Down
9 changes: 9 additions & 0 deletions ...lr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/DefaultConstructorMapNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,15 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
if (defaultCtor == null)
continue;

// We only place default constructors of reflection-blocked types in this table.
// At runtime, the type loader will search both this table and the invoke map
// for default constructor info. If the ctor is reflectable, we would have
// expected dataflow analysis to ensure there's a reflectable method for it.
// If we don't find a reflectable method for the ctor of a non-blocked type
// there would have to be a dataflow analysis warning.
if (!factory.MetadataManager.IsReflectionBlocked(defaultCtor))
continue;

defaultCtor = defaultCtor.GetCanonMethodTarget(CanonicalFormKind.Specific);

ISymbolNode typeNode = factory.NecessaryTypeSymbol(type);
Expand Down