From c2199ecf1e833dc4b5e269141ecc72d3deb11616 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Sun, 6 Jul 2014 17:43:22 +0000 Subject: [PATCH] Update for llvm api change. llvm-svn: 212407 --- lld/include/lld/Driver/CoreInputGraph.h | 7 ++++--- lld/lib/Core/InputGraph.cpp | 7 ++++--- lld/lib/Driver/WinLinkDriver.cpp | 14 +++++++------- lld/lib/Passes/RoundTripNativePass.cpp | 7 ++++--- lld/lib/Passes/RoundTripYAMLPass.cpp | 7 ++++--- lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp | 7 ++++--- .../MachOTests/MachONormalizedFileBinaryWriterTests.cpp | 4 +++- lld/utils/linker-script-test/linker-script-test.cpp | 14 ++++++++------ 8 files changed, 38 insertions(+), 29 deletions(-) diff --git a/lld/include/lld/Driver/CoreInputGraph.h b/lld/include/lld/Driver/CoreInputGraph.h index d194b80..d16bfec 100644 --- a/lld/include/lld/Driver/CoreInputGraph.h +++ b/lld/include/lld/Driver/CoreInputGraph.h @@ -40,11 +40,12 @@ public: return make_error_code(llvm::errc::no_such_file_or_directory); // Create a memory buffer - std::unique_ptr mb; - if (std::error_code ec = MemoryBuffer::getFileOrSTDIN(*filePath, mb)) + ErrorOr> mb = + MemoryBuffer::getFileOrSTDIN(*filePath); + if (std::error_code ec = mb.getError()) return ec; - _buffer = std::move(mb); + _buffer = std::move(mb.get()); return ctx.registry().parseFile(_buffer, _files); } diff --git a/lld/lib/Core/InputGraph.cpp b/lld/lib/Core/InputGraph.cpp index c269b0d4..5d8009f 100644 --- a/lld/lib/Core/InputGraph.cpp +++ b/lld/lib/Core/InputGraph.cpp @@ -86,10 +86,11 @@ void InputGraph::normalize() { /// \brief Read the file into _buffer. std::error_code FileNode::getBuffer(StringRef filePath) { // Create a memory buffer - std::unique_ptr mb; - if (std::error_code ec = MemoryBuffer::getFileOrSTDIN(filePath, mb)) + ErrorOr> mb = + MemoryBuffer::getFileOrSTDIN(filePath); + if (std::error_code ec = mb.getError()) return ec; - _buffer = std::move(mb); + _buffer = std::move(mb.get()); return std::error_code(); } diff --git a/lld/lib/Driver/WinLinkDriver.cpp b/lld/lib/Driver/WinLinkDriver.cpp index 74d6a5b..f4b8886 100644 --- a/lld/lib/Driver/WinLinkDriver.cpp +++ b/lld/lib/Driver/WinLinkDriver.cpp @@ -251,12 +251,12 @@ static bool parseSection(StringRef option, std::string §ion, static bool readFile(PECOFFLinkingContext &ctx, StringRef path, ArrayRef &result) { - std::unique_ptr buf; - if (MemoryBuffer::getFile(path, buf)) + ErrorOr> buf = MemoryBuffer::getFile(path); + if (!buf) return false; + StringRef Data = buf.get()->getBuffer(); result = ctx.allocate(ArrayRef( - reinterpret_cast(buf->getBufferStart()), - buf->getBufferSize())); + reinterpret_cast(Data.begin()), Data.size())); return true; } @@ -353,10 +353,10 @@ static bool parseExport(StringRef option, // Read module-definition file. static bool parseDef(StringRef option, llvm::BumpPtrAllocator &alloc, std::vector &result) { - std::unique_ptr buf; - if (MemoryBuffer::getFile(option, buf)) + ErrorOr> buf = MemoryBuffer::getFile(option); + if (!buf) return llvm::None; - moduledef::Lexer lexer(std::move(buf)); + moduledef::Lexer lexer(std::move(buf.get())); moduledef::Parser parser(lexer, alloc); return parser.parse(result); } diff --git a/lld/lib/Passes/RoundTripNativePass.cpp b/lld/lib/Passes/RoundTripNativePass.cpp index fb5e9ca..977fcab 100644 --- a/lld/lib/Passes/RoundTripNativePass.cpp +++ b/lld/lib/Passes/RoundTripNativePass.cpp @@ -37,11 +37,12 @@ void RoundTripNativePass::perform(std::unique_ptr &mergedFile) { // The file that is written would be kept around if there is a problem // writing to the file or when reading atoms back from the file. nativeWriter->writeFile(*mergedFile, tmpNativeFile.str()); - std::unique_ptr mb; - if (MemoryBuffer::getFile(tmpNativeFile.str(), mb)) + ErrorOr> mb = + MemoryBuffer::getFile(tmpNativeFile.str()); + if (!mb) return; - std::error_code ec = _context.registry().parseFile(mb, _nativeFile); + std::error_code ec = _context.registry().parseFile(mb.get(), _nativeFile); if (ec) { // Note: we need a way for Passes to report errors. llvm_unreachable("native reader not registered or read error"); diff --git a/lld/lib/Passes/RoundTripYAMLPass.cpp b/lld/lib/Passes/RoundTripYAMLPass.cpp index 9bb09e7..d96341f 100644 --- a/lld/lib/Passes/RoundTripYAMLPass.cpp +++ b/lld/lib/Passes/RoundTripYAMLPass.cpp @@ -37,11 +37,12 @@ void RoundTripYAMLPass::perform(std::unique_ptr &mergedFile) { // The file that is written would be kept around if there is a problem // writing to the file or when reading atoms back from the file. yamlWriter->writeFile(*mergedFile, tmpYAMLFile.str()); - std::unique_ptr mb; - if (MemoryBuffer::getFile(tmpYAMLFile.str(), mb)) + ErrorOr> mb = + MemoryBuffer::getFile(tmpYAMLFile.str()); + if (!mb) return; - std::error_code ec = _context.registry().parseFile(mb, _yamlFile); + std::error_code ec = _context.registry().parseFile(mb.get(), _yamlFile); if (ec) { // Note: we need a way for Passes to report errors. llvm_unreachable("yaml reader not registered or read error"); diff --git a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp index 0a4d274..59d429f 100644 --- a/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp +++ b/lld/lib/ReaderWriter/PECOFF/ReaderCOFF.cpp @@ -958,11 +958,12 @@ public: llvm::FileRemover coffFileRemover(*coffPath); // Read and parse the COFF - std::unique_ptr newmb; - if (std::error_code ec = MemoryBuffer::getFile(*coffPath, newmb)) + ErrorOr> newmb = + MemoryBuffer::getFile(*coffPath); + if (std::error_code ec = newmb.getError()) return ec; std::error_code ec; - std::unique_ptr file(new FileCOFF(std::move(newmb), ec)); + std::unique_ptr file(new FileCOFF(std::move(newmb.get()), ec)); if (ec) return ec; if (std::error_code ec = file->parse()) diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp index 5ca7f9d..d79c6d6 100644 --- a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp +++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp @@ -30,8 +30,10 @@ using namespace lld::mach_o::normalized; // Normalized file to nf parameter. static void fromBinary(StringRef path, std::unique_ptr &mb, std::unique_ptr &nf, StringRef archStr) { - std::error_code ec = MemoryBuffer::getFile(path, mb); + ErrorOr> mbOrErr = MemoryBuffer::getFile(path); + std::error_code ec = mbOrErr.getError(); EXPECT_FALSE(ec); + mb = std::move(mbOrErr.get()); ErrorOr> r = lld::mach_o::normalized::readBinary( diff --git a/lld/utils/linker-script-test/linker-script-test.cpp b/lld/utils/linker-script-test/linker-script-test.cpp index e481470..9749898 100644 --- a/lld/utils/linker-script-test/linker-script-test.cpp +++ b/lld/utils/linker-script-test/linker-script-test.cpp @@ -26,12 +26,13 @@ int main(int argc, const char **argv) { llvm::PrettyStackTraceProgram X(argc, argv); { - std::unique_ptr mb; - if (std::error_code ec = MemoryBuffer::getFileOrSTDIN(argv[1], mb)) { + ErrorOr> mb = + MemoryBuffer::getFileOrSTDIN(argv[1]); + if (std::error_code ec = mb.getError()) { llvm::errs() << ec.message() << "\n"; return 1; } - Lexer l(std::move(mb)); + Lexer l(std::move(mb.get())); Token tok; while (true) { l.lex(tok); @@ -41,12 +42,13 @@ int main(int argc, const char **argv) { } } { - std::unique_ptr mb; - if (std::error_code ec = MemoryBuffer::getFileOrSTDIN(argv[1], mb)) { + ErrorOr> mb = + MemoryBuffer::getFileOrSTDIN(argv[1]); + if (std::error_code ec = mb.getError()) { llvm::errs() << ec.message() << "\n"; return 1; } - Lexer l(std::move(mb)); + Lexer l(std::move(mb.get())); Parser p(l); LinkerScript *ls = p.parse(); if (ls) -- 2.7.4