From d7831fdb1eff3ac0e6b3589fa38280d97bd1d0f0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 31 Jul 2008 14:33:43 +0000 Subject: [PATCH] re PR debug/36976 (FAIL: g++.dg/torture/stackalign/unwind-2.C) 2008-07-31 H.J. Lu PR debug/36976 * dwarf2out.c (dwarf2out_args_size_adjust): New. (dwarf2out_stack_adjust): Use it. (dwarf2out_frame_debug_expr): Likewise. From-SVN: r138416 --- gcc/ChangeLog | 7 +++++++ gcc/dwarf2out.c | 31 ++++++++++++++----------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c83a2faa81cd..e293cc5ec021 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2008-07-31 H.J. Lu + + PR debug/36976 + * dwarf2out.c (dwarf2out_args_size_adjust): New. + (dwarf2out_stack_adjust): Use it. + (dwarf2out_frame_debug_expr): Likewise. + 2008-07-31 Richard Guenther PR tree-optimization/36978 diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index dbf5105604b8..888ac99d187c 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -387,6 +387,7 @@ static void output_cfi (dw_cfi_ref, dw_fde_ref, int); static void output_call_frame_info (int); static void dwarf2out_note_section_used (void); static void dwarf2out_stack_adjust (rtx, bool); +static void dwarf2out_args_size_adjust (HOST_WIDE_INT, const char *); static void flush_queued_reg_saves (void); static bool clobbers_queued_reg_save (const_rtx); static void dwarf2out_frame_debug_expr (rtx, const char *); @@ -1225,9 +1226,21 @@ dwarf2out_stack_adjust (rtx insn, bool after_p) if (offset == 0) return; + label = dwarf2out_cfi_label (); + dwarf2out_args_size_adjust (offset, label); +} + +/* Adjust args_size based on stack adjustment OFFSET. */ + +static void +dwarf2out_args_size_adjust (HOST_WIDE_INT offset, const char *label) +{ if (cfa.reg == STACK_POINTER_REGNUM) cfa.offset += offset; + if (cfa_store.reg == STACK_POINTER_REGNUM) + cfa_store.offset += offset; + #ifndef STACK_GROWS_DOWNWARD offset = -offset; #endif @@ -1236,7 +1249,6 @@ dwarf2out_stack_adjust (rtx insn, bool after_p) if (args_size < 0) args_size = 0; - label = dwarf2out_cfi_label (); def_cfa_1 (label, &cfa); if (flag_asynchronous_unwind_tables) dwarf2out_args_size (label, args_size); @@ -1668,22 +1680,7 @@ dwarf2out_frame_debug_expr (rtx expr, const char *label) HOST_WIDE_INT offset = stack_adjust_offset (elem); if (offset != 0) - { - if (cfa.reg == STACK_POINTER_REGNUM) - cfa.offset += offset; - -#ifndef STACK_GROWS_DOWNWARD - offset = -offset; -#endif - - args_size += offset; - if (args_size < 0) - args_size = 0; - - def_cfa_1 (label, &cfa); - if (flag_asynchronous_unwind_tables) - dwarf2out_args_size (label, args_size); - } + dwarf2out_args_size_adjust (offset, label); } } return; -- 2.47.2