From 2edb462ee46b548bf329776139299d29ad355eac Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Sun, 24 Jul 2011 20:05:06 -0700 Subject: [PATCH] re PR debug/49825 (Many testcase failures) PR debug/49825 Test case gcc.c-torture/compile/pr49474.c, among others. * dwarf2cfi.c (cfi_row_equal_p): Don't compare args_size. From-SVN: r176726 --- gcc/ChangeLog | 5 +++++ gcc/dwarf2cfi.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 70cac5b5c5e..b9a21ba55d8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2011-07-24 Richard Henderson + + PR debug/49825 + * dwarf2cfi.c (cfi_row_equal_p): Don't compare args_size. + 2011-07-24 H.J. Lu PR bootstrap/49835 diff --git a/gcc/dwarf2cfi.c b/gcc/dwarf2cfi.c index 3ff4c612411..f715e079e7c 100644 --- a/gcc/dwarf2cfi.c +++ b/gcc/dwarf2cfi.c @@ -667,8 +667,15 @@ cfi_row_equal_p (dw_cfi_row *a, dw_cfi_row *b) else if (!cfa_equal_p (&a->cfa, &b->cfa)) return false; - if (a->args_size != b->args_size) - return false; + /* Logic suggests that we compare args_size here. However, if + EXIT_IGNORE_STACK we don't bother tracking the args_size after + the last time it really matters within the function. This does + in fact lead to paths with differing arg_size, but in cases for + which it doesn't matter. */ + /* ??? If we really want to sanity check the output of the optimizers, + find a way to backtrack from epilogues to the last EH site. This + would allow us to distinguish regions with garbage args_size and + regions where paths ought to agree. */ n_a = VEC_length (dw_cfi_ref, a->reg_save); n_b = VEC_length (dw_cfi_ref, b->reg_save); -- 2.30.2