summaryrefslogtreecommitdiff
path: root/lib/LTO
diff options
context:
space:
mode:
authorJohan Engelen <jbc.engelen@gmail.com>2017-09-17 18:11:26 +0000
committerJohan Engelen <jbc.engelen@gmail.com>2017-09-17 18:11:26 +0000
commit3de9cb6125dd58cd6eb5c706a3e72cb57ecf523b (patch)
tree23dd3a17790223a14e2b06500c6063ce4cfc73b3 /lib/LTO
parent6402565d2dc9b196a827deb9b6b4b40eb5b6f3c6 (diff)
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
Diffstat (limited to 'lib/LTO')
-rw-r--r--lib/LTO/ThinLTOCodeGenerator.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/LTO/ThinLTOCodeGenerator.cpp b/lib/LTO/ThinLTOCodeGenerator.cpp
index d6e5d4d0c21..ffd78dad922 100644
--- 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(