summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2014-09-10 13:01:03 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2014-09-10 13:01:03 +0000
commit4015ea6b2417f9928f47b8b864c2a1064e90311d (patch)
treea74d1b27789469efc396203846c9a6f908a3130d
parentba1d7042290bee0d0bf8b920a62758951e14d609 (diff)
downloadbcm5719-llvm-4015ea6b2417f9928f47b8b864c2a1064e90311d.tar.gz
bcm5719-llvm-4015ea6b2417f9928f47b8b864c2a1064e90311d.zip
Attempt to pacify buildbots.
llvm-svn: 217499
-rw-r--r--llvm/include/llvm/Object/COFF.h9
-rw-r--r--llvm/lib/Object/COFFObjectFile.cpp11
2 files changed, 8 insertions, 12 deletions
diff --git a/llvm/include/llvm/Object/COFF.h b/llvm/include/llvm/Object/COFF.h
index 3c619851894..51706b4a180 100644
--- a/llvm/include/llvm/Object/COFF.h
+++ b/llvm/include/llvm/Object/COFF.h
@@ -567,7 +567,14 @@ public:
const data_directory *&Res) const;
std::error_code getSection(int32_t index, const coff_section *&Res) const;
template <typename coff_symbol_type>
- std::error_code getSymbol(uint32_t index, const coff_symbol_type *&Res) const;
+ std::error_code getSymbol(uint32_t Index,
+ const coff_symbol_type *&Res) const {
+ if (Index < getNumberOfSymbols())
+ Res = reinterpret_cast<coff_symbol_type *>(getSymbolTable()) + Index;
+ else
+ return object_error::parse_failed;
+ return object_error::success;
+ }
ErrorOr<COFFSymbolRef> getSymbol(uint32_t index) const {
if (SymbolTable16) {
const coff_symbol16 *Symb = nullptr;
diff --git a/llvm/lib/Object/COFFObjectFile.cpp b/llvm/lib/Object/COFFObjectFile.cpp
index ea134b2499e..cf8ff3193c4 100644
--- a/llvm/lib/Object/COFFObjectFile.cpp
+++ b/llvm/lib/Object/COFFObjectFile.cpp
@@ -768,17 +768,6 @@ std::error_code COFFObjectFile::getString(uint32_t Offset,
return object_error::success;
}
-template <typename coff_symbol_type>
-std::error_code
-COFFObjectFile::getSymbol(uint32_t Index,
- const coff_symbol_type *&Result) const {
- if (Index < getNumberOfSymbols())
- Result = reinterpret_cast<coff_symbol_type *>(getSymbolTable()) + Index;
- else
- return object_error::parse_failed;
- return object_error::success;
-}
-
std::error_code COFFObjectFile::getSymbolName(COFFSymbolRef Symbol,
StringRef &Res) const {
// Check for string table entry. First 4 bytes are 0.
OpenPOWER on IntegriCloud