diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-pretty-print.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/20060419-1.c | 4 |
4 files changed, 24 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 978e128fc2b..ba42b128f37 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-04-20 Jakub Jelinek <jakub@redhat.com> + + * c-pretty-print.c (pp_c_direct_abstract_declarator): Print + TYPE_MAX_VALUE (TYPE_DOMAIN (t)) + 1 for ARRAY_TYPE rather + than plain TYPE_MAX_VALUE (TYPE_DOMAIN (t)). + 2006-04-20 Alan Modra <amodra@bigpond.net.au> * config/rs6000/rs6000.c (rs6000_gimplify_va_arg): Consume all diff --git a/gcc/c-pretty-print.c b/gcc/c-pretty-print.c index 67015675234..9b9add2d0a0 100644 --- a/gcc/c-pretty-print.c +++ b/gcc/c-pretty-print.c @@ -521,7 +521,16 @@ pp_c_direct_abstract_declarator (c_pretty_printer *pp, tree t) case ARRAY_TYPE: pp_c_left_bracket (pp); if (TYPE_DOMAIN (t) && TYPE_MAX_VALUE (TYPE_DOMAIN (t))) - pp_expression (pp, TYPE_MAX_VALUE (TYPE_DOMAIN (t))); + { + tree maxval = TYPE_MAX_VALUE (TYPE_DOMAIN (t)); + tree type = TREE_TYPE (maxval); + + if (host_integerp (maxval, 0)) + pp_wide_integer (pp, tree_low_cst (maxval, 0) + 1); + else + pp_expression (pp, fold_build2 (PLUS_EXPR, type, maxval, + build_int_cst (type, 1))); + } pp_c_right_bracket (pp); pp_direct_abstract_declarator (pp, TREE_TYPE (t)); break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b6772a0e205..bbc744fd6fe 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2006-04-20 Jakub Jelinek <jakub@redhat.com> + + * gcc.dg/20060419-1.c: New test. + 2006-04-19 Carlos O'Donell <carlos@codesourcery.com> PR c/26774 diff --git a/gcc/testsuite/gcc.dg/20060419-1.c b/gcc/testsuite/gcc.dg/20060419-1.c new file mode 100644 index 00000000000..754774162a2 --- /dev/null +++ b/gcc/testsuite/gcc.dg/20060419-1.c @@ -0,0 +1,4 @@ +struct T { + unsigned char f[1] __attribute__((packed)); /* { dg-warning "ignored for field of type.*unsigned char\\\[1\\\]" } */ + unsigned char g[14] __attribute__((packed)); /* { dg-warning "ignored for field of type.*unsigned char\\\[14\\\]" } */ +}; |