Skip to content

Scan calli dependencies #72413

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
merged 1 commit into from
Jul 19, 2022
Merged

Scan calli dependencies #72413

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
32 changes: 25 additions & 7 deletions src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,6 @@ private void EndImportingInstruction()
_isReadOnly = false;
}

private void ImportJmp(int token)
{
// JMP is kind of like a tail call (with no arguments pushed on the stack).
ImportCall(ILOpcode.call, token);
}

private void ImportCasting(ILOpcode opcode, int token)
{
TypeDesc type = (TypeDesc)_methodIL.GetObject(token);
Expand Down Expand Up @@ -767,6 +761,31 @@ private void ImportLdFtn(int token, ILOpcode opCode)
ImportCall(opCode, token);
}

private void ImportJmp(int token)
Copy link
Member Author

@jkotas jkotas Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just to have all call-like opcodes together.

{
// JMP is kind of like a tail call (with no arguments pushed on the stack).
ImportCall(ILOpcode.call, token);
}

private void ImportCalli(int token)
{
MethodSignature signature = (MethodSignature)_methodIL.GetObject(token);

// Managed calli
if ((signature.Flags & MethodSignatureFlags.UnmanagedCallingConventionMask) == 0)
return;

// Calli in marshaling stubs
if (_methodIL is Internal.IL.Stubs.PInvokeILStubMethodIL)
return;

MethodDesc stub = _compilation.PInvokeILProvider.GetCalliStub(
signature,
((MetadataType)_methodIL.OwningMethod.OwningType).Module);

_dependencies.Add(_factory.CanonicalEntrypoint(stub), "calli");
}

private void ImportBranch(ILOpcode opcode, BasicBlock target, BasicBlock fallthrough)
{
ImportFallthrough(target);
Expand Down Expand Up @@ -1316,7 +1335,6 @@ private void ImportStoreVar(int index, bool argument) { }
private void ImportAddressOfVar(int index, bool argument) { }
private void ImportDup() { }
private void ImportPop() { }
private void ImportCalli(int token) { }
private void ImportLoadNull() { }
private void ImportReturn() { }
private void ImportLoadInt(long value, StackValueKind kind) { }
Expand Down