[libc++abi] Apply simplify scan_eh_tab to SjLj

kaz7 · ldionne · commit 4094728a8147 · 2021-08-26T13:22:32.000-04:00
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)
diff --git a/libcxxabi/src/cxa_personality.cpp b/libcxxabi/src/cxa_personality.cpp
@@ -702,10 +702,10 @@ static void scan_eh_tab(scan_results &results, _Unwind_Action actions,
                 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

Original file line number	Diff line number	Diff line change
`@@ -702,10 +702,10 @@ static void scan_eh_tab(scan_results &results, _Unwind_Action actions,`
`702`	`702`	`return;`
`703`	`703`	`}`
`704`	`704`	`landingPad = (uintptr_t)lpStart + landingPad;`
`705`		`- results.landingPad = landingPad;`
`706`	`705`	`#else // __USING_SJLJ_EXCEPTIONS__`
`707`	`706`	`++landingPad;`
`708`	`707`	`#endif // __USING_SJLJ_EXCEPTIONS__`
	`708`	`+ results.landingPad = landingPad;`
`709`	`709`	`if (actionEntry == 0)`
`710`	`710`	`{`
`711`	`711`	`// Found a cleanup`