Suppress tailcall flag if target is a non-marshaled pinvoke (tail calling a marshaled pinvoke should work since the stub is IL)

kg · kg · commit 54c8d6d048d2 · 2025-09-16T13:02:24.000-07:00
diff --git a/src/coreclr/interpreter/compiler.cpp b/src/coreclr/interpreter/compiler.cpp
@@ -3551,6 +3551,10 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re
             }
             else
             {
+                // Tail call target needs to be IL
+                if (tailcall && isPInvoke && !isMarshaledPInvoke)
+                    tailcall = false;
+
                 // Normal call
                 InterpOpcode opcode;
                 if (isDelegateInvoke)
@@ -3560,7 +3564,6 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re
                 }
                 else if (tailcall)
                 {
-                    assert(!isPInvoke && !isMarshaledPInvoke);
                     opcode = INTOP_CALL_TAIL;
                 }
                 else

Original file line number	Diff line number	Diff line change
`@@ -3551,6 +3551,10 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re`
`3551`	`3551`	`}`
`3552`	`3552`	`else`
`3553`	`3553`	`{`
	`3554`	`+ // Tail call target needs to be IL`
	`3555`	`+ if (tailcall && isPInvoke && !isMarshaledPInvoke)`
	`3556`	`+ tailcall = false;`
	`3557`	`+`
`3554`	`3558`	`// Normal call`
`3555`	`3559`	`InterpOpcode opcode;`
`3556`	`3560`	`if (isDelegateInvoke)`
`@@ -3560,7 +3564,6 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re`
`3560`	`3564`	`}`
`3561`	`3565`	`else if (tailcall)`
`3562`	`3566`	`{`
`3563`		`- assert(!isPInvoke && !isMarshaledPInvoke);`
`3564`	`3567`	`opcode = INTOP_CALL_TAIL;`
`3565`	`3568`	`}`
`3566`	`3569`	`else`