Skip to content

Add interp support for field addr via helper #123466

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
janvorli merged 1 commit into from
Jan 22, 2026
Merged

Add interp support for field addr via helper #123466

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
41 changes: 41 additions & 0 deletions src/coreclr/interpreter/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6127,6 +6127,15 @@ void InterpCompiler::EmitStaticFieldAddress(CORINFO_FIELD_INFO *pFieldInfo, CORI
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
break;
}
case CORINFO_FIELD_STATIC_ADDR_HELPER:
{
AddIns(INTOP_CALL_HELPER_P_P);
m_pLastNewIns->data[0] = GetDataForHelperFtn(pFieldInfo->helper);
m_pLastNewIns->data[1] = GetDataItemIndex(pResolvedToken->hField);
PushInterpType(InterpTypeByRef, NULL);
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
break;
}
default:
BADCODE("Unsupported static field accessor");
break;
Expand Down Expand Up @@ -9441,6 +9450,16 @@ void InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
m_pStackPointer--;
EmitStaticFieldAddress(&fieldInfo, &resolvedToken);
}
else if (fieldInfo.fieldAccessor == CORINFO_FIELD_INSTANCE_ADDR_HELPER)
{
m_pStackPointer--;
AddIns(INTOP_CALL_HELPER_P_SP);
m_pLastNewIns->data[0] = GetDataForHelperFtn(fieldInfo.helper);
m_pLastNewIns->data[1] = GetDataItemIndex(resolvedToken.hField);
m_pLastNewIns->SetSVar(m_pStackPointer[0].var);
PushInterpType(InterpTypeByRef, NULL);
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
}
else
{
assert(fieldInfo.fieldAccessor == CORINFO_FIELD_INSTANCE);
Expand Down Expand Up @@ -9477,6 +9496,17 @@ void InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
m_pStackPointer--;
EmitStaticFieldAccess(interpFieldType, &fieldInfo, &resolvedToken, true);
}
else if (fieldInfo.fieldAccessor == CORINFO_FIELD_INSTANCE_ADDR_HELPER)
{
m_pStackPointer--;
AddIns(INTOP_CALL_HELPER_P_SP);
m_pLastNewIns->data[0] = GetDataForHelperFtn(fieldInfo.helper);
m_pLastNewIns->data[1] = GetDataItemIndex(resolvedToken.hField);
m_pLastNewIns->SetSVar(m_pStackPointer[0].var);
PushInterpType(InterpTypeByRef, NULL);
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
EmitLdind(interpFieldType, fieldInfo.structType, 0);
}
else
{
assert(fieldInfo.fieldAccessor == CORINFO_FIELD_INSTANCE);
Expand Down Expand Up @@ -9547,6 +9577,17 @@ void InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
// Pop the unused object reference
m_pStackPointer--;
}
else if (fieldInfo.fieldAccessor == CORINFO_FIELD_INSTANCE_ADDR_HELPER)
{
AddIns(INTOP_CALL_HELPER_P_SP);
m_pLastNewIns->data[0] = GetDataForHelperFtn(fieldInfo.helper);
m_pLastNewIns->data[1] = GetDataItemIndex(resolvedToken.hField);
m_pLastNewIns->SetSVar(m_pStackPointer[-2].var);
PushInterpType(InterpTypeByRef, NULL);
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
EmitStind(interpFieldType, fieldInfo.structType, 0, true, true /* enableImplicitArgConversionRules */);
m_pStackPointer--;
}
else
{
assert(fieldInfo.fieldAccessor == CORINFO_FIELD_INSTANCE);
Expand Down