Skip to content

Commit 5075f72

Browse files
authored
Unify asserts in the interpexec.cpp (#121213)
There was a mix of using `assert` and `_ASSERTE` in this file. The `assert` is a pain for local testing on Windows, as it pops out a dialog box when the assert fires. This change unifies all of them to `_ASSERTE`.
1 parent a5275f5 commit 5075f72

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/coreclr/vm/interpexec.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ void* DoGenericLookup(void* genericVarAsPtr, InterpGenericLookup* pLookup)
652652
}
653653
else
654654
{
655-
assert(pLookup->lookupType == InterpGenericLookupType::Method);
655+
_ASSERTE(pLookup->lookupType == InterpGenericLookupType::Method);
656656
pMD = (MethodDesc*)genericVarAsPtr;
657657
lookup = (uint8_t*)pMD;
658658
}
@@ -784,7 +784,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
784784
int8_t *stack;
785785

786786
InterpMethod *pMethod = pFrame->startIp->Method;
787-
assert(pMethod->CheckIntegrity());
787+
_ASSERTE(pMethod->CheckIntegrity());
788788

789789
pThreadContext->pStackPointer = pFrame->pStack + pMethod->allocaSize;
790790
stack = pFrame->pStack;
@@ -853,7 +853,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
853853
case INTOP_STORESTUBCONTEXT:
854854
{
855855
UMEntryThunkData* thunkData = GetMostRecentUMEntryThunkData();
856-
assert(thunkData);
856+
_ASSERTE(thunkData);
857857
LOCAL_VAR(ip[1], void*) = thunkData;
858858
ip += 2;
859859
break;
@@ -2484,7 +2484,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
24842484
pFrame->ip = ip;
24852485

24862486
PCODE calliFunctionPointer = LOCAL_VAR(calliFunctionPointerVar, PCODE);
2487-
assert(calliFunctionPointer);
2487+
_ASSERTE(calliFunctionPointer);
24882488

24892489
if (flags & (int32_t)CalliFlags::PInvoke)
24902490
{
@@ -2616,7 +2616,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
26162616
if (isTailcall)
26172617
{
26182618
// Move args from callArgsOffset to start of stack frame.
2619-
assert(pTargetMethod->CheckIntegrity());
2619+
_ASSERTE(pTargetMethod->CheckIntegrity());
26202620
// It is safe to use memcpy because the source and destination are both on the interp stack, not in the GC heap.
26212621
// We need to use the target method's argsSize, not our argsSize, because tail calls (unlike CEE_JMP) can have a
26222622
// different signature from the caller.
@@ -2643,7 +2643,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
26432643
}
26442644
// Set execution state for the new frame
26452645
pMethod = pFrame->startIp->Method;
2646-
assert(pMethod->CheckIntegrity());
2646+
_ASSERTE(pMethod->CheckIntegrity());
26472647
stack = pFrame->pStack;
26482648
ip = pFrame->startIp->GetByteCodes();
26492649
pThreadContext->pStackPointer = stack + pMethod->allocaSize;
@@ -2731,7 +2731,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
27312731
{
27322732
// Move args from callArgsOffset to start of stack frame.
27332733
InterpMethod* pTargetMethod = targetIp->Method;
2734-
assert(pTargetMethod->CheckIntegrity());
2734+
_ASSERTE(pTargetMethod->CheckIntegrity());
27352735
// It is safe to use memcpy because the source and destination are both on the interp stack, not in the GC heap.
27362736
// We need to use the target method's argsSize, not our argsSize, because tail calls (unlike CEE_JMP) can have a
27372737
// different signature from the caller.
@@ -2763,7 +2763,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
27632763

27642764
// Set execution state for the new frame
27652765
pMethod = pFrame->startIp->Method;
2766-
assert(pMethod->CheckIntegrity());
2766+
_ASSERTE(pMethod->CheckIntegrity());
27672767
stack = pFrame->pStack;
27682768
ip = pFrame->startIp->GetByteCodes();
27692769
pThreadContext->pStackPointer = stack + pMethod->allocaSize;
@@ -2917,7 +2917,7 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
29172917
}
29182918
case INTOP_LOAD_EXCEPTION:
29192919
// This opcode loads the exception object coming from a catch / filter funclet caller to a variable.
2920-
assert(pExceptionClauseArgs != NULL);
2920+
_ASSERTE(pExceptionClauseArgs != NULL);
29212921
LOCAL_VAR(ip[1], OBJECTREF) = pExceptionClauseArgs->throwable;
29222922
ip += 2;
29232923
break;
@@ -3591,7 +3591,7 @@ do \
35913591
COMPlusThrow(kPlatformNotSupportedException);
35923592
break;
35933593
default:
3594-
assert(!"Unimplemented or invalid interpreter opcode");
3594+
EEPOLICY_HANDLE_FATAL_ERROR_WITH_MESSAGE(COR_E_EXECUTIONENGINE, W("Unimplemented or invalid interpreter opcode\n"));
35953595
break;
35963596
}
35973597
}
@@ -3627,7 +3627,7 @@ do \
36273627

36283628
stack = pFrame->pStack;
36293629
pMethod = pFrame->startIp->Method;
3630-
assert(pMethod->CheckIntegrity());
3630+
_ASSERTE(pMethod->CheckIntegrity());
36313631
pThreadContext->pStackPointer = pFrame->pStack + pMethod->allocaSize;
36323632

36333633
pInterpreterFrame->SetIsFaulting(false);
@@ -3646,7 +3646,7 @@ do \
36463646
ip = pFrame->ip;
36473647
stack = pFrame->pStack;
36483648
pMethod = pFrame->startIp->Method;
3649-
assert(pMethod->CheckIntegrity());
3649+
_ASSERTE(pMethod->CheckIntegrity());
36503650
pFrame->ip = NULL;
36513651

36523652
pThreadContext->pStackPointer = pFrame->pStack + pMethod->allocaSize;

0 commit comments

Comments
 (0)