Re: [PATCH] Set correct source location for deallocator calls

[Andrew Pinski <pinskia@gmail.com>]

On Fri, Sep 14, 2012 at 9:25 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Sat, Sep 8, 2012 at 2:42 PM, Dehao Chen <dehao@google.com> wrote:
>> Hi,
>>
>> I've added a libjava unittest which verifies that this patch will not
>> break Java debug info. I've also incorporated Richard's review in the
>> previous mail. Attached is the new patch, which passed bootstrap and
>> all gcc/libjava testsuites on x86.
>>
>> Is it ok for trunk?
>>
>> Thanks,
>> Dehao
>>
>> gcc/ChangeLog:
>> 2012-09-08  Dehao Chen  <dehao@google.com>
>>
>>          * tree-eh.c (goto_queue_node): New field.
>>         (record_in_goto_queue): New parameter.
>>         (record_in_goto_queue_label): New parameter.
>>         (lower_try_finally_dup_block): New parameter.
>>         (maybe_record_in_goto_queue): Update source location.
>>         (lower_try_finally_copy): Likewise.
>>         (honor_protect_cleanup_actions): Likewise.
>>         * gimplify.c (gimplify_expr): Reset the location to unknown.
>>
>> gcc/testsuite/ChangeLog:
>> 2012-09-08  Dehao Chen  <dehao@google.com>
>>
>>         * g++.dg/debug/dwarf2/deallocator.C: New test.
>>
>> libjava/ChangeLog:
>> 2012-09-08  Dehao Chen  <dehao@google.com>
>>
>>         * testsuite/libjava.lang/sourcelocation.java: New cases.
>>         * testsuite/libjava.lang/sourcelocation.out: New cases.
>
> On Linux/x86, I got
>
> FAIL: sourcelocation -O3 -findirect-dispatch output - source compiled test
> FAIL: sourcelocation -O3 output - source compiled test
> FAIL: sourcelocation -findirect-dispatch output - source compiled test
> FAIL: sourcelocation output - source compiled test
>
> spawn [open ...]^M
> -1
> -1
> -1
> PASS: sourcelocation -findirect-dispatch execution - source compiled test
> FAIL: sourcelocation -findirect-dispatch output - source compiled test

I bet you have an older addr2line installed.

Thanks,
Andrew Pinski