RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-03-05 00:59:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Elf_Word is not POD! Stop using it in a DenseMap.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141851 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Nick Lewycky 2011-10-13 03:30:21 +00:00
parent dec1b10161
commit f77dea13d7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Object/ELFObjectFile.cpp
View File

@ -296,7 +296,7 @@ class ELFObjectFile : public ObjectFile {
const Elf_Shdr *dot_strtab_sec; // Symbol header string table.
Sections_t SymbolTableSections;
IndexMap_t SymbolTableSectionsIndexMap;
DenseMap<const Elf_Sym*, Elf_Word> ExtendedSymbolTable;
DenseMap<const Elf_Sym*, ELF::Elf64_Word> ExtendedSymbolTable;
/// @brief Map sections to an array of relocation sections that reference
/// them sorted by section index.
@ -375,7 +375,7 @@ public:
uint64_t getNumSections() const;
uint64_t getStringTableIndex() const;
uint64_t getSymbolTableIndex(const Elf_Sym *symb) const;
ELF::Elf64_Word getSymbolTableIndex(const Elf_Sym *symb) const;
const Elf_Shdr *getSection(const Elf_Sym *symb) const;
};
} // end namespace
@ -433,7 +433,7 @@ error_code ELFObjectFile<target_endianness, is64Bits>
}
template<support::endianness target_endianness, bool is64Bits>
uint64_t ELFObjectFile<target_endianness, is64Bits>
ELF::Elf64_Word ELFObjectFile<target_endianness, is64Bits>
::getSymbolTableIndex(const Elf_Sym *symb) const {
if (symb->st_shndx == ELF::SHN_XINDEX)
return ExtendedSymbolTable.lookup(symb);
@ -444,11 +444,8 @@ template<support::endianness target_endianness, bool is64Bits>
const typename ELFObjectFile<target_endianness, is64Bits>::Elf_Shdr *
ELFObjectFile<target_endianness, is64Bits>
::getSection(const Elf_Sym *symb) const {
if (symb->st_shndx == ELF::SHN_XINDEX) {
if (!ExtendedSymbolTable.count(symb))
return 0;
if (symb->st_shndx == ELF::SHN_XINDEX)
return getSection(ExtendedSymbolTable.lookup(symb));
}
if (symb->st_shndx >= ELF::SHN_LORESERVE)
return 0;
return getSection(symb->st_shndx);