1 files changed, 6 insertions, 2 deletions
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);
 }