averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Call swift_vasprintf() from libConcurrency

Browse Source
This commit is contained in:
Jonathan Grynspan
2025-08-19 16:00:06 -04:00
parent 274940ae54
commit ae180dd033
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
stdlib/public/Concurrency/Error.cpp
View File

@@ -10,6 +10,7 @@
//
//===----------------------------------------------------------------------===//
#include "swift/Runtime/Portability.h"
#include "swift/Threading/Errors.h"
#include <atomic>
#include <cstdio>
@@ -32,10 +33,8 @@ SWIFT_VFORMAT(2)
void swift::swift_Concurrency_fatalErrorv(uint32_t flags, const char *format,
va_list val) {
#if !SWIFT_CONCURRENCY_EMBEDDED
// TODO: copy swift_vasprintf() so we can capture the formatted log message
const char *log = format;
vfprintf(stderr, format, val);
char *log = nullptr;
swift_vasprintf(&log, format, val);
if (&_swift_willAbort != nullptr) {
auto handler = _swift_willAbort.exchange(nullptr, std::memory_order_acq_rel);
@@ -43,6 +42,8 @@ void swift::swift_Concurrency_fatalErrorv(uint32_t flags, const char *format,
(* handler)(flags, log, nullptr);
}
}
fputs(log, stderr);
#else
vprintf(format, val);
#endif

5
stdlib/public/runtime/Errors.cpp
View File

@@ -420,11 +420,8 @@ void swift::swift_reportError(uint32_t flags,
// Report a fatal error to system console, stderr, and crash logs, then abort.
SWIFT_NORETURN void swift::fatalErrorv(uint32_t flags, const char *format,
va_list args) {
char *log;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wuninitialized"
char *log = nullptr;
swift_vasprintf(&log, format, args);
#pragma GCC diagnostic pop
swift_reportError(flags, log);