Skip to content

[clr-interp] fix native int input to switch statements #122364

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
davidwrighton merged 2 commits into from
Dec 10, 2025
Merged

[clr-interp] fix native int input to switch statements #122364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a4e819
[clr-interp] fix native int input to switch statements
davidwrighton Dec 9, 2025
7b91d8a
Update src/coreclr/vm/interpexec.cpp
davidwrighton Dec 10, 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
8 changes: 8 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 @@ -8672,6 +8672,14 @@ void InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
}
}

#ifdef TARGET_64BIT
if (m_pStackPointer->GetStackType() == StackTypeI)
{
// Emit a saturating conversion from U8 to U4
EmitConv(m_pStackPointer, StackTypeI4, INTOP_CONV_U4_U8_SAT);
}
#endif // TARGET_64BIT

AddInsExplicit(INTOP_SWITCH, n + 3);
m_pLastNewIns->data[0] = n;
m_pLastNewIns->SetSVar(m_pStackPointer->var);
Expand Down
1 change: 1 addition & 0 deletions src/coreclr/interpreter/inc/intops.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ OPDEF(INTOP_CONV_U2_R8, "conv.u2.r8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_I4_R4, "conv.i4.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_I4_R8, "conv.i4.r8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_U4_U8_SAT, "conv.u4.u8.sat", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_U4_R4, "conv.u4.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_U4_R8, "conv.u4.r8", 3, 1, 1, InterpOpNoArgs)

Expand Down
11 changes: 10 additions & 1 deletion src/coreclr/vm/interpexec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,16 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
ConvOvfHelper<uint32_t, uint64_t>(stack, ip);
ip += 3;
break;

case INTOP_CONV_U4_U8_SAT:
{
uint64_t val = LOCAL_VAR(ip[2], uint64_t);
if (val > UINT32_MAX)
LOCAL_VAR(ip[1], uint32_t) = UINT32_MAX;
else
LOCAL_VAR(ip[1], uint32_t) = (uint32_t)val;
ip += 3;
break;
}
case INTOP_SWITCH:
{
uint32_t val = LOCAL_VAR(ip[1], uint32_t);
Expand Down
Loading