6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-17 21:29:02 +00:00
Code Issues Projects Releases Wiki Activity

generalize LLVMContext::emitError to take a twine instead of a StringRef.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@147501 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2012-01-03 23:47:05 +00:00
parent b90d2a9046
commit 3a4c60ca3b
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/llvm/LLVMContext.h
View File

@@ -19,6 +19,7 @@ namespace llvm {
class LLVMContextImpl; class LLVMContextImpl;
class StringRef; class StringRef;
class Twine;
class Instruction; class Instruction;
class Module; class Module;
class SMDiagnostic; class SMDiagnostic;
@@ -80,9 +81,9 @@ public:
/// be prepared to drop the erroneous construct on the floor and "not crash". /// be prepared to drop the erroneous construct on the floor and "not crash".
/// The generated code need not be correct. The error message will be /// The generated code need not be correct. The error message will be
/// implicitly prefixed with "error: " and should not end with a ".". /// implicitly prefixed with "error: " and should not end with a ".".
void emitError(unsigned LocCookie, StringRef ErrorStr); void emitError(unsigned LocCookie, const Twine &ErrorStr);
void emitError(const Instruction *I, StringRef ErrorStr); void emitError(const Instruction *I, const Twine &ErrorStr);
void emitError(StringRef ErrorStr); void emitError(const Twine &ErrorStr);
private: private:
// DO NOT IMPLEMENT // DO NOT IMPLEMENT

6
lib/VMCore/LLVMContext.cpp
View File

@@ -83,11 +83,11 @@ void *LLVMContext::getInlineAsmDiagnosticContext() const {
return pImpl->InlineAsmDiagContext; return pImpl->InlineAsmDiagContext;
} }
void LLVMContext::emitError(StringRef ErrorStr) { void LLVMContext::emitError(const Twine &ErrorStr) {
emitError(0U, ErrorStr); emitError(0U, ErrorStr);
} }
void LLVMContext::emitError(const Instruction *I, StringRef ErrorStr) { void LLVMContext::emitError(const Instruction *I, const Twine &ErrorStr) {
unsigned LocCookie = 0; unsigned LocCookie = 0;
if (const MDNode *SrcLoc = I->getMetadata("srcloc")) { if (const MDNode *SrcLoc = I->getMetadata("srcloc")) {
if (SrcLoc->getNumOperands() != 0) if (SrcLoc->getNumOperands() != 0)
@@ -97,7 +97,7 @@ void LLVMContext::emitError(const Instruction *I, StringRef ErrorStr) {
return emitError(LocCookie, ErrorStr); return emitError(LocCookie, ErrorStr);
} }
void LLVMContext::emitError(unsigned LocCookie, StringRef ErrorStr) { void LLVMContext::emitError(unsigned LocCookie, const Twine &ErrorStr) {
// If there is no error handler installed, just print the error and exit. // If there is no error handler installed, just print the error and exit.
if (pImpl->InlineAsmDiagHandler == 0) { if (pImpl->InlineAsmDiagHandler == 0) {
errs() << "error: " << ErrorStr << "\n"; errs() << "error: " << ErrorStr << "\n";