Skip to content

Commit 228a12c

Browse files
Report CORINFO_CALLCONV_GENERIC to JIT (#121561)
Outerloops are broken. Apparently we got away without reporting this until the test in #121130 was added. Not reporting the calling convention results in this not kicking in: https://github.com/dotnet/runtime/blob/5e97723bdd8eb9eff95c52b7120cec6bfb5a0a19/src/coreclr/jit/importer.cpp#L7291-L7297 and failing the test. Cc @dotnet/ilc-contrib --------- Co-authored-by: Jan Kotas <[email protected]>
1 parent f873b2f commit 228a12c

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/coreclr/tools/Common/JitInterface/CorInfoImpl.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,8 @@ private void Get_CORINFO_SIG_INFO(MethodSignature signature, CORINFO_SIG_INFO* s
882882
if (!signature.IsStatic) sig->callConv |= CorInfoCallConv.CORINFO_CALLCONV_HASTHIS;
883883
if (signature.IsExplicitThis) sig->callConv |= CorInfoCallConv.CORINFO_CALLCONV_EXPLICITTHIS;
884884

885+
if (signature.GenericParameterCount != 0) sig->callConv |= CorInfoCallConv.CORINFO_CALLCONV_GENERIC;
886+
885887
TypeDesc returnType = signature.ReturnType;
886888

887889
CorInfoType corInfoRetType = asCorInfoType(signature.ReturnType, &sig->retTypeClass);

0 commit comments

Comments
 (0)