[llvm] r313489 - Revert "[ThinLTO] Avoid archive member collisions with old API"

[Johan Engelen via llvm-commits]

Author: jengelen
Date: Sun Sep 17 11:11:26 2017
New Revision: 313489

URL: http://llvm.org/viewvc/llvm-project?rev=313489&view=rev
Log:
Revert "[ThinLTO] Avoid archive member collisions with old API"

This reverts commit r313488, because it breaks compilation on Android and breaks llvm-lto. 


Modified:
    llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp

Modified: llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp?rev=313489&r1=313488&r2=313489&view=diff
==============================================================================
--- llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp (original)
+++ llvm/trunk/lib/LTO/ThinLTOCodeGenerator.cpp Sun Sep 17 11:11:26 2017
@@ -535,9 +535,7 @@ static void initTMBuilder(TargetMachineB
 } // end anonymous namespace
 
 void ThinLTOCodeGenerator::addModule(StringRef Identifier, StringRef Data) {
-  std::string Id =
-      (Twine(Identifier) + "_" + std::to_string(Modules.size())).str();
-  ThinLTOBuffer Buffer(Data, std::move(Id));
+  ThinLTOBuffer Buffer(Data, Identifier);
   LLVMContext Context;
   StringRef TripleStr;
   ErrorOr<std::string> TripleOrErr = expectedToErrorOrAndEmitErrors(