[libcxx-commits] [libcxxabi] befd8f8 - [libc++abi] Fix build failure in abort_message.cpp when vasprintf isn't provided

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-06-26T11:50:05-04:00
New Revision: befd8f82fe2050a6406c45d330577f46969c7c7d

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

LOG: [libc++abi] Fix build failure in abort_message.cpp when vasprintf isn't provided

Added: 
    

Modified: 
    libcxxabi/src/abort_message.cpp

Removed: 
    


################################################################################
diff  --git a/libcxxabi/src/abort_message.cpp b/libcxxabi/src/abort_message.cpp
index c5abbe2838a5..ad44063facb7 100644
--- a/libcxxabi/src/abort_message.cpp
+++ b/libcxxabi/src/abort_message.cpp
@@ -44,15 +44,21 @@ void abort_message(const char* format, ...)
 
     // Format the arguments into an allocated buffer. We leak the buffer on
     // purpose, since we're about to abort() anyway.
+#if defined(_LIBCXXABI_USE_CRASHREPORTER_CLIENT)
     char* buffer;
     va_list list;
     va_start(list, format);
     vasprintf(&buffer, format, list);
     va_end(list);
 
-#if defined(_LIBCXXABI_USE_CRASHREPORTER_CLIENT)
     CRSetCrashLogMessage(buffer);
 #elif defined(__BIONIC__)
+    char* buffer;
+    va_list list;
+    va_start(list, format);
+    vasprintf(&buffer, format, list);
+    va_end(list);
+
 #   if __ANDROID_API__ >= 21
     // Show error in tombstone.
     android_set_abort_message(buffer);