Patchwork [google,4.7] Fix for PR 8013197 (issue7140044)

login
register
mail settings
Submitter Sterling Augustine
Date Jan. 16, 2013, 9:37 p.m.
Message ID <20130116213704.34796A19A8@sterling.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/213067/
State New
Headers show

Comments

Sterling Augustine - Jan. 16, 2013, 9:37 p.m.
commit 257910a4dd56ac0c95ad79053a4364a3ff34a674
Author: Sterling Augustine <saugustine@google.com>
Date:   Wed Jan 16 13:22:59 2013 -0800

    Fix for PR 8013197.
    
    Address table entries will already have been removed at this point in
    resolve_addr, so no need to call again.

M	gcc/dwarf2out.c

Tested:
	With full bootstrap and regression test.

ChangeLog:
  <Split this into multiple sections if you're touching directories
  covered by multiple ChangeLog files.>

2013-01-16   Sterling Augustine <saugustine@google.com>

	* gcc/dwarf2out.c (resolve_addr): Delete call to
	remove_addr_table_entry.


--
This patch is available for review at http://codereview.appspot.com/7140044
Cary Coutant - Jan. 17, 2013, 12:21 a.m.
> 2013-01-16   Sterling Augustine <saugustine@google.com>
>
>         * gcc/dwarf2out.c (resolve_addr): Delete call to
>         remove_addr_table_entry.

OK for google/gcc-4_7. The commit log entry should say "Google ref:
b/8013197" instead of "PR ...".

Thanks!

-cary
Sterling Augustine - Jan. 17, 2013, 10:01 p.m.
On Wed, Jan 16, 2013 at 4:21 PM, Cary Coutant <ccoutant@google.com> wrote:
>
> > 2013-01-16   Sterling Augustine <saugustine@google.com>
> >
> >         * gcc/dwarf2out.c (resolve_addr): Delete call to
> >         remove_addr_table_entry.
>
> OK for google/gcc-4_7. The commit log entry should say "Google ref:
> b/8013197" instead of "PR ...".
>
> Thanks!
>
> -cary

Committed with your suggestion. Thanks.

Sterling
Cary Coutant - Jan. 18, 2013, 7:05 p.m.
>> 2013-01-16   Sterling Augustine <saugustine@google.com>
>>
>>         * gcc/dwarf2out.c (resolve_addr): Delete call to
>>         remove_addr_table_entry.
>
> OK for google/gcc-4_7. The commit log entry should say "Google ref:
> b/8013197" instead of "PR ...".

I'll file an upstream bug for this as well (as soon as I can get the
test case reduced enough), and I'd like to get this fix into 4.8.

-cary

Patch

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 026991b..5ca22b2 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -23234,8 +23234,6 @@  resolve_addr (dw_die_ref die)
 	    else
 	      {
 		loc->replaced = 1;
-                if (dwarf_split_debug_info)
-                  remove_loc_list_addr_table_entries (loc->expr);
 		loc->dw_loc_next = *start;
 	      }
 	  }