Skip to content

Implement CEE_CKFINITE in the interpreter #119548

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
kg merged 1 commit into from
Sep 10, 2025
Merged

Implement CEE_CKFINITE in the interpreter #119548

Show file tree
Hide file tree
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
26 changes: 26 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 @@ -4353,6 +4353,32 @@ void InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
m_ip++;
break;
}

case CEE_CKFINITE:
{
CHECK_STACK(1);
int sVar = m_pStackPointer[-1].var;
StackType argType = m_pStackPointer[-1].type;
switch (argType)
{
case StackTypeR4:
AddIns(INTOP_CKFINITE_R4);
break;
case StackTypeR8:
AddIns(INTOP_CKFINITE_R8);
break;
default:
BADCODE("ckfinite operand must be R4 or R8");
break;
}
m_pStackPointer--;
PushStackType(argType, nullptr);
m_pLastNewIns->SetSVar(sVar);
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
m_ip++;
break;
}

case CEE_CONV_U1:
CHECK_STACK(1);
switch (m_pStackPointer[-1].type)
Expand Down
3 changes: 3 additions & 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 @@ -128,6 +128,9 @@ OPDEF(INTOP_NEG_R8, "neg.r8", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_NOT_I4, "not.i4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_NOT_I8, "not.i8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CKFINITE_R4, "ckfinite.r4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CKFINITE_R8, "ckfinite.r8", 3, 1, 1, InterpOpNoArgs)

OPDEF(INTOP_CONV_R_UN_I4, "conv.r.un.i4", 3, 1, 1, InterpOpNoArgs)
OPDEF(INTOP_CONV_R_UN_I8, "conv.r.un.i8", 3, 1, 1, InterpOpNoArgs)

Expand Down
23 changes: 23 additions & 0 deletions src/coreclr/vm/interpexec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,20 @@ template <typename TResult, typename TSource> void ConvOvfHelper(int8_t *stack,
}
}

static float CkfiniteHelper(float value)
{
if (!std::isfinite(value))
COMPlusThrow(kArithmeticException);
return value;
}

static double CkfiniteHelper(double value)
{
if (!std::isfinite(value))
COMPlusThrow(kArithmeticException);
return value;
}

void* DoGenericLookup(void* genericVarAsPtr, InterpGenericLookup* pLookup)
{
// TODO! If this becomes a performance bottleneck, we could expand out the various permutations of this
Expand Down Expand Up @@ -804,6 +818,15 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
ip += 4;
break;

case INTOP_CKFINITE_R4:
LOCAL_VAR(ip[1], float) = CkfiniteHelper(LOCAL_VAR(ip[2], float));
ip += 3;
break;
case INTOP_CKFINITE_R8:
LOCAL_VAR(ip[1], double) = CkfiniteHelper(LOCAL_VAR(ip[2], double));
ip += 3;
break;

case INTOP_CONV_R_UN_I4:
LOCAL_VAR(ip[1], double) = (double)LOCAL_VAR(ip[2], uint32_t);
ip += 3;
Expand Down
Loading