From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Mon, 3 Oct 2016 18:01:10 +0000 (+0000)
Subject: Revert "Use getSize instead of data().size(). NFC."
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee3cdffe7e59cc4565b8340ad403ea048e3777d8;p=llvm

Revert "Use getSize instead of data().size(). NFC."

This reverts commit r283125.

lld needs to be updated.

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

diff --git a/include/llvm/MC/StringTableBuilder.h b/include/llvm/MC/StringTableBuilder.h
index c8908c384c8..f2b8ecd2d99 100644
--- a/include/llvm/MC/StringTableBuilder.h
+++ b/include/llvm/MC/StringTableBuilder.h
@@ -61,7 +61,7 @@ public:
     return StringIndexMap;
   }
 
-  size_t getSize() const;
+  size_t getSize() const { return Size; }
   void clear();
 
 private:
diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp
index acb79223d4e..e39271949d9 100644
--- a/lib/MC/MachObjectWriter.cpp
+++ b/lib/MC/MachObjectWriter.cpp
@@ -882,7 +882,7 @@ void MachObjectWriter::writeObject(MCAssembler &Asm,
                                               sizeof(MachO::nlist_64) :
                                               sizeof(MachO::nlist));
     writeSymtabLoadCommand(SymbolTableOffset, NumSymTabSymbols,
-                           StringTableOffset, StringTable.getSize());
+                           StringTableOffset, StringTable.data().size());
 
     writeDysymtabLoadCommand(FirstLocalSymbol, NumLocalSymbols,
                              FirstExternalSymbol, NumExternalSymbols,
diff --git a/lib/MC/StringTableBuilder.cpp b/lib/MC/StringTableBuilder.cpp
index 24ae9d034d2..9d95952a6d3 100644
--- a/lib/MC/StringTableBuilder.cpp
+++ b/lib/MC/StringTableBuilder.cpp
@@ -34,11 +34,6 @@ StringTableBuilder::StringTableBuilder(Kind K, unsigned Alignment)
   }
 }
 
-size_t StringTableBuilder::getSize() const {
-  assert(isFinalized());
-  return Size;
-}
-
 typedef std::pair<CachedHash<StringRef>, size_t> StringPair;
 
 // Returns the character at Pos from end of a string.
diff --git a/tools/yaml2obj/yaml2elf.cpp b/tools/yaml2obj/yaml2elf.cpp
index 60d21599613..c98093431a7 100644
--- a/tools/yaml2obj/yaml2elf.cpp
+++ b/tools/yaml2obj/yaml2elf.cpp
@@ -307,7 +307,7 @@ void ELFState<ELFT>::initStrtabSectionHeader(Elf_Shdr &SHeader, StringRef Name,
   SHeader.sh_type = ELF::SHT_STRTAB;
   CBA.getOSAndAlignedOffset(SHeader.sh_offset, SHeader.sh_addralign)
       << STB.data();
-  SHeader.sh_size = STB.getSize();
+  SHeader.sh_size = STB.data().size();
   SHeader.sh_addralign = 1;
 }