FIX #6074 : cannot find exception handler on arm

chunseoklee · Jul 1, 2016 · ed9aa2a · ed9aa2a
1 parent 24a53c5
commit ed9aa2a
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp
@@ -1444,7 +1444,8 @@ void ExceptionTracker::InitializeCrawlFrame(CrawlFrame* pcfThisFrame, Thread* pT
     // For async exceptions (e.g. AV), this will be false.
     //
     // We decrement by two to be in accordance with how the kernel does as well.
-    if (pDispatcherContext->ControlPcIsUnwound)
+    if (pDispatcherContext->ControlPcIsUnwound
+        || (pDispatcherContext->ContextRecord->ContextFlags & CONTEXT_UNWOUND_TO_CALL))
     {
         ControlPCForEHSearch -= STACKWALK_CONTROLPC_ADJUST_OFFSET;
         if (fAdjustRegdisplayControlPC == true)