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

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

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

diff --git a/lib/LTO/ThinLTOCodeGenerator.cpp b/lib/LTO/ThinLTOCodeGenerator.cpp
index d6e5d4d0c213ff652f52680bb8aee95d024c6b4a..ffd78dad9228cb4c8bf1f5e25ee02189f2ae1955 100644 (file)
--- a/lib/LTO/ThinLTOCodeGenerator.cpp
+++ b/lib/LTO/ThinLTOCodeGenerator.cpp
@@ -535,9 +535,7 @@ static void initTMBuilder(TargetMachineBuilder &TMBuilder,
 } // 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(