[libunwind] [libunwind] fix unwinding from signal handler (PR #92291)

Azat Khuzhin via cfe-commits cfe-commits at lists.llvm.org
Tue Jul 9 07:36:03 PDT 2024


================
@@ -365,7 +365,12 @@ int DwarfInstructions<A, R>::stepWithDwarf(A &addressSpace, pint_t pc,
 
       // Return address is address after call site instruction, so setting IP to
       // that does simulates a return.
-      newRegisters.setIP(returnAddress);
+      //
+      // In case of this is frame of signal handler, the IP should be
+      // incremented, because the IP saved in the signal handler points to
+      // first non-executed instruction, while FDE/CIE expects IP to be after
+      // the first non-executed instruction.
+      newRegisters.setIP(returnAddress + cieInfo.isSignalFrame);
----------------
azat wrote:

@compnerd I've moved this logic into `UnwindCursor<A, R>::setInfoBasedOnIPRegister`, and verified it with the initial reproducer (it is too complex to convert it to a test) - the patch works correctly

https://github.com/llvm/llvm-project/pull/92291


More information about the cfe-commits mailing list