From afd693cff38ea76188f8f895c75fdf24c90c606a Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Sat, 13 Nov 2010 02:48:51 +0000 Subject: [PATCH] report_fatal_error: Simplify a possible ambiguity. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118972 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/ErrorHandling.h | 2 ++ lib/Support/ErrorHandling.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/include/llvm/Support/ErrorHandling.h b/include/llvm/Support/ErrorHandling.h index 6a0b6a30bbd..5eca438d8b4 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 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 839c405250b..66b2c83fe73 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());