Skip to content

[interp] Forcibly enable intrinsics when we encounter a must-expand call #117727

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 6 commits into from
Jul 30, 2025
Merged

[interp] Forcibly enable intrinsics when we encounter a must-expand call #117727

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
69c768e
Forcibly enable interpreter intrinsics when we encounter a must-expan…
kg Jul 16, 2025
d92b2f2
Remove alignment assert
kg Jul 16, 2025
503d35e
Address PR feedback
kg Jul 16, 2025
c9feba0
Address PR feedback
kg Jul 17, 2025
4cda4b0
Revert "Address PR feedback"
kg Jul 17, 2025
06314c7
Update src/coreclr/interpreter/compiler.cpp
kg Jul 22, 2025
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
31 changes: 8 additions & 23 deletions src/coreclr/interpreter/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,8 +1392,6 @@ int32_t InterpCompiler::GetInterpTypeStackSize(CORINFO_CLASS_HANDLE clsHnd, Inte
size = m_compHnd->getClassSize(clsHnd);
align = m_compHnd->getClassAlignmentRequirement(clsHnd);

assert(align <= INTERP_STACK_ALIGNMENT);

// All vars are stored at 8 byte aligned offsets
if (align < INTERP_STACK_SLOT_SIZE)
align = INTERP_STACK_SLOT_SIZE;
Expand Down Expand Up @@ -2303,25 +2301,9 @@ bool InterpCompiler::EmitNamedIntrinsicCall(NamedIntrinsic ni, CORINFO_CLASS_HAN
case NI_System_Runtime_CompilerServices_RuntimeHelpers_IsReferenceOrContainsReferences:
{
CORINFO_CLASS_HANDLE clsHnd = sig.sigInst.methInst[0];
bool isValueType = (m_compHnd->getClassAttribs(clsHnd) & CORINFO_FLG_VALUECLASS) != 0;
bool hasGCRefs = false;

if (isValueType)
{
// Walk the layout to see if any field is a GC pointer
const uint32_t maxSlots = 256;
BYTE gcLayout[maxSlots];
uint32_t numSlots = m_compHnd->getClassGClayout(clsHnd, gcLayout);

for (uint32_t i = 0; i < numSlots; ++i)
{
if (gcLayout[i] != TYPE_GC_NONE)
{
hasGCRefs = true;
break;
}
}
}
uint32_t clsAttribs = m_compHnd->getClassAttribs(clsHnd);
bool isValueType = (clsAttribs & CORINFO_FLG_VALUECLASS) != 0;
bool hasGCRefs = (clsAttribs & CORINFO_FLG_CONTAINS_GC_PTR) != 0;

int32_t result = (!isValueType || hasGCRefs) ? 1 : 0;

Expand Down Expand Up @@ -2732,12 +2714,15 @@ void InterpCompiler::EmitCall(CORINFO_RESOLVED_TOKEN* pConstrainedToken, bool re

CORINFO_CALLINFO_FLAGS flags = (CORINFO_CALLINFO_FLAGS)(CORINFO_CALLINFO_ALLOWINSTPARAM | CORINFO_CALLINFO_SECURITYCHECKS | CORINFO_CALLINFO_DISALLOW_STUB);
if (isVirtual)
flags = (CORINFO_CALLINFO_FLAGS)(flags | CORINFO_CALLINFO_CALLVIRT);
flags = (CORINFO_CALLINFO_FLAGS)(flags | CORINFO_CALLINFO_CALLVIRT);

m_compHnd->getCallInfo(&resolvedCallToken, pConstrainedToken, m_methodInfo->ftn, flags, &callInfo);
if (callInfo.methodFlags & CORINFO_FLG_INTRINSIC)
{
if (InterpConfig.InterpMode() >= 3)
// If we are being asked explicitly to compile an intrinsic for interpreting, we need to forcibly enable
// intrinsics for the recursive call. Otherwise we will just recurse infinitely and overflow stack.
bool isMustExpand = (callInfo.hMethod == m_methodHnd);
if ((InterpConfig.InterpMode() == 3) || isMustExpand)
{
NamedIntrinsic ni = GetNamedIntrinsic(m_compHnd, m_methodHnd, callInfo.hMethod);
if (EmitNamedIntrinsicCall(ni, resolvedCallToken.hClass, callInfo.hMethod, callInfo.sig))
Expand Down
Loading