[libcxx-commits] [libcxxabi] a4fa667 - [libc++abi] Disable _Unwind_ForcedUnwind + exception tests for ARM EHABI

Fangrui Song via libcxx-commits libcxx-commits at lists.llvm.org
Fri Feb 5 14:12:34 PST 2021


Author: Fangrui Song
Date: 2021-02-05T14:12:27-08:00
New Revision: a4fa667dee6012e350bd405ee7a759a53738b279

URL: https://github.com/llvm/llvm-project/commit/a4fa667dee6012e350bd405ee7a759a53738b279
DIFF: https://github.com/llvm/llvm-project/commit/a4fa667dee6012e350bd405ee7a759a53738b279.diff

LOG: [libc++abi] Disable _Unwind_ForcedUnwind + exception tests for ARM EHABI

libunwind ARM EHABI does not support _Unwind_ForcedUnwind yet.
In addition, ARM EHABI makes `_Unwind_Exception` a typedef so
`struct _Unwind_Exception*` cannot be used.

Added: 
    

Modified: 
    libcxxabi/test/forced_unwind1.pass.cpp
    libcxxabi/test/forced_unwind2.pass.cpp

Removed: 
    


################################################################################
diff  --git a/libcxxabi/test/forced_unwind1.pass.cpp b/libcxxabi/test/forced_unwind1.pass.cpp
index 9432f48677d5..b98f5721b8c3 100644
--- a/libcxxabi/test/forced_unwind1.pass.cpp
+++ b/libcxxabi/test/forced_unwind1.pass.cpp
@@ -16,6 +16,9 @@
 #include <unwind.h>
 #include <tuple>
 
+#if defined(_LIBCXXABI_ARM_EHABI)
+int main() {}
+#else
 static int bits = 0;
 
 struct C {
@@ -75,3 +78,4 @@ int main() {
   test();
   return bits != 15;
 }
+#endif

diff  --git a/libcxxabi/test/forced_unwind2.pass.cpp b/libcxxabi/test/forced_unwind2.pass.cpp
index 4eb9f48ca6b8..ee11b69f99dc 100644
--- a/libcxxabi/test/forced_unwind2.pass.cpp
+++ b/libcxxabi/test/forced_unwind2.pass.cpp
@@ -17,6 +17,9 @@
 #include <unwind.h>
 #include <tuple>
 
+#if defined(_LIBCXXABI_ARM_EHABI)
+int main() {}
+#else
 template <typename T>
 struct Stop;
 
@@ -55,3 +58,4 @@ int main() {
   }
   abort();
 }
+#endif


        


More information about the libcxx-commits mailing list