Change the begin and end methods in ObjectFile to match the style guide.
llvm-svn: 201108
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 4572c96..3b87507 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -386,14 +386,14 @@
// in RelocSecs contain the relocations for section S.
error_code EC;
std::map<SectionRef, SmallVector<SectionRef, 1> > SectionRelocMap;
- for (section_iterator I = Obj->begin_sections(), E = Obj->end_sections();
+ for (section_iterator I = Obj->section_begin(), E = Obj->section_end();
I != E; ++I) {
section_iterator Sec2 = I->getRelocatedSection();
- if (Sec2 != Obj->end_sections())
+ if (Sec2 != Obj->section_end())
SectionRelocMap[*Sec2].push_back(*I);
}
- for (section_iterator I = Obj->begin_sections(), E = Obj->end_sections();
+ for (section_iterator I = Obj->section_begin(), E = Obj->section_end();
I != E; ++I) {
bool Text;
if (error(I->isText(Text)))
@@ -407,7 +407,7 @@
// Make a list of all the symbols in this section.
std::vector<std::pair<uint64_t, StringRef> > Symbols;
- for (symbol_iterator SI = Obj->begin_symbols(), SE = Obj->end_symbols();
+ for (symbol_iterator SI = Obj->symbol_begin(), SE = Obj->symbol_end();
SI != SE; ++SI) {
bool contains;
if (!error(I->containsSymbol(*SI, contains)) && contains) {
@@ -435,8 +435,8 @@
for (SmallVectorImpl<SectionRef>::iterator RelocSec = RelocSecs->begin(),
E = RelocSecs->end();
RelocSec != E; ++RelocSec) {
- for (relocation_iterator RI = RelocSec->begin_relocations(),
- RE = RelocSec->end_relocations();
+ for (relocation_iterator RI = RelocSec->relocation_begin(),
+ RE = RelocSec->relocation_end();
RI != RE; ++RI)
Rels.push_back(*RI);
}
@@ -552,15 +552,15 @@
}
static void PrintRelocations(const ObjectFile *o) {
- for (section_iterator si = o->begin_sections(), se = o->end_sections();
+ for (section_iterator si = o->section_begin(), se = o->section_end();
si != se; ++si) {
- if (si->begin_relocations() == si->end_relocations())
+ if (si->relocation_begin() == si->relocation_end())
continue;
StringRef secname;
if (error(si->getName(secname))) continue;
outs() << "RELOCATION RECORDS FOR [" << secname << "]:\n";
- for (relocation_iterator ri = si->begin_relocations(),
- re = si->end_relocations();
+ for (relocation_iterator ri = si->relocation_begin(),
+ re = si->relocation_end();
ri != re; ++ri) {
bool hidden;
uint64_t address;
@@ -581,7 +581,7 @@
outs() << "Sections:\n"
"Idx Name Size Address Type\n";
unsigned i = 0;
- for (section_iterator si = o->begin_sections(), se = o->end_sections();
+ for (section_iterator si = o->section_begin(), se = o->section_end();
si != se; ++si) {
StringRef Name;
if (error(si->getName(Name)))
@@ -604,7 +604,7 @@
static void PrintSectionContents(const ObjectFile *o) {
error_code EC;
- for (section_iterator si = o->begin_sections(), se = o->end_sections();
+ for (section_iterator si = o->section_begin(), se = o->section_end();
si != se; ++si) {
StringRef Name;
StringRef Contents;
@@ -696,14 +696,14 @@
if (const COFFObjectFile *coff = dyn_cast<const COFFObjectFile>(o))
PrintCOFFSymbolTable(coff);
else {
- for (symbol_iterator si = o->begin_symbols(), se = o->end_symbols();
+ for (symbol_iterator si = o->symbol_begin(), se = o->symbol_end();
si != se; ++si) {
StringRef Name;
uint64_t Address;
SymbolRef::Type Type;
uint64_t Size;
uint32_t Flags = si->getFlags();
- section_iterator Section = o->end_sections();
+ section_iterator Section = o->section_end();
if (error(si->getName(Name))) continue;
if (error(si->getAddress(Address))) continue;
if (error(si->getType(Type))) continue;
@@ -743,7 +743,7 @@
<< ' ';
if (Absolute)
outs() << "*ABS*";
- else if (Section == o->end_sections())
+ else if (Section == o->section_end())
outs() << "*UND*";
else {
if (const MachOObjectFile *MachO =