tree-cfg.c (tree_flow_call_edges_add): Check for empty basic blocks.

2005-12-18  Andreas Krebbel  <krebbel1@de.ibm.com>

	* tree-cfg.c (tree_flow_call_edges_add): Check for empty basic blocks.

	* gcc.dg/20051201-1.c: New test.

From-SVN: r108755

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5a5a591..6e4f1ff 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-18  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+       * tree-cfg.c (tree_flow_call_edges_add): Check for empty basic blocks.
+
 2005-12-18  Steven Bosscher  <stevenb@suse.de>
 
        * gcse.c (gcse_main, bypass_jumps): Fix non-GNU-isms from

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5ecdf09..87e1de6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-18  Andreas Krebbel  <krebbel1@de.ibm.com>
+
+       * gcc.dg/20051201-1.c: New test.
+
 2005-12-18  Paul Thomas  <pault@gcc.gnu.org>
 
        PR fortran/25018

diff --git a/gcc/testsuite/gcc.dg/20051201-1.c b/gcc/testsuite/gcc.dg/20051201-1.c
new file mode 100644 (file)
index 0000000..8e77986
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/20051201-1.c
@@ -0,0 +1,26 @@
+/* This failed with profiling due to a missing check in
+   tree_flow_call_edges_add.  */
+
+/* { dg-do compile } */
+/* { dg-options "-O1 -fprofile-generate" } */
+
+static __attribute__ ((always_inline)) void 
+baz ()
+{
+}
+
+static __attribute__ ((always_inline)) int
+bar ()
+{
+ out:
+  baz ();
+  goto out;
+}
+
+int
+foo ()
+{
+  long res;
+  
+  res = bar ();
+}

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 3f925b3..d2e688e 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -4769,7 +4769,7 @@ tree_flow_call_edges_add (sbitmap blocks)
       if (!bsi_end_p (bsi))
        t = bsi_stmt (bsi);
 
-      if (need_fake_edge_p (t))
+      if (t && need_fake_edge_p (t))
        {
          edge e;