Skip to content

Commit 9a1debd

Browse files
Fix unwinding for NativeAOT on Unix x64 (#74673)
1 parent 4937707 commit 9a1debd

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/coreclr/nativeaot/Runtime/unix/UnixNativeCodeManager.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ uintptr_t UnixNativeCodeManager::GetConservativeUpperBoundForOutgoingArgs(Method
222222

223223
UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;
224224

225-
PTR_UInt8 p = pNativeMethodInfo->pMainLSDA;
225+
PTR_UInt8 p = pNativeMethodInfo->pLSDA;
226226

227227
uint8_t unwindBlockFlags = *p++;
228228

@@ -283,7 +283,7 @@ bool UnixNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,
283283
{
284284
UnixNativeMethodInfo * pNativeMethodInfo = (UnixNativeMethodInfo *)pMethodInfo;
285285

286-
PTR_UInt8 p = pNativeMethodInfo->pMainLSDA;
286+
PTR_UInt8 p = pNativeMethodInfo->pLSDA;
287287

288288
uint8_t unwindBlockFlags = *p++;
289289

@@ -868,7 +868,7 @@ PTR_VOID UnixNativeCodeManager::GetAssociatedData(PTR_VOID ControlPC)
868868
if (!FindMethodInfo(ControlPC, (MethodInfo*)&methodInfo))
869869
return NULL;
870870

871-
PTR_UInt8 p = methodInfo.pMainLSDA;
871+
PTR_UInt8 p = methodInfo.pLSDA;
872872

873873
uint8_t unwindBlockFlags = *p++;
874874
if ((unwindBlockFlags & UBF_FUNC_HAS_ASSOCIATED_DATA) == 0)

0 commit comments

Comments
 (0)