Combine loop epilogue into main loop body to reduce duplication.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index a7deb77..73ee43e 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-04  Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
+
+       * merge.cc (do_add_input_section): Combine loop epilogue into main loop
+       body.
+
 2015-02-04  Peter Collingbourne  <pcc@google.com>
 
        * plugin.cc (Pluginobj::get_symbol_resolution_info): Resolve

diff --git a/gold/merge.cc b/gold/merge.cc
index 269e6bf..f547388 100644 (file)
--- a/gold/merge.cc
+++ b/gold/merge.cc
@@ -564,9 +564,9 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
                                 & (this->addralign() - 1));
   bool has_misaligned_strings = false;
 
-  while (p < pend0)
+  while (p < pend)
     {
-      size_t len = string_length(p);
+      size_t len = p < pend0 ? string_length(p) : pend - p;
 
       // Within merge input section each string must be aligned.
       if (len != 0
@@ -581,17 +581,6 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
       p += len + 1;
       i += (len + 1) * sizeof(Char_type);
     }
-  if (p < pend)
-    {
-      size_t len = pend - p;
-
-      Stringpool::Key key;
-      this->stringpool_.add_with_length(p, len, true, &key);
-
-      merged_strings.push_back(Merged_string(i, key));
-
-      i += (len + 1) * sizeof(Char_type);
-    }
 
   // Record the last offset in the input section so that we can
   // compute the length of the last string.