6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-28 03:25:23 +00:00
Code Issues Projects Releases Wiki Activity

Pass a MemoryBufferRef when we can avoid taking ownership.

Browse Source 
The attached patch simplifies a few interfaces that don't need to take
ownership of a buffer.

For example, both parseAssembly and parseBitcodeFile will parse the
entire buffer before returning. There is no need to take ownership.

Using a MemoryBufferRef makes it obvious in the type signature that
there is no ownership transfer.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216488 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-08-26 21:49:01 +00:00
parent af07403c3e
commit 2292996e1a
16 changed files with 58 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/AsmParser/Parser.cpp
View File

@@ -21,22 +21,21 @@
#include <system_error>
using namespace llvm;
bool llvm::parseAssemblyInto(std::unique_ptr<MemoryBuffer> F, Module &M,
SMDiagnostic &Err) {
bool llvm::parseAssemblyInto(MemoryBufferRef F, Module &M, SMDiagnostic &Err) {
SourceMgr SM;
StringRef Buf = F->getBuffer();
SM.AddNewSourceBuffer(std::move(F), SMLoc());
std::unique_ptr<MemoryBuffer> Buf = MemoryBuffer::getMemBuffer(F, false);
SM.AddNewSourceBuffer(std::move(Buf), SMLoc());
return LLParser(Buf, SM, Err, &M).Run();
return LLParser(F.getBuffer(), SM, Err, &M).Run();
}
std::unique_ptr<Module> llvm::parseAssembly(std::unique_ptr<MemoryBuffer> F,
std::unique_ptr<Module> llvm::parseAssembly(MemoryBufferRef F,
SMDiagnostic &Err,
LLVMContext &Context) {
std::unique_ptr<Module> M =
make_unique<Module>(F->getBufferIdentifier(), Context);
make_unique<Module>(F.getBufferIdentifier(), Context);
if (parseAssemblyInto(std::move(F), *M, Err))
if (parseAssemblyInto(F, *M, Err))
return nullptr;
return std::move(M);
@@ -53,14 +52,12 @@ std::unique_ptr<Module> llvm::parseAssemblyFile(StringRef Filename,
return nullptr;
}
return parseAssembly(std::move(FileOrErr.get()), Err, Context);
return parseAssembly(FileOrErr.get()->getMemBufferRef(), Err, Context);
}
std::unique_ptr<Module> llvm::parseAssemblyString(StringRef AsmString,
SMDiagnostic &Err,
LLVMContext &Context) {
std::unique_ptr<MemoryBuffer> F(
MemoryBuffer::getMemBuffer(AsmString, "<string>"));
return parseAssembly(std::move(F), Err, Context);
MemoryBufferRef F(AsmString, "<string>");
return parseAssembly(F, Err, Context);
}