From 6bf924b0ab37b8fd62d11262e93f34902ed5e457 Mon Sep 17 00:00:00 2001 From: Doug Kwan Date: Fri, 9 Apr 2010 00:04:30 +0000 Subject: [PATCH] 2010-04-08 Doug Kwan * merge.cc (Output_merge_data::set_final_data_size): Handle empty Output_merge_data. * output.cc (Output_section::add_merge_input_section): Simplify code and return status of Output_merge_base::add_input_section. Update merge section map only if Output_merge_base::add_input_section returns true. --- gold/ChangeLog | 9 ++++++ gold/merge.cc | 5 +++- gold/output.cc | 77 ++++++++++++++++++++++++-------------------------- 3 files changed, 50 insertions(+), 41 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 125d1c83b2..e9b79d4b46 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,12 @@ +2010-04-08 Doug Kwan + + * merge.cc (Output_merge_data::set_final_data_size): Handle empty + Output_merge_data. + * output.cc (Output_section::add_merge_input_section): Simplify + code and return status of Output_merge_base::add_input_section. + Update merge section map only if Output_merge_base::add_input_section + returns true. + 2010-04-07 Doug Kwan * arm.cc (Arm_relobj::scan_section_for_cortex_a8_erratum): Warn diff --git a/gold/merge.cc b/gold/merge.cc index 3d9692124a..e2b6eef2f7 100644 --- a/gold/merge.cc +++ b/gold/merge.cc @@ -425,7 +425,10 @@ Output_merge_data::set_final_data_size() { // Release the memory we don't need. this->p_ = static_cast(realloc(this->p_, this->len_)); - gold_assert(this->p_ != NULL); + // An Output_merge_data object may be empty and realloc is allowed + // to return a NULL pointer in this case. An Output_merge_data is empty + // if all its input sections have sizes that are not multiples of entsize. + gold_assert(this->p_ != NULL || this->len_ == 0); this->set_data_size(this->len_); } diff --git a/gold/output.cc b/gold/output.cc index 0627cbe698..37ec8b3c3f 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -2154,58 +2154,55 @@ Output_section::add_merge_input_section(Relobj* object, unsigned int shndx, gold_assert(this->checkpoint_ == NULL); // Look up merge sections by required properties. + Output_merge_base* pomb; Merge_section_properties msp(is_string, entsize, addralign); Merge_section_by_properties_map::const_iterator p = this->merge_section_by_properties_map_.find(msp); if (p != this->merge_section_by_properties_map_.end()) { - Output_merge_base* merge_section = p->second; - merge_section->add_input_section(object, shndx); - gold_assert(merge_section->is_string() == is_string - && merge_section->entsize() == entsize - && merge_section->addralign() == addralign); - - // Link input section to found merge section. - Const_section_id csid(object, shndx); - this->merge_section_map_[csid] = merge_section; - return true; + pomb = p->second; + gold_assert(pomb->is_string() == is_string + && pomb->entsize() == entsize + && pomb->addralign() == addralign); } - - // We handle the actual constant merging in Output_merge_data or - // Output_merge_string_data. - Output_merge_base* pomb; - if (!is_string) - pomb = new Output_merge_data(entsize, addralign); else { - switch (entsize) + // Create a new Output_merge_data or Output_merge_string_data. + if (!is_string) + pomb = new Output_merge_data(entsize, addralign); + else { - case 1: - pomb = new Output_merge_string(addralign); - break; - case 2: - pomb = new Output_merge_string(addralign); - break; - case 4: - pomb = new Output_merge_string(addralign); - break; - default: - return false; + switch (entsize) + { + case 1: + pomb = new Output_merge_string(addralign); + break; + case 2: + pomb = new Output_merge_string(addralign); + break; + case 4: + pomb = new Output_merge_string(addralign); + break; + default: + return false; + } } + // Add new merge section to this output section and link merge + // section properties to new merge section in map. + this->add_output_merge_section(pomb, is_string, entsize); + this->merge_section_by_properties_map_[msp] = pomb; } - // Add new merge section to this output section and link merge section - // properties to new merge section in map. - this->add_output_merge_section(pomb, is_string, entsize); - this->merge_section_by_properties_map_[msp] = pomb; - - // Add input section to new merge section and link input section to new - // merge section in map. - pomb->add_input_section(object, shndx); - Const_section_id csid(object, shndx); - this->merge_section_map_[csid] = pomb; - - return true; + if (pomb->add_input_section(object, shndx)) + { + // Add input section to new merge section and link input section to new + // merge section in map. + Const_section_id csid(object, shndx); + this->merge_section_map_[csid] = pomb; + return true; + } + else + return false; } // Build a relaxation map to speed up relaxation of existing input sections.