diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2016-11-11 19:50:39 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2016-11-11 19:50:39 +0000 |
| commit | 6de481a3786b5b0409eddeee4b99a148e3f0f3f3 (patch) | |
| tree | e2a11dcd251688636adc5f1a4657c15aef1d0aad /llvm/lib/LTO/LTO.cpp | |
| parent | cd513a41c17a3591e764b1ff986ae501a28cc5f5 (diff) | |
| download | bcm5719-llvm-6de481a3786b5b0409eddeee4b99a148e3f0f3f3.tar.gz bcm5719-llvm-6de481a3786b5b0409eddeee4b99a148e3f0f3f3.zip | |
Bitcode: Change getModuleSummaryIndex() to return an llvm::Expected.
Differential Revision: https://reviews.llvm.org/D26539
llvm-svn: 286624
Diffstat (limited to 'llvm/lib/LTO/LTO.cpp')
| -rw-r--r-- | llvm/lib/LTO/LTO.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp index 4ff1bfb1471..cf40bfd4ebc 100644 --- a/llvm/lib/LTO/LTO.cpp +++ b/llvm/lib/LTO/LTO.cpp @@ -417,11 +417,10 @@ Error LTO::addThinLTO(std::unique_ptr<InputFile> Input, collectUsedGlobalVariables(M, Used, /*CompilerUsed*/ false); MemoryBufferRef MBRef = Input->Obj->getMemoryBufferRef(); - ErrorOr<std::unique_ptr<object::ModuleSummaryIndexObjectFile>> - SummaryObjOrErr = - object::ModuleSummaryIndexObjectFile::create(MBRef, Conf.DiagHandler); + Expected<std::unique_ptr<object::ModuleSummaryIndexObjectFile>> + SummaryObjOrErr = object::ModuleSummaryIndexObjectFile::create(MBRef); if (!SummaryObjOrErr) - return errorCodeToError(SummaryObjOrErr.getError()); + return SummaryObjOrErr.takeError(); ThinLTO.CombinedIndex.mergeFrom((*SummaryObjOrErr)->takeIndex(), ThinLTO.ModuleMap.size()); |
