PR rtl-optimization/46440

	* combine.c (update_cfg_for_uncondjump): When changing
	an indirect jump into unconditional jump, remove BARRIERs
	from bb's footer.

	* gcc.dg/pr46440.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166867 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a131549..3fa0b56 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-17  Jakub Jelinek  <jakub@redhat.com>
+
+       PR rtl-optimization/46440
+       * combine.c (update_cfg_for_uncondjump): When changing
+       an indirect jump into unconditional jump, remove BARRIERs
+       from bb's footer.
+
 2010-11-17  Joseph Myers  <joseph@codesourcery.com>
 
        * opts.c (target_handle_option): Do not assert that loc ==

diff --git a/gcc/combine.c b/gcc/combine.c
index d55ce31..c557e8c 100644 (file)
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -2460,7 +2460,25 @@ update_cfg_for_uncondjump (rtx insn)
 
   delete_insn (insn);
   if (at_end && EDGE_COUNT (bb->succs) == 1)
-    single_succ_edge (bb)->flags |= EDGE_FALLTHRU;
+    {
+      rtx insn;
+
+      single_succ_edge (bb)->flags |= EDGE_FALLTHRU;
+
+      /* Remove barriers from the footer if there are any.  */
+      for (insn = bb->il.rtl->footer; insn; insn = NEXT_INSN (insn))
+       if (BARRIER_P (insn))
+         {
+           if (PREV_INSN (insn))
+             NEXT_INSN (PREV_INSN (insn)) = NEXT_INSN (insn);
+           else
+             bb->il.rtl->footer = NEXT_INSN (insn);
+           if (NEXT_INSN (insn))
+             PREV_INSN (NEXT_INSN (insn)) = PREV_INSN (insn);
+         }
+       else if (LABEL_P (insn))
+         break;
+    }
 }
 
 /* Try to combine the insns I0, I1 and I2 into I3.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3f2958c..4c94254 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2010-11-17  Jakub Jelinek  <jakub@redhat.com>
 
+       PR rtl-optimization/46440
+       * gcc.dg/pr46440.c: New test.
+
        PR testsuite/45429
        * gcc.dg/vect/no-section-anchors-vect-64.c: New test.
 

diff --git a/gcc/testsuite/gcc.dg/pr46440.c b/gcc/testsuite/gcc.dg/pr46440.c
new file mode 100644 (file)
index 0000000..12a9997
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr46440.c
@@ -0,0 +1,25 @@
+/* PR rtl-optimization/46440 */
+/* { dg-do compile } */
+/* { dg-options "-O -fstack-protector -fno-tree-dominator-opts -fno-tree-fre" } */
+/* { dg-require-effective-target fstack_protector } */
+
+int i;
+
+void bar (char *);
+
+void
+foo (void)
+{
+  void *l;
+  char c[64];
+  bar (c);
+  i = 1;
+  if (i)
+    l = &&l1;
+  else
+    l = &&l2;
+  goto *l;
+l2:
+  __builtin_abort ();
+l1:;
+}