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

runtime: improve error handling path for the runtime

Browse Source 
Rather than use `fprintf` for the error handling path use the platform
specific error handling systems (`asl_log`, `__android_log_printf`) if
available.  The standard file streams are not available on all platforms
(e.g. Android).
This commit is contained in:
Saleem Abdulrasool
2020-05-19 23:59:35 +00:00
parent 5b10c5f60c
commit 0637e17957
1 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
stdlib/public/LLVMSupport/ErrorHandling.cpp
View File

@@ -21,22 +21,50 @@
# include <fcntl.h>
#else
# include <stdio.h>
# include <unistd.h>
#endif
#include <stdarg.h>
#if defined(__APPLE__)
#include <asl.h>
#elif defined(__ANDROID__)
#include <android/log.h>
#endif
namespace {
void error(const char *fmt, ...) {
char buffer[1024];
va_list argp;
va_start(argp, fmt);
vsnprintf(buffer, sizeof(buffer), fmt, argp);
va_end(argp);
#if defined(__APPLE__)
asl_log(nullptr, nullptr, ASL_LEVEL_ERR, "%s", buffer);
#elif defined(__ANDROID__)
__android_log_printf(ANDROID_LOG_FATAL, "SwiftRuntime", "%s", buffer);
#elif defined(_WIN32)
#define STDERR_FILENO 2
_write(STDERR_FILENO, buffer, strlen(buffer));
#else
write(STDERR_FILENO, buffer, strlen(buffer));
#endif
}
}
using namespace llvm;
void __swift::__runtime::llvm::report_fatal_error(const char *Reason,
bool GenCrashDiag) {
report_fatal_error(std::string(Reason), GenCrashDiag);
error("LLVM ERROR: %s\n", Reason);
abort();
}
void __swift::__runtime::llvm::report_fatal_error(const std::string &Reason,
bool GenCrashDiag) {
// Blast the result out to stderr. We don't try hard to make sure this
// succeeds (e.g. handling EINTR) and we can't use errs() here because
// raw ostreams can call report_fatal_error.
fprintf(stderr, "LLVM ERROR: %s\n", Reason.c_str());
abort();
report_fatal_error(Reason.c_str(), GenCrashDiag);
}
void __swift::__runtime::llvm::report_fatal_error(StringRef Reason,
@@ -48,7 +76,7 @@ void __swift::__runtime::llvm::report_bad_alloc_error(const char *Reason,
bool GenCrashDiag) {
// Don't call the normal error handler. It may allocate memory. Directly write
// an OOM to stderr and abort.
fprintf(stderr, "LLVM ERROR: out of memory\n");
error("LLVM ERROR: out of memory\n");
abort();
}
@@ -58,11 +86,11 @@ void __swift::__runtime::llvm::llvm_unreachable_internal(
// llvm_unreachable is intended to be used to indicate "impossible"
// situations, and not legitimate runtime errors.
if (msg)
fprintf(stderr, "%s\n", msg);
fprintf(stderr, "UNREACHABLE executed");
error("%s\n", msg);
error("UNREACHABLE executed");
if (file)
fprintf(stderr, " at %s:%u", file, line);
fprintf(stderr, "!\n");
error(" at %s:%u", file, line);
error("!\n");
abort();
#ifdef LLVM_BUILTIN_UNREACHABLE
// Windows systems and possibly others don't declare abort() to be noreturn,