For fastcc on x86, let ECX be used as a return register after EAX and EDX

[oota-llvm.git] / lib / Support / ErrorHandling.cpp

diff --git a/lib/Support/ErrorHandling.cpp b/lib/Support/ErrorHandling.cpp
index d60dc1d2ad200b0e728279f9ba3a3cd0a68fbfb5..dff4f030fefe2bc6bd75d8f6e3c960fcbbf95006 100644 (file)
--- a/lib/Support/ErrorHandling.cpp
+++ b/lib/Support/ErrorHandling.cpp
@@ -23,15 +23,19 @@ 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) {
+void llvm_remove_error_handler() {
   ErrorHandler = 0;
 }
 
@@ -47,13 +51,16 @@ void llvm_report_error(const Twine &reason) {
   if (!ErrorHandler) {
     errs() << "LLVM ERROR: " << reason << "\n";
   } else {
-    ErrorHandler(reason.str());
+    ErrorHandler(ErrorHandlerUserData, reason.str());
   }
   exit(1);
 }
 
 void llvm_unreachable_internal(const char *msg, const char *file, 
                                unsigned line) {
+  // This code intentionally doesn't call the ErrorHandler callback, because
+  // llvm_unreachable is intended to be used to indicate "impossible"
+  // situations, and not legitimate runtime errors.
   if (msg)
     errs() << msg << "\n";
   errs() << "UNREACHABLE executed";