From ca15f3d6d6c29e9cc75225730270e9ef85834a22 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Mon, 10 Aug 2009 03:36:26 +0000 Subject: Add support for a user supplied pointer argument to llvm_install_error_handler. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78553 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/ErrorHandling.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/Support/ErrorHandling.cpp') diff --git a/lib/Support/ErrorHandling.cpp b/lib/Support/ErrorHandling.cpp index d60dc1d2ad..81669223b0 100644 --- a/lib/Support/ErrorHandling.cpp +++ b/lib/Support/ErrorHandling.cpp @@ -23,12 +23,16 @@ using namespace llvm; using namespace std; static llvm_error_handler_t ErrorHandler = 0; +static void *ErrorHandlerUserData = 0; + namespace llvm { -void llvm_install_error_handler(llvm_error_handler_t handler) { +void llvm_install_error_handler(llvm_error_handler_t handler, + void *user_data) { assert(!llvm_is_multithreaded() && "Cannot register error handlers after starting multithreaded mode!\n"); assert(!ErrorHandler && "Error handler already registered!\n"); ErrorHandler = handler; + ErrorHandlerUserData = user_data; } void llvm_remove_error_handler(void) { @@ -47,7 +51,7 @@ void llvm_report_error(const Twine &reason) { if (!ErrorHandler) { errs() << "LLVM ERROR: " << reason << "\n"; } else { - ErrorHandler(reason.str()); + ErrorHandler(ErrorHandlerUserData, reason.str()); } exit(1); } -- cgit v1.2.3-18-g5258