RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-27 21:50:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split parseAssembly into parseAssembly and parseAssemblyInto.

Browse Source 
This should restore the functionality of parsing new code into an existing
module without the confusing interface.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216031 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2014-08-19 22:05:47 +00:00
parent 97eadf21c8
commit b12ab608fe
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/llvm/AsmParser/Parser.h
View File

@ -50,8 +50,7 @@ std::unique_ptr<Module> parseAssemblyString(StringRef AsmString,
SMDiagnostic &Error,
LLVMContext &Context);
/// This function is the low-level interface to the LLVM Assembly Parser.
/// ParseAssemblyFile and ParseAssemblyString are wrappers around this function.
/// parseAssemblyFile and parseAssemblyString are wrappers around this function.
/// @brief Parse LLVM Assembly from a MemoryBuffer.
/// @param F The MemoryBuffer containing assembly
/// @param Err Error result info.
@ -59,6 +58,18 @@ std::unique_ptr<Module> parseAssemblyString(StringRef AsmString,
std::unique_ptr<Module> parseAssembly(std::unique_ptr<MemoryBuffer> F,
SMDiagnostic &Err, LLVMContext &Context);
/// This function is the low-level interface to the LLVM Assembly Parser.
/// This is kept as an independent function instead of being inlined into
/// parseAssembly for the convenience of interactive users that want to add
/// recently parsed bits to an existing module.
///
/// @param F The MemoryBuffer containing assembly
/// @param M The module to add data to.
/// @param Err Error result info.
/// @return true on error.
bool parseAssemblyInto(std::unique_ptr<MemoryBuffer> F, Module &M,
SMDiagnostic &Err);
} // End llvm namespace
#endif

19
lib/AsmParser/Parser.cpp
View File

@ -21,17 +21,24 @@
#include <system_error>
using namespace llvm;
bool llvm::parseAssemblyInto(std::unique_ptr<MemoryBuffer> F, Module &M,
SMDiagnostic &Err) {
SourceMgr SM;
StringRef Buf = F->getBuffer();
SM.AddNewSourceBuffer(F.release(), SMLoc());
return LLParser(Buf, SM, Err, &M).Run();
}
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());
std::unique_ptr<Module> M =
make_unique<Module>(Buf->getBufferIdentifier(), Context);
if (LLParser(Buf->getBuffer(), SM, Err, M.get()).Run())
make_unique<Module>(F->getBufferIdentifier(), Context);
if (parseAssemblyInto(std::move(F), *M, Err))
return nullptr;
return std::move(M);
}