From d9c14d4d919f5eab2107cd91c0460469c000b5a1 Mon Sep 17 00:00:00 2001 From: Xing Xue Date: Mon, 29 Jul 2024 14:53:36 -0400 Subject: [PATCH] Fix the problem introduced by upstream patch https://github.com/llvm/llvm-project/pull/92291 guard the code added to exclude traceback based unwinding used for AIX. --- libunwind/src/UnwindCursor.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libunwind/src/UnwindCursor.hpp b/libunwind/src/UnwindCursor.hpp index 2ec60e4c123d5e..758557337899ed 100644 --- a/libunwind/src/UnwindCursor.hpp +++ b/libunwind/src/UnwindCursor.hpp @@ -2589,7 +2589,8 @@ void UnwindCursor::setInfoBasedOnIPRegister(bool isReturnAddress) { --pc; #endif -#if !(defined(_LIBUNWIND_SUPPORT_SEH_UNWIND) && defined(_WIN32)) +#if !(defined(_LIBUNWIND_SUPPORT_SEH_UNWIND) && defined(_WIN32)) && \ + !defined(_LIBUNWIND_SUPPORT_TBTAB_UNWIND) // In case of this is frame of signal handler, 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.