Skip to content

Unify asserts in the interpexec.cpp #121213

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 2 commits into from
Nov 4, 2025
+12 −12
Merged

Unify asserts in the interpexec.cpp #121213

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
979f6ab
Unify asserts in the interpexec.cpp
janvorli Oct 30, 2025
062634a
Replace assert on invalid opcode by failfast
janvorli Nov 3, 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
24 changes: 12 additions & 12 deletions src/coreclr/vm/interpexec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ void* DoGenericLookup(void* genericVarAsPtr, InterpGenericLookup* pLookup)
}
else
{
assert(pLookup->lookupType == InterpGenericLookupType::Method);
_ASSERTE(pLookup->lookupType == InterpGenericLookupType::Method);
pMD = (MethodDesc*)genericVarAsPtr;
lookup = (uint8_t*)pMD;
}
Expand Down Expand Up @@ -742,7 +742,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
int8_t *stack;

InterpMethod *pMethod = pFrame->startIp->Method;
assert(pMethod->CheckIntegrity());
_ASSERTE(pMethod->CheckIntegrity());

pThreadContext->pStackPointer = pFrame->pStack + pMethod->allocaSize;
stack = pFrame->pStack;
Expand Down Expand Up @@ -812,7 +812,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
case INTOP_STORESTUBCONTEXT:
{
UMEntryThunkData* thunkData = GetMostRecentUMEntryThunkData();
assert(thunkData);
_ASSERTE(thunkData);
LOCAL_VAR(ip[1], void*) = thunkData;
ip += 2;
break;
Expand Down Expand Up @@ -2443,7 +2443,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
pFrame->ip = ip;

PCODE calliFunctionPointer = LOCAL_VAR(calliFunctionPointerVar, PCODE);
assert(calliFunctionPointer);
_ASSERTE(calliFunctionPointer);

if (flags & (int32_t)CalliFlags::PInvoke)
{
Expand Down Expand Up @@ -2575,7 +2575,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
if (isTailcall)
{
// Move args from callArgsOffset to start of stack frame.
assert(pTargetMethod->CheckIntegrity());
_ASSERTE(pTargetMethod->CheckIntegrity());
// It is safe to use memcpy because the source and destination are both on the interp stack, not in the GC heap.
// We need to use the target method's argsSize, not our argsSize, because tail calls (unlike CEE_JMP) can have a
// different signature from the caller.
Expand Down Expand Up @@ -2603,7 +2603,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
}
// Set execution state for the new frame
pMethod = pFrame->startIp->Method;
assert(pMethod->CheckIntegrity());
_ASSERTE(pMethod->CheckIntegrity());
stack = pFrame->pStack;
ip = pFrame->startIp->GetByteCodes();
pThreadContext->pStackPointer = stack + pMethod->allocaSize;
Expand Down Expand Up @@ -2691,7 +2691,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
{
// Move args from callArgsOffset to start of stack frame.
InterpMethod* pTargetMethod = targetIp->Method;
assert(pTargetMethod->CheckIntegrity());
_ASSERTE(pTargetMethod->CheckIntegrity());
// It is safe to use memcpy because the source and destination are both on the interp stack, not in the GC heap.
// We need to use the target method's argsSize, not our argsSize, because tail calls (unlike CEE_JMP) can have a
// different signature from the caller.
Expand Down Expand Up @@ -2724,7 +2724,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr

// Set execution state for the new frame
pMethod = pFrame->startIp->Method;
assert(pMethod->CheckIntegrity());
_ASSERTE(pMethod->CheckIntegrity());
stack = pFrame->pStack;
ip = pFrame->startIp->GetByteCodes();
pThreadContext->pStackPointer = stack + pMethod->allocaSize;
Expand Down Expand Up @@ -2878,7 +2878,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
}
case INTOP_LOAD_EXCEPTION:
// This opcode loads the exception object coming from a catch / filter funclet caller to a variable.
assert(pExceptionClauseArgs != NULL);
_ASSERTE(pExceptionClauseArgs != NULL);
LOCAL_VAR(ip[1], OBJECTREF) = pExceptionClauseArgs->throwable;
ip += 2;
break;
Expand Down Expand Up @@ -3553,7 +3553,7 @@ do \
COMPlusThrow(kPlatformNotSupportedException);
break;
default:
assert(!"Unimplemented or invalid interpreter opcode");
EEPOLICY_HANDLE_FATAL_ERROR_WITH_MESSAGE(COR_E_EXECUTIONENGINE, W("Unimplemented or invalid interpreter opcode\n"));
break;
}
}
Expand Down Expand Up @@ -3589,7 +3589,7 @@ do \

stack = pFrame->pStack;
pMethod = pFrame->startIp->Method;
assert(pMethod->CheckIntegrity());
_ASSERTE(pMethod->CheckIntegrity());
pThreadContext->pStackPointer = pFrame->pStack + pMethod->allocaSize;

pInterpreterFrame->SetIsFaulting(false);
Expand All @@ -3608,7 +3608,7 @@ do \
ip = pFrame->ip;
stack = pFrame->pStack;
pMethod = pFrame->startIp->Method;
assert(pMethod->CheckIntegrity());
_ASSERTE(pMethod->CheckIntegrity());
pFrame->ip = NULL;

pThreadContext->pStackPointer = pFrame->pStack + pMethod->allocaSize;
Expand Down
Loading