diff --git a/llvm/include/llvm/Support/InitLLVM.h b/llvm/include/llvm/Support/InitLLVM.h --- a/llvm/include/llvm/Support/InitLLVM.h +++ b/llvm/include/llvm/Support/InitLLVM.h @@ -9,6 +9,7 @@ #ifndef LLVM_SUPPORT_LLVM_H #define LLVM_SUPPORT_LLVM_H +#include "llvm/ADT/Optional.h" #include "llvm/ADT/SmallVector.h" #include "llvm/Support/Allocator.h" #include "llvm/Support/PrettyStackTrace.h" @@ -44,7 +45,7 @@ private: BumpPtrAllocator Alloc; SmallVector Args; - PrettyStackTraceProgram StackPrinter; + Optional StackPrinter; }; } // namespace llvm diff --git a/llvm/lib/Support/InitLLVM.cpp b/llvm/lib/Support/InitLLVM.cpp --- a/llvm/lib/Support/InitLLVM.cpp +++ b/llvm/lib/Support/InitLLVM.cpp @@ -22,10 +22,17 @@ using namespace llvm::sys; InitLLVM::InitLLVM(int &Argc, const char **&Argv, - bool InstallPipeSignalExitHandler) - : StackPrinter(Argc, Argv) { + bool InstallPipeSignalExitHandler) { if (InstallPipeSignalExitHandler) + // The pipe signal handler must be installed before any other handlers are + // registered. This is because the Unix \ref RegisterHandlers function does + // not perform a sigaction() for SIGPIPE unless a one-shot handler is + // present, to allow long-lived processes (like lldb) to fully opt-out of + // llvm's SIGPIPE handling and ignore the signal safely. sys::SetOneShotPipeSignalFunction(sys::DefaultOneShotPipeSignalHandler); + // Initialize the stack printer after installing the one-shot pipe signal + // handler, so we can perform a sigaction() for SIGPIPE on Unix if requested. + StackPrinter.emplace(Argc, Argv); sys::PrintStackTraceOnErrorSignal(Argv[0]); install_out_of_memory_new_handler();