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 | b1d17f64e554e4eea6307284336e9ea87343d433 (patch) | |
| tree | c4107ac9841c10c7c28b4f93f4c408f46f398e6c /clang/lib/CodeGen/BackendUtil.cpp | |
| parent | d68935c5ac4da578d82936e4d1dfcd0574ef8366 (diff) | |
| download | bcm5719-llvm-b1d17f64e554e4eea6307284336e9ea87343d433.tar.gz bcm5719-llvm-b1d17f64e554e4eea6307284336e9ea87343d433.zip | |
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.
llvm-svn: 337185
Diffstat (limited to 'clang/lib/CodeGen/BackendUtil.cpp')
| -rw-r--r-- | clang/lib/CodeGen/BackendUtil.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp index 2a02b838d22..226a27b2161 100644 --- a/clang/lib/CodeGen/BackendUtil.cpp +++ b/clang/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; |
