Skip to content

Commit f7893c3

Browse files
author
git apple-llvm automerger
committed
Merge commit 'a17afee7ec41' from llvm.org/main into next
2 parents def50dd + a17afee commit f7893c3

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

libunwind/src/Unwind-seh.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,8 @@ _GCC_specific_handler(PEXCEPTION_RECORD ms_exc, PVOID frame, PCONTEXT ms_ctx,
174174
}
175175
// FIXME: Indicate target frame in foreign case!
176176
// phase 2: the clean up phase
177-
RtlUnwindEx(frame, (PVOID)disp->ControlPc, ms_exc, exc, ms_ctx, disp->HistoryTable);
177+
RtlUnwindEx(frame, (PVOID)disp->ControlPc, ms_exc, exc, disp->ContextRecord,
178+
disp->HistoryTable);
178179
_LIBUNWIND_ABORT("RtlUnwindEx() failed");
179180
case _URC_INSTALL_CONTEXT: {
180181
// If we were called by __libunwind_seh_personality(), indicate that

0 commit comments

Comments
 (0)