Support/MemoryBuffer: Replace all uses of std::string *ErrMsg with error_code &ec. And fix clients.

llvm-svn: 121379
This commit is contained in:
Michael J. Spencer
2010-12-09 17:36:48 +00:00
parent f25faaaffb
commit 7b6fef82d4
23 changed files with 173 additions and 117 deletions

View File

@@ -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<MemoryBuffer> Buffer(MemoryBuffer::getFileOrSTDIN(FN.c_str()));
error_code ec;
std::auto_ptr<MemoryBuffer> 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<Module>(Result);