diff options
-rw-r--r-- | gcc/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/c-pretty-print.c | 27 | ||||
-rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/format/unnamed-1.c | 22 |
4 files changed, 57 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a2e518a14f5..8de34f21c4b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2005-11-03 Joseph S. Myers <joseph@codesourcery.com> + + PR c/24329 + * c-pretty-print.c (pp_c_type_specifier): Do not recurse if + c_common_type_for_mode returns an unnamed type. + 2005-11-02 Richard Henderson <rth@redhat.com> PR target/9350 diff --git a/gcc/c-pretty-print.c b/gcc/c-pretty-print.c index bbc19be9fd4..5e67a96cf4e 100644 --- a/gcc/c-pretty-print.c +++ b/gcc/c-pretty-print.c @@ -323,11 +323,32 @@ pp_c_type_specifier (c_pretty_printer *pp, tree t) { int prec = TYPE_PRECISION (t); t = c_common_type_for_mode (TYPE_MODE (t), TYPE_UNSIGNED (t)); - pp_c_type_specifier (pp, t); - if (TYPE_PRECISION (t) != prec) + if (TYPE_NAME (t)) + { + pp_c_type_specifier (pp, t); + if (TYPE_PRECISION (t) != prec) + { + pp_string (pp, ":"); + pp_decimal_int (pp, prec); + } + } + else { - pp_string (pp, ":"); + switch (code) + { + case INTEGER_TYPE: + pp_string (pp, (TYPE_UNSIGNED (t) + ? "<unnamed-unsigned:" + : "<unnamed-signed:")); + break; + case REAL_TYPE: + pp_string (pp, "<unnamed-float:"); + break; + default: + gcc_unreachable (); + } pp_decimal_int (pp, prec); + pp_string (pp, ">"); } } break; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b52603ba2cc..393452736f0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-11-03 Joseph S. Myers <joseph@codesourcery.com> + + PR c/24329 + * gcc.dg/format/unnamed-1.c: New test. + 2005-11-02 Mark Mitchell <mark@codesourcery.com> PR c++/22434 diff --git a/gcc/testsuite/gcc.dg/format/unnamed-1.c b/gcc/testsuite/gcc.dg/format/unnamed-1.c new file mode 100644 index 00000000000..5fc11a12c57 --- /dev/null +++ b/gcc/testsuite/gcc.dg/format/unnamed-1.c @@ -0,0 +1,22 @@ +/* Test for warnings with possibly unnamed integer types. Bug 24329. */ +/* Origin: Joseph Myers <joseph@codesourcery.com> */ +/* { dg-do compile } */ +/* { dg-options "-Wformat" } */ + +#include "format.h" + +/* Definition of TItype follows same logic as in gcc.dg/titype-1.c, + but must be a #define to avoid giving the type a name. */ +#if defined(__LP64__) && !defined(__hppa__) +#define TItype int __attribute__ ((mode (TI))) +#else +#define TItype long +#endif + +void +f (TItype x) +{ + printf("%d", x); /* { dg-warning "expects type" } */ + printf("%d", 141592653589793238462643383279502884197169399375105820974944); /* { dg-warning "expects type" } */ + /* { dg-warning "unsigned only|too large" "constant" { target *-*-* } 20 } */ +} |