From 333fb04506233255f10d8095c9e2de5e5f0fdc6f Mon Sep 17 00:00:00 2001 From: "Michael J. Spencer" Date: Thu, 9 Dec 2010 17:36:48 +0000 Subject: Support/MemoryBuffer: Replace all uses of std::string *ErrMsg with error_code &ec. And fix clients. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121379 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/IRReader.h | 17 +++++++------- include/llvm/Support/MemoryBuffer.h | 25 ++++++++++---------- include/llvm/Support/system_error.h | 5 ++++ lib/Archive/Archive.cpp | 15 ++++++++---- lib/Archive/ArchiveWriter.cpp | 18 +++++++++++---- lib/AsmParser/Parser.cpp | 7 +++--- lib/Linker/LinkItems.cpp | 6 +++-- lib/Linker/Linker.cpp | 8 +++++-- lib/Object/ObjectFile.cpp | 4 +++- lib/Support/CommandLine.cpp | 4 +++- lib/Support/FileUtilities.cpp | 18 +++++++++++---- lib/Support/MemoryBuffer.cpp | 38 ++++++++++++++++--------------- lib/Support/SourceMgr.cpp | 7 +++--- lib/Support/system_error.cpp | 9 ++++++++ lib/VMCore/Core.cpp | 15 ++++++------ tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp | 7 ++++-- tools/llvm-dis/llvm-dis.cpp | 10 ++++---- tools/llvm-mc/llvm-mc.cpp | 35 ++++++++-------------------- tools/llvm-nm/llvm-nm.cpp | 6 ++++- tools/llvm-prof/llvm-prof.cpp | 8 ++++--- tools/macho-dump/macho-dump.cpp | 6 +++-- utils/FileCheck/FileCheck.cpp | 15 ++++++------ utils/TableGen/TableGen.cpp | 7 +++--- 23 files changed, 173 insertions(+), 117 deletions(-) diff --git a/include/llvm/Support/IRReader.h b/include/llvm/Support/IRReader.h index a44da528ac..a2002ef224 100644 --- a/include/llvm/Support/IRReader.h +++ b/include/llvm/Support/IRReader.h @@ -23,6 +23,7 @@ #include "llvm/Bitcode/ReaderWriter.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/SourceMgr.h" +#include "llvm/Support/system_error.h" namespace llvm { @@ -56,11 +57,11 @@ namespace llvm { inline Module *getLazyIRFileModule(const std::string &Filename, SMDiagnostic &Err, LLVMContext &Context) { - std::string ErrMsg; - MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrMsg); + error_code ec; + MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), ec); if (F == 0) { - Err = SMDiagnostic(Filename, - "Could not open input file: " + ErrMsg); + Err = SMDiagnostic(Filename, + "Could not open input file: " + ec.message()); return 0; } @@ -94,11 +95,11 @@ namespace llvm { inline Module *ParseIRFile(const std::string &Filename, SMDiagnostic &Err, LLVMContext &Context) { - std::string ErrMsg; - MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrMsg); + error_code ec; + MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), ec); if (F == 0) { - Err = SMDiagnostic(Filename, - "Could not open input file: " + ErrMsg); + Err = SMDiagnostic(Filename, + "Could not open input file: " + ec.message()); return 0; } diff --git a/include/llvm/Support/MemoryBuffer.h b/include/llvm/Support/MemoryBuffer.h index aaa49f5479..6dc49d899f 100644 --- a/include/llvm/Support/MemoryBuffer.h +++ b/include/llvm/Support/MemoryBuffer.h @@ -16,10 +16,11 @@ #include "llvm/ADT/StringRef.h" #include "llvm/Support/DataTypes.h" -#include namespace llvm { +class error_code; + /// MemoryBuffer - This interface provides simple read-only access to a block /// of memory, and provides simple methods for reading files and standard input /// into a memory buffer. In addition to basic access to the characters in the @@ -46,8 +47,8 @@ public: const char *getBufferEnd() const { return BufferEnd; } size_t getBufferSize() const { return BufferEnd-BufferStart; } - StringRef getBuffer() const { - return StringRef(BufferStart, getBufferSize()); + StringRef getBuffer() const { + return StringRef(BufferStart, getBufferSize()); } /// getBufferIdentifier - Return an identifier for this buffer, typically the @@ -60,16 +61,16 @@ public: /// MemoryBuffer if successful, otherwise returning null. If FileSize is /// specified, this means that the client knows that the file exists and that /// it has the specified size. - static MemoryBuffer *getFile(StringRef Filename, std::string *ErrStr = 0, + static MemoryBuffer *getFile(StringRef Filename, error_code &ec, int64_t FileSize = -1); - static MemoryBuffer *getFile(const char *Filename, std::string *ErrStr = 0, + static MemoryBuffer *getFile(const char *Filename, error_code &ec, int64_t FileSize = -1); /// getOpenFile - Given an already-open file descriptor, read the file and /// return a MemoryBuffer. This takes ownership of the descriptor, /// immediately closing it after reading the file. static MemoryBuffer *getOpenFile(int FD, const char *Filename, - std::string *ErrStr = 0, + error_code &ec, int64_t FileSize = -1); /// getMemBuffer - Open the specified memory range as a MemoryBuffer. Note @@ -97,18 +98,18 @@ public: StringRef BufferName = ""); /// getSTDIN - Read all of stdin into a file buffer, and return it. - /// If an error occurs, this returns null and fills in *ErrStr with a reason. - static MemoryBuffer *getSTDIN(std::string *ErrStr = 0); + /// If an error occurs, this returns null and sets ec. + static MemoryBuffer *getSTDIN(error_code &ec); /// getFileOrSTDIN - Open the specified file as a MemoryBuffer, or open stdin - /// if the Filename is "-". If an error occurs, this returns null and fills - /// in *ErrStr with a reason. + /// if the Filename is "-". If an error occurs, this returns null and sets + /// ec. static MemoryBuffer *getFileOrSTDIN(StringRef Filename, - std::string *ErrStr = 0, + error_code &ec, int64_t FileSize = -1); static MemoryBuffer *getFileOrSTDIN(const char *Filename, - std::string *ErrStr = 0, + error_code &ec, int64_t FileSize = -1); }; diff --git a/include/llvm/Support/system_error.h b/include/llvm/Support/system_error.h index 40f5b3cd7f..e5306ecfb3 100644 --- a/include/llvm/Support/system_error.h +++ b/include/llvm/Support/system_error.h @@ -668,6 +668,11 @@ public: const error_category& generic_category(); const error_category& system_category(); +/// Get the error_category used for errno values from POSIX functions. This is +/// the same as the system_category on POISIX systems, but is the same as the +/// generic_category on Windows. +const error_category& posix_category(); + class error_condition { int _val_; diff --git a/lib/Archive/Archive.cpp b/lib/Archive/Archive.cpp index e2e5593c6b..3ce7fbdc94 100644 --- a/lib/Archive/Archive.cpp +++ b/lib/Archive/Archive.cpp @@ -17,6 +17,7 @@ #include "llvm/Module.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Process.h" +#include "llvm/Support/system_error.h" #include #include using namespace llvm; @@ -147,9 +148,13 @@ Archive::Archive(const sys::Path& filename, LLVMContext& C) bool Archive::mapToMemory(std::string* ErrMsg) { - mapfile = MemoryBuffer::getFile(archPath.c_str(), ErrMsg); - if (mapfile == 0) + error_code ec; + mapfile = MemoryBuffer::getFile(archPath.c_str(), ec); + if (mapfile == 0) { + if (ErrMsg) + *ErrMsg = ec.message(); return true; + } base = mapfile->getBufferStart(); return false; } @@ -213,10 +218,12 @@ bool llvm::GetBitcodeSymbols(const sys::Path& fName, LLVMContext& Context, std::vector& symbols, std::string* ErrMsg) { + error_code ec; std::auto_ptr Buffer( - MemoryBuffer::getFileOrSTDIN(fName.c_str())); + MemoryBuffer::getFileOrSTDIN(fName.c_str(), ec)); if (!Buffer.get()) { - if (ErrMsg) *ErrMsg = "Could not open file '" + fName.str() + "'"; + if (ErrMsg) *ErrMsg = "Could not open file '" + fName.str() + "'" + ": " + + ec.message(); return true; } diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp index de5887e5c7..e9222c5e09 100644 --- a/lib/Archive/ArchiveWriter.cpp +++ b/lib/Archive/ArchiveWriter.cpp @@ -18,6 +18,7 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Process.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/system_error.h" #include #include #include @@ -212,9 +213,13 @@ Archive::writeMember( const char *data = (const char*)member.getData(); MemoryBuffer *mFile = 0; if (!data) { - mFile = MemoryBuffer::getFile(member.getPath().c_str(), ErrMsg); - if (mFile == 0) + error_code ec; + mFile = MemoryBuffer::getFile(member.getPath().c_str(), ec); + if (mFile == 0) { + if (ErrMsg) + *ErrMsg = ec.message(); return true; + } data = mFile->getBufferStart(); fSize = mFile->getBufferSize(); } @@ -406,8 +411,13 @@ Archive::writeToDisk(bool CreateSymbolTable, bool TruncateNames, bool Compress, // Map in the archive we just wrote. { - OwningPtr arch(MemoryBuffer::getFile(TmpArchive.c_str())); - if (arch == 0) return true; + error_code ec; + OwningPtr arch(MemoryBuffer::getFile(TmpArchive.c_str(), ec)); + if (arch == 0) { + if (ErrMsg) + *ErrMsg = ec.message(); + return true; + } const char* base = arch->getBufferStart(); // Open another temporary file in order to avoid invalidating the diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp index e7cef9b5c3..a613a8346a 100644 --- a/lib/AsmParser/Parser.cpp +++ b/lib/AsmParser/Parser.cpp @@ -18,6 +18,7 @@ #include "llvm/Support/SourceMgr.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Support/system_error.h" #include using namespace llvm; @@ -41,11 +42,11 @@ Module *llvm::ParseAssembly(MemoryBuffer *F, Module *llvm::ParseAssemblyFile(const std::string &Filename, SMDiagnostic &Err, LLVMContext &Context) { - std::string ErrorStr; - MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr); + error_code ec; + MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), ec); if (F == 0) { Err = SMDiagnostic(Filename, - "Could not open input file: " + ErrorStr); + "Could not open input file: " + ec.message()); return 0; } diff --git a/lib/Linker/LinkItems.cpp b/lib/Linker/LinkItems.cpp index cbbdd4ba10..7716b61a79 100644 --- a/lib/Linker/LinkItems.cpp +++ b/lib/Linker/LinkItems.cpp @@ -18,6 +18,7 @@ #include "llvm/Support/Path.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MemoryBuffer.h" +#include "llvm/Support/system_error.h" using namespace llvm; // LinkItems - This function is the main entry point into linking. It takes a @@ -160,7 +161,8 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) { // Check for a file of name "-", which means "read standard input" if (File.str() == "-") { std::auto_ptr M; - if (MemoryBuffer *Buffer = MemoryBuffer::getSTDIN(&Error)) { + error_code ec; + if (MemoryBuffer *Buffer = MemoryBuffer::getSTDIN(ec)) { if (!Buffer->getBufferSize()) { delete Buffer; Error = "standard input is empty"; @@ -172,7 +174,7 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) { return false; } } - return error("Cannot link stdin: " + Error); + return error("Cannot link stdin: " + ec.message()); } // Determine what variety of file it is. diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp index 6e27fdad03..9606d067e0 100644 --- a/lib/Linker/Linker.cpp +++ b/lib/Linker/Linker.cpp @@ -18,6 +18,7 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Config/config.h" +#include "llvm/Support/system_error.h" using namespace llvm; Linker::Linker(StringRef progname, StringRef modname, @@ -98,11 +99,14 @@ Linker::LoadObject(const sys::Path &FN) { std::string ParseErrorMessage; Module *Result = 0; - std::auto_ptr Buffer(MemoryBuffer::getFileOrSTDIN(FN.c_str())); + error_code ec; + std::auto_ptr Buffer( + MemoryBuffer::getFileOrSTDIN(FN.c_str(), ec)); if (Buffer.get()) Result = ParseBitcodeFile(Buffer.get(), Context, &ParseErrorMessage); else - ParseErrorMessage = "Error reading file '" + FN.str() + "'"; + ParseErrorMessage = "Error reading file '" + FN.str() + "'" + ": " + + ec.message(); if (Result) return std::auto_ptr(Result); diff --git a/lib/Object/ObjectFile.cpp b/lib/Object/ObjectFile.cpp index 3ea39b3793..2a6e086137 100644 --- a/lib/Object/ObjectFile.cpp +++ b/lib/Object/ObjectFile.cpp @@ -15,6 +15,7 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/Path.h" +#include "llvm/Support/system_error.h" using namespace llvm; using namespace object; @@ -62,5 +63,6 @@ ObjectFile *ObjectFile::createObjectFile(MemoryBuffer *Object) { } ObjectFile *ObjectFile::createObjectFile(StringRef ObjectPath) { - return createObjectFile(MemoryBuffer::getFile(ObjectPath)); + error_code ec; + return createObjectFile(MemoryBuffer::getFile(ObjectPath, ec)); } diff --git a/lib/Support/CommandLine.cpp b/lib/Support/CommandLine.cpp index a99e46dbd1..e856509d4f 100644 --- a/lib/Support/CommandLine.cpp +++ b/lib/Support/CommandLine.cpp @@ -22,6 +22,7 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Support/system_error.h" #include "llvm/Target/TargetRegistry.h" #include "llvm/Support/Host.h" #include "llvm/Support/Path.h" @@ -464,8 +465,9 @@ static void ExpandResponseFiles(unsigned argc, char** argv, if (FileStat && FileStat->getSize() != 0) { // Mmap the response file into memory. + error_code ec; OwningPtr - respFilePtr(MemoryBuffer::getFile(respFile.c_str())); + respFilePtr(MemoryBuffer::getFile(respFile.c_str(), ec)); // If we could open the file, parse its contents, otherwise // pass the @file option verbatim. diff --git a/lib/Support/FileUtilities.cpp b/lib/Support/FileUtilities.cpp index 72200850c5..77de94dfc9 100644 --- a/lib/Support/FileUtilities.cpp +++ b/lib/Support/FileUtilities.cpp @@ -16,6 +16,7 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/Path.h" +#include "llvm/Support/system_error.h" #include "llvm/ADT/OwningPtr.h" #include "llvm/ADT/SmallString.h" #include @@ -199,11 +200,20 @@ int llvm::DiffFilesWithTolerance(const sys::PathWithStatus &FileA, // Now its safe to mmap the files into memory becasue both files // have a non-zero size. - OwningPtr F1(MemoryBuffer::getFile(FileA.c_str(), Error)); - OwningPtr F2(MemoryBuffer::getFile(FileB.c_str(), Error)); - if (F1 == 0 || F2 == 0) + error_code ec; + OwningPtr F1(MemoryBuffer::getFile(FileA.c_str(), ec)); + if (F1 == 0) { + if (Error) + *Error = ec.message(); + return 2; + } + OwningPtr F2(MemoryBuffer::getFile(FileB.c_str(), ec)); + if (F2 == 0) { + if (Error) + *Error = ec.message(); return 2; - + } + // Okay, now that we opened the files, scan them for the first difference. const char *File1Start = F1->getBufferStart(); const char *File2Start = F2->getBufferStart(); diff --git a/lib/Support/MemoryBuffer.cpp b/lib/Support/MemoryBuffer.cpp index 07a5ed478c..0966f9069f 100644 --- a/lib/Support/MemoryBuffer.cpp +++ b/lib/Support/MemoryBuffer.cpp @@ -19,6 +19,7 @@ #include "llvm/Support/Path.h" #include "llvm/Support/Process.h" #include "llvm/Support/Program.h" +#include "llvm/Support/system_error.h" #include #include #include @@ -143,19 +144,19 @@ MemoryBuffer *MemoryBuffer::getNewMemBuffer(size_t Size, StringRef BufferName) { /// in *ErrStr with a reason. If stdin is empty, this API (unlike getSTDIN) /// returns an empty buffer. MemoryBuffer *MemoryBuffer::getFileOrSTDIN(StringRef Filename, - std::string *ErrStr, + error_code &ec, int64_t FileSize) { if (Filename == "-") - return getSTDIN(ErrStr); - return getFile(Filename, ErrStr, FileSize); + return getSTDIN(ec); + return getFile(Filename, ec, FileSize); } MemoryBuffer *MemoryBuffer::getFileOrSTDIN(const char *Filename, - std::string *ErrStr, + error_code &ec, int64_t FileSize) { if (strcmp(Filename, "-") == 0) - return getSTDIN(ErrStr); - return getFile(Filename, ErrStr, FileSize); + return getSTDIN(ec); + return getFile(Filename, ec, FileSize); } //===----------------------------------------------------------------------===// @@ -185,14 +186,14 @@ public: }; } -MemoryBuffer *MemoryBuffer::getFile(StringRef Filename, std::string *ErrStr, +MemoryBuffer *MemoryBuffer::getFile(StringRef Filename, error_code &ec, int64_t FileSize) { // Ensure the path is null terminated. SmallString<256> PathBuf(Filename.begin(), Filename.end()); - return MemoryBuffer::getFile(PathBuf.c_str(), ErrStr, FileSize); + return MemoryBuffer::getFile(PathBuf.c_str(), ec, FileSize); } -MemoryBuffer *MemoryBuffer::getFile(const char *Filename, std::string *ErrStr, +MemoryBuffer *MemoryBuffer::getFile(const char *Filename, error_code &ec, int64_t FileSize) { int OpenFlags = O_RDONLY; #ifdef O_BINARY @@ -200,15 +201,15 @@ MemoryBuffer *MemoryBuffer::getFile(const char *Filename, std::string *ErrStr, #endif int FD = ::open(Filename, OpenFlags); if (FD == -1) { - if (ErrStr) *ErrStr = sys::StrError(); + ec = error_code(errno, posix_category()); return 0; } - return getOpenFile(FD, Filename, ErrStr, FileSize); + return getOpenFile(FD, Filename, ec, FileSize); } MemoryBuffer *MemoryBuffer::getOpenFile(int FD, const char *Filename, - std::string *ErrStr, int64_t FileSize) { + error_code &ec, int64_t FileSize) { FileCloser FC(FD); // Close FD on return. // If we don't know the file size, use fstat to find out. fstat on an open @@ -217,7 +218,7 @@ MemoryBuffer *MemoryBuffer::getOpenFile(int FD, const char *Filename, struct stat FileInfo; // TODO: This should use fstat64 when available. if (fstat(FD, &FileInfo) == -1) { - if (ErrStr) *ErrStr = sys::StrError(); + ec = error_code(errno, posix_category()); return 0; } FileSize = FileInfo.st_size; @@ -240,8 +241,9 @@ MemoryBuffer *MemoryBuffer::getOpenFile(int FD, const char *Filename, MemoryBuffer *Buf = MemoryBuffer::getNewUninitMemBuffer(FileSize, Filename); if (!Buf) { - // Failed to create a buffer. - if (ErrStr) *ErrStr = "could not allocate buffer"; + // Failed to create a buffer. The only way it can fail is if + // new(std::nothrow) returns 0. + ec = make_error_code(errc::not_enough_memory); return 0; } @@ -255,7 +257,7 @@ MemoryBuffer *MemoryBuffer::getOpenFile(int FD, const char *Filename, if (errno == EINTR) continue; // Error while reading. - if (ErrStr) *ErrStr = sys::StrError(); + ec = error_code(errno, posix_category()); return 0; } else if (NumRead == 0) { // We hit EOF early, truncate and terminate buffer. @@ -274,7 +276,7 @@ MemoryBuffer *MemoryBuffer::getOpenFile(int FD, const char *Filename, // MemoryBuffer::getSTDIN implementation. //===----------------------------------------------------------------------===// -MemoryBuffer *MemoryBuffer::getSTDIN(std::string *ErrStr) { +MemoryBuffer *MemoryBuffer::getSTDIN(error_code &ec) { // Read in all of the data from stdin, we cannot mmap stdin. // // FIXME: That isn't necessarily true, we should try to mmap stdin and @@ -290,7 +292,7 @@ MemoryBuffer *MemoryBuffer::getSTDIN(std::string *ErrStr) { ReadBytes = read(0, Buffer.end(), ChunkSize); if (ReadBytes == -1) { if (errno == EINTR) continue; - if (ErrStr) *ErrStr = sys::StrError(); + ec = error_code(errno, posix_category()); return 0; } Buffer.set_size(Buffer.size() + ReadBytes); diff --git a/lib/Support/SourceMgr.cpp b/lib/Support/SourceMgr.cpp index 0dc1331d26..f53169a8cf 100644 --- a/lib/Support/SourceMgr.cpp +++ b/lib/Support/SourceMgr.cpp @@ -17,6 +17,7 @@ #include "llvm/Support/SourceMgr.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Support/system_error.h" using namespace llvm; namespace { @@ -48,13 +49,13 @@ SourceMgr::~SourceMgr() { /// ~0, otherwise it returns the buffer ID of the stacked file. unsigned SourceMgr::AddIncludeFile(const std::string &Filename, SMLoc IncludeLoc) { - - MemoryBuffer *NewBuf = MemoryBuffer::getFile(Filename.c_str()); + error_code ec; + MemoryBuffer *NewBuf = MemoryBuffer::getFile(Filename.c_str(), ec); // If the file didn't exist directly, see if it's in an include path. for (unsigned i = 0, e = IncludeDirectories.size(); i != e && !NewBuf; ++i) { std::string IncFile = IncludeDirectories[i] + "/" + Filename; - NewBuf = MemoryBuffer::getFile(IncFile.c_str()); + NewBuf = MemoryBuffer::getFile(IncFile.c_str(), ec); } if (NewBuf == 0) return ~0U; diff --git a/lib/Support/system_error.cpp b/lib/Support/system_error.cpp index cd18906f06..56898de315 100644 --- a/lib/Support/system_error.cpp +++ b/lib/Support/system_error.cpp @@ -96,6 +96,15 @@ system_category() { return s; } +const error_category& +posix_category() { +#ifdef LLVM_ON_WIN32 + return generic_category(); +#else + return system_category(); +#endif +} + // error_condition std::string diff --git a/lib/VMCore/Core.cpp b/lib/VMCore/Core.cpp index 858f49cdf5..a4c77a2670 100644 --- a/lib/VMCore/Core.cpp +++ b/lib/VMCore/Core.cpp @@ -28,6 +28,7 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Support/system_error.h" #include #include #include @@ -2220,25 +2221,25 @@ LLVMBool LLVMCreateMemoryBufferWithContentsOfFile( LLVMMemoryBufferRef *OutMemBuf, char **OutMessage) { - std::string Error; - if (MemoryBuffer *MB = MemoryBuffer::getFile(Path, &Error)) { + error_code ec; + if (MemoryBuffer *MB = MemoryBuffer::getFile(Path, ec)) { *OutMemBuf = wrap(MB); return 0; } - - *OutMessage = strdup(Error.c_str()); + + *OutMessage = strdup(ec.message().c_str()); return 1; } LLVMBool LLVMCreateMemoryBufferWithSTDIN(LLVMMemoryBufferRef *OutMemBuf, char **OutMessage) { - std::string Error; - if (MemoryBuffer *MB = MemoryBuffer::getSTDIN(&Error)) { + error_code ec; + if (MemoryBuffer *MB = MemoryBuffer::getSTDIN(ec)) { *OutMemBuf = wrap(MB); return 0; } - *OutMessage = strdup(Error.c_str()); + *OutMessage = strdup(ec.message().c_str()); return 1; } diff --git a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp b/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp index 36b0deb07e..f11fdb893f 100644 --- a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp +++ b/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp @@ -38,6 +38,7 @@ #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/system_error.h" #include #include #include @@ -473,10 +474,12 @@ static void PrintSize(uint64_t Bits) { /// AnalyzeBitcode - Analyze the bitcode file specified by InputFilename. static int AnalyzeBitcode() { // Read the input file. - MemoryBuffer *MemBuf = MemoryBuffer::getFileOrSTDIN(InputFilename.c_str()); + error_code ec; + MemoryBuffer *MemBuf = + MemoryBuffer::getFileOrSTDIN(InputFilename.c_str(), ec); if (MemBuf == 0) - return Error("Error reading '" + InputFilename + "'."); + return Error("Error reading '" + InputFilename + "': " + ec.message()); if (MemBuf->getBufferSize() & 3) return Error("Bitcode stream should be a multiple of 4 bytes in length"); diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp index 9e057755f8..781bca95ea 100644 --- a/tools/llvm-dis/llvm-dis.cpp +++ b/tools/llvm-dis/llvm-dis.cpp @@ -28,6 +28,7 @@ #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/ToolOutputFile.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/system_error.h" using namespace llvm; static cl::opt @@ -78,13 +79,14 @@ int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, "llvm .bc -> .ll disassembler\n"); std::string ErrorMessage; + error_code ec; std::auto_ptr M; - - if (MemoryBuffer *Buffer - = MemoryBuffer::getFileOrSTDIN(InputFilename, &ErrorMessage)) { + + if (MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename, ec)) { M.reset(ParseBitcodeFile(Buffer, Context, &ErrorMessage)); delete Buffer; - } + } else + ErrorMessage = ec.message(); if (M.get() == 0) { errs() << argv[0] << ": "; diff --git a/tools/llvm-mc/llvm-mc.cpp b/tools/llvm-mc/llvm-mc.cpp index b42f373472..46eb3727d6 100644 --- a/tools/llvm-mc/llvm-mc.cpp +++ b/tools/llvm-mc/llvm-mc.cpp @@ -37,6 +37,7 @@ #include "llvm/Support/ToolOutputFile.h" #include "llvm/Support/Host.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/system_error.h" #include "Disassembler.h" using namespace llvm; @@ -164,15 +165,10 @@ static tool_output_file *GetOutputStream() { } static int AsLexInput(const char *ProgName) { - std::string ErrorMessage; - MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename, - &ErrorMessage); + error_code ec; + MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename, ec); if (Buffer == 0) { - errs() << ProgName << ": "; - if (ErrorMessage.size()) - errs() << ErrorMessage << "\n"; - else - errs() << "input file didn't read correctly.\n"; + errs() << ProgName << ": " << ec.message() << '\n'; return 1; } @@ -282,14 +278,10 @@ static int AssembleInput(const char *ProgName) { if (!TheTarget) return 1; - std::string Error; - MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename, &Error); + error_code ec; + MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename, ec); if (Buffer == 0) { - errs() << ProgName << ": "; - if (Error.size()) - errs() << Error << "\n"; - else - errs() << "input file didn't read correctly.\n"; + errs() << ProgName << ": " << ec.message() << '\n'; return 1; } @@ -383,18 +375,11 @@ static int DisassembleInput(const char *ProgName, bool Enhanced) { const Target *TheTarget = GetTarget(ProgName); if (!TheTarget) return 0; - - std::string ErrorMessage; - - MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename, - &ErrorMessage); + error_code ec; + MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFilename, ec); if (Buffer == 0) { - errs() << ProgName << ": "; - if (ErrorMessage.size()) - errs() << ErrorMessage << "\n"; - else - errs() << "input file didn't read correctly.\n"; + errs() << ProgName << ": " << ec.message() << '\n'; return 1; } diff --git a/tools/llvm-nm/llvm-nm.cpp b/tools/llvm-nm/llvm-nm.cpp index 132644d8d2..16615964a3 100644 --- a/tools/llvm-nm/llvm-nm.cpp +++ b/tools/llvm-nm/llvm-nm.cpp @@ -26,6 +26,7 @@ #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/system_error.h" #include #include #include @@ -143,8 +144,11 @@ static void DumpSymbolNamesFromFile(std::string &Filename) { sys::Path aPath(Filename); // Note: Currently we do not support reading an archive from stdin. if (Filename == "-" || aPath.isBitcodeFile()) { + error_code ec; std::auto_ptr Buffer( - MemoryBuffer::getFileOrSTDIN(Filename, &ErrorMessage)); + MemoryBuffer::getFileOrSTDIN(Filename, ec)); + if (Buffer.get() == 0) + ErrorMessage = ec.message(); Module *Result = 0; if (Buffer.get()) Result = ParseBitcodeFile(Buffer.get(), Context, &ErrorMessage); diff --git a/tools/llvm-prof/llvm-prof.cpp b/tools/llvm-prof/llvm-prof.cpp index 3351bd2735..aa9cf004c7 100644 --- a/tools/llvm-prof/llvm-prof.cpp +++ b/tools/llvm-prof/llvm-prof.cpp @@ -30,6 +30,7 @@ #include "llvm/Support/raw_ostream.h" #include "llvm/Support/Format.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/system_error.h" #include #include #include @@ -263,12 +264,13 @@ int main(int argc, char **argv) { // Read in the bitcode file... std::string ErrorMessage; + error_code ec; Module *M = 0; - if (MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(BitcodeFile, - &ErrorMessage)) { + if (MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(BitcodeFile, ec)) { M = ParseBitcodeFile(Buffer, Context, &ErrorMessage); delete Buffer; - } + } else + ErrorMessage = ec.message(); if (M == 0) { errs() << argv[0] << ": " << BitcodeFile << ": " << ErrorMessage << "\n"; diff --git a/tools/macho-dump/macho-dump.cpp b/tools/macho-dump/macho-dump.cpp index 02fa36680f..982443a2ce 100644 --- a/tools/macho-dump/macho-dump.cpp +++ b/tools/macho-dump/macho-dump.cpp @@ -19,6 +19,7 @@ #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Support/system_error.h" using namespace llvm; using namespace llvm::object; @@ -365,10 +366,11 @@ int main(int argc, char **argv) { // Load the input file. std::string ErrorStr; + error_code ec; OwningPtr InputBuffer( - MemoryBuffer::getFileOrSTDIN(InputFile, &ErrorStr)); + MemoryBuffer::getFileOrSTDIN(InputFile, ec)); if (!InputBuffer) - return Error("unable to read input: '" + ErrorStr + "'"); + return Error("unable to read input: '" + ec.message() + "'"); // Construct the Mach-O wrapper object. OwningPtr InputObject( diff --git a/utils/FileCheck/FileCheck.cpp b/utils/FileCheck/FileCheck.cpp index 9343617c3c..b8c14f0e9b 100644 --- a/utils/FileCheck/FileCheck.cpp +++ b/utils/FileCheck/FileCheck.cpp @@ -23,6 +23,7 @@ #include "llvm/Support/SourceMgr.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/system_error.h" #include "llvm/ADT/SmallString.h" #include "llvm/ADT/StringMap.h" #include @@ -488,12 +489,11 @@ static MemoryBuffer *CanonicalizeInputFile(MemoryBuffer *MB) { static bool ReadCheckFile(SourceMgr &SM, std::vector &CheckStrings) { // Open the check file, and tell SourceMgr about it. - std::string ErrorStr; - MemoryBuffer *F = - MemoryBuffer::getFileOrSTDIN(CheckFilename.c_str(), &ErrorStr); + error_code ec; + MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(CheckFilename.c_str(), ec); if (F == 0) { errs() << "Could not open check file '" << CheckFilename << "': " - << ErrorStr << '\n'; + << ec.message() << '\n'; return true; } @@ -648,12 +648,11 @@ int main(int argc, char **argv) { return 2; // Open the file to check and add it to SourceMgr. - std::string ErrorStr; - MemoryBuffer *F = - MemoryBuffer::getFileOrSTDIN(InputFilename.c_str(), &ErrorStr); + error_code ec; + MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(InputFilename.c_str(), ec); if (F == 0) { errs() << "Could not open input file '" << InputFilename << "': " - << ErrorStr << '\n'; + << ec.message() << '\n'; return true; } diff --git a/utils/TableGen/TableGen.cpp b/utils/TableGen/TableGen.cpp index e6d000a1e2..e8815da35c 100644 --- a/utils/TableGen/TableGen.cpp +++ b/utils/TableGen/TableGen.cpp @@ -42,6 +42,7 @@ #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/ToolOutputFile.h" #include "llvm/Support/Signals.h" +#include "llvm/Support/system_error.h" #include #include using namespace llvm; @@ -188,11 +189,11 @@ void llvm::PrintError(SMLoc ErrorLoc, const Twine &Msg) { static bool ParseFile(const std::string &Filename, const std::vector &IncludeDirs, SourceMgr &SrcMgr) { - std::string ErrorStr; - MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), &ErrorStr); + error_code ec; + MemoryBuffer *F = MemoryBuffer::getFileOrSTDIN(Filename.c_str(), ec); if (F == 0) { errs() << "Could not open input file '" << Filename << "': " - << ErrorStr <<"\n"; + << ec.message() <<"\n"; return true; } -- cgit v1.2.3