summaryrefslogtreecommitdiffstats
path: root/llvm/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
commitdcebe4fc1417dab397c9b89ae26deb0ac17bac09 (patch)
tree2913434749bdee3bc1d93def9f3460fc20f9cc97 /llvm/lib/LTO
parentd3a827126f733c05952184afc6827adb44bffd22 (diff)
downloadbcm5719-llvm-dcebe4fc1417dab397c9b89ae26deb0ac17bac09.tar.gz
bcm5719-llvm-dcebe4fc1417dab397c9b89ae26deb0ac17bac09.zip
Revert "[ThinLTO] Avoid archive member collisions with old API"
This reverts commit r313488, because it breaks compilation on Android and breaks llvm-lto. llvm-svn: 313489
Diffstat (limited to 'llvm/lib/LTO')
-rw-r--r--llvm/lib/LTO/ThinLTOCodeGenerator.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp b/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
index d6e5d4d0c21..ffd78dad922 100644
--- a/llvm/lib/LTO/ThinLTOCodeGenerator.cpp
+++ b/llvm/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(
OpenPOWER on IntegriCloud