FIX #6074 : cannot find exception handler on arm

chunseoklee · Jul 1, 2016 · 3974095 · jkotas · Jul 1, 2016 · 3974095
1 parent 24a53c5
commit 3974095
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp
@@ -4385,7 +4385,8 @@ VOID UnwindManagedExceptionPass2(PAL_SEHException& ex, CONTEXT* unwindStartConte
         dispatcherContext.ControlPc = controlPc;
         dispatcherContext.ImageBase = codeInfo.GetModuleBase();
 #if defined(_TARGET_ARM_)
-        dispatcherContext.ControlPcIsUnwound = !(currentFrameContext->ContextFlags & CONTEXT_EXCEPTION_ACTIVE);
+        dispatcherContext.ControlPcIsUnwound = !(currentFrameContext->ContextFlags & CONTEXT_EXCEPTION_ACTIVE)
+          || (currentFrameContext->ContextFlags & CONTEXT_UNWOUND_TO_CALL);
 #endif
         // Check whether we have a function table entry for the current controlPC.
         // If yes, then call RtlVirtualUnwind to get the establisher frame pointer.
@@ -4533,7 +4534,8 @@ VOID DECLSPEC_NORETURN UnwindManagedExceptionPass1(PAL_SEHException& ex, CONTEXT
         dispatcherContext.ControlPc = controlPc;
         dispatcherContext.ImageBase = codeInfo.GetModuleBase();
 #if defined(_TARGET_ARM_) 
-        dispatcherContext.ControlPcIsUnwound = !(frameContext->ContextFlags & CONTEXT_EXCEPTION_ACTIVE);
+        dispatcherContext.ControlPcIsUnwound = !(frameContext->ContextFlags & CONTEXT_EXCEPTION_ACTIVE)
+          || (frameContext->ContextFlags & CONTEXT_UNWOUND_TO_CALL);
 #endif
 
         // Check whether we have a function table entry for the current controlPC.