diff options
author | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-30 02:49:50 +0000 |
---|---|---|
committer | Rafael Espindola <rafael.espindola@gmail.com> | 2014-01-30 02:49:50 +0000 |
commit | efdbec8b0a49fb67c3844be703548fdc6c1dded0 (patch) | |
tree | 040894fc0c18d09dfdfec8693a253bcf998cb8c5 /lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | |
parent | 6bf3966f7fd92217360877d1c04ea8ffe47c11cc (diff) | |
download | llvm-efdbec8b0a49fb67c3844be703548fdc6c1dded0.tar.gz llvm-efdbec8b0a49fb67c3844be703548fdc6c1dded0.tar.bz2 llvm-efdbec8b0a49fb67c3844be703548fdc6c1dded0.tar.xz |
Simplify the handling of iterators in ObjectFile.
None of the object file formats reported error on iterator increment. In
retrospect, that is not too surprising: no object format stores symbols or
sections in a linked list or other structure that requires chasing pointers.
As a consequence, all error checking can be done on begin() and end().
This reduces the text segment of bin/llvm-readobj in my machine from 521233 to
518526 bytes.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200442 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp')
-rw-r--r-- | lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp index f99d7d0b27..6f9eefb68c 100644 --- a/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +++ b/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp @@ -115,12 +115,10 @@ ObjectImage *RuntimeDyldImpl::loadObject(ObjectImage *InputObject) { // Maximum required total memory to allocate all common symbols uint64_t CommonSize = 0; - error_code err; // Parse symbols DEBUG(dbgs() << "Parse symbols:\n"); - for (symbol_iterator i = obj->begin_symbols(), e = obj->end_symbols(); - i != e; i.increment(err)) { - Check(err); + for (symbol_iterator i = obj->begin_symbols(), e = obj->end_symbols(); i != e; + ++i) { object::SymbolRef::Type SymType; StringRef Name; Check(i->getType(SymType)); @@ -173,18 +171,16 @@ ObjectImage *RuntimeDyldImpl::loadObject(ObjectImage *InputObject) { // Parse and process relocations DEBUG(dbgs() << "Parse relocations:\n"); - for (section_iterator si = obj->begin_sections(), - se = obj->end_sections(); si != se; si.increment(err)) { - Check(err); + for (section_iterator si = obj->begin_sections(), se = obj->end_sections(); + si != se; ++si) { bool isFirstRelocation = true; unsigned SectionID = 0; StubMap Stubs; section_iterator RelocatedSection = si->getRelocatedSection(); for (relocation_iterator i = si->begin_relocations(), - e = si->end_relocations(); i != e; i.increment(err)) { - Check(err); - + e = si->end_relocations(); + i != e; ++i) { // If it's the first relocation in this section, find its SectionID if (isFirstRelocation) { SectionID = @@ -251,21 +247,21 @@ unsigned RuntimeDyldImpl::emitSection(ObjectImage &Obj, unsigned StubBufSize = 0, StubSize = getMaxStubSize(); - error_code err; const ObjectFile *ObjFile = Obj.getObjectFile(); // FIXME: this is an inefficient way to handle this. We should computed the // necessary section allocation size in loadObject by walking all the sections // once. if (StubSize > 0) { for (section_iterator SI = ObjFile->begin_sections(), - SE = ObjFile->end_sections(); - SI != SE; SI.increment(err), Check(err)) { + SE = ObjFile->end_sections(); + SI != SE; ++SI) { section_iterator RelSecI = SI->getRelocatedSection(); if (!(RelSecI == Section)) continue; for (relocation_iterator I = SI->begin_relocations(), - E = SI->end_relocations(); I != E; I.increment(err), Check(err)) { + E = SI->end_relocations(); + I != E; ++I) { StubBufSize += StubSize; } } |