diff options
author | Teresa Johnson <tejohnson@google.com> | 2018-07-14 01:45:49 +0000 |
---|---|---|
committer | Teresa Johnson <tejohnson@google.com> | 2018-07-14 01:45:49 +0000 |
commit | b78c5d0602e47a37fd4b79b05cf687d83290d58f (patch) | |
tree | 68565e43311890dc06da31418b9fe33187736548 /llvm/lib/LTO/LTO.cpp | |
parent | 8e739f98fe0529ec6af842a635792e781c4ac967 (diff) | |
download | llvm-b78c5d0602e47a37fd4b79b05cf687d83290d58f.zip llvm-b78c5d0602e47a37fd4b79b05cf687d83290d58f.tar.gz llvm-b78c5d0602e47a37fd4b79b05cf687d83290d58f.tar.bz2 |
Revert "[ThinLTO] Ensure we always select the same function copy to import"
This reverts commits r337050 and r337059. Caused failure in
reverse-iteration bot that needs more investigation.
llvm-svn: 337081
Diffstat (limited to 'llvm/lib/LTO/LTO.cpp')
-rw-r--r-- | llvm/lib/LTO/LTO.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/LTO/LTO.cpp b/llvm/lib/LTO/LTO.cpp index 3ce2315..34cca32 100644 --- a/llvm/lib/LTO/LTO.cpp +++ b/llvm/lib/LTO/LTO.cpp @@ -156,7 +156,7 @@ static void computeCacheKey( AddUint64(Entry.second.size()); for (auto &Fn : Entry.second) - AddUint64(Fn); + AddUint64(Fn.first); } // Include the hash for the resolved ODR. @@ -221,7 +221,7 @@ static void computeCacheKey( // so we need to collect their used resolutions as well. for (auto &ImpM : ImportList) for (auto &ImpF : ImpM.second) - AddUsedThings(Index.findSummaryInModule(ImpF, ImpM.first())); + AddUsedThings(Index.findSummaryInModule(ImpF.first, ImpM.first())); auto AddTypeIdSummary = [&](StringRef TId, const TypeIdSummary &S) { AddString(TId); |