From f6f2ca8f9266d155463d294dc8b650880e400a93 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 2 Nov 2010 14:00:39 +0100 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.dg/pr46255.c | 12 ++++++++++++ gcc/tree-cfg.c | 4 ++-- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/pr46255.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 18df572382c3..f46c18f7ce8e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-11-02 Jakub Jelinek + + 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 Maxim Kuvyrkov diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9e657754de5c..cfa980de1105 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2010-11-02 Jakub Jelinek + + PR debug/46255 + * gcc.dg/pr46255.c: New test. + 2010-11-02 Dodji Seketeli PR c++/46170 diff --git a/gcc/testsuite/gcc.dg/pr46255.c b/gcc/testsuite/gcc.dg/pr46255.c new file mode 100644 index 000000000000..e3c9fa76710a --- /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 bffa67922ce9..e31a50d9466c 100644 --- 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); -- 2.47.2