Add -Wshadow to the gcc command line options used when compiling the binutils.

[deliverable/binutils-gdb.git] / gold / merge.cc

diff --git a/gold/merge.cc b/gold/merge.cc
index 9b416e6fdd13056ff35189a68d4ae9a37c87007e..654f3495fee34a3ee727e1a0ad518706b5197797 100644 (file)
--- a/gold/merge.cc
+++ b/gold/merge.cc
@@ -140,7 +140,7 @@ Object_merge_map::add_mapping(const Merge_map* merge_map, unsigned int shndx,
 
 // Get the output offset for an input address.
 
-inline bool
+bool
 Object_merge_map::get_output_offset(const Merge_map* merge_map,
                                    unsigned int shndx,
                                    section_offset_type input_offset,
@@ -204,6 +204,12 @@ Object_merge_map::initialize_input_to_output_map(
   Input_merge_map* map = this->get_input_merge_map(shndx);
   gold_assert(map != NULL);
 
+  gold_assert(initialize_map->empty());
+  // We know how many entries we are going to add.
+  // reserve_unordered_map takes an expected count of buckets, not a
+  // count of elements, so double it to try to reduce collisions.
+  reserve_unordered_map(initialize_map, map->entries.size() * 2);
+
   for (Input_merge_map::Entries::const_iterator p = map->entries.begin();
        p != map->entries.end();
        ++p)
@@ -283,10 +289,10 @@ Merge_map::is_merge_section_for(const Relobj* object, unsigned int shndx) const
 bool
 Output_merge_base::do_output_offset(const Relobj* object,
                                    unsigned int shndx,
-                                   section_offset_type offset,
+                                   section_offset_type off,
                                    section_offset_type* poutput) const
 {
-  return this->merge_map_.get_output_offset(object, shndx, offset, poutput);
+  return this->merge_map_.get_output_offset(object, shndx, off, poutput);
 }
 
 // Return whether this is the merge section for SHNDX in OBJECT.
@@ -348,10 +354,10 @@ Output_merge_data::Merge_data_eq::operator()(Merge_data_key k1,
 void
 Output_merge_data::add_constant(const unsigned char* p)
 {
-  section_size_type entsize = convert_to_section_size_type(this->entsize());
-  section_size_type addralign =
+  section_size_type ent_size = convert_to_section_size_type(this->entsize());
+  section_size_type addr_align =
     convert_to_section_size_type(this->addralign());
-  section_size_type addsize = std::max(entsize, addralign);
+  section_size_type addsize = std::max(ent_size, addr_align);
   if (this->len_ + addsize > this->alc_)
     {
       if (this->alc_ == 0)
@@ -363,9 +369,9 @@ Output_merge_data::add_constant(const unsigned char* p)
        gold_nomem();
     }
 
-  memcpy(this->p_ + this->len_, p, entsize);
-  if (addsize > entsize)
-    memset(this->p_ + this->len_ + entsize, 0, addsize - entsize);
+  memcpy(this->p_ + this->len_, p, ent_size);
+  if (addsize > ent_size)
+    memset(this->p_ + this->len_ + ent_size, 0, addsize - ent_size);
   this->len_ += addsize;
 }
 
@@ -380,14 +386,14 @@ Output_merge_data::do_add_input_section(Relobj* object, unsigned int shndx)
   section_size_type len;
   const unsigned char* p = object->section_contents(shndx, &len, false);
 
-  section_size_type entsize = convert_to_section_size_type(this->entsize());
+  section_size_type ent_size = convert_to_section_size_type(this->entsize());
 
-  if (len % entsize != 0)
+  if (len % ent_size != 0)
     return false;
 
-  this->input_count_ += len / entsize;
+  this->input_count_ += len / ent_size;
 
-  for (section_size_type i = 0; i < len; i += entsize, p += entsize)
+  for (section_size_type i = 0; i < len; i += ent_size, p += ent_size)
     {
       // Add the constant to the section contents.  If we find that it
       // is already in the hash table, we will remove it again.
@@ -400,12 +406,12 @@ Output_merge_data::do_add_input_section(Relobj* object, unsigned int shndx)
       if (!ins.second)
        {
          // Key was already present.  Remove the copy we just added.
-         this->len_ -= entsize;
+         this->len_ -= ent_size;
          k = *ins.first;
        }
 
       // Record the offset of this constant in the output section.
-      this->add_mapping(object, shndx, i, entsize, k);
+      this->add_mapping(object, shndx, i, ent_size, k);
     }
 
   return true;
@@ -465,7 +471,7 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
   const unsigned char* pdata = object->section_contents(shndx, &len, false);
 
   const Char_type* p = reinterpret_cast<const Char_type*>(pdata);
-  const Char_type* pend = p + len;
+  const Char_type* pend = p + len / sizeof(Char_type);
 
   if (len % sizeof(Char_type) != 0)
     {
@@ -485,8 +491,10 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
        {
          if (pl >= pend)
            {
-             object->error(_("entry in mergeable string section "
-                             "not null terminated"));
+             gold_warning(_("%s: last entry in mergeable string section '%s' "
+                            "not null terminated"),
+                          object->name().c_str(),
+                          object->section_name(shndx).c_str());
              break;
            }
        }
@@ -523,9 +531,9 @@ Output_merge_string<Char_type>::finalize_merged_data()
        p != this->merged_strings_.end();
        ++p)
     {
-      section_offset_type offset =
+      section_offset_type soffset =
        this->stringpool_.get_offset_from_key(p->stringpool_key);
-      this->add_mapping(p->object, p->shndx, p->offset, p->length, offset);
+      this->add_mapping(p->object, p->shndx, p->offset, p->length, soffset);
     }
 
   // Save some memory.  This also ensures that this function will work