projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PM] Remove the preverifier and directly compute the DominatorTree for
[oota-llvm.git]
/
lib
/
IRReader
/
IRReader.cpp
diff --git
a/lib/IRReader/IRReader.cpp
b/lib/IRReader/IRReader.cpp
index 7356fd005adf8666ff9b78129cec20b435dd947e..70801c43f1a3ac475bb866d70048dad0c3dfb42e 100644
(file)
--- a/
lib/IRReader/IRReader.cpp
+++ b/
lib/IRReader/IRReader.cpp
@@
-69,12
+69,14
@@
Module *llvm::ParseIR(MemoryBuffer *Buffer, SMDiagnostic &Err,
TimePassesIsEnabled);
if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
(const unsigned char *)Buffer->getBufferEnd())) {
TimePassesIsEnabled);
if (isBitcode((const unsigned char *)Buffer->getBufferStart(),
(const unsigned char *)Buffer->getBufferEnd())) {
-
std::string ErrMsg
;
- Module *M =
ParseBitcodeFile(Buffer, Context, &ErrMsg)
;
- if (
M == 0
)
+
ErrorOr<Module *> ModuleOrErr = parseBitcodeFile(Buffer, Context)
;
+ Module *M =
0
;
+ if (
error_code EC = ModuleOrErr.getError()
)
Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,
Err = SMDiagnostic(Buffer->getBufferIdentifier(), SourceMgr::DK_Error,
- ErrMsg);
- // ParseBitcodeFile does not take ownership of the Buffer.
+ EC.message());
+ else
+ M = ModuleOrErr.get();
+ // parseBitcodeFile does not take ownership of the Buffer.
delete Buffer;
return M;
}
delete Buffer;
return M;
}