diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2017-05-01 22:04:36 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2017-05-01 22:04:36 +0000 |
| commit | 74d22dd7dc608675486f166918b4d4369d79c88b (patch) | |
| tree | 52b89971135c28dae9a2be39c73765a79a2a3c76 /llvm/lib/LTO/LTO.cpp | |
| parent | 864a363e8f4e2ea59cd4c9a6561ab0707546f6ce (diff) | |
| download | llvm-74d22dd7dc608675486f166918b4d4369d79c88b.zip llvm-74d22dd7dc608675486f166918b4d4369d79c88b.tar.gz llvm-74d22dd7dc608675486f166918b4d4369d79c88b.tar.bz2 | |
Bitcode: Make the summary reader responsible for merging. NFCI.
This is to prepare for an upcoming change which uses pointers instead of
GUIDs to represent references.
Differential Revision: https://reviews.llvm.org/D32469
llvm-svn: 301843
Diffstat (limited to 'llvm/lib/LTO/LTO.cpp')
| -rw-r--r-- | llvm/lib/LTO/LTO.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp index cc3d964..0afa1ba 100644 --- a/llvm/lib/LTO/LTO.cpp +++ b/llvm/lib/LTO/LTO.cpp @@ -591,11 +591,9 @@ Error LTO::addThinLTO(BitcodeModule BM, ArrayRef<InputFile::Symbol> Syms, const SymbolResolution *&ResI, const SymbolResolution *ResE) { - Expected<std::unique_ptr<ModuleSummaryIndex>> SummaryOrErr = BM.getSummary(); - if (!SummaryOrErr) - return SummaryOrErr.takeError(); - ThinLTO.CombinedIndex.mergeFrom(std::move(*SummaryOrErr), - ThinLTO.ModuleMap.size()); + if (Error Err = + BM.readSummary(ThinLTO.CombinedIndex, ThinLTO.ModuleMap.size())) + return Err; for (const InputFile::Symbol &Sym : Syms) { assert(ResI != ResE); |