Skip to content

Commit 4094728

Browse files
kaz7ldionne
authored andcommitted
[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 (cherry picked from commit 9d2740f)
1 parent 4e692c9 commit 4094728

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

libcxxabi/src/cxa_personality.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,10 +702,10 @@ static void scan_eh_tab(scan_results &results, _Unwind_Action actions,
702702
return;
703703
}
704704
landingPad = (uintptr_t)lpStart + landingPad;
705-
results.landingPad = landingPad;
706705
#else // __USING_SJLJ_EXCEPTIONS__
707706
++landingPad;
708707
#endif // __USING_SJLJ_EXCEPTIONS__
708+
results.landingPad = landingPad;
709709
if (actionEntry == 0)
710710
{
711711
// Found a cleanup

0 commit comments

Comments
 (0)