mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-26 13:51:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

tree-pretty-print.c (dump_array_domain): Split out from dump_generic_node; fix off-by-one error on zero-based array bounds.

Browse Source 
* tree-pretty-print.c (dump_array_domain): Split out from
        dump_generic_node; fix off-by-one error on zero-based array bounds.
        (dump_generic_node): Use it.
        (print_declaration): Likewise.

From-SVN: r91850
This commit is contained in:
Richard Henderson 2004-12-07 18:04:57 -08:00 committed by Richard Henderson
parent 74515a0a1a
commit b16bcb178a
2 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2004-12-07 Richard Henderson <rth@redhat.com>
* tree-pretty-print.c (dump_array_domain): Split out from
dump_generic_node; fix off-by-one error on zero-based array bounds.
(dump_generic_node): Use it.
(print_declaration): Likewise.
2004-12-08 Richard Guenther <richard.guenther@uni-tuebingen.de> 2004-12-08 Richard Guenther <richard.guenther@uni-tuebingen.de>
* doc/invoke.texi: Adjust default values for * doc/invoke.texi: Adjust default values for

74
gcc/tree-pretty-print.c
View File

@ -217,6 +217,35 @@ dump_function_declaration (pretty_printer *buffer, tree node,
pp_character (buffer, ')'); pp_character (buffer, ')');
} }
/* Dump the domain associated with an array. */
static void
dump_array_domain (pretty_printer *buffer, tree domain, int spc, int flags)
{
pp_character (buffer, '[');
if (domain)
{
tree min = TYPE_MIN_VALUE (domain);
tree max = TYPE_MAX_VALUE (domain);
if (min && max
&& integer_zerop (min)
&& host_integerp (max, 0))
pp_wide_integer (buffer, TREE_INT_CST_LOW (max) + 1);
else
{
if (min)
dump_generic_node (buffer, min, spc, flags, false);
pp_character (buffer, ':');
if (max)
dump_generic_node (buffer, max, spc, flags, false);
}
}
else
pp_string (buffer, "<unknown>");
pp_character (buffer, ']');
}
/* Dump the node NODE on the pretty_printer BUFFER, SPC spaces of indent. /* Dump the node NODE on the pretty_printer BUFFER, SPC spaces of indent.
FLAGS specifies details to show in the dump (see TDF_* in tree.h). If FLAGS specifies details to show in the dump (see TDF_* in tree.h). If
IS_STMT is true, the object printed is considered to be a statement IS_STMT is true, the object printed is considered to be a statement
@ -427,31 +456,8 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
dump_generic_node (buffer, tmp, spc, flags, false); dump_generic_node (buffer, tmp, spc, flags, false);
/* Print the dimensions. */ /* Print the dimensions. */
for (tmp = node; TREE_CODE (tmp) == ARRAY_TYPE; for (tmp = node; TREE_CODE (tmp) == ARRAY_TYPE; tmp = TREE_TYPE (tmp))
tmp = TREE_TYPE (tmp)) dump_array_domain (buffer, TYPE_DOMAIN (tmp), spc, flags);
{
tree domain = TYPE_DOMAIN (tmp);
pp_character (buffer, '[');
if (domain)
{
if (TYPE_MIN_VALUE (domain)
&& !integer_zerop (TYPE_MIN_VALUE (domain)))
{
dump_generic_node (buffer, TYPE_MIN_VALUE (domain),
spc, flags, false);
pp_string (buffer, " .. ");
}
if (TYPE_MAX_VALUE (domain))
dump_generic_node (buffer, TYPE_MAX_VALUE (domain),
spc, flags, false);
}
else
pp_string (buffer, "<unknown>");
pp_character (buffer, ']');
}
break; break;
} }
@ -1515,23 +1521,7 @@ print_declaration (pretty_printer *buffer, tree t, int spc, int flags)
tmp = TREE_TYPE (t); tmp = TREE_TYPE (t);
while (TREE_CODE (tmp) == ARRAY_TYPE) while (TREE_CODE (tmp) == ARRAY_TYPE)
{ {
pp_character (buffer, '['); dump_array_domain (buffer, TYPE_DOMAIN (tmp), spc, flags);
if (TYPE_DOMAIN (tmp))
{
if (TYPE_MIN_VALUE (TYPE_DOMAIN (tmp))
&& !integer_zerop (TYPE_MIN_VALUE (TYPE_DOMAIN (tmp))))
{
dump_generic_node (buffer,
TYPE_MIN_VALUE (TYPE_DOMAIN (tmp)),
spc, flags, false);
pp_string (buffer, " .. ");
}
if (TYPE_MAX_VALUE (TYPE_DOMAIN (tmp)))
dump_generic_node (buffer, TYPE_MAX_VALUE (TYPE_DOMAIN (tmp)),
spc, flags, false);
}
pp_character (buffer, ']');
tmp = TREE_TYPE (tmp); tmp = TREE_TYPE (tmp);
} }
} }