Skip to content

Commit 36fc0bf

Browse files
committed
Build fixes
1 parent 679f0b3 commit 36fc0bf

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/coreclr/interpreter/compiler.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ static const char *g_stackTypeString[] = { "I4", "I8", "R4", "R8", "O ", "VT", "
3535
/*****************************************************************************/
3636
void DECLSPEC_NORETURN Interp_NOMEM()
3737
{
38-
assert(0);
38+
assert(false);
39+
// Interpreter-FIXME: Additional nonsense to convince the compiler that we don't return
40+
void* av = *((void**)0);
41+
while (av == av)
42+
;
3943
}
4044

4145
// GCInfoEncoder needs an IAllocator implementation. This is a simple one that forwards to the Compiler.

src/coreclr/vm/interpexec.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -757,12 +757,11 @@ void InterpExecMethod(InterpreterFrame *pInterpreterFrame, InterpMethodContextFr
757757
case INTOP_COLLECT: {
758758
// HACK: blocking gc of all generations to enable early stackwalk testing
759759
// Interpreter-TODO: Remove this
760-
InterpreterExitFrame exitFrame(pFrame);
761760
{
761+
pInterpreterFrame->SetTopInterpMethodContextFrame(pFrame);
762762
GCX_COOP();
763763
GCHeapUtilities::GetGCHeap()->GarbageCollect(-1, false, 0x00000002);
764764
}
765-
exitFrame.Pop();
766765
ip++;
767766
break;
768767
}

0 commit comments

Comments
 (0)