re PR middle-end/28683 (ICE (segfault in add_reg_br_prob_note) when comparing pointer...

	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 d9f6e4dba86bea9cb622b8df6de50e688d6696f3..6360ec6488706c1c86ee7191e4bbcb7ff2b0a821 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-26  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/28683
+       * cfgexpand.c (add_reg_br_prob_note): Check if last has exactly
+       3 following insns.
+
 2006-08-25  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
        * flow.c (verify_wide_reg): Use internal_error for consistency failure.

diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c
index 630a82a28a5c9fd29c9cab777faec031b8c824db..9839d098375536f1b01953027d99ac47bb538567 100644 (file)
--- 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 39d2fc8650765df389ef87d8bb302713d1115322..b9ddcf0ba93b7f23ddfa4beebabc021b438426a4 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-26  Jakub Jelinek  <jakub@redhat.com>
+
+       PR middle-end/28683
+       * gcc.c-torture/compile/20060823-1.c: New test.
+
 2006-08-25  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
        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 (file)
index 0000000..fbce7fe
--- /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;
+}