Skip to content

Avoid stripping IL of non-async Task-returning methods #129884

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
jakobbotsch wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −2
Open

Avoid stripping IL of non-async Task-returning methods #129884

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
21 changes: 19 additions & 2 deletions ...ls/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedMethodILNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Reflection.Metadata;

using Internal.Text;
using Internal.TypeSystem;
using Internal.TypeSystem.Ecma;

using Debug = System.Diagnostics.Debug;
Expand Down Expand Up @@ -57,8 +58,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)

if (factory.OptimizationFlags.StripILBodies
&& factory.OptimizationFlags.CompiledMethodDefs.Contains(_method)
&& !_method.HasInstantiation
&& !_method.OwningType.HasInstantiation)
&& !MayNeedILAtRuntime(_method))
{
return new ObjectData(s_minimalILBody, Array.Empty<Relocation>(), 4, new ISymbolDefinitionNode[] { this });
}
Expand All @@ -72,6 +72,23 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
return new ObjectData(bodyBytes, Array.Empty<Relocation>(), 4, new ISymbolDefinitionNode[] { this });
}

private static bool MayNeedILAtRuntime(MethodDesc method)
{
if (method.HasInstantiation || method.OwningType.HasInstantiation)
{
// IL may be needed for new instantiations
Comment thread
jakobbotsch marked this conversation as resolved.
return true;
}

if (method.GetTypicalMethodDefinition().Signature.ReturnsTaskOrValueTask() && !method.IsAsync)
{
// IL may be needed for async version of non-async Task-returning method
Comment thread
jakobbotsch marked this conversation as resolved.
return true;
}

return false;
}

public override int ClassCode => 541651465;

public override int CompareToImpl(ISortableNode other, CompilerComparer comparer)
Expand Down
Loading