From: Jakub Jelinek Date: Sat, 26 Aug 2006 07:31:30 +0000 (+0200) Subject: re PR middle-end/28683 (ICE (segfault in add_reg_br_prob_note) when comparing pointer... X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fa1ff4eb8cb4ec1474d6ab338b6840a2140b588d;p=gcc.git re PR middle-end/28683 (ICE (segfault in add_reg_br_prob_note) when comparing pointers with -O (and higher)) PR middle-end/28683 * cfgexpand.c (add_reg_br_prob_note): Check if last has exactly 3 following insns. * gcc.c-torture/compile/20060823-1.c: New test. From-SVN: r116467 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d9f6e4dba86..6360ec64887 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-08-26 Jakub Jelinek + + PR middle-end/28683 + * cfgexpand.c (add_reg_br_prob_note): Check if last has exactly + 3 following insns. + 2006-08-25 Volker Reichelt * flow.c (verify_wide_reg): Use internal_error for consistency failure. diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c index 630a82a28a5..9839d098375 100644 --- a/gcc/cfgexpand.c +++ b/gcc/cfgexpand.c @@ -58,7 +58,9 @@ add_reg_br_prob_note (rtx last, int probability) if (!any_condjump_p (last) || !JUMP_P (NEXT_INSN (last)) || !simplejump_p (NEXT_INSN (last)) + || !NEXT_INSN (NEXT_INSN (last)) || !BARRIER_P (NEXT_INSN (NEXT_INSN (last))) + || !NEXT_INSN (NEXT_INSN (NEXT_INSN (last))) || !LABEL_P (NEXT_INSN (NEXT_INSN (NEXT_INSN (last)))) || NEXT_INSN (NEXT_INSN (NEXT_INSN (NEXT_INSN (last))))) goto failed; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 39d2fc86507..b9ddcf0ba93 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-08-26 Jakub Jelinek + + PR middle-end/28683 + * gcc.c-torture/compile/20060823-1.c: New test. + 2006-08-25 Volker Reichelt PR c++/28853 diff --git a/gcc/testsuite/gcc.c-torture/compile/20060823-1.c b/gcc/testsuite/gcc.c-torture/compile/20060823-1.c new file mode 100644 index 00000000000..fbce7fe941f --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20060823-1.c @@ -0,0 +1,18 @@ +/* PR middle-end/28683 */ + +extern void foo (int *); + +struct A +{ + int f; +}; + +struct A * +test (struct A *r) +{ + int *f = &r->f; + static int i = 0; + if (!i && !((void *) f == (void *) r)) + foo (&i); + return r; +}