diff mbox

Patch: PR debug/45865

Message ID AANLkTi=Ap6+DXDbTrkp6xUbGV5Vw6QmPpefhu-ernG3Y@mail.gmail.com
State New
Headers show

Commit Message

H.J. Lu Oct. 10, 2010, 2:41 a.m. UTC 
On Sat, Oct 9, 2010 at 2:59 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Fri, Oct 8, 2010 at 11:43 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Fri, Oct 8, 2010 at 4:50 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>>> On Tue, Oct 5, 2010 at 7:46 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>>>> On Tue, Oct 5, 2010 at 6:12 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>>>>> On Sun, Oct 3, 2010 at 4:34 AM, Bernd Schmidt <bernds@codesourcery.com> wrote:
>>>>>> On 10/02/2010 03:07 PM, H.J. Lu wrote:
>>>>>>> On Wed, Aug 4, 2010 at 6:35 AM, Bernd Schmidt <bernds@codesourcery.com> wrote:
>>>>>>>> On 08/03/2010 07:12 PM, Jeff Law wrote:
>>>>>>>>> OK.  WRT the comment, we might want to just say that BB_MODIFIED is set
>>>>>>>>> at the same time as a block is marked dirty, but is not cleared during a
>>>>>>>>> df_analyze allowing a pass to update the DF information and still know
>>>>>>>>> what blocks were modified.
>>>>>>>>
>>>>>>>> New patch below.
>>>>>>>>
>>>>>>>
>>>>>>> This caused:
>>>>>>>
>>>>>>> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45865
>>>>>>
>>>>>> This should fix it, refusing to move NOTE_EPILOGUE_BEGIN and anything
>>>>>> beyond it.
>>>>>>
>>>>>> Bootstrapped and tested on i686-linux, ok?
>>>>>>
>>>>>
>>>>> It still failed this testcase.
>>>>>
>>>>> --
>>>>> H.J.
>>>>> ---
>>>>> [hjl@gnu-32 rrs]$ cat pr45865.c
>>>>> typedef struct rtx_def *rtx;
>>>>> enum machine_mode {
>>>>>  VOIDmode,
>>>>>  CCFPmode,
>>>>>  CCFPUmode,
>>>>>  MAX_MACHINE_MODE
>>>>> };
>>>>> enum mode_class {
>>>>>  MODE_CC,
>>>>>  MODE_FLOAT,
>>>>>  MODE_COMPLEX_FLOAT,
>>>>>  MODE_VECTOR_FLOAT
>>>>> };
>>>>> extern const enum mode_class mode_class[(int) MAX_MACHINE_MODE];
>>>>> enum rtx_code {
>>>>>  UNKNOWN,
>>>>>  GEU,
>>>>>  ORDERED,
>>>>>  CONST_INT
>>>>> };
>>>>> struct rtx_def {
>>>>>  unsigned int code: 16;
>>>>>  unsigned int mode : 8;
>>>>> };
>>>>> extern enum rtx_code reverse_condition (enum rtx_code);
>>>>> enum rtx_code
>>>>> reversed_comparison_code_parts (enum rtx_code code, rtx insn, rtx arg0,
>>>>>                                rtx arg1)
>>>>> {
>>>>>  enum machine_mode mode;
>>>>>  mode = (enum machine_mode) (arg0)->mode;
>>>>>  if (mode == VOIDmode)
>>>>>    mode = (enum machine_mode) (arg1)->mode;
>>>>>  if ((mode_class[(int) (mode)]) == MODE_CC)
>>>>>    return (mode != CCFPmode && mode != CCFPUmode
>>>>>            ? reverse_condition (code)
>>>>>            : reverse_condition_maybe_unordered (code));
>>>>>  switch (code)
>>>>>    {
>>>>>    case GEU:
>>>>>      return reverse_condition (code);
>>>>>    case ORDERED:
>>>>>      return UNKNOWN;
>>>>>    }
>>>>>  if (((enum rtx_code) (arg0)->code) == CONST_INT
>>>>>      || (((enum machine_mode) (arg0)->mode) != VOIDmode
>>>>>          && ! ((mode_class[(int) (mode)]) == MODE_FLOAT
>>>>>                || (mode_class[(int) (mode)]) == MODE_COMPLEX_FLOAT
>>>>>                || (mode_class[(int) (mode)]) == MODE_VECTOR_FLOAT)))
>>>>>    return reverse_condition (code);
>>>>>  return UNKNOWN;
>>>>> }
>>>>> [hjl@gnu-32 rrs]$ /export/gnu/import/rrs/164914/usr/bin/gcc -O2 -S
>>>>> -m32 pr45865.c
>>>>> pr45865.c: In function \u2018reversed_comparison_code_parts\u2019:
>>>>> pr45865.c:52:1: internal compiler error: in
>>>>> dwarf2out_cfi_begin_epilogue, at dwarf2out.c:2930
>>>>> Please submit a full bug report,
>>>>> with preprocessed source if appropriate.
>>>>> See <http://gcc.gnu.org/bugs.html> for instructions.
>>>>> [hjl@gnu-32 rrs]$
>>>>>
>>>>
>>>> One problem is:
>>>>
>>>> if (max_to == NULL_RTX || (fail && pmove_upto == NULL))
>>>>
>>>> When pmove_upto isn't NULL,*pmove_upto is initialized to NULL
>>>> This patch works for me.  OK for trunk?
>>>>
>>>> Thanks.
>>>>
>>>> --
>>>> H.J.
>>>> ---
>>>> gcc/
>>>>
>>>> 2010-10-05  Bernd Schmidt  <bernds@codesourcery.com>
>>>>            H.J. Lu  <hongjiu.lu@intel.com>
>>>>
>>>>         PR rtl-optimization/45865
>>>>         * df-problems.c (can_move_insns_across): Don't move
>>>>         NOTE_EPILOGUE_BEGIN and anything beyond it.  Properly check
>>>>         pmove_upto.
>>>>
>>>> gcc/testsuite/
>>>>
>>>> 2010-10-05  H.J. Lu  <hongjiu.lu@intel.com>
>>>>
>>>>         PR rtl-optimization/45865
>>>>         * gcc.dg/torture/pr45865.c: New.
>>>>
>>
>> On Linux/ia32, I got
>>
>> Bootstrap comparison failure!
>> gcc/i386.o differs
>> make[4]: *** [compare] Error 1
>>
>>
>
> The difference is in ix86_get_builtin_type.
>

Does this patch make senses?

Comments

Jason Merrill Oct. 10, 2010, 1:50 p.m. UTC | #1 
On 10/09/2010 10:41 PM, H.J. Lu wrote:
> Does this patch make senses?

If the problem is that there's a return jump that isn't so marked, that 
seems to be the thing to fix, rather than assume that any jump within an 
epilogue is a return.

Jason
H.J. Lu Oct. 10, 2010, 11:06 p.m. UTC | #2 
On Sun, Oct 10, 2010 at 6:50 AM, Jason Merrill <jason@redhat.com> wrote:
> On 10/09/2010 10:41 PM, H.J. Lu wrote:
>>
>> Does this patch make senses?
>
> If the problem is that there's a return jump that isn't so marked, that
> seems to be the thing to fix, rather than assume that any jump within an
> epilogue is a return.
>

That function has multiple epilogues:

  epilogue 1
....
label1:
  ...
  return

  epilogue 2
  ...
  jump label1
 epilogue 3

dwarf2out_cfi_begin_epilogue fails to properly handle epilogue 2. It
doesn't stop at "jump label1" and treats epilogue 3 is the part of
epilogue 2. My patch makes dwarf2out_cfi_begin_epilogue to stop
at "jump label1".

Thanks.
H.J. Lu Oct. 15, 2010, 10:19 p.m. UTC | #3 
On Sun, Oct 10, 2010 at 4:06 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Sun, Oct 10, 2010 at 6:50 AM, Jason Merrill <jason@redhat.com> wrote:
>> On 10/09/2010 10:41 PM, H.J. Lu wrote:
>>>
>>> Does this patch make senses?
>>
>> If the problem is that there's a return jump that isn't so marked, that
>> seems to be the thing to fix, rather than assume that any jump within an
>> epilogue is a return.
>>
>
> That function has multiple epilogues:
>
>  epilogue 1
> ....
> label1:
>  ...
>  return
>
>  epilogue 2
>  ...
>  jump label1
>  epilogue 3
>
> dwarf2out_cfi_begin_epilogue fails to properly handle epilogue 2. It
> doesn't stop at "jump label1" and treats epilogue 3 is the part of
> epilogue 2. My patch makes dwarf2out_cfi_begin_epilogue to stop
> at "jump label1".
>

Bernd, should your ifcvt/crossjump change mark "jump label1"
in epilogue as return jump?
diff mbox

Patch

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index af5f809..14d4f9b 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -2872,7 +2872,7 @@  dwarf2out_cfi_begin_epilogue (rtx insn)
 	continue;
 
       /* Look for both regular and sibcalls to end the block.  */
-      if (returnjump_p (i))
+      if (returnjump_p (i) || any_uncondjump_p (i))
 	break;
       if (CALL_P (i) && SIBLING_CALL_P (i))
 	break;
--- /dev/null	2010-09-09 09:16:30.485584932 -0700
+++ gcc/gcc/testsuite/gcc.dg/pr45865.c	2010-10-09 19:11:53.988124142 -0700
@@ -0,0 +1,28 @@ 
+/* PR debug/45865 */
+/* { dg-do compile } */
+/* { dg-options "-O2 -fcompare-debug" } */
+
+typedef union tree_node *tree;
+enum ix86_builtin_type {
+  IX86_BT_LAST_VECT,
+  IX86_BT_LAST_PTR
+};
+extern const enum ix86_builtin_type ix86_builtin_type_ptr_base[];
+extern tree build_qualified_type (tree, int);
+extern tree build_pointer_type (tree);
+tree
+ix86_get_builtin_type (enum ix86_builtin_type tcode, unsigned int index)
+{
+  tree type, itype;
+  int quals;
+  if (tcode <= IX86_BT_LAST_PTR)
+    quals = 0x0;
+  else
+    quals = 0x1;
+  itype = ix86_get_builtin_type (ix86_builtin_type_ptr_base[index],
+				 index);
+  if (quals != 0x0)
+    itype = build_qualified_type (itype, quals);
+  type = build_pointer_type (itype);
+  return type;
+}
--- /dev/null	2010-09-09 09:16:30.485584932 -0700
+++ gcc/gcc/testsuite/gcc.dg/torture/pr45865.c	2010-10-05 19:36:04.918278945 -0700
@@ -0,0 +1,54 @@ 
+/* { dg-do compile } */
+
+typedef struct rtx_def *rtx;
+enum machine_mode {
+  VOIDmode,
+  CCFPmode,
+  CCFPUmode,
+  MAX_MACHINE_MODE
+};
+enum mode_class {
+  MODE_CC,
+  MODE_FLOAT,
+  MODE_COMPLEX_FLOAT,
+  MODE_VECTOR_FLOAT
+};
+extern const enum mode_class mode_class[(int) MAX_MACHINE_MODE];
+enum rtx_code {
+  UNKNOWN,
+  GEU,
+  ORDERED,
+  CONST_INT
+};
+struct rtx_def {
+  unsigned int code: 16;
+  unsigned int mode : 8;
+};
+extern enum rtx_code reverse_condition (enum rtx_code);
+enum rtx_code
+reversed_comparison_code_parts (enum rtx_code code, rtx insn, rtx arg0,
+				rtx arg1)
+{
+  enum machine_mode mode;
+  mode = (enum machine_mode) (arg0)->mode;
+  if (mode == VOIDmode)
+    mode = (enum machine_mode) (arg1)->mode;
+  if ((mode_class[(int) (mode)]) == MODE_CC)
+    return (mode != CCFPmode && mode != CCFPUmode
+	    ? reverse_condition (code)
+	    : reverse_condition_maybe_unordered (code));
+  switch (code) 
+    {
+    case GEU:
+      return reverse_condition (code);
+    case ORDERED:
+      return UNKNOWN;
+    }
+  if (((enum rtx_code) (arg0)->code) == CONST_INT
+      || (((enum machine_mode) (arg0)->mode) != VOIDmode
+	  && ! ((mode_class[(int) (mode)]) == MODE_FLOAT
+		|| (mode_class[(int) (mode)]) == MODE_COMPLEX_FLOAT
+		|| (mode_class[(int) (mode)]) == MODE_VECTOR_FLOAT)))
+    return reverse_condition (code);
+  return UNKNOWN;
+}