re PR debug/49825 (Many testcase failures)

PR debug/49825
        * dwarf2cfi.c (dwarf2out_stack_adjust): Move A_O_A test earlier.
        (dwarf2out_notice_stack_adjust): Use args_size from call_insn.

From-SVN: r176729

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4fc18eeed46717918f85818dd6632f31a98f4ca7..b88996e5befe1b3719863ca97fca480c7db20c74 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-24  Richard Henderson  <rth@redhat.com>
+
+       PR debug/49825
+       * dwarf2cfi.c (dwarf2out_stack_adjust): Move A_O_A test earlier.
+       (dwarf2out_notice_stack_adjust): Use args_size from call_insn.
+
 2011-07-24  Richard Henderson  <rth@redhat.com>
 
        PR debug/49827

diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c
index 9e64de67ec0b191f7fe32bca626fdbfab07395bb..de19d06a08eec7606a82816eefbc21baaae62cfd 100644 (file)
--- a/gcc/dwarf2cfi.c
+++ b/gcc/dwarf2cfi.c
@@ -956,14 +956,6 @@ dwarf2out_stack_adjust (HOST_WIDE_INT offset)
   if (cur_trace->cfa_store.reg == dw_stack_pointer_regnum)
     cur_trace->cfa_store.offset += offset;
 
-#ifndef STACK_GROWS_DOWNWARD
-  offset = -offset;
-#endif
-
-  queued_args_size += offset;
-  if (queued_args_size < 0)
-    queued_args_size = 0;
-
   /* ??? The assumption seems to be that if A_O_A, the only CFA adjustments
      involving the stack pointer are inside the prologue and marked as
      RTX_FRAME_RELATED_P.  That said, should we not verify this assumption
@@ -972,6 +964,14 @@ dwarf2out_stack_adjust (HOST_WIDE_INT offset)
   if (ACCUMULATE_OUTGOING_ARGS)
     return;
 
+#ifndef STACK_GROWS_DOWNWARD
+  offset = -offset;
+#endif
+
+  queued_args_size += offset;
+  if (queued_args_size < 0)
+    queued_args_size = 0;
+
   def_cfa_1 (&loc);
   if (flag_asynchronous_unwind_tables)
     dwarf2out_args_size (queued_args_size);
@@ -1016,8 +1016,7 @@ dwarf2out_notice_stack_adjust (rtx insn, bool after_p)
          if (GET_CODE (insn) == SET)
            insn = SET_SRC (insn);
          gcc_assert (GET_CODE (insn) == CALL);
-         gcc_assert (queued_args_size == INTVAL (XEXP (insn, 1)));
-         dwarf2out_args_size (queued_args_size);
+         dwarf2out_args_size (INTVAL (XEXP (insn, 1)));
        }
       return;
     }