From: Teresa Johnson <tejohnson@google.com>
Date: Sat, 14 Jul 2018 01:50:14 +0000 (+0000)
Subject: Revert "[ThinLTO] Ensure we always select the same function copy to import"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bdb4f6d2d659950de9b4a8b317c8d5e82821461d;p=clang

Revert "[ThinLTO] Ensure we always select the same function copy to import"

This reverts commit r337051.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@337082 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/CodeGen/BackendUtil.cpp b/lib/CodeGen/BackendUtil.cpp
index 226a27b216..2a02b838d2 100644
--- a/lib/CodeGen/BackendUtil.cpp
+++ b/lib/CodeGen/BackendUtil.cpp
@@ -1127,8 +1127,9 @@ static void runThinLTOBackend(ModuleSummaryIndex *CombinedIndex, Module *M,
     // e.g. record required linkage changes.
     if (Summary->modulePath() == M->getModuleIdentifier())
       continue;
-    // Add an entry to provoke importing by thinBackend.
-    ImportList[Summary->modulePath()].insert(GUID);
+    // 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;
   }
 
   std::vector<std::unique_ptr<llvm::MemoryBuffer>> OwnedImports;