From e180f6b23ebac74b163e9406ff48182ccaf58a48 Mon Sep 17 00:00:00 2001 From: Anton Lapounov Date: Fri, 26 Aug 2022 11:42:42 -0700 Subject: [PATCH] Fix unwinding for NativeAOT on Unix x64 --- .../nativeaot/Runtime/unix/UnixNativeCodeManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp b/src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp index 95e6d6778b9752..8ca31f5ae05bcc 100644 --- a/src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp +++ b/src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp @@ -222,7 +222,7 @@ uintptr_t UnixNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo; - PTR_UInt8 p = pNativeMethodInfo->pMainLSDA; + PTR_UInt8 p = pNativeMethodInfo->pLSDA; uint8_t unwindBlockFlags = *p++; @@ -283,7 +283,7 @@ bool UnixNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo, { UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo; - PTR_UInt8 p = pNativeMethodInfo->pMainLSDA; + PTR_UInt8 p = pNativeMethodInfo->pLSDA; uint8_t unwindBlockFlags = *p++; @@ -868,7 +868,7 @@ PTR_VOID UnixNativeCodeManager::GetAssociatedData(PTR_VOID ControlPC) if (!FindMethodInfo(ControlPC, (MethodInfo*)&methodInfo)) return NULL; - PTR_UInt8 p = methodInfo.pMainLSDA; + PTR_UInt8 p = methodInfo.pLSDA; uint8_t unwindBlockFlags = *p++; if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) == 0)