PR tree-optimization/37879

	* predict.c (tree_estimate_probability): Check if last_stmt is
	non-NULL before dereferencing it.

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

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a683eca..a92a67a 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-27  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/37879
+       * predict.c (tree_estimate_probability): Check if last_stmt is
+       non-NULL before dereferencing it.
+
 2008-10-27  Vladimir Makarov  <vmakarov@redhat.com>
 
        * ira-int.h (ira_allocno): Add member updated_cover_class_cost.

diff --git a/gcc/predict.c b/gcc/predict.c
index 5ed6c43..c6e933f 100644 (file)
--- a/gcc/predict.c
+++ b/gcc/predict.c
@@ -1599,6 +1599,7 @@ tree_estimate_probability (void)
     {
       edge e;
       edge_iterator ei;
+      gimple last;
 
       FOR_EACH_EDGE (e, ei, bb->succs)
        {
@@ -1621,7 +1622,8 @@ tree_estimate_probability (void)
              && e->dest != EXIT_BLOCK_PTR
              && single_succ_p (e->dest)
              && single_succ_edge (e->dest)->dest == EXIT_BLOCK_PTR
-             && gimple_code (last_stmt (e->dest)) == GIMPLE_RETURN)
+             && (last = last_stmt (e->dest)) != NULL
+             && gimple_code (last) == GIMPLE_RETURN)
            {
              edge e1;
              edge_iterator ei1;

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 886e542..3aa9a1e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-27  Jakub Jelinek  <jakub@redhat.com>
+
+       PR tree-optimization/37879
+       * gcc.dg/pr37879.c: New test.
+
 2008-10-24  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        PR target/37841

diff --git a/gcc/testsuite/gcc.dg/pr37879.c b/gcc/testsuite/gcc.dg/pr37879.c
new file mode 100644 (file)
index 0000000..5dd2527
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr37879.c
@@ -0,0 +1,28 @@
+/* PR tree-optimization/37879 */
+/* { dg-do compile } */
+/* { dg-options "-O2" } */
+
+static inline void bar (int) __attribute__ ((noreturn));
+void baz () __attribute__ ((noreturn));
+
+inline int
+foo (int i)
+{
+  return i;
+}
+
+int i = 23;
+static inline void
+bar (int j)
+{
+  if (j)
+    asm ("");
+}              /* { dg-warning "does return" } */
+
+void
+baz ()
+{
+  int j;
+  bar (foo (j = i++));
+  asm ("");
+}