diff options
| author | Teresa Johnson <tejohnson@google.com> | 2014-04-15 15:12:00 +0000 |
|---|---|---|
| committer | Teresa Johnson <tejohnson@gcc.gnu.org> | 2014-04-15 15:12:00 +0000 |
| commit | d00e4baae7c2518ebe24cfc8536b52354096d562 (patch) | |
| tree | 4d721163e9a4949de2ee44779574494863ee58ae /gcc | |
| parent | fe9208efaf5a745526539330b3353418ab711d7d (diff) | |
| download | gcc-d00e4baae7c2518ebe24cfc8536b52354096d562.zip gcc-d00e4baae7c2518ebe24cfc8536b52354096d562.tar.gz gcc-d00e4baae7c2518ebe24cfc8536b52354096d562.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cfg.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-prof/update-loopch.c | 7 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 2 |
5 files changed, 15 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index cd6adc4..356a111 100644 --- 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 @@ -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 a2645d8..6904ef6 100644 --- 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 5297098..85a4b2a 100644 --- 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 cd35d55..5e3ef91 100644 --- 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"); } } |