Skip to content

Commit 0511095

Browse files
committed
Fix the problem introduced by upstream patch llvm#92291 guard the code added to exclude traceback based unwinding used for AIX.
1 parent 0dd1128 commit 0511095

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

libunwind/src/UnwindCursor.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2589,7 +2589,8 @@ void UnwindCursor<A, R>::setInfoBasedOnIPRegister(bool isReturnAddress) {
25892589
--pc;
25902590
#endif
25912591

2592-
#if !(defined(_LIBUNWIND_SUPPORT_SEH_UNWIND) && defined(_WIN32))
2592+
#if !(defined(_LIBUNWIND_SUPPORT_SEH_UNWIND) && defined(_WIN32)) && \
2593+
!defined(_LIBUNWIND_SUPPORT_TBTAB_UNWIND)
25932594
// In case of this is frame of signal handler, the IP saved in the signal
25942595
// handler points to first non-executed instruction, while FDE/CIE expects IP
25952596
// to be after the first non-executed instruction.

0 commit comments

Comments
 (0)