From 9aea4c5c66a0c6c93551738cf1f8fa050830415a Mon Sep 17 00:00:00 2001 From: Hanjoung Lee Date: Wed, 15 Feb 2017 19:08:37 +0900 Subject: [PATCH] [x86/Linux] Fix EnclosingClauseCallerSP --- src/vm/exceptionhandling.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vm/exceptionhandling.cpp b/src/vm/exceptionhandling.cpp index ba7a68dba748..0be7562b5645 100644 --- a/src/vm/exceptionhandling.cpp +++ b/src/vm/exceptionhandling.cpp @@ -1930,12 +1930,12 @@ CLRUnwindStatus ExceptionTracker::ProcessOSExceptionNotification( // DispatcherContext->EstablisherFrame's value // represents the CallerSP of the current frame. UINT_PTR EnclosingClauseCallerSP = (UINT_PTR)pDispatcherContext->EstablisherFrame; -#elif defined(_TARGET_AMD64_) - // Extract the CallerSP from RegDisplay on AMD64 +#elif defined(_TARGET_AMD64_) || defined(_TARGET_X86_) + // Extract the CallerSP from RegDisplay on AMD64 and x86 REGDISPLAY *pRD = cfThisFrame.GetRegisterSet(); _ASSERTE(pRD->IsCallerContextValid || pRD->IsCallerSPValid); UINT_PTR EnclosingClauseCallerSP = (UINT_PTR)GetSP(pRD->pCallerContext); -#else // !_ARM_ && !_AMD64_ && !_ARM64_ +#else // !_ARM_ && !_AMD64_ && !_ARM64_ && !_X86_ PORTABILITY_ASSERT("ExceptionTracker::ProcessOSExceptionNotification"); UINT_PTR EnclosingClauseCallerSP = NULL; #endif // defined(_TARGET_ARM_) || defined(_TARGET_ARM64_)