From 5a22e848da03dfde441a44bc3b580664e0607fd9 Mon Sep 17 00:00:00 2001
From: Rui Ueyama <ruiu@google.com>
Date: Tue, 26 May 2015 16:20:40 +0000
Subject: [PATCH] Object: Add Archive::getNumberOfSymbols().
Add a function that returns number of symbols in archive headers.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238213 91177308-0d34-0410-b5e6-96231b3b80d8
---
include/llvm/Object/Archive.h | 1 +
lib/Object/Archive.cpp | 27 +++++++++++++--------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/include/llvm/Object/Archive.h b/include/llvm/Object/Archive.h
index d40dc9db9f5..8da6919a465 100644
--- a/include/llvm/Object/Archive.h
+++ b/include/llvm/Object/Archive.h
@@ -207,6 +207,7 @@ public:
bool hasSymbolTable() const;
child_iterator getSymbolTableChild() const { return SymbolTable; }
+ uint32_t getNumberOfSymbols() const;
private:
child_iterator SymbolTable;
diff --git a/lib/Object/Archive.cpp b/lib/Object/Archive.cpp
index 7d43daaf0f4..fb91eed2909 100644
--- a/lib/Object/Archive.cpp
+++ b/lib/Object/Archive.cpp
@@ -487,22 +487,21 @@ Archive::symbol_iterator Archive::symbol_begin() const {
Archive::symbol_iterator Archive::symbol_end() const {
if (!hasSymbolTable())
return symbol_iterator(Symbol(this, 0, 0));
+ return symbol_iterator(Symbol(this, getNumberOfSymbols(), 0));
+}
+uint32_t Archive::getNumberOfSymbols() const {
const char *buf = SymbolTable->getBuffer().begin();
- uint32_t symbol_count = 0;
- if (kind() == K_GNU) {
- symbol_count = read32be(buf);
- } else if (kind() == K_MIPS64) {
- symbol_count = read64be(buf);
- } else if (kind() == K_BSD) {
- symbol_count = read32le(buf) / 8;
- } else {
- uint32_t member_count = 0;
- member_count = read32le(buf);
- buf += 4 + (member_count * 4); // Skip offsets.
- symbol_count = read32le(buf);
- }
- return symbol_iterator(Symbol(this, symbol_count, 0));
+ if (kind() == K_GNU)
+ return read32be(buf);
+ if (kind() == K_MIPS64)
+ return read64be(buf);
+ if (kind() == K_BSD)
+ return read32le(buf) / 8;
+ uint32_t member_count = 0;
+ member_count = read32le(buf);
+ buf += 4 + (member_count * 4); // Skip offsets.
+ return read32le(buf);
}
Archive::child_iterator Archive::findSym(StringRef name) const {