[libcxx-commits] [PATCH] D64191: [libcxxabi] Don't process exceptions in cxa_handlers when they're disabled

[Petr Hosek via Phabricator via libcxx-commits]

phosek updated this revision to Diff 209343.
phosek added a comment.
Herald added a subscriber: mgorny.

Done, I've updated the comment for the CMake option.


Repository:
  rCXXA libc++abi

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D64191/new/

https://reviews.llvm.org/D64191

Files:
  libcxxabi/CMakeLists.txt
  libcxxabi/src/cxa_default_handlers.cpp
  libcxxabi/src/cxa_handlers.cpp


Index: libcxxabi/src/cxa_handlers.cpp
===================================================================
--- libcxxabi/src/cxa_handlers.cpp
+++ libcxxabi/src/cxa_handlers.cpp
@@ -73,6 +73,7 @@
 void
 terminate() _NOEXCEPT
 {
+#ifndef _LIBCXXABI_NO_EXCEPTIONS
     // If there might be an uncaught exception
     using namespace __cxxabiv1;
     __cxa_eh_globals* globals = __cxa_get_globals_fast();
@@ -87,6 +88,7 @@
                 __terminate(exception_header->terminateHandler);
         }
     }
+#endif
     __terminate(get_terminate());
 }
 
Index: libcxxabi/src/cxa_default_handlers.cpp
===================================================================
--- libcxxabi/src/cxa_default_handlers.cpp
+++ libcxxabi/src/cxa_default_handlers.cpp
@@ -25,6 +25,7 @@
 __attribute__((noreturn))
 static void demangling_terminate_handler()
 {
+#ifndef _LIBCXXABI_NO_EXCEPTIONS
     // If there might be an uncaught exception
     using namespace __cxxabiv1;
     __cxa_eh_globals* globals = __cxa_get_globals_fast();
@@ -71,6 +72,7 @@
                 abort_message("terminating with %s foreign exception", cause);
         }
     }
+#endif
     // Else just note that we're terminating
     abort_message("terminating");
 }
Index: libcxxabi/CMakeLists.txt
===================================================================
--- libcxxabi/CMakeLists.txt
+++ libcxxabi/CMakeLists.txt
@@ -43,7 +43,9 @@
 include(HandleCompilerRT)
 
 # Define options.
-option(LIBCXXABI_ENABLE_EXCEPTIONS "Use exceptions." ON)
+option(LIBCXXABI_ENABLE_EXCEPTIONS
+  "Provide support for exceptions in the runtime.
+  When disabled, libc++abi does not support stack unwinding and other exceptions-related features." ON)
 option(LIBCXXABI_ENABLE_ASSERTIONS "Enable assertions independent of build mode." ON)
 option(LIBCXXABI_ENABLE_PEDANTIC "Compile with pedantic enabled." ON)
 option(LIBCXXABI_ENABLE_PIC "Build Position-Independent Code, even in static library" ON)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D64191.209343.patch
Type: text/x-patch
Size: 1947 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20190711/469e80d9/attachment.bin>