[libunwind] a17afee - [libunwind] Fix aarch64 SEH unwinding with a debugger attached (#162867)

via cfe-commits cfe-commits at lists.llvm.org
Thu Oct 16 12:47:13 PDT 2025


Author: Martin Storsjö
Date: 2025-10-16T22:47:08+03:00
New Revision: a17afee7ec41e53292f074fc967d264452e4363b

URL: https://github.com/llvm/llvm-project/commit/a17afee7ec41e53292f074fc967d264452e4363b
DIFF: https://github.com/llvm/llvm-project/commit/a17afee7ec41e53292f074fc967d264452e4363b.diff

LOG: [libunwind] Fix aarch64 SEH unwinding with a debugger attached (#162867)

See https://github.com/LuaJIT/LuaJIT/issues/593#issuecomment-1717728494
for the original explanation of the problem.

In short; when a debugger is attached, there's a
function KiUserExceptionDispatcher in the stack that is being unwound.
The function KiUserExceptionDispatcher contains a CONTEXT, with a copy
of the context from where the exception was raised. When unwinding
through this function, this whole CONTEXT gets restored.

This CONTEXT is what we receive a pointer to in the callbacks, as the
ms_ctx pointer.

When we unwind manually using RtlUnwindEx, the unwinding overwrites the
CONTEXT that is passed to it. Thus, to avoid clobbering the CONTEXT that
needs to be restored by KiUserExceptionDispatcher, we could either
declare a new temporary CONTEXT on the stack before calling RtlUnwindEx,
or just use disp->ContextRecord as we already have available.

Fixes: https://github.com/llvm/llvm-project/issues/161851

Co-authored-by: Peter Cawley <corsix at corsix.org>
Co-authored-by: Hannes Domani <ssbssa at yahoo.de>

Added: 
    

Modified: 
    libunwind/src/Unwind-seh.cpp

Removed: 
    


################################################################################
diff  --git a/libunwind/src/Unwind-seh.cpp b/libunwind/src/Unwind-seh.cpp
index 8b83f10615f22..110c5987c3f1a 100644
--- a/libunwind/src/Unwind-seh.cpp
+++ b/libunwind/src/Unwind-seh.cpp
@@ -174,7 +174,8 @@ _GCC_specific_handler(PEXCEPTION_RECORD ms_exc, PVOID frame, PCONTEXT ms_ctx,
     }
     // FIXME: Indicate target frame in foreign case!
     // phase 2: the clean up phase
-    RtlUnwindEx(frame, (PVOID)disp->ControlPc, ms_exc, exc, ms_ctx, disp->HistoryTable);
+    RtlUnwindEx(frame, (PVOID)disp->ControlPc, ms_exc, exc, disp->ContextRecord,
+                disp->HistoryTable);
     _LIBUNWIND_ABORT("RtlUnwindEx() failed");
   case _URC_INSTALL_CONTEXT: {
     // If we were called by __libunwind_seh_personality(), indicate that


        


More information about the cfe-commits mailing list