Scan calli dependencies (#72413)

Contributes to #72316
dotnet · Jul 19, 2022 · 07b9113 · 07b9113
1 parent 62075f1
commit 07b9113
Showing 1 changed file with 25 additions and 7 deletions.
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/IL/ILImporter.Scanner.cs
@@ -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);
@@ -767,6 +761,31 @@ private void ImportLdFtn(int token, ILOpcode opCode)
             ImportCall(opCode, token);
         }
 
+        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 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);
@@ -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) { }