cfg.c (dump_bb_info): Fix flags check.

2014-04-15  Teresa Johnson  <tejohnson@google.com>

	* cfg.c (dump_bb_info): Fix flags check.
	* tree-cfg.c (remove_bb): Only dump TDF_BLOCKS when removing.

2014-04-15  Teresa Johnson  <tejohnson@google.com>

	* gcc.dg/tree-prof/update-loopch.c: Update expected output.

From-SVN: r209421

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cd6adc4efe6121c6dbd86664f7b1e41d007fdb23..356a111503e2917bc474defcbb3ec92b57767404 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-15  Teresa Johnson  <tejohnson@google.com>
+
+       * cfg.c (dump_bb_info): Fix flags check.
+       * tree-cfg.c (remove_bb): Only dump TDF_BLOCKS when removing.
+
 2014-04-15  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        PR rtl-optimization/60663

diff --git a/gcc/cfg.c b/gcc/cfg.c
index a281c0fb82320bc5cbf6af986efe0aae9ade6581..3b6349aec495efaf54cdcd5cd0a2422e8205616e 100644 (file)
--- a/gcc/cfg.c
+++ b/gcc/cfg.c
@@ -743,11 +743,10 @@ dump_bb_info (FILE *outf, basic_block bb, int indent, int flags,
            fputs (", probably never executed", outf);
        }
       fputc ('\n', outf);
-      if (TDF_DETAILS)
-       check_bb_profile (bb, outf, indent, flags);
 
       if (flags & TDF_DETAILS)
        {
+         check_bb_profile (bb, outf, indent, flags);
          if (flags & TDF_COMMENT)
            fputs (";; ", outf);
          fprintf (outf, "%s prev block ", s_indent);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a2645d84097964b1168bc287d509baf55864d9e5..6904ef6c2fb01ee8a35d6be098f4d18b9e3b92b0 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-15  Teresa Johnson  <tejohnson@google.com>
+
+       * gcc.dg/tree-prof/update-loopch.c: Update expected output.
+
 2014-04-15  Eric Botcazou  <ebotcazou@adacore.com>
 
        * gnat.dg/vect14.adb: New test.

diff --git a/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c b/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c
index 5297098fc91491b1c87bd1dd476cdea1b80a6e37..85a4b2a840c90622e55db7d5a5fd931743fb5266 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c
+++ b/gcc/testsuite/gcc.dg/tree-prof/update-loopch.c
@@ -15,8 +15,9 @@ main ()
    is once reached directly from entry point of function, rest via loopback
    edge.  */
 /* { dg-final-use { scan-ipa-dump "loop depth 1, count 33334" "profile"} } */
-/* { dg-final-use { scan-tree-dump "loop depth 1, count 33332" "optimized"} } */
-/* { dg-final-use { scan-tree-dump-times "Removing basic block \[^\r\n\]*\[\\r\\n\]+\[^\r\n\]*\[\\r\\n\]+Invalid sum of\[^\r\n\]*\[\\r\\n\]+Invalid sum of" 1 "optimized"} } */
-/* { dg-final-use { scan-tree-dump-times "Invalid sum of" 2 "optimized"} } */
+/* { dg-final-use { scan-tree-dump "loop depth 1, count 33333" "optimized"} } */
+/* { dg-final-use { scan-tree-dump-not "loop depth 1, count 33332" "optimized"} } */
+/* { dg-final-use { scan-tree-dump "Removing basic block" "optimized"} } */
+/* { dg-final-use { scan-tree-dump-not "Invalid sum" "optimized"} } */
 /* { dg-final-use { cleanup-ipa-dump "profile" } } */
 /* { dg-final-use { cleanup-tree-dump "optimized" } } */

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index cd35d5595901668edf433e116019b9a5f37041cb..5e3ef91049f736d096f3551bc4cbfae09fd25d73 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -1959,7 +1959,7 @@ remove_bb (basic_block bb)
       fprintf (dump_file, "Removing basic block %d\n", bb->index);
       if (dump_flags & TDF_DETAILS)
        {
-         dump_bb (dump_file, bb, 0, dump_flags);
+         dump_bb (dump_file, bb, 0, TDF_BLOCKS);
          fprintf (dump_file, "\n");
        }
     }