commit e86be82a8726446990173cd8e810812187177894
author Kazushi (Jam) Marukawa <marukawa@nec.com> Tue Aug 24 16:51:21 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Tue Aug 24 13:55:57 2021 -0700
tree 16fda6795501b0de6a9a9e78678e68612c33aa3e
parent 843a58f0bd056393f084d574a6efa3172be4fb2b

[libc++abi] Apply simplify scan_eh_tab to SjLj

Previous "simplify scan_eh_tab" patch, https://reviews.llvm.org/D93190,
saves landingpad if and only if the target is not using SjLj exceptions.
However, the landingpad is used by SjLj exception handler also.  This
patch changes to set landingpad for both exception handlers.

Differential Revision: https://reviews.llvm.org/D108082

GitOrigin-RevId: 9d2740f331772d372d4d437192da56b8c60e9fe8

src/cxa_personality.cpp

diff --git a/src/cxa_personality.cpp b/src/cxa_personality.cpp
index d63741b..e31619a 100644
--- a/src/cxa_personality.cpp
+++ b/src/cxa_personality.cpp
@@ -702,10 +702,10 @@
                 return;
             }
             landingPad = (uintptr_t)lpStart + landingPad;
-            results.landingPad = landingPad;
 #else  // __USING_SJLJ_EXCEPTIONS__
             ++landingPad;
 #endif // __USING_SJLJ_EXCEPTIONS__
+            results.landingPad = landingPad;
             if (actionEntry == 0)
             {
                 // Found a cleanup