projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RegisterCoalescer: Sprinkle some const modifiers.
[oota-llvm.git]
/
lib
/
IRReader
/
IRReader.cpp
diff --git
a/lib/IRReader/IRReader.cpp
b/lib/IRReader/IRReader.cpp
index 259b41af24fe4d0cc5e3af638e859a557f6117cd..7bc6f076d62ddef0bdbd4a4d42456d7e6bc2d4b7 100644
(file)
--- a/
lib/IRReader/IRReader.cpp
+++ b/
lib/IRReader/IRReader.cpp
@@
-34,19
+34,17
@@
getLazyIRModule(std::unique_ptr<MemoryBuffer> Buffer, SMDiagnostic &Err,
LLVMContext &Context) {
if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
(const unsigned char *)Buffer->getBufferEnd())) {
LLVMContext &Context) {
if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
(const unsigned char *)Buffer->getBufferEnd())) {
- std::string ErrMsg;
-
ErrorOr<Module *> ModuleOrErr = getLazyBitcodeModule(Buffer.get(
), Context);
+ ErrorOr<Module *> ModuleOrErr =
+
getLazyBitcodeModule(std::move(Buffer
), Context);
if (std::error_code EC = ModuleOrErr.getError()) {
Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,
EC.message());
return nullptr;
}
if (std::error_code EC = ModuleOrErr.getError()) {
Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,
EC.message());
return nullptr;
}
- // getLazyBitcodeModule takes ownership of the Buffer when successful.
- Buffer.release();
return std::unique_ptr<Module>(ModuleOrErr.get());
}
return std::unique_ptr<Module>(ModuleOrErr.get());
}
- return parseAssembly(
std::move(Buffer
), Err, Context);
+ return parseAssembly(
Buffer->getMemBufferRef(
), Err, Context);
}
std::unique_ptr<Module> llvm::getLazyIRFileModule(StringRef Filename,
}
std::unique_ptr<Module> llvm::getLazyIRFileModule(StringRef Filename,
@@
-63,24
+61,22
@@
std::unique_ptr<Module> llvm::getLazyIRFileModule(StringRef Filename,
return getLazyIRModule(std::move(FileOrErr.get()), Err, Context);
}
return getLazyIRModule(std::move(FileOrErr.get()), Err, Context);
}
-std::unique_ptr<Module> llvm::parseIR(MemoryBuffer
*
Buffer, SMDiagnostic &Err,
+std::unique_ptr<Module> llvm::parseIR(MemoryBuffer
Ref
Buffer, SMDiagnostic &Err,
LLVMContext &Context) {
NamedRegionTimer T(TimeIRParsingName, TimeIRParsingGroupName,
TimePassesIsEnabled);
LLVMContext &Context) {
NamedRegionTimer T(TimeIRParsingName, TimeIRParsingGroupName,
TimePassesIsEnabled);
- if (isBitcode((const unsigned char *)Buffer
->
getBufferStart(),
- (const unsigned char *)Buffer
->
getBufferEnd())) {
+ if (isBitcode((const unsigned char *)Buffer
.
getBufferStart(),
+ (const unsigned char *)Buffer
.
getBufferEnd())) {
ErrorOr<Module *> ModuleOrErr = parseBitcodeFile(Buffer, Context);
if (std::error_code EC = ModuleOrErr.getError()) {
ErrorOr<Module *> ModuleOrErr = parseBitcodeFile(Buffer, Context);
if (std::error_code EC = ModuleOrErr.getError()) {
- Err = SMDiagnostic(Buffer
->
getBufferIdentifier(), SourceMgr::DK_Error,
+ Err = SMDiagnostic(Buffer
.
getBufferIdentifier(), SourceMgr::DK_Error,
EC.message());
return nullptr;
}
return std::unique_ptr<Module>(ModuleOrErr.get());
}
EC.message());
return nullptr;
}
return std::unique_ptr<Module>(ModuleOrErr.get());
}
- return parseAssembly(std::unique_ptr<MemoryBuffer>(MemoryBuffer::getMemBuffer(
- Buffer->getBuffer(), Buffer->getBufferIdentifier())),
- Err, Context);
+ return parseAssembly(Buffer, Err, Context);
}
std::unique_ptr<Module> llvm::parseIRFile(StringRef Filename, SMDiagnostic &Err,
}
std::unique_ptr<Module> llvm::parseIRFile(StringRef Filename, SMDiagnostic &Err,
@@
-93,7
+89,7
@@
std::unique_ptr<Module> llvm::parseIRFile(StringRef Filename, SMDiagnostic &Err,
return nullptr;
}
return nullptr;
}
- return parseIR(FileOrErr.get()
.get
(), Err, Context);
+ return parseIR(FileOrErr.get()
->getMemBufferRef
(), Err, Context);
}
//===----------------------------------------------------------------------===//
}
//===----------------------------------------------------------------------===//
@@
-106,7
+102,8
@@
LLVMBool LLVMParseIRInContext(LLVMContextRef ContextRef,
SMDiagnostic Diag;
std::unique_ptr<MemoryBuffer> MB(unwrap(MemBuf));
SMDiagnostic Diag;
std::unique_ptr<MemoryBuffer> MB(unwrap(MemBuf));
- *OutM = wrap(parseIR(MB.get(), Diag, *unwrap(ContextRef)).release());
+ *OutM =
+ wrap(parseIR(MB->getMemBufferRef(), Diag, *unwrap(ContextRef)).release());
if(!*OutM) {
if (OutMessage) {
if(!*OutM) {
if (OutMessage) {