6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-20 10:24:12 +00:00
Code Issues Projects Releases Wiki Activity

Allow llvm_report_error to accept a Twine.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@76961 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar
2009-07-24 07:58:10 +00:00
parent 23ed52752b
commit 82a29b6a02
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Support/ErrorHandling.h
View File

@ -19,6 +19,8 @@
#include <string> #include <string>
namespace llvm { namespace llvm {
class Twine;
/// An error handler callback. /// An error handler callback.
typedef void (*llvm_error_handler_t)(const std::string& reason); typedef void (*llvm_error_handler_t)(const std::string& reason);
@ -44,7 +46,9 @@ namespace llvm {
/// standard error, followed by a newline. /// standard error, followed by a newline.
/// After the error handler is called this function will call exit(1), it /// After the error handler is called this function will call exit(1), it
/// does not return. /// does not return.
void llvm_report_error(const char *reason) NORETURN;
void llvm_report_error(const std::string &reason) NORETURN; void llvm_report_error(const std::string &reason) NORETURN;
void llvm_report_error(const Twine &reason) NORETURN;
/// This function calls abort(), and prints the optional message to stderr. /// This function calls abort(), and prints the optional message to stderr.
/// Use the llvm_unreachable macro (that adds location info), instead of /// Use the llvm_unreachable macro (that adds location info), instead of

15
lib/Support/ErrorHandling.cpp
View File

@ -12,7 +12,7 @@
// Callbacks can be registered for these errors through this API. // Callbacks can be registered for these errors through this API.
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/Twine.h"
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include "llvm/System/Threading.h" #include "llvm/System/Threading.h"
@ -35,16 +35,25 @@ void llvm_remove_error_handler(void) {
ErrorHandler = 0; ErrorHandler = 0;
} }
void llvm_report_error(const char *reason) {
llvm_report_error(Twine(reason));
}
void llvm_report_error(const std::string &reason) { void llvm_report_error(const std::string &reason) {
llvm_report_error(Twine(reason));
}
void llvm_report_error(const Twine &reason) {
if (!ErrorHandler) { if (!ErrorHandler) {
errs() << "LLVM ERROR: " << reason << "\n"; errs() << "LLVM ERROR: " << reason << "\n";
} else { } else {
ErrorHandler(reason); ErrorHandler(reason.str());
} }
exit(1); exit(1);
} }
void llvm_unreachable_internal(const char *msg, const char *file, unsigned line) { void llvm_unreachable_internal(const char *msg, const char *file,
unsigned line) {
if (msg) if (msg)
errs() << msg << "\n"; errs() << msg << "\n";
errs() << "UNREACHABLE executed"; errs() << "UNREACHABLE executed";