diff options
| author | chunseoklee <chunseoklee@naver.com> | 2016-07-01 17:41:20 +0900 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-07-01 10:41:20 +0200 |
| commit | 597e160564c2d4ce26efff1450b0d96647071638 (patch) | |
| tree | 232ec532809549ccc3410f15c11e4a029eff231c /src/vm/exceptionhandling.cpp | |
| parent | a9ab292d74caf5e0e412f4cd6e4e2127aa8eb6a6 (diff) | |
| download | coreclr-597e160564c2d4ce26efff1450b0d96647071638.tar.gz coreclr-597e160564c2d4ce26efff1450b0d96647071638.tar.bz2 coreclr-597e160564c2d4ce26efff1450b0d96647071638.zip | |
FIX #6074 : cannot find exception handler on arm (#6088)
Diffstat (limited to 'src/vm/exceptionhandling.cpp')
| -rw-r--r-- | src/vm/exceptionhandling.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp index e74b2d87b4..3b60de0362 100644 --- a/src/vm/exceptionhandling.cpp +++ b/src/vm/exceptionhandling.cpp @@ -4385,7 +4385,7 @@ 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_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 +4533,7 @@ 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_UNWOUND_TO_CALL); #endif // Check whether we have a function table entry for the current controlPC. |