diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-08-19 16:58:54 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-08-19 16:58:54 +0000 |
commit | 9b29ff99c0443ec0c038adafc8d5c782a8624e17 (patch) | |
tree | 7e4757889a9139ad4de4f6fbb43a66a6f8fccf83 /lib/AsmParser/Parser.cpp | |
parent | 2788345a9b58d97f0bd1d1c22381aeec125d73aa (diff) |
Modernize the .ll parsing interface.
* Use StringRef instead of std::string&
* Return a std::unique_ptr<Module> instead of taking an optional module to write
to (was not really used).
* Use current comment style.
* Use current naming convention.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@215989 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AsmParser/Parser.cpp')
-rw-r--r-- | lib/AsmParser/Parser.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/lib/AsmParser/Parser.cpp b/lib/AsmParser/Parser.cpp index 6cae013b129..7c6598106ec 100644 --- a/lib/AsmParser/Parser.cpp +++ b/lib/AsmParser/Parser.cpp @@ -21,25 +21,23 @@ #include <system_error> using namespace llvm; -Module *llvm::ParseAssembly(std::unique_ptr<MemoryBuffer> F, Module *M, - SMDiagnostic &Err, LLVMContext &Context) { +std::unique_ptr<Module> llvm::parseAssembly(std::unique_ptr<MemoryBuffer> F, + SMDiagnostic &Err, + LLVMContext &Context) { SourceMgr SM; MemoryBuffer *Buf = F.get(); SM.AddNewSourceBuffer(F.release(), SMLoc()); - // If we are parsing into an existing module, do it. - if (M) - return LLParser(Buf->getBuffer(), SM, Err, M).Run() ? nullptr : M; - - // Otherwise create a new module. - std::unique_ptr<Module> M2(new Module(Buf->getBufferIdentifier(), Context)); - if (LLParser(Buf->getBuffer(), SM, Err, M2.get()).Run()) + std::unique_ptr<Module> M = + make_unique<Module>(Buf->getBufferIdentifier(), Context); + if (LLParser(Buf->getBuffer(), SM, Err, M.get()).Run()) return nullptr; - return M2.release(); + return std::move(M); } -Module *llvm::ParseAssemblyFile(const std::string &Filename, SMDiagnostic &Err, - LLVMContext &Context) { +std::unique_ptr<Module> llvm::parseAssemblyFile(StringRef Filename, + SMDiagnostic &Err, + LLVMContext &Context) { ErrorOr<std::unique_ptr<MemoryBuffer>> FileOrErr = MemoryBuffer::getFileOrSTDIN(Filename); if (std::error_code EC = FileOrErr.getError()) { @@ -48,13 +46,14 @@ Module *llvm::ParseAssemblyFile(const std::string &Filename, SMDiagnostic &Err, return nullptr; } - return ParseAssembly(std::move(FileOrErr.get()), nullptr, Err, Context); + return parseAssembly(std::move(FileOrErr.get()), Err, Context); } -Module *llvm::ParseAssemblyString(const char *AsmString, Module *M, - SMDiagnostic &Err, LLVMContext &Context) { - MemoryBuffer *F = - MemoryBuffer::getMemBuffer(StringRef(AsmString), "<string>"); +std::unique_ptr<Module> llvm::parseAssemblyString(StringRef AsmString, + SMDiagnostic &Err, + LLVMContext &Context) { + std::unique_ptr<MemoryBuffer> F( + MemoryBuffer::getMemBuffer(AsmString, "<string>")); - return ParseAssembly(std::unique_ptr<MemoryBuffer>(F), M, Err, Context); + return parseAssembly(std::move(F), Err, Context); } |