Skip to content

Commit

Permalink
Fix Linux x86 build
Browse files Browse the repository at this point in the history
  • Loading branch information
gbalykov committed Apr 4, 2020
1 parent 15fdfac commit 8e8efcb
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/coreclr/src/vm/exceptionhandling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1264,6 +1264,7 @@ lExit: ;

if ((ExceptionContinueSearch == returnDisposition))
{
#ifdef USE_GC_INFO_DECODER
if (dwExceptionFlags & EXCEPTION_UNWINDING)
{
EECodeInfo codeInfo(pDispatcherContext->ControlPc);
Expand All @@ -1279,6 +1280,7 @@ lExit: ;
}
}
}
#endif // USE_GC_INFO_DECODER

GCX_PREEMP_NO_DTOR();
}
Expand Down Expand Up @@ -4681,6 +4683,7 @@ VOID DECLSPEC_NORETURN UnwindManagedExceptionPass1(PAL_SEHException& ex, CONTEXT
controlPc = Thread::VirtualUnwindLeafCallFrame(frameContext);
}

#ifdef USE_GC_INFO_DECODER
GcInfoDecoder gcInfoDecoder(codeInfo.GetGCInfoToken(), DECODE_REVERSE_PINVOKE_VAR);

if (gcInfoDecoder.GetReversePInvokeFrameStackSlot() != NO_REVERSE_PINVOKE_FRAME)
Expand All @@ -4694,6 +4697,7 @@ VOID DECLSPEC_NORETURN UnwindManagedExceptionPass1(PAL_SEHException& ex, CONTEXT
TerminateProcess(GetCurrentProcess(), 1);
UNREACHABLE();
}
#endif // USE_GC_INFO_DECODER

// Check whether we are crossing managed-to-native boundary
while (!ExecutionManager::IsManagedCode(controlPc))
Expand Down

0 comments on commit 8e8efcb

Please sign in to comment.