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-Tag: llvmorg-7.0.0-rc1~1442
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70993d37e8dd2031b623071372d7aebefb18c74c;p=platform%2Fupstream%2Fllvm.git

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

This reverts commit r337051.

llvm-svn: 337082
---

diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
index 226a27b..2a02b83 100644
--- a/clang/lib/CodeGen/BackendUtil.cpp
+++ b/clang/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;