Skip to content

Make IL Scanner report both variants #128107

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
eduardo-vp merged 6 commits into from
May 15, 2026
+29 −27
Merged

Make IL Scanner report both variants #128107

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a17eae7
Make IL Scanner report both variants
May 13, 2026
db0eb55
Refactor ImportCall
May 13, 2026
ad95ad2
Adjust refactor
May 13, 2026
0dde1cc
Adjust refactor
May 13, 2026
72868ac
Merge branch 'main' into ilcscanner-report-both-variants
eduardo-vp May 14, 2026
f5c57f0
Enable test
May 14, 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
21 changes: 17 additions & 4 deletions src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs
View file
Open in desktop
Comment thread
MichalStrehovsky marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,8 @@ private void ImportCall(ILOpcode opcode, int token)
Debug.Assert(false); break;
}

MethodDesc asyncVariantMethod = null;
MethodDesc asyncVariantRuntimeDeterminedMethod = null;
Comment thread
eduardo-vp marked this conversation as resolved.
Outdated
// Are we scanning a call within a state machine?
if (opcode is ILOpcode.call or ILOpcode.callvirt
&& _canonMethod.IsAsyncCall())
Expand All @@ -475,8 +477,10 @@ private void ImportCall(ILOpcode opcode, int token)
_dependencies.Add(_factory.MethodEntrypoint(asyncHelpers.GetKnownMethod("FinishSuspensionWithContinuationContext"u8, null)), asyncReason);
}

// If this is the task await pattern, we're actually going to call the variant
// so switch our focus to the variant.
// If this is the task await pattern, the JIT will first resolve the call to the
// async variant, then may switch back to the original if the async variant is just
// a thunk (for non-runtime-async methods). Report both variants as dependencies such
// that the JIT can pick either one.
Comment thread
eduardo-vp marked this conversation as resolved.

// in rare cases a method that returns Task is not actually TaskReturning (i.e. returns T).
// we cannot resolve to an Async variant in such case.
Expand All @@ -487,11 +491,20 @@ private void ImportCall(ILOpcode opcode, int token)

if (allowAsyncVariant && MatchTaskAwaitPattern())
{
runtimeDeterminedMethod = _factory.TypeSystemContext.GetAsyncVariantMethod(runtimeDeterminedMethod);
method = _factory.TypeSystemContext.GetAsyncVariantMethod(method);
asyncVariantMethod = _factory.TypeSystemContext.GetAsyncVariantMethod(method);
asyncVariantRuntimeDeterminedMethod = _factory.TypeSystemContext.GetAsyncVariantMethod(runtimeDeterminedMethod);
}
}

ImportCall(opcode, reason, method, runtimeDeterminedMethod);
if (asyncVariantMethod != null)
{
ImportCall(opcode, reason, asyncVariantMethod, asyncVariantRuntimeDeterminedMethod);
}
}

private void ImportCall(ILOpcode opcode, string reason, MethodDesc method, MethodDesc runtimeDeterminedMethod)
{
if (opcode == ILOpcode.newobj)
{
TypeDesc owningType = runtimeDeterminedMethod.OwningType;
Expand Down
Loading