[llvm] r283127 - Revert "Use getSize instead of data().size(). NFC."

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Mon Oct  3 13:01:10 2016
New Revision: 283127

URL: http://llvm.org/viewvc/llvm-project?rev=283127&view=rev
Log:
Revert "Use getSize instead of data().size(). NFC."

This reverts commit r283125.

lld needs to be updated.

Modified:
    llvm/trunk/include/llvm/MC/StringTableBuilder.h
    llvm/trunk/lib/MC/MachObjectWriter.cpp
    llvm/trunk/lib/MC/StringTableBuilder.cpp
    llvm/trunk/tools/yaml2obj/yaml2elf.cpp

Modified: llvm/trunk/include/llvm/MC/StringTableBuilder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/StringTableBuilder.h?rev=283127&r1=283126&r2=283127&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/StringTableBuilder.h (original)
+++ llvm/trunk/include/llvm/MC/StringTableBuilder.h Mon Oct  3 13:01:10 2016
@@ -61,7 +61,7 @@ public:
     return StringIndexMap;
   }
 
-  size_t getSize() const;
+  size_t getSize() const { return Size; }
   void clear();
 
 private:

Modified: llvm/trunk/lib/MC/MachObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MachObjectWriter.cpp?rev=283127&r1=283126&r2=283127&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MachObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/MachObjectWriter.cpp Mon Oct  3 13:01:10 2016
@@ -882,7 +882,7 @@ void MachObjectWriter::writeObject(MCAss
                                               sizeof(MachO::nlist_64) :
                                               sizeof(MachO::nlist));
     writeSymtabLoadCommand(SymbolTableOffset, NumSymTabSymbols,
-                           StringTableOffset, StringTable.getSize());
+                           StringTableOffset, StringTable.data().size());
 
     writeDysymtabLoadCommand(FirstLocalSymbol, NumLocalSymbols,
                              FirstExternalSymbol, NumExternalSymbols,

Modified: llvm/trunk/lib/MC/StringTableBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/StringTableBuilder.cpp?rev=283127&r1=283126&r2=283127&view=diff
==============================================================================
--- llvm/trunk/lib/MC/StringTableBuilder.cpp (original)
+++ llvm/trunk/lib/MC/StringTableBuilder.cpp Mon Oct  3 13:01:10 2016
@@ -34,11 +34,6 @@ StringTableBuilder::StringTableBuilder(K
   }
 }
 
-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.

Modified: llvm/trunk/tools/yaml2obj/yaml2elf.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/yaml2elf.cpp?rev=283127&r1=283126&r2=283127&view=diff
==============================================================================
--- llvm/trunk/tools/yaml2obj/yaml2elf.cpp (original)
+++ llvm/trunk/tools/yaml2obj/yaml2elf.cpp Mon Oct  3 13:01:10 2016
@@ -307,7 +307,7 @@ void ELFState<ELFT>::initStrtabSectionHe
   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;
 }