diff options
-rw-r--r-- | llvm/include/llvm/MC/StringTableBuilder.h | 2 | ||||
-rw-r--r-- | llvm/lib/MC/MachObjectWriter.cpp | 2 | ||||
-rw-r--r-- | llvm/lib/MC/StringTableBuilder.cpp | 5 | ||||
-rw-r--r-- | llvm/tools/yaml2obj/yaml2elf.cpp | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/llvm/include/llvm/MC/StringTableBuilder.h b/llvm/include/llvm/MC/StringTableBuilder.h index c8908c384c8..f2b8ecd2d99 100644 --- a/llvm/include/llvm/MC/StringTableBuilder.h +++ b/llvm/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/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp index acb79223d4e..e39271949d9 100644 --- a/llvm/lib/MC/MachObjectWriter.cpp +++ b/llvm/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/llvm/lib/MC/StringTableBuilder.cpp b/llvm/lib/MC/StringTableBuilder.cpp index 24ae9d034d2..9d95952a6d3 100644 --- a/llvm/lib/MC/StringTableBuilder.cpp +++ b/llvm/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/llvm/tools/yaml2obj/yaml2elf.cpp b/llvm/tools/yaml2obj/yaml2elf.cpp index 60d21599613..c98093431a7 100644 --- a/llvm/tools/yaml2obj/yaml2elf.cpp +++ b/llvm/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; } |