From 7b6fef82d43a4e121a284ebabf5de94c3485b29a 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. llvm-svn: 121379 --- llvm/lib/Linker/Linker.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Linker/Linker.cpp') diff --git a/llvm/lib/Linker/Linker.cpp b/llvm/lib/Linker/Linker.cpp index 6e27fdad03a..9606d067e0a 100644 --- a/llvm/lib/Linker/Linker.cpp +++ b/llvm/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); -- cgit v1.2.3