projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Recommit r235458: [opaque pointer type] Avoid using PointerType::getElementType for...
[oota-llvm.git]
/
lib
/
AsmParser
/
Parser.cpp
diff --git
a/lib/AsmParser/Parser.cpp
b/lib/AsmParser/Parser.cpp
index 9bc9b241666e1f83a84c46bdf88badbe881ab159..2e76c0ecc45bcbd23fd82267f2d356d0465a8dae 100644
(file)
--- a/
lib/AsmParser/Parser.cpp
+++ b/
lib/AsmParser/Parser.cpp
@@
-13,6
+13,7
@@
#include "llvm/AsmParser/Parser.h"
#include "LLParser.h"
#include "llvm/AsmParser/Parser.h"
#include "LLParser.h"
+#include "llvm/ADT/STLExtras.h"
#include "llvm/IR/Module.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/SourceMgr.h"
#include "llvm/IR/Module.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/SourceMgr.h"
@@
-21,25
+22,24
@@
#include <system_error>
using namespace llvm;
#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;
SourceMgr SM;
-
StringRef Buf = F->getBuffer(
);
- SM.AddNewSourceBuffer(
F.release(
), 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 =
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 nullptr;
- return
std::move(M)
;
+ return
M
;
}
std::unique_ptr<Module> llvm::parseAssemblyFile(StringRef Filename,
}
std::unique_ptr<Module> llvm::parseAssemblyFile(StringRef Filename,
@@
-53,14
+53,12
@@
std::unique_ptr<Module> llvm::parseAssemblyFile(StringRef Filename,
return nullptr;
}
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<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);
}
}