diff mbox

[Bug15639,ARM] gold and -flto always fails with an internal error on arm-linux-gnueabi*

Message ID CAHACq4p+d326TL9Hqcs83=SGnM-ESHi9QCsb0x+YQyaAUhv4BA@mail.gmail.com
State New
Headers show

Commit Message

'Timothy Arceri' via Patchwork Forward July 7, 2014, 5:22 p.m. UTC 
My apologies -- I must have missed this patch (and your ping).

My first reaction is that we probably shouldn't be calling the Target
version of do_read_symbols from do_layout_deferred_sections. This same
problem could occur on other targets that have an override of
do_read_symbols.

I'd suggest instead factoring out the body of
Sized_relobj_file::do_read_symbols() into a non-virtual, protected,
method Sized_relobj_file::base_read_symbols(), and have
Sized_relobj_file::do_read_symbols() call it. Then call that instead
of read_symbols() from do_layout_deferred_sections(). The
target-specific overrides of do_read_symbols() should also call the
new method directly instead of calling the base class'
do_read_symbols().

Could you give the attached patch a try and see if it fixes your problem?

-cary


On Fri, Jul 4, 2014 at 2:47 PM, Doug Kwan (關振德) <dougkwan@google.com> wrote:
> Looks good to me.  I don't have approval power.  Cary, could you approval
> this?
>
> -Doug
>
>
> On Wed, Jan 29, 2014 at 3:27 AM, Kugan <kugan.vivekanandarajah@linaro.org>
> wrote:
>>
>> Hi,
>>
>> In Sized_relobj_file<size,
>> big_endian>::do_layout_deferred_sections(Layout* layout), while reading
>> .eh_frame, Arm_relobj<big_endian>::do_read_symbols(Read_symbols_data*
>> sd) is called second time around and this triggering the assert.
>>
>> This patch removes the assert and skips reading if this section is
>> already read.
>>
>> Is this OK?
>>
>> Thanks,
>> Kugan
>>
>>
>> gold/
>> +2014-01-29  Kugan Vivekanandarajah  <kuganv@linaro.org>
>> +
>> +       * arm.cc (Arm_relobj<big_endian>::do_read_symbols): Skip reading
>> +       .ARM.attributes section if already read.
>> +
>
>
commit bc0b896929c1cc8735f391b82940f5e46f38dcb9
Author: Cary Coutant <ccoutant@google.com>
Date:   Mon Jul 7 10:14:45 2014 -0700

    Fix internal error with LTO on ARM.
    
    This prevents the target-specific do_read_symbols methods from being called
    twice when do_layout_deferred_sections needs to layout an .eh_frame section.
    
    gold/
    	* dynobj.h (Sized_dynobj::base_read_symbols): New method.
    	* dynobj.cc (Sized_dynobj::do_read_symbols): Move body to...
    	(Sized_dynobj::base_read_symbols): ...new method.
    	* object.h (Sized_relobj_file::base_read_symbols): New method.
    	* object.cc (Sized_relobj_file::do_read_symbols): Move body to...
    	(Sized_relobj_file::base_read_symbols): ...new method.
    	* arm.cc (Arm_relobj::do_read_symbols): Call base_read_symbols.
    	* mips.cc: (Mips_relobj::do_read_symbols): Likewise.
    	* powerpc.cc (Powerpc_dynobj::do_read_symbols): Likewise.

Comments

Will Newton July 8, 2014, 9:28 a.m. UTC | #1 
On 7 July 2014 18:22, Cary Coutant <ccoutant@google.com> wrote:
> My apologies -- I must have missed this patch (and your ping).
>
> My first reaction is that we probably shouldn't be calling the Target
> version of do_read_symbols from do_layout_deferred_sections. This same
> problem could occur on other targets that have an override of
> do_read_symbols.
>
> I'd suggest instead factoring out the body of
> Sized_relobj_file::do_read_symbols() into a non-virtual, protected,
> method Sized_relobj_file::base_read_symbols(), and have
> Sized_relobj_file::do_read_symbols() call it. Then call that instead
> of read_symbols() from do_layout_deferred_sections(). The
> target-specific overrides of do_read_symbols() should also call the
> new method directly instead of calling the base class'
> do_read_symbols().
>
> Could you give the attached patch a try and see if it fixes your problem?

Yes, this fixes the problem for me. Thanks!

> -cary
>
>
> On Fri, Jul 4, 2014 at 2:47 PM, Doug Kwan (關振德) <dougkwan@google.com> wrote:
>> Looks good to me.  I don't have approval power.  Cary, could you approval
>> this?
>>
>> -Doug
>>
>>
>> On Wed, Jan 29, 2014 at 3:27 AM, Kugan <kugan.vivekanandarajah@linaro.org>
>> wrote:
>>>
>>> Hi,
>>>
>>> In Sized_relobj_file<size,
>>> big_endian>::do_layout_deferred_sections(Layout* layout), while reading
>>> .eh_frame, Arm_relobj<big_endian>::do_read_symbols(Read_symbols_data*
>>> sd) is called second time around and this triggering the assert.
>>>
>>> This patch removes the assert and skips reading if this section is
>>> already read.
>>>
>>> Is this OK?
>>>
>>> Thanks,
>>> Kugan
>>>
>>>
>>> gold/
>>> +2014-01-29  Kugan Vivekanandarajah  <kuganv@linaro.org>
>>> +
>>> +       * arm.cc (Arm_relobj<big_endian>::do_read_symbols): Skip reading
>>> +       .ARM.attributes section if already read.
>>> +
>>
>>
diff mbox

Patch

diff --git a/gold/arm.cc b/gold/arm.cc
index 607f9d6..6c472bb 100644
--- a/gold/arm.cc
+++ b/gold/arm.cc
@@ -6683,7 +6683,7 @@  void
 Arm_relobj<big_endian>::do_read_symbols(Read_symbols_data* sd)
 {
   // Call parent class to read symbol information.
-  Sized_relobj_file<32, big_endian>::do_read_symbols(sd);
+  this->base_read_symbols(sd);
 
   // If this input file is a binary file, it has no processor
   // specific flags and attributes section.
@@ -6974,7 +6974,7 @@  void
 Arm_dynobj<big_endian>::do_read_symbols(Read_symbols_data* sd)
 {
   // Call parent class to read symbol information.
-  Sized_dynobj<32, big_endian>::do_read_symbols(sd);
+  this->base_read_symbols(sd);
 
   // Read processor-specific flags in ELF file header.
   const unsigned char* pehdr = this->get_view(elfcpp::file_header_offset,
diff --git a/gold/dynobj.cc b/gold/dynobj.cc
index 2a1b9a3..baf8489 100644
--- a/gold/dynobj.cc
+++ b/gold/dynobj.cc
@@ -336,6 +336,17 @@  template<int size, bool big_endian>
 void
 Sized_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 {
+  this->base_read_symbols(sd);
+}
+
+// Read the symbols and sections from a dynamic object.  We read the
+// dynamic symbols, not the normal symbols.  This is common code for
+// all target-specific overrides of do_read_symbols().
+
+template<int size, bool big_endian>
+void
+Sized_dynobj<size, big_endian>::base_read_symbols(Read_symbols_data* sd)
+{
   this->read_section_data(&this->elf_file_, sd);
 
   const unsigned char* const pshdrs = sd->section_headers->data();
diff --git a/gold/dynobj.h b/gold/dynobj.h
index b8d4b90..03b8053 100644
--- a/gold/dynobj.h
+++ b/gold/dynobj.h
@@ -270,6 +270,12 @@  class Sized_dynobj : public Dynobj
   do_get_global_symbols() const
   { return this->symbols_; }
 
+ protected:
+  // Read the symbols.  This is common code for all target-specific
+  // overrides of do_read_symbols().
+  void
+  base_read_symbols(Read_symbols_data*);
+
  private:
   // For convenience.
   typedef Sized_dynobj<size, big_endian> This;
diff --git a/gold/mips.cc b/gold/mips.cc
index 50d0227..450883e 100644
--- a/gold/mips.cc
+++ b/gold/mips.cc
@@ -5857,7 +5857,7 @@  void
 Mips_relobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 {
   // Call parent class to read symbol information.
-  Sized_relobj_file<size, big_endian>::do_read_symbols(sd);
+  this->base_read_symbols(sd);
 
   // Read processor-specific flags in ELF file header.
   const unsigned char* pehdr = this->get_view(elfcpp::file_header_offset,
diff --git a/gold/object.cc b/gold/object.cc
index c894c13..1811cda 100644
--- a/gold/object.cc
+++ b/gold/object.cc
@@ -755,6 +755,16 @@  template<int size, bool big_endian>
 void
 Sized_relobj_file<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 {
+  this->base_read_symbols(sd);
+}
+
+// Read the sections and symbols from an object file.  This is common
+// code for all target-specific overrides of do_read_symbols().
+
+template<int size, bool big_endian>
+void
+Sized_relobj_file<size, big_endian>::base_read_symbols(Read_symbols_data* sd)
+{
   this->read_section_data(&this->elf_file_, sd);
 
   const unsigned char* const pshdrs = sd->section_headers->data();
@@ -1848,7 +1858,7 @@  Sized_relobj_file<size, big_endian>::do_layout_deferred_sections(Layout* layout)
 
 	  // Reading the symbols again here may be slow.
 	  Read_symbols_data sd;
-	  this->read_symbols(&sd);
+	  this->base_read_symbols(&sd);
 	  this->layout_eh_frame_section(layout,
 					sd.symbols->data(),
 					sd.symbols_size,
diff --git a/gold/object.h b/gold/object.h
index 38b06f0..92cdbdd 100644
--- a/gold/object.h
+++ b/gold/object.h
@@ -2214,6 +2214,11 @@  class Sized_relobj_file : public Sized_relobj<size, big_endian>
   void
   do_read_symbols(Read_symbols_data*);
 
+  // Read the symbols.  This is common code for all target-specific
+  // overrides of do_read_symbols.
+  void
+  base_read_symbols(Read_symbols_data*);
+
   // Return the value of a local symbol.
   uint64_t
   do_local_symbol_value(unsigned int symndx, uint64_t addend) const
diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index 96432ed..0a9ab7d 100644
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -1839,7 +1839,7 @@  template<int size, bool big_endian>
 void
 Powerpc_relobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 {
-  Sized_relobj_file<size, big_endian>::do_read_symbols(sd);
+  this->base_read_symbols(sd);
   if (size == 64)
     {
       const int shdr_size = elfcpp::Elf_sizes<size>::shdr_size;
@@ -1896,14 +1896,14 @@  Powerpc_dynobj<size, big_endian>::set_abiversion(int ver)
     }
 }
 
-// Call Sized_dynobj::do_read_symbols to read the symbols then
+// Call Sized_dynobj::base_read_symbols to read the symbols then
 // read .opd from a dynamic object, filling in opd_ent_ vector,
 
 template<int size, bool big_endian>
 void
 Powerpc_dynobj<size, big_endian>::do_read_symbols(Read_symbols_data* sd)
 {
-  Sized_dynobj<size, big_endian>::do_read_symbols(sd);
+  this->base_read_symbols(sd);
   if (size == 64)
     {
       const int shdr_size = elfcpp::Elf_sizes<size>::shdr_size;