From 43359148b252b9501b0b570b8d48d02fb301b6c8 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 29 Dec 2021 17:50:28 -0500
Subject: [PATCH] tree-pretty-print: still indent unhandled codes

It would be nice to handle language-specific codes in the tree
pretty-printer, but until then we can at least indent them appropriately.

gcc/ChangeLog:

	* tree-pretty-print.c (do_niy): Add spc parameter.
	(NIY): Pass it.
	(print_call_name): Add spc local variable.
---
 gcc/tree-pretty-print.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index c2bdfb5..3526625 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -53,19 +53,19 @@ static const char *op_symbol (const_tree);
 static void newline_and_indent (pretty_printer *, int);
 static void maybe_init_pretty_print (FILE *);
 static void print_struct_decl (pretty_printer *, const_tree, int, dump_flags_t);
-static void do_niy (pretty_printer *, const_tree, dump_flags_t);
+static void do_niy (pretty_printer *, const_tree, int, dump_flags_t);
 
 #define INDENT(SPACE) do { \
   int i; for (i = 0; i<SPACE; i++) pp_space (pp); } while (0)
 
-#define NIY do_niy (pp, node, flags)
+#define NIY do_niy (pp, node, spc, flags)
 
 static pretty_printer *tree_pp;
 
 /* Try to print something for an unknown tree code.  */
 
 static void
-do_niy (pretty_printer *pp, const_tree node, dump_flags_t flags)
+do_niy (pretty_printer *pp, const_tree node, int spc, dump_flags_t flags)
 {
   int i, len;
 
@@ -77,8 +77,8 @@ do_niy (pretty_printer *pp, const_tree node, dump_flags_t flags)
       len = TREE_OPERAND_LENGTH (node);
       for (i = 0; i < len; ++i)
 	{
-	  newline_and_indent (pp, 2);
-	  dump_generic_node (pp, TREE_OPERAND (node, i), 2, flags, false);
+	  newline_and_indent (pp, spc+2);
+	  dump_generic_node (pp, TREE_OPERAND (node, i), spc+2, flags, false);
 	}
     }
 
@@ -4397,6 +4397,7 @@ void
 print_call_name (pretty_printer *pp, tree node, dump_flags_t flags)
 {
   tree op0 = node;
+  int spc = 0;
 
   if (TREE_CODE (op0) == NON_LVALUE_EXPR)
     op0 = TREE_OPERAND (op0, 0);
-- 
2.7.4