diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2018-03-17 03:36:35 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2018-03-17 03:36:35 +0300 |
| commit | f5ee8b1d40e659e86aa1180be42a0dfc2d7b507a (patch) | |
| tree | e00acec762b310ba21c1a60ba5d8ca3d68a65d26 /src/Runtime.Base | |
| parent | 6dd566f4e0e637d0e2b36cbe6327107fea192284 (diff) | |
[tfs-changeset: 1692327]
Diffstat (limited to 'src/Runtime.Base')
| -rw-r--r-- | src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs b/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs index 4d3cdf674..b4e58dbad 100644 --- a/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs +++ b/src/Runtime.Base/src/System/Runtime/ExceptionHandling.cs @@ -728,7 +728,11 @@ namespace System.Runtime Debug.Assert(isValid, "second-pass EH unwind failed unexpectedly"); DebugScanCallFrame(exInfo._passNumber, frameIter.ControlPC, frameIter.SP); - if (frameIter.SP == handlingFrameSP) + if ((frameIter.SP == handlingFrameSP) +#if ARM64 + && (frameIter.ControlPC == prevControlPC) +#endif + ) { // invoke only a partial second-pass here... InvokeSecondPass(ref exInfo, startIdx, catchingTryRegionIdx); |