Simplify the handling of iterators in ObjectFile.

[oota-llvm.git] / tools / llvm-size / llvm-size.cpp

diff --git a/tools/llvm-size/llvm-size.cpp b/tools/llvm-size/llvm-size.cpp
index ead853e16a7894d8b73cbd226c14ad72e6170569..f46bf6b4a204172f24fac2f746b2b26e09b1380a 100644 (file)
--- a/tools/llvm-size/llvm-size.cpp
+++ b/tools/llvm-size/llvm-size.cpp
@@ -111,12 +111,8 @@ static void PrintObjectSectionSizes(ObjectFile *o) {
     std::size_t max_name_len = strlen("section");
     std::size_t max_size_len = strlen("size");
     std::size_t max_addr_len = strlen("addr");
-    error_code ec;
-    for (section_iterator i = o->begin_sections(),
-                          e = o->end_sections(); i != e;
-                          i.increment(ec)) {
-      if (error(ec))
-        return;
+    for (section_iterator i = o->begin_sections(), e = o->end_sections();
+         i != e; ++i) {
       uint64_t size = 0;
       if (error(i->getSize(size)))
         return;
@@ -154,12 +150,8 @@ static void PrintObjectSectionSizes(ObjectFile *o) {
         << "%#" << max_addr_len << radix_fmt << "\n";
 
     // Print each section.
-    for (section_iterator i = o->begin_sections(),
-                          e = o->end_sections(); i != e;
-                          i.increment(ec)) {
-      if (error(ec))
-        return;
-
+    for (section_iterator i = o->begin_sections(), e = o->end_sections();
+         i != e; ++i) {
       StringRef name;
       uint64_t size = 0;
       uint64_t addr = 0;
@@ -189,13 +181,8 @@ static void PrintObjectSectionSizes(ObjectFile *o) {
     uint64_t total_bss = 0;
 
     // Make one pass over the section table to calculate sizes.
-    error_code ec;
-    for (section_iterator i = o->begin_sections(),
-                          e = o->end_sections(); i != e;
-                          i.increment(ec)) {
-      if (error(ec))
-        return;
-
+    for (section_iterator i = o->begin_sections(), e = o->end_sections();
+         i != e; ++i) {
       uint64_t size = 0;
       bool isText = false;
       bool isData = false;