if (dni->binfo_p)
{
unsigned ix;
- tree bases = BINFO_BASETYPES (t);
- unsigned n_bases = bases ? TREE_VEC_LENGTH (bases): 0;
- tree accesses = BINFO_BASEACCESSES (t);
+ tree base;
+ VEC (tree) *accesses = BINFO_BASE_ACCESSES (t);
dump_child ("type", BINFO_TYPE (t));
- if (TREE_VIA_VIRTUAL (t))
+ if (BINFO_VIRTUAL_P (t))
dump_string (di, "virt");
- dump_int (di, "bases", n_bases);
- for (ix = 0; ix != n_bases; ix++)
+ dump_int (di, "bases", BINFO_N_BASE_BINFOS (t));
+ for (ix = 0; BINFO_BASE_ITERATE (t, ix, base); ix++)
{
- tree base = TREE_VEC_ELT (bases, ix);
- tree access = (accesses ? TREE_VEC_ELT (accesses, ix)
+ tree access = (accesses ? VEC_index (tree, accesses, ix)
: access_public_node);
const char *string = NULL;
}
else if (DECL_P (t))
{
+ expanded_location xloc;
/* All declarations have names. */
if (DECL_NAME (t))
dump_child ("name", DECL_NAME (t));
queue_and_dump_type (di, t);
dump_child ("scpe", DECL_CONTEXT (t));
/* And a source position. */
- if (DECL_SOURCE_FILE (t))
+ xloc = expand_location (DECL_SOURCE_LOCATION (t));
+ if (xloc.file)
{
- const char *filename = strrchr (DECL_SOURCE_FILE (t), '/');
+ const char *filename = strrchr (xloc.file, '/');
if (!filename)
- filename = DECL_SOURCE_FILE (t);
+ filename = xloc.file;
else
/* Skip the slash. */
++filename;
dump_maybe_newline (di);
fprintf (di->stream, "srcp: %s:%-6d ", filename,
- DECL_SOURCE_LINE (t));
+ xloc.line);
di->column += 6 + strlen (filename) + 8;
}
/* And any declaration can be compiler-generated. */
case INDIRECT_REF:
case CLEANUP_POINT_EXPR:
case SAVE_EXPR:
+ case REALPART_EXPR:
+ case IMAGPART_EXPR:
/* These nodes are unary, but do not have code class `1'. */
dump_child ("op 0", TREE_OPERAND (t, 0));
break;