diff options
| author | Teresa Johnson <tejohnson@google.com> | 2018-07-16 15:30:36 +0000 |
|---|---|---|
| committer | Teresa Johnson <tejohnson@google.com> | 2018-07-16 15:30:36 +0000 |
| commit | 5d5f03678e836071629fbda98b7e88d907664dce (patch) | |
| tree | f8dbfc5784ec98039dd06fbd8c44bce026de0a3f | |
| parent | 1ab19fc539dac7a6a0713f0bb8ddd4180914b2bc (diff) | |
Restore "[ThinLTO] Ensure we always select the same function copy to import"
This reverts commit r337082, restoring r337051, since the LLVM side
patch has been restored.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@337185 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/BackendUtil.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp index 2a02b838d2..226a27b216 100644 --- a/lib/CodeGen/BackendUtil.cpp +++ b/lib/CodeGen/BackendUtil.cpp @@ -1127,9 +1127,8 @@ static void runThinLTOBackend(ModuleSummaryIndex *CombinedIndex, Module *M, // e.g. record required linkage changes. if (Summary->modulePath() == M->getModuleIdentifier()) continue; - // Doesn't matter what value we plug in to the map, just needs an entry - // to provoke importing by thinBackend. - ImportList[Summary->modulePath()][GUID] = 1; + // Add an entry to provoke importing by thinBackend. + ImportList[Summary->modulePath()].insert(GUID); } std::vector<std::unique_ptr<llvm::MemoryBuffer>> OwnedImports; |