Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 597e160

Browse files
chunseokleejkotas
authored andcommitted
FIX #6074 : cannot find exception handler on arm (#6088)
1 parent a9ab292 commit 597e160

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/vm/exceptionhandling.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4385,7 +4385,7 @@ VOID UnwindManagedExceptionPass2(PAL_SEHException& ex, CONTEXT* unwindStartConte
43854385
dispatcherContext.ControlPc = controlPc;
43864386
dispatcherContext.ImageBase = codeInfo.GetModuleBase();
43874387
#if defined(_TARGET_ARM_)
4388-
dispatcherContext.ControlPcIsUnwound = !(currentFrameContext->ContextFlags & CONTEXT_EXCEPTION_ACTIVE);
4388+
dispatcherContext.ControlPcIsUnwound = !!(currentFrameContext->ContextFlags & CONTEXT_UNWOUND_TO_CALL);
43894389
#endif
43904390
// Check whether we have a function table entry for the current controlPC.
43914391
// If yes, then call RtlVirtualUnwind to get the establisher frame pointer.
@@ -4533,7 +4533,7 @@ VOID DECLSPEC_NORETURN UnwindManagedExceptionPass1(PAL_SEHException& ex, CONTEXT
45334533
dispatcherContext.ControlPc = controlPc;
45344534
dispatcherContext.ImageBase = codeInfo.GetModuleBase();
45354535
#if defined(_TARGET_ARM_)
4536-
dispatcherContext.ControlPcIsUnwound = !(frameContext->ContextFlags & CONTEXT_EXCEPTION_ACTIVE);
4536+
dispatcherContext.ControlPcIsUnwound = !!(frameContext->ContextFlags & CONTEXT_UNWOUND_TO_CALL);
45374537
#endif
45384538

45394539
// Check whether we have a function table entry for the current controlPC.

0 commit comments

Comments
 (0)