diff options
| author | Rafael Ávila de Espíndola <rafael.espindola@gmail.com> | 2015-02-04 17:37:05 -0500 |
|---|---|---|
| committer | Rafael Ávila de Espíndola <rafael.espindola@gmail.com> | 2015-02-04 17:37:05 -0500 |
| commit | b39b8b9d90e142179709e846c15afdebd49b0fb1 (patch) | |
| tree | eeb295d2e10e4ab4c052751d01d9b151dd3da56b | |
| parent | b9394193d08bef2193f805ded0af898e4c10a509 (diff) | |
| download | binutils-gdb-b39b8b9d90e142179709e846c15afdebd49b0fb1.tar.gz | |
Combine loop epilogue into main loop body to reduce duplication.
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/merge.cc | 15 |
2 files changed, 7 insertions, 13 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index a7deb7730f1..73ee43e37bf 100644 --- 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 269e6bf6e3c..f547388e308 100644 --- 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. |