From ee3e94b5688725c35a664a80c8f334aeeb401f36 Mon Sep 17 00:00:00 2001 From: Teresa Johnson Date: Fri, 13 Jul 2018 21:35:58 +0000 Subject: [PATCH] [ThinLTO] Ensure we always select the same function copy to import Clang change to reflect the FunctionsToImportTy type change in the llvm changes for D48670. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@337051 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/BackendUtil.cpp | 5 ++--- 1 file 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> OwnedImports; -- 2.50.1