From 11c07d7eec2889be194e1662277542af2c9359df Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Tue, 19 Aug 2014 16:58:54 +0000 Subject: Modernize the .ll parsing interface. * Use StringRef instead of std::string& * Return a std::unique_ptr instead of taking an optional module to write to (was not really used). * Use current comment style. * Use current naming convention. llvm-svn: 215989 --- llvm/lib/IRReader/IRReader.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'llvm/lib/IRReader/IRReader.cpp') diff --git a/llvm/lib/IRReader/IRReader.cpp b/llvm/lib/IRReader/IRReader.cpp index aa7312ac041..22a7493b70f 100644 --- a/llvm/lib/IRReader/IRReader.cpp +++ b/llvm/lib/IRReader/IRReader.cpp @@ -29,8 +29,9 @@ namespace llvm { static const char *const TimeIRParsingGroupName = "LLVM IR Parsing"; static const char *const TimeIRParsingName = "Parse IR"; -static Module *getLazyIRModule(std::unique_ptr Buffer, - SMDiagnostic &Err, LLVMContext &Context) { +static std::unique_ptr +getLazyIRModule(std::unique_ptr Buffer, SMDiagnostic &Err, + LLVMContext &Context) { if (isBitcode((const unsigned char *)Buffer->getBufferStart(), (const unsigned char *)Buffer->getBufferEnd())) { std::string ErrMsg; @@ -42,10 +43,10 @@ static Module *getLazyIRModule(std::unique_ptr Buffer, } // getLazyBitcodeModule takes ownership of the Buffer when successful. Buffer.release(); - return ModuleOrErr.get(); + return std::unique_ptr(ModuleOrErr.get()); } - return ParseAssembly(std::move(Buffer), nullptr, Err, Context); + return parseAssembly(std::move(Buffer), Err, Context); } Module *llvm::getLazyIRFileModule(const std::string &Filename, @@ -58,7 +59,7 @@ Module *llvm::getLazyIRFileModule(const std::string &Filename, return nullptr; } - return getLazyIRModule(std::move(FileOrErr.get()), Err, Context); + return getLazyIRModule(std::move(FileOrErr.get()), Err, Context).release(); } Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, @@ -78,9 +79,9 @@ Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err, return M; } - return ParseAssembly(std::unique_ptr(MemoryBuffer::getMemBuffer( + return parseAssembly(std::unique_ptr(MemoryBuffer::getMemBuffer( Buffer->getBuffer(), Buffer->getBufferIdentifier())), - nullptr, Err, Context); + Err, Context).release(); } Module *llvm::ParseIRFile(const std::string &Filename, SMDiagnostic &Err, -- cgit v1.2.3