tree-pretty-print.c (dump_generic_node): Avoid outputing "(void) 0;" as the else...

	* tree-pretty-print.c (dump_generic_node): Avoid outputing "(void) 0;"
	as the else branch of a COND_EXPR.

From-SVN: r120140

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5bbfa73de5ffe75ee5c980877c95a28744ecd9b1..f56ca54cdd769fd74ea4c76d22a0673629c81001 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-21  Roger Sayle  <roger@eyesopen.com>
+
+       * tree-pretty-print.c (dump_generic_node): Avoid outputing "(void) 0;"
+       as the else branch of a COND_EXPR.
+
 2006-12-22  Kazu Hirata  <kazu@codesourcery.com>
 
        * cgraphunit.c, config/i386/i386.c, config/ia64/ia64.c, cse.c,

diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index e4f85c132752b345b9979b2a63ee9ab82fee0416..7d895a1b4c7a0078004050f180c22d4220807e1f 100644 (file)
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -1093,9 +1093,14 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
                  || TREE_CODE (COND_EXPR_ELSE (node)) == GOTO_EXPR))
            {
              pp_space (buffer);
-             dump_generic_node (buffer, COND_EXPR_THEN (node), 0, flags, true);
-             pp_string (buffer, " else ");
-             dump_generic_node (buffer, COND_EXPR_ELSE (node), 0, flags, true);
+             dump_generic_node (buffer, COND_EXPR_THEN (node),
+                                0, flags, true);
+             if (!IS_EMPTY_STMT (COND_EXPR_ELSE (node)))
+               {
+                 pp_string (buffer, " else ");
+                 dump_generic_node (buffer, COND_EXPR_ELSE (node),
+                                    0, flags, true);
+               }
            }
          else if (!(flags & TDF_SLIM))
            {
@@ -1112,7 +1117,8 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
                }
 
              /* Output COND_EXPR_ELSE.  */
-             if (COND_EXPR_ELSE (node))
+             if (COND_EXPR_ELSE (node)
+                 && !IS_EMPTY_STMT (COND_EXPR_ELSE (node)))
                {
                  newline_and_indent (buffer, spc);
                  pp_string (buffer, "else");