diff options
| author | Josh Stone <jistone@redhat.com> | 2024-03-15 15:49:06 -0700 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2024-03-15 15:49:06 -0700 |
| commit | 0ade5a11f5705e33e031ae5b47c21fd0553d6675 (patch) | |
| tree | f07ea4cb148065fb06b8818ecff90be3ce57336b /compiler/rustc_llvm/llvm-wrapper | |
| parent | 1ca424ca436d4d4449def39723c9ec442837c370 (diff) | |
| download | rust-0ade5a11f5705e33e031ae5b47c21fd0553d6675.tar.gz rust-0ade5a11f5705e33e031ae5b47c21fd0553d6675.zip | |
Register LLVM handlers for bad-alloc / OOM
LLVM's default bad-alloc handler may throw if exceptions are enabled, and `operator new` isn't hooked at all by default. Now we register our own handler that prints a message similar to fatal errors, then aborts. We also call the function that registers the C++ `std::new_handler`.
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 1632b9e1249..072620c65a5 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -25,6 +25,13 @@ #include <iostream> +// for raw `write` in the bad-alloc handler +#ifdef _MSC_VER +#include <io.h> +#else +#include <unistd.h> +#endif + //===----------------------------------------------------------------------=== // // This file defines alternate interfaces to core functions that are more @@ -88,8 +95,24 @@ static void FatalErrorHandler(void *UserData, exit(101); } -extern "C" void LLVMRustInstallFatalErrorHandler() { +// Custom error handler for bad-alloc LLVM errors. +// +// It aborts the process without any further allocations, similar to LLVM's +// default except that may be configured to `throw std::bad_alloc()` instead. +static void BadAllocErrorHandler(void *UserData, + const char* Reason, + bool GenCrashDiag) { + const char *OOM = "rustc-LLVM ERROR: out of memory\n"; + write(2, OOM, strlen(OOM)); + write(2, Reason, strlen(Reason)); + write(2, "\n", 1); + abort(); +} + +extern "C" void LLVMRustInstallErrorHandlers() { install_fatal_error_handler(FatalErrorHandler); + install_bad_alloc_error_handler(BadAllocErrorHandler); + install_out_of_memory_new_handler(); } extern "C" void LLVMRustDisableSystemDialogsOnCrash() { |
