re PR debug/46255 (-fcompare-debug failure with -fprofile-generate)

	PR debug/46255
	* tree-cfg.c (gimple_flow_call_edges_add): Use gsi_last_nondebug_bb
	instead of gsi_last_bb.

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

From-SVN: r166182

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18df572382c3ccde610addfc596bde2a590eb2e6..f46c18f7ce8e4db046247dcd7cdfcc9b667a8d32 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-02  Jakub Jelinek  <jakub@redhat.com>
+
+       PR debug/46255
+       * tree-cfg.c (gimple_flow_call_edges_add): Use gsi_last_nondebug_bb
+       instead of gsi_last_bb.
+
 2010-11-02  Bernd Schmidt  <bernds@codesourcery.com>
            Maxim Kuvyrkov  <maxim@codesourcery.com>
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9e657754de5c23dac796ae3ac053d575f0956726..cfa980de1105d4e3d69da327a04ccffc26ee9cfb 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-02  Jakub Jelinek  <jakub@redhat.com>
+
+       PR debug/46255
+       * gcc.dg/pr46255.c: New test.
+
 2010-11-02  Dodji Seketeli  <dodji@redhat.com>
 
        PR c++/46170

diff --git a/gcc/testsuite/gcc.dg/pr46255.c b/gcc/testsuite/gcc.dg/pr46255.c
new file mode 100644 (file)
index 0000000..e3c9fa7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr46255.c
@@ -0,0 +1,12 @@
+/* PR debug/46255 */
+/* { dg-do compile } */
+/* { dg-options "-fcompare-debug -fprofile-generate -O" } */
+
+int bar (void);
+
+void
+foo (int i)
+{
+  while (i)
+    i = bar ();
+}

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index bffa67922ce91d9f4040820d72eaf805dc919ef6..e31a50d9466ca4e1a0c5b8f354c6388049f91448 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -6749,7 +6749,7 @@ gimple_flow_call_edges_add (sbitmap blocks)
   if (check_last_block)
     {
       basic_block bb = EXIT_BLOCK_PTR->prev_bb;
-      gimple_stmt_iterator gsi = gsi_last_bb (bb);
+      gimple_stmt_iterator gsi = gsi_last_nondebug_bb (bb);
       gimple t = NULL;
 
       if (!gsi_end_p (gsi))
@@ -6783,7 +6783,7 @@ gimple_flow_call_edges_add (sbitmap blocks)
       if (blocks && !TEST_BIT (blocks, i))
        continue;
 
-      gsi = gsi_last_bb (bb);
+      gsi = gsi_last_nondebug_bb (bb);
       if (!gsi_end_p (gsi))
        {
          last_stmt = gsi_stmt (gsi);