rename llvm_install_error_handler -> install_fatal_error_handler

and friends.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@100717 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2010-04-07 23:12:29 +00:00
parent 28e830d25f
commit b0094c2404
2 changed files with 22 additions and 25 deletions

View File

@ -1,4 +1,4 @@
//===- lib/Support/ErrorHandling.cpp - Callbacks for errors -----*- C++ -*-===//
//===- lib/Support/ErrorHandling.cpp - Callbacks for errors ---------------===//
//
// The LLVM Compiler Infrastructure
//
@ -7,9 +7,9 @@
//
//===----------------------------------------------------------------------===//
//
// This file defines an API for error handling, it supersedes cerr+abort(), and
// cerr+exit() style error handling.
// Callbacks can be registered for these errors through this API.
// This file defines an API used to indicate fatal error conditions. Non-fatal
// errors (most of them) should be handled through LLVMContext.
//
//===----------------------------------------------------------------------===//
#include "llvm/ADT/Twine.h"
@ -19,16 +19,14 @@
#include "llvm/System/Threading.h"
#include <cassert>
#include <cstdlib>
using namespace llvm;
using namespace std;
static llvm_error_handler_t ErrorHandler = 0;
static fatal_error_handler_t ErrorHandler = 0;
static void *ErrorHandlerUserData = 0;
namespace llvm {
void llvm_install_error_handler(llvm_error_handler_t handler,
void *user_data) {
void llvm::install_fatal_error_handler(fatal_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");
@ -36,19 +34,19 @@ void llvm_install_error_handler(llvm_error_handler_t handler,
ErrorHandlerUserData = user_data;
}
void llvm_remove_error_handler() {
void llvm::remove_fatal_error_handler() {
ErrorHandler = 0;
}
void report_fatal_error(const char *reason) {
void llvm::report_fatal_error(const char *reason) {
report_fatal_error(Twine(reason));
}
void report_fatal_error(const std::string &reason) {
void llvm::report_fatal_error(const std::string &reason) {
report_fatal_error(Twine(reason));
}
void report_fatal_error(const Twine &reason) {
void llvm::report_fatal_error(const Twine &reason) {
if (!ErrorHandler) {
errs() << "LLVM ERROR: " << reason << "\n";
} else {
@ -57,8 +55,8 @@ void report_fatal_error(const Twine &reason) {
exit(1);
}
void llvm_unreachable_internal(const char *msg, const char *file,
unsigned line) {
void llvm::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.
@ -70,4 +68,3 @@ void llvm_unreachable_internal(const char *msg, const char *file,
dbgs() << "!\n";
abort();
}
}