aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-11-13 02:48:51 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-11-13 02:48:51 +0000
commitafd693cff38ea76188f8f895c75fdf24c90c606a (patch)
treef4782fc31983fb94a76a92ba73abaca1d262c3cb
parent5b1d431217038f5169e8597f2bf4ce5b2897d95f (diff)
report_fatal_error: Simplify a possible ambiguity.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118972 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/Support/ErrorHandling.h2
-rw-r--r--lib/Support/ErrorHandling.cpp4
2 files changed, 6 insertions, 0 deletions
diff --git a/include/llvm/Support/ErrorHandling.h b/include/llvm/Support/ErrorHandling.h
index 6a0b6a30bb..5eca438d8b 100644
--- a/include/llvm/Support/ErrorHandling.h
+++ b/include/llvm/Support/ErrorHandling.h
@@ -16,6 +16,7 @@
#define LLVM_SUPPORT_ERRORHANDLING_H
#include "llvm/Support/Compiler.h"
+#include "llvm/ADT/StringRef.h"
#include <string>
namespace llvm {
@@ -74,6 +75,7 @@ namespace llvm {
/// does not return.
LLVM_ATTRIBUTE_NORETURN void report_fatal_error(const char *reason);
LLVM_ATTRIBUTE_NORETURN void report_fatal_error(const std::string &reason);
+ LLVM_ATTRIBUTE_NORETURN void report_fatal_error(StringRef reason);
LLVM_ATTRIBUTE_NORETURN void report_fatal_error(const Twine &reason);
/// This function calls abort(), and prints the optional message to stderr.
diff --git a/lib/Support/ErrorHandling.cpp b/lib/Support/ErrorHandling.cpp
index 839c405250..66b2c83fe7 100644
--- a/lib/Support/ErrorHandling.cpp
+++ b/lib/Support/ErrorHandling.cpp
@@ -58,6 +58,10 @@ void llvm::report_fatal_error(const std::string &Reason) {
report_fatal_error(Twine(Reason));
}
+void llvm::report_fatal_error(StringRef Reason) {
+ report_fatal_error(Twine(Reason));
+}
+
void llvm::report_fatal_error(const Twine &Reason) {
if (ErrorHandler) {
ErrorHandler(ErrorHandlerUserData, Reason.str());