Update for llvm change.

llvm-svn: 283267

2 files changed, 5 insertions, 13 deletions

diff --git a/lld/ELF/ELFCreator.cpp b/lld/ELF/ELFCreator.cpp
index 7ca5c4fe392..bc6c5b400ed 100644
--- a/lld/ELF/ELFCreator.cpp
+++ b/lld/ELF/ELFCreator.cpp
@@ -100,10 +100,8 @@ template <class ELFT> std::size_t ELFCreator<ELFT>::layout() {
 
 template <class ELFT> void ELFCreator<ELFT>::write(uint8_t *Out) {
   std::memcpy(Out, &Header, sizeof(Elf_Ehdr));
-  std::copy(SecHdrStrTabBuilder.data().begin(),
-            SecHdrStrTabBuilder.data().end(), Out + ShStrTab->sh_offset);
-  std::copy(StrTabBuilder.data().begin(), StrTabBuilder.data().end(),
-            Out + StrTab->sh_offset);
+  SecHdrStrTabBuilder.write(Out + ShStrTab->sh_offset);
+  StrTabBuilder.write(Out + StrTab->sh_offset);
 
   Elf_Sym *Sym = reinterpret_cast<Elf_Sym *>(Out + SymTab->sh_offset);
   // Skip null.
diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp
index 9a7fb0f8ba3..0cbee53bd9b 100644
--- a/lld/ELF/OutputSections.cpp
+++ b/lld/ELF/OutputSections.cpp
@@ -1222,15 +1222,7 @@ MergeOutputSection<ELFT>::MergeOutputSection(StringRef Name, uint32_t Type,
       Builder(StringTableBuilder::RAW, Alignment) {}
 
 template <class ELFT> void MergeOutputSection<ELFT>::writeTo(uint8_t *Buf) {
-  if (shouldTailMerge()) {
-    StringRef Data = Builder.data();
-    memcpy(Buf, Data.data(), Data.size());
-    return;
-  }
-  for (const std::pair<CachedHash<StringRef>, size_t> &P : Builder.getMap()) {
-    StringRef Data = P.first.Val;
-    memcpy(Buf + P.second, Data.data(), Data.size());
-  }
+  Builder.write(Buf);
 }
 
 static StringRef toStringRef(ArrayRef<uint8_t> A) {
@@ -1268,6 +1260,8 @@ template <class ELFT> bool MergeOutputSection<ELFT>::shouldTailMerge() const {
 template <class ELFT> void MergeOutputSection<ELFT>::finalize() {
   if (shouldTailMerge())
     Builder.finalize();
+  else
+    Builder.finalizeInOrder();
   this->Header.sh_size = Builder.getSize();
 }