dump.c (DUMP_CHILDREN): Remove.

* dump.c (DUMP_CHILDREN): Remove.
	(DUMP_BINFO): Adjust.
	(struct dump_node_info): Remove dump_children_p.
	(queue_and_dump_type): Remove dump_children_p parameter.
	(queue): Don't set dump_children_p.
	(dump_child): Pass DUMP_NONE, instead of DUMP_CHILDREN, to
	queue_and_dump_index.
	(dequeue_and_dump): Unconditionally print children.  Adjust calls
	to functions mentioned above.
	(dump_node):  Pass DUMP_NONE, instead of DUMP_CHILDREN to queue.

From-SVN: r29837
This commit is contained in:
Mark Mitchell 1999-10-06 05:35:38 +00:00 committed by Mark Mitchell
parent dca31eb4cc
commit 3454335f03
2 changed files with 146 additions and 247 deletions

View File

@ -1,5 +1,16 @@
1999-10-05 Mark Mitchell <mark@codesourcery.com> 1999-10-05 Mark Mitchell <mark@codesourcery.com>
* dump.c (DUMP_CHILDREN): Remove.
(DUMP_BINFO): Adjust.
(struct dump_node_info): Remove dump_children_p.
(queue_and_dump_type): Remove dump_children_p parameter.
(queue): Don't set dump_children_p.
(dump_child): Pass DUMP_NONE, instead of DUMP_CHILDREN, to
queue_and_dump_index.
(dequeue_and_dump): Unconditionally print children. Adjust calls
to functions mentioned above.
(dump_node): Pass DUMP_NONE, instead of DUMP_CHILDREN to queue.
* ir.texi: Document BIND_EXPR, LOOP_EXPR, and EXIT_EXPR. * ir.texi: Document BIND_EXPR, LOOP_EXPR, and EXIT_EXPR.
* dump.c (dequeue_and_dump): Dump them. * dump.c (dequeue_and_dump): Dump them.

View File

@ -27,8 +27,7 @@ Boston, MA 02111-1307, USA. */
/* Flags used with queue functions. */ /* Flags used with queue functions. */
#define DUMP_NONE 0 #define DUMP_NONE 0
#define DUMP_CHILDREN 1 #define DUMP_BINFO 1
#define DUMP_BINFO 2
/* Information about a node to be dumped. */ /* Information about a node to be dumped. */
@ -36,8 +35,6 @@ typedef struct dump_node_info
{ {
/* The index for the node. */ /* The index for the node. */
unsigned int index; unsigned int index;
/* Nonzero if we should dump the children of the node. */
unsigned int dump_children_p : 1;
/* Nonzero if the node is a binfo. */ /* Nonzero if the node is a binfo. */
unsigned int binfo_p : 1; unsigned int binfo_p : 1;
} *dump_node_info_p; } *dump_node_info_p;
@ -78,7 +75,7 @@ typedef struct dump_info
static unsigned int queue PROTO ((dump_info_p, tree, int)); static unsigned int queue PROTO ((dump_info_p, tree, int));
static void dump_index PROTO ((dump_info_p, unsigned int)); static void dump_index PROTO ((dump_info_p, unsigned int));
static void queue_and_dump_index PROTO ((dump_info_p, const char *, tree, int)); static void queue_and_dump_index PROTO ((dump_info_p, const char *, tree, int));
static void queue_and_dump_type PROTO ((dump_info_p, tree, int)); static void queue_and_dump_type PROTO ((dump_info_p, tree));
static void dequeue_and_dump PROTO ((dump_info_p)); static void dequeue_and_dump PROTO ((dump_info_p));
static void dump_new_line PROTO ((dump_info_p)); static void dump_new_line PROTO ((dump_info_p));
static void dump_maybe_newline PROTO ((dump_info_p)); static void dump_maybe_newline PROTO ((dump_info_p));
@ -89,9 +86,8 @@ static void dump_node PROTO ((tree, FILE *));
static void dump_stmt PROTO ((dump_info_p, tree)); static void dump_stmt PROTO ((dump_info_p, tree));
static void dump_next_stmt PROTO ((dump_info_p, tree)); static void dump_next_stmt PROTO ((dump_info_p, tree));
/* Add T to the end of the queue of nodes to dump. If DUMP_CHILDREN_P /* Add T to the end of the queue of nodes to dump. Returns the index
is non-zero, then its children should be dumped as well. Returns assigned to T. */
the index assigned to T. */
static unsigned int static unsigned int
queue (di, t, flags) queue (di, t, flags)
@ -118,7 +114,6 @@ queue (di, t, flags)
/* Create a new entry in the splay-tree. */ /* Create a new entry in the splay-tree. */
dni = (dump_node_info_p) xmalloc (sizeof (struct dump_node_info)); dni = (dump_node_info_p) xmalloc (sizeof (struct dump_node_info));
dni->index = index; dni->index = index;
dni->dump_children_p = ((flags & DUMP_CHILDREN) != 0);
dni->binfo_p = ((flags & DUMP_BINFO) != 0); dni->binfo_p = ((flags & DUMP_BINFO) != 0);
dq->node = splay_tree_insert (di->nodes, (splay_tree_key) t, dq->node = splay_tree_insert (di->nodes, (splay_tree_key) t,
(splay_tree_value) dni); (splay_tree_value) dni);
@ -181,12 +176,11 @@ queue_and_dump_index (di, field, t, flags)
/* Dump the type of T. */ /* Dump the type of T. */
static void static void
queue_and_dump_type (di, t, dump_children_p) queue_and_dump_type (di, t)
dump_info_p di; dump_info_p di;
tree t; tree t;
int dump_children_p;
{ {
queue_and_dump_index (di, "type", TREE_TYPE (t), dump_children_p); queue_and_dump_index (di, "type", TREE_TYPE (t), DUMP_NONE);
} }
/* Insert a new line in the dump output, and indent to an appropriate /* Insert a new line in the dump output, and indent to an appropriate
@ -273,7 +267,7 @@ dump_stmt (di, t)
/* Dump the CHILD and its children. */ /* Dump the CHILD and its children. */
#define dump_child(field, child) \ #define dump_child(field, child) \
queue_and_dump_index (di, field, child, DUMP_CHILDREN) queue_and_dump_index (di, field, child, DUMP_NONE)
/* Dump the next statement after STMT. */ /* Dump the next statement after STMT. */
@ -296,7 +290,6 @@ dequeue_and_dump (di)
dump_node_info_p dni; dump_node_info_p dni;
tree t; tree t;
unsigned int index; unsigned int index;
int dump_children_p;
enum tree_code code; enum tree_code code;
char code_class; char code_class;
const char* code_name; const char* code_name;
@ -307,7 +300,6 @@ dequeue_and_dump (di)
t = (tree) stn->key; t = (tree) stn->key;
dni = (dump_node_info_p) stn->value; dni = (dump_node_info_p) stn->value;
index = dni->index; index = dni->index;
dump_children_p = dni->dump_children_p;
/* Remove the node from the queue, and put it on the free list. */ /* Remove the node from the queue, and put it on the free list. */
di->queue = dq->next; di->queue = dq->next;
@ -343,11 +335,8 @@ dequeue_and_dump (di)
if (TREE_VIA_VIRTUAL (t)) if (TREE_VIA_VIRTUAL (t))
dump_string (di, "virt"); dump_string (di, "virt");
if (dump_children_p) dump_child ("type", BINFO_TYPE (t));
{ dump_child ("base", BINFO_BASETYPES (t));
dump_child ("type", BINFO_TYPE (t));
dump_child ("base", BINFO_BASETYPES (t));
}
goto done; goto done;
} }
@ -357,29 +346,26 @@ dequeue_and_dump (di)
if (IS_EXPR_CODE_CLASS (code_class)) if (IS_EXPR_CODE_CLASS (code_class))
{ {
/* If we're dumping children, dump them now. */ /* If we're dumping children, dump them now. */
if (dump_children_p) queue_and_dump_type (di, t);
{
queue_and_dump_type (di, t, 1);
switch (code_class) switch (code_class)
{ {
case '1': case '1':
dump_child ("op 0", TREE_OPERAND (t, 0)); dump_child ("op 0", TREE_OPERAND (t, 0));
break; break;
case '2': case '2':
case '<': case '<':
dump_child ("op 0", TREE_OPERAND (t, 0)); dump_child ("op 0", TREE_OPERAND (t, 0));
dump_child ("op 1", TREE_OPERAND (t, 1)); dump_child ("op 1", TREE_OPERAND (t, 1));
break; break;
case 'e': case 'e':
/* These nodes are handled explicitly below. */ /* These nodes are handled explicitly below. */
break; break;
default: default:
my_friendly_abort (19990726); my_friendly_abort (19990726);
}
} }
} }
else if (code_class == 'd') else if (code_class == 'd')
@ -388,11 +374,8 @@ dequeue_and_dump (di)
if (DECL_NAME (t)) if (DECL_NAME (t))
dump_child ("name", DECL_NAME (t)); dump_child ("name", DECL_NAME (t));
/* And types. */ /* And types. */
if (dump_children_p) queue_and_dump_type (di, t);
{ queue_and_dump_index (di, "scpe", DECL_CONTEXT (t), 0);
queue_and_dump_type (di, t, 1);
queue_and_dump_index (di, "scpe", DECL_CONTEXT (t), 0);
}
/* And a source position. */ /* And a source position. */
if (DECL_SOURCE_FILE (t)) if (DECL_SOURCE_FILE (t))
{ {
@ -430,22 +413,19 @@ dequeue_and_dump (di)
/* All types have associated declarations. */ /* All types have associated declarations. */
dump_child ("name", TYPE_NAME (t)); dump_child ("name", TYPE_NAME (t));
if (dump_children_p) /* All types have a main variant. */
{ if (TYPE_MAIN_VARIANT (t) != t)
/* All types have a main variant. */ dump_child ("unql", TYPE_MAIN_VARIANT (t));
if (TYPE_MAIN_VARIANT (t) != t)
dump_child ("unql", TYPE_MAIN_VARIANT (t));
/* And sizes. */ /* And sizes. */
dump_child ("size", TYPE_SIZE (t)); dump_child ("size", TYPE_SIZE (t));
}
/* All types have alignments. */ /* All types have alignments. */
dump_int (di, "algn", TYPE_ALIGN (t)); dump_int (di, "algn", TYPE_ALIGN (t));
} }
else if (code_class == 'c' && dump_children_p) else if (code_class == 'c')
/* All constants can have types. */ /* All constants can have types. */
queue_and_dump_type (di, t, 1); queue_and_dump_type (di, t);
/* Now handle the various kinds of nodes. */ /* Now handle the various kinds of nodes. */
switch (code) switch (code)
@ -467,23 +447,19 @@ dequeue_and_dump (di)
break; break;
case TREE_LIST: case TREE_LIST:
if (dump_children_p) dump_child ("purp", TREE_PURPOSE (t));
{ dump_child ("valu", TREE_VALUE (t));
dump_child ("purp", TREE_PURPOSE (t)); dump_child ("chan", TREE_CHAIN (t));
dump_child ("valu", TREE_VALUE (t));
dump_child ("chan", TREE_CHAIN (t));
}
break; break;
case TREE_VEC: case TREE_VEC:
dump_int (di, "lngt", IDENTIFIER_LENGTH (t)); dump_int (di, "lngt", IDENTIFIER_LENGTH (t));
if (dump_children_p) for (i = 0; i < TREE_VEC_LENGTH (t); ++i)
for (i = 0; i < TREE_VEC_LENGTH (t); ++i) {
{ char buffer[32];
char buffer[32]; sprintf (buffer, "%u", i);
sprintf (buffer, "%u", i); queue_and_dump_index (di, buffer, TREE_VEC_ELT (t, i), 1);
queue_and_dump_index (di, buffer, TREE_VEC_ELT (t, i), 1); }
}
break; break;
case INTEGER_TYPE: case INTEGER_TYPE:
@ -491,13 +467,10 @@ dequeue_and_dump (di)
dump_int (di, "prec", TYPE_PRECISION (t)); dump_int (di, "prec", TYPE_PRECISION (t));
if (TREE_UNSIGNED (t)) if (TREE_UNSIGNED (t))
dump_string (di, "unsigned"); dump_string (di, "unsigned");
if (dump_children_p) dump_child ("min", TYPE_MIN_VALUE (t));
{ dump_child ("max", TYPE_MAX_VALUE (t));
dump_child ("min", TYPE_MIN_VALUE (t));
dump_child ("max", TYPE_MAX_VALUE (t));
}
if (code == ENUMERAL_TYPE && dump_children_p) if (code == ENUMERAL_TYPE)
dump_child ("csts", TYPE_VALUES (t)); dump_child ("csts", TYPE_VALUES (t));
break; break;
@ -506,45 +479,34 @@ dequeue_and_dump (di)
break; break;
case POINTER_TYPE: case POINTER_TYPE:
if (dump_children_p) if (TYPE_PTRMEM_P (t))
{ {
if (TYPE_PTRMEM_P (t)) dump_string (di, "ptrmem");
{ queue_and_dump_index (di, "ptd",
dump_string (di, "ptrmem"); TYPE_PTRMEM_POINTED_TO_TYPE (t), 1);
queue_and_dump_index (di, "ptd", queue_and_dump_index (di, "cls",
TYPE_PTRMEM_POINTED_TO_TYPE (t), 1); TYPE_PTRMEM_CLASS_TYPE (t), 1);
queue_and_dump_index (di, "cls",
TYPE_PTRMEM_CLASS_TYPE (t), 1);
}
else
dump_child ("ptd", TREE_TYPE (t));
} }
else
dump_child ("ptd", TREE_TYPE (t));
break; break;
case REFERENCE_TYPE: case REFERENCE_TYPE:
if (dump_children_p) dump_child ("refd", TREE_TYPE (t));
dump_child ("refd", TREE_TYPE (t));
break; break;
case METHOD_TYPE: case METHOD_TYPE:
if (dump_children_p) dump_child ("clas", TYPE_METHOD_BASETYPE (t));
dump_child ("clas", TYPE_METHOD_BASETYPE (t));
/* Fall through. */ /* Fall through. */
case FUNCTION_TYPE: case FUNCTION_TYPE:
if (dump_children_p) dump_child ("retn", TREE_TYPE (t));
{ dump_child ("prms", TYPE_ARG_TYPES (t));
dump_child ("retn", TREE_TYPE (t));
dump_child ("prms", TYPE_ARG_TYPES (t));
}
break; break;
case ARRAY_TYPE: case ARRAY_TYPE:
if (dump_children_p) dump_child ("elts", TREE_TYPE (t));
{ dump_child ("domn", TYPE_DOMAIN (t));
dump_child ("elts", TREE_TYPE (t));
dump_child ("domn", TYPE_DOMAIN (t));
}
break; break;
case RECORD_TYPE: case RECORD_TYPE:
@ -566,36 +528,29 @@ dequeue_and_dump (di)
else else
dump_string (di, "union"); dump_string (di, "union");
if (dump_children_p) dump_child ("flds", TYPE_FIELDS (t));
{ dump_child ("fncs", TYPE_METHODS (t));
dump_child ("flds", TYPE_FIELDS (t)); queue_and_dump_index (di, "binf", TYPE_BINFO (t),
dump_child ("fncs", TYPE_METHODS (t)); DUMP_BINFO);
queue_and_dump_index (di, "binf", TYPE_BINFO (t),
DUMP_CHILDREN | DUMP_BINFO);
}
} }
break; break;
case CONST_DECL: case CONST_DECL:
if (dump_children_p) dump_child ("cnst", DECL_INITIAL (t));
dump_child ("cnst", DECL_INITIAL (t));
break; break;
case VAR_DECL: case VAR_DECL:
case PARM_DECL: case PARM_DECL:
case FIELD_DECL: case FIELD_DECL:
case RESULT_DECL: case RESULT_DECL:
if (dump_children_p) if (TREE_CODE (t) == PARM_DECL)
{ dump_child ("argt", DECL_ARG_TYPE (t));
if (TREE_CODE (t) == PARM_DECL) else
dump_child ("argt", DECL_ARG_TYPE (t)); dump_child ("init", DECL_INITIAL (t));
else dump_child ("size", DECL_SIZE (t));
dump_child ("init", DECL_INITIAL (t));
dump_child ("size", DECL_SIZE (t));
}
dump_int (di, "algn", DECL_ALIGN (t)); dump_int (di, "algn", DECL_ALIGN (t));
if (TREE_CODE (t) == FIELD_DECL && dump_children_p) if (TREE_CODE (t) == FIELD_DECL)
{ {
if (DECL_C_BIT_FIELD (t)) if (DECL_C_BIT_FIELD (t))
dump_string (di, "bitfield"); dump_string (di, "bitfield");
@ -605,12 +560,9 @@ dequeue_and_dump (di)
case FUNCTION_DECL: case FUNCTION_DECL:
case THUNK_DECL: case THUNK_DECL:
if (dump_children_p) queue_and_dump_index (di, "scpe", DECL_REAL_CONTEXT (t), 0);
{ dump_child ("mngl", DECL_ASSEMBLER_NAME (t));
queue_and_dump_index (di, "scpe", DECL_REAL_CONTEXT (t), 0); dump_child ("args", DECL_ARGUMENTS (t));
dump_child ("mngl", DECL_ASSEMBLER_NAME (t));
dump_child ("args", DECL_ARGUMENTS (t));
}
if (DECL_EXTERNAL (t)) if (DECL_EXTERNAL (t))
dump_string (di, "undefined"); dump_string (di, "undefined");
if (TREE_PUBLIC (t)) if (TREE_PUBLIC (t))
@ -638,8 +590,7 @@ dequeue_and_dump (di)
dump_int (di, "prio", GLOBAL_INIT_PRIORITY (t)); dump_int (di, "prio", GLOBAL_INIT_PRIORITY (t));
} }
if (dump_children_p) dump_child ("body", DECL_SAVED_TREE (t));
dump_child ("body", DECL_SAVED_TREE (t));
} }
else else
{ {
@ -653,34 +604,26 @@ dequeue_and_dump (di)
and therefore many other macros do not work on it. */ and therefore many other macros do not work on it. */
if (t == std_node) if (t == std_node)
break; break;
if (dump_children_p) dump_child ("dcls", cp_namespace_decls (t));
dump_child ("dcls", cp_namespace_decls (t));
break; break;
case TEMPLATE_DECL: case TEMPLATE_DECL:
if (dump_children_p) dump_child ("spcs", DECL_TEMPLATE_SPECIALIZATIONS (t));
dump_child ("spcs", DECL_TEMPLATE_SPECIALIZATIONS (t));
break; break;
case OVERLOAD: case OVERLOAD:
if (dump_children_p) dump_child ("crnt", OVL_CURRENT (t));
{ dump_child ("chan", OVL_CHAIN (t));
dump_child ("crnt", OVL_CURRENT (t));
dump_child ("chan", OVL_CHAIN (t));
}
break; break;
case ASM_STMT: case ASM_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (ASM_VOLATILE_P (t)) if (ASM_VOLATILE_P (t))
dump_string (di, "volatile"); dump_string (di, "volatile");
if (dump_children_p) dump_child ("strg", ASM_STRING (t));
{ dump_child ("outs", ASM_OUTPUTS (t));
dump_child ("strg", ASM_STRING (t)); dump_child ("ins", ASM_INPUTS (t));
dump_child ("outs", ASM_OUTPUTS (t)); dump_child ("clbr", ASM_CLOBBERS (t));
dump_child ("ins", ASM_INPUTS (t));
dump_child ("clbr", ASM_CLOBBERS (t));
}
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
@ -693,140 +636,108 @@ dequeue_and_dump (di)
case CASE_LABEL: case CASE_LABEL:
/* Note that a case label is not like other statments; there is /* Note that a case label is not like other statments; there is
no way to get the line-number of a case label. */ no way to get the line-number of a case label. */
if (dump_children_p) dump_child ("low", CASE_LOW (t));
{ dump_child ("high", CASE_HIGH (t));
dump_child ("low", CASE_LOW (t));
dump_child ("high", CASE_HIGH (t));
}
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case COMPOUND_STMT: case COMPOUND_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("body", COMPOUND_BODY (t));
dump_child ("body", COMPOUND_BODY (t));
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case DECL_STMT: case DECL_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("decl", DECL_STMT_DECL (t));
dump_child ("decl", DECL_STMT_DECL (t));
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case DO_STMT: case DO_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("body", DO_BODY (t));
{ dump_child ("cond", DO_COND (t));
dump_child ("body", DO_BODY (t));
dump_child ("cond", DO_COND (t));
}
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case EXPR_STMT: case EXPR_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("expr", EXPR_STMT_EXPR (t));
dump_child ("expr", EXPR_STMT_EXPR (t));
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case FOR_STMT: case FOR_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("init", FOR_INIT_STMT (t));
{ dump_child ("cond", FOR_COND (t));
dump_child ("init", FOR_INIT_STMT (t)); dump_child ("expr", FOR_EXPR (t));
dump_child ("cond", FOR_COND (t)); dump_child ("body", FOR_BODY (t));
dump_child ("expr", FOR_EXPR (t));
dump_child ("body", FOR_BODY (t));
}
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case GOTO_STMT: case GOTO_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("dest", GOTO_DESTINATION (t));
dump_child ("dest", GOTO_DESTINATION (t));
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case IF_STMT: case IF_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("cond", IF_COND (t));
{ dump_child ("then", THEN_CLAUSE (t));
dump_child ("cond", IF_COND (t)); dump_child ("else", ELSE_CLAUSE (t));
dump_child ("then", THEN_CLAUSE (t));
dump_child ("else", ELSE_CLAUSE (t));
}
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case LABEL_STMT: case LABEL_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("labl", LABEL_STMT_LABEL (t));
dump_child ("labl", LABEL_STMT_LABEL (t));
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case RETURN_STMT: case RETURN_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("expr", RETURN_EXPR (t));
dump_child ("expr", RETURN_EXPR (t));
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case SWITCH_STMT: case SWITCH_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("cond", SWITCH_COND (t));
{ dump_child ("body", SWITCH_BODY (t));
dump_child ("cond", SWITCH_COND (t));
dump_child ("body", SWITCH_BODY (t));
}
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case TRY_BLOCK: case TRY_BLOCK:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("body", TRY_STMTS (t));
{ dump_child ("hdlr", TRY_HANDLERS (t));
dump_child ("body", TRY_STMTS (t));
dump_child ("hdlr", TRY_HANDLERS (t));
}
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case WHILE_STMT: case WHILE_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("cond", WHILE_COND (t));
{ dump_child ("body", WHILE_BODY (t));
dump_child ("cond", WHILE_COND (t));
dump_child ("body", WHILE_BODY (t));
}
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case SUBOBJECT: case SUBOBJECT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("clnp", TREE_OPERAND (t, 0));
dump_child ("clnp", TREE_OPERAND (t, 0));
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case START_CATCH_STMT: case START_CATCH_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) queue_and_dump_type (di, TREE_TYPE (t));
queue_and_dump_type (di, TREE_TYPE (t), /*dump_children_p=*/1);
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
case CLEANUP_STMT: case CLEANUP_STMT:
dump_stmt (di, t); dump_stmt (di, t);
if (dump_children_p) dump_child ("decl", CLEANUP_DECL (t));
{ dump_child ("expr", CLEANUP_EXPR (t));
dump_child ("decl", CLEANUP_DECL (t));
dump_child ("expr", CLEANUP_EXPR (t));
}
dump_next_stmt (di, t); dump_next_stmt (di, t);
break; break;
@ -853,11 +764,8 @@ dequeue_and_dump (di)
break; break;
case PTRMEM_CST: case PTRMEM_CST:
if (dump_children_p) dump_child ("clas", PTRMEM_CST_CLASS (t));
{ dump_child ("mbr", PTRMEM_CST_MEMBER (t));
dump_child ("clas", PTRMEM_CST_CLASS (t));
dump_child ("mbr", PTRMEM_CST_MEMBER (t));
}
break; break;
case TRUTH_NOT_EXPR: case TRUTH_NOT_EXPR:
@ -865,8 +773,7 @@ dequeue_and_dump (di)
case INDIRECT_REF: case INDIRECT_REF:
case THROW_EXPR: case THROW_EXPR:
/* These nodes are unary, but do not have code class `1'. */ /* These nodes are unary, but do not have code class `1'. */
if (dump_children_p) dump_child ("op 0", TREE_OPERAND (t, 0));
dump_child ("op 0", TREE_OPERAND (t, 0));
break; break;
case TRUTH_ANDIF_EXPR: case TRUTH_ANDIF_EXPR:
@ -878,71 +785,52 @@ dequeue_and_dump (di)
case COND_EXPR: case COND_EXPR:
case ARRAY_REF: case ARRAY_REF:
/* These nodes are binary, but do not have code class `2'. */ /* These nodes are binary, but do not have code class `2'. */
if (dump_children_p) dump_child ("op 0", TREE_OPERAND (t, 0));
{ dump_child ("op 1", TREE_OPERAND (t, 1));
dump_child ("op 0", TREE_OPERAND (t, 0));
dump_child ("op 1", TREE_OPERAND (t, 1));
}
break; break;
case CALL_EXPR: case CALL_EXPR:
if (dump_children_p) dump_child ("fn", TREE_OPERAND (t, 0));
{ dump_child ("args", TREE_OPERAND (t, 1));
dump_child ("fn", TREE_OPERAND (t, 0));
dump_child ("args", TREE_OPERAND (t, 1));
}
break; break;
case CONSTRUCTOR: case CONSTRUCTOR:
if (dump_children_p) dump_child ("elts", TREE_OPERAND (t, 1));
dump_child ("elts", TREE_OPERAND (t, 1));
break; break;
case STMT_EXPR: case STMT_EXPR:
if (dump_children_p) dump_child ("stmt", STMT_EXPR_STMT (t));
dump_child ("stmt", STMT_EXPR_STMT (t));
break; break;
case BIND_EXPR: case BIND_EXPR:
if (dump_children_p) dump_child ("vars", TREE_OPERAND (t, 0));
{ dump_child ("body", TREE_OPERAND (t, 1));
dump_child ("vars", TREE_OPERAND (t, 0));
dump_child ("body", TREE_OPERAND (t, 1));
}
break; break;
case LOOP_EXPR: case LOOP_EXPR:
if (dump_children_p) dump_child ("body", TREE_OPERAND (t, 0));
dump_child ("body", TREE_OPERAND (t, 0));
break; break;
case EXIT_EXPR: case EXIT_EXPR:
if (dump_children_p) dump_child ("cond", TREE_OPERAND (t, 0));
dump_child ("cond", TREE_OPERAND (t, 0));
break; break;
case TARGET_EXPR: case TARGET_EXPR:
if (dump_children_p) dump_child ("decl", TREE_OPERAND (t, 0));
{ dump_child ("init", TREE_OPERAND (t, 1));
dump_child ("decl", TREE_OPERAND (t, 0)); dump_child ("clnp", TREE_OPERAND (t, 2));
dump_child ("init", TREE_OPERAND (t, 1)); /* There really are two possible places the initializer can be.
dump_child ("clnp", TREE_OPERAND (t, 2)); After RTL expansion, the second operand is moved to the
/* There really are two possible places the initializer can position of the fourth operand, and the second operand
be. After RTL expansion, the second operand is moved to becomes NULL. */
the position of the fourth operand, and the second dump_child ("init", TREE_OPERAND (t, 3));
operand becomes NULL. */
dump_child ("init", TREE_OPERAND (t, 3));
}
break; break;
case AGGR_INIT_EXPR: case AGGR_INIT_EXPR:
dump_int (di, "ctor", AGGR_INIT_VIA_CTOR_P (t)); dump_int (di, "ctor", AGGR_INIT_VIA_CTOR_P (t));
if (dump_children_p) dump_child ("fn", TREE_OPERAND (t, 0));
{ dump_child ("args", TREE_OPERAND (t, 1));
dump_child ("fn", TREE_OPERAND (t, 0)); dump_child ("decl", TREE_OPERAND (t, 2));
dump_child ("args", TREE_OPERAND (t, 1));
dump_child ("decl", TREE_OPERAND (t, 2));
}
break; break;
default: default:
@ -977,7 +865,7 @@ dump_node (t, stream)
(splay_tree_delete_value_fn) &free); (splay_tree_delete_value_fn) &free);
/* Queue up the first node. */ /* Queue up the first node. */
queue (&di, t, DUMP_CHILDREN); queue (&di, t, DUMP_NONE);
/* Until the queue is empty, keep dumping nodes. */ /* Until the queue is empty, keep dumping nodes. */
while (di.queue) while (di.queue)