diff options
| -rw-r--r-- | include/llvm/Object/COFF.h | 2 | ||||
| -rw-r--r-- | include/llvm/Object/MachO.h | 2 | ||||
| -rw-r--r-- | include/llvm/Object/ObjectFile.h | 8 | ||||
| -rw-r--r-- | lib/Object/COFFObjectFile.cpp | 2 | ||||
| -rw-r--r-- | lib/Object/ELFObjectFile.cpp | 4 | ||||
| -rw-r--r-- | lib/Object/MachOObjectFile.cpp | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/include/llvm/Object/COFF.h b/include/llvm/Object/COFF.h index 067bcd471a..fa8dee7c5d 100644 --- a/include/llvm/Object/COFF.h +++ b/include/llvm/Object/COFF.h @@ -100,7 +100,7 @@ protected: virtual error_code getSymbolNMTypeChar(DataRefImpl Symb, char &Res) const; virtual error_code isSymbolInternal(DataRefImpl Symb, bool &Res) const; virtual error_code isSymbolGlobal(DataRefImpl Symb, bool &Res) const; - virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::SymbolType &Res) const; + virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::Type &Res) const; virtual error_code getSectionNext(DataRefImpl Sec, SectionRef &Res) const; virtual error_code getSectionName(DataRefImpl Sec, StringRef &Res) const; diff --git a/include/llvm/Object/MachO.h b/include/llvm/Object/MachO.h index f5e7461a48..dc1a647893 100644 --- a/include/llvm/Object/MachO.h +++ b/include/llvm/Object/MachO.h @@ -47,7 +47,7 @@ protected: virtual error_code getSymbolNMTypeChar(DataRefImpl Symb, char &Res) const; virtual error_code isSymbolInternal(DataRefImpl Symb, bool &Res) const; virtual error_code isSymbolGlobal(DataRefImpl Symb, bool &Res) const; - virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::SymbolType &Res) const; + virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::Type &Res) const; virtual error_code getSectionNext(DataRefImpl Sec, SectionRef &Res) const; virtual error_code getSectionName(DataRefImpl Sec, StringRef &Res) const; diff --git a/include/llvm/Object/ObjectFile.h b/include/llvm/Object/ObjectFile.h index 83854a0d6c..ca8df59752 100644 --- a/include/llvm/Object/ObjectFile.h +++ b/include/llvm/Object/ObjectFile.h @@ -90,7 +90,7 @@ public: std::memset(&SymbolPimpl, 0, sizeof(SymbolPimpl)); } - enum SymbolType { + enum Type { ST_Function, ST_Data, ST_External, // Defined in another object file @@ -107,7 +107,7 @@ public: error_code getAddress(uint64_t &Result) const; error_code getOffset(uint64_t &Result) const; error_code getSize(uint64_t &Result) const; - error_code getSymbolType(SymbolRef::SymbolType &Result) const; + error_code getType(SymbolRef::Type &Result) const; /// Returns the ascii char that should be displayed in a symbol table dump via /// nm for this symbol. @@ -232,7 +232,7 @@ protected: virtual error_code getSymbolNMTypeChar(DataRefImpl Symb, char &Res) const = 0; virtual error_code isSymbolInternal(DataRefImpl Symb, bool &Res) const = 0; virtual error_code isSymbolGlobal(DataRefImpl Symb, bool &Res) const = 0; - virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::SymbolType &Res) const = 0; + virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::Type &Res) const = 0; // Same as above for SectionRef. friend class SectionRef; @@ -343,7 +343,7 @@ inline error_code SymbolRef::isGlobal(bool &Result) const { return OwningObject->isSymbolGlobal(SymbolPimpl, Result); } -inline error_code SymbolRef::getSymbolType(SymbolRef::SymbolType &Result) const { +inline error_code SymbolRef::getType(SymbolRef::Type &Result) const { return OwningObject->getSymbolType(SymbolPimpl, Result); } diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp index 750c34d12a..8e038a2a85 100644 --- a/lib/Object/COFFObjectFile.cpp +++ b/lib/Object/COFFObjectFile.cpp @@ -154,7 +154,7 @@ error_code COFFObjectFile::getSymbolAddress(DataRefImpl Symb, } error_code COFFObjectFile::getSymbolType(DataRefImpl Symb, - SymbolRef::SymbolType &Result) const { + SymbolRef::Type &Result) const { const coff_symbol *symb = toSymb(Symb); Result = SymbolRef::ST_Other; if (symb->StorageClass == COFF::IMAGE_SYM_CLASS_EXTERNAL && diff --git a/lib/Object/ELFObjectFile.cpp b/lib/Object/ELFObjectFile.cpp index 257d08cadf..e13c31214a 100644 --- a/lib/Object/ELFObjectFile.cpp +++ b/lib/Object/ELFObjectFile.cpp @@ -331,7 +331,7 @@ protected: virtual error_code getSymbolNMTypeChar(DataRefImpl Symb, char &Res) const; virtual error_code isSymbolInternal(DataRefImpl Symb, bool &Res) const; virtual error_code isSymbolGlobal(DataRefImpl Symb, bool &Res) const; - virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::SymbolType &Res) const; + virtual error_code getSymbolType(DataRefImpl Symb, SymbolRef::Type &Res) const; virtual error_code getSectionNext(DataRefImpl Sec, SectionRef &Res) const; virtual error_code getSectionName(DataRefImpl Sec, StringRef &Res) const; @@ -602,7 +602,7 @@ error_code ELFObjectFile<target_endianness, is64Bits> template<support::endianness target_endianness, bool is64Bits> error_code ELFObjectFile<target_endianness, is64Bits> ::getSymbolType(DataRefImpl Symb, - SymbolRef::SymbolType &Result) const { + SymbolRef::Type &Result) const { validateSymbol(Symb); const Elf_Sym *symb = getSymbol(Symb); diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp index 507df5865e..55887c91c1 100644 --- a/lib/Object/MachOObjectFile.cpp +++ b/lib/Object/MachOObjectFile.cpp @@ -229,7 +229,7 @@ error_code MachOObjectFile::isSymbolGlobal(DataRefImpl Symb, bool &Res) const { } error_code MachOObjectFile::getSymbolType(DataRefImpl Symb, - SymbolRef::SymbolType &Res) const { + SymbolRef::Type &Res) const { uint8_t n_type; if (MachOObj->is64Bit()) { InMemoryStruct<macho::Symbol64TableEntry> Entry; @@ -454,7 +454,7 @@ error_code MachOObjectFile::isSectionBSS(DataRefImpl DRI, error_code MachOObjectFile::sectionContainsSymbol(DataRefImpl Sec, DataRefImpl Symb, bool &Result) const { - SymbolRef::SymbolType ST; + SymbolRef::Type ST; getSymbolType(Symb, ST); if (ST == SymbolRef::ST_External) { Result = false; |