From: Jakub Jelinek Date: Wed, 3 Apr 2013 17:57:32 +0000 (+0200) Subject: backport: re PR middle-end/54486 (Spurious printf format warning mentions nonexistent... X-Git-Tag: releases/gcc-4.6.4~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b10ee0ba7fa4b623b7bb8bfe981cf26783cf2c5;p=thirdparty%2Fgcc.git backport: re PR middle-end/54486 (Spurious printf format warning mentions nonexistent type 'sizetype') Backported from mainline 2012-09-05 Jakub Jelinek PR middle-end/54486 * builtins.c (fold_builtin_strspn, fold_builtin_strcspn): Use build_int_cst with size_type_node instead of size_int. * c-c++-common/pr54486.c: New test. From-SVN: r197444 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 641bd65aa563..4c49df5801bd 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,6 +1,12 @@ 2013-04-03 Jakub Jelinek Backported from mainline + 2012-09-05 Jakub Jelinek + + PR middle-end/54486 + * builtins.c (fold_builtin_strspn, fold_builtin_strcspn): Use + build_int_cst with size_type_node instead of size_int. + 2012-08-24 Jakub Jelinek PR c/54363 diff --git a/gcc/builtins.c b/gcc/builtins.c index fd996113e873..4d8c1b7da93b 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -11575,7 +11575,7 @@ fold_builtin_strspn (location_t loc, tree s1, tree s2) if (p1 && p2) { const size_t r = strspn (p1, p2); - return size_int (r); + return build_int_cst (size_type_node, r); } /* If either argument is "", return NULL_TREE. */ @@ -11620,7 +11620,7 @@ fold_builtin_strcspn (location_t loc, tree s1, tree s2) if (p1 && p2) { const size_t r = strcspn (p1, p2); - return size_int (r); + return build_int_cst (size_type_node, r); } /* If the first argument is "", return NULL_TREE. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d51c2564e678..99e28b1b9297 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,6 +1,11 @@ 2013-04-03 Jakub Jelinek Backported from mainline + 2012-09-05 Jakub Jelinek + + PR middle-end/54486 + * c-c++-common/pr54486.c: New test. + 2012-08-24 Jakub Jelinek PR c/54363 diff --git a/gcc/testsuite/c-c++-common/pr54486.c b/gcc/testsuite/c-c++-common/pr54486.c new file mode 100644 index 000000000000..e8125fcf398e --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr54486.c @@ -0,0 +1,32 @@ +/* PR middle-end/54486 */ +/* { dg-do compile } */ +/* { dg-options "-Wformat" } */ + +#ifdef __cplusplus +extern "C" { +#endif +typedef __SIZE_TYPE__ size_t; +extern int printf (const char *, ...); +extern size_t strspn (const char *, const char *); +extern size_t strcspn (const char *, const char *); +extern size_t strlen (const char *); +#ifdef __cplusplus +} +#endif + +void +foo (void) +{ + printf ("%zu\n", strspn ("abc", "abcdefg")); + printf ("%zu\n", (size_t) strspn ("abc", "abcdefg")); + printf ("%zu\n", __builtin_strspn ("abc", "abcdefg")); + printf ("%zu\n", (size_t) __builtin_strspn ("abc", "abcdefg")); + printf ("%zu\n", strcspn ("abc", "abcdefg")); + printf ("%zu\n", (size_t) strcspn ("abc", "abcdefg")); + printf ("%zu\n", __builtin_strcspn ("abc", "abcdefg")); + printf ("%zu\n", (size_t) __builtin_strcspn ("abc", "abcdefg")); + printf ("%zu\n", strlen ("abc")); + printf ("%zu\n", (size_t) strlen ("abc")); + printf ("%zu\n", __builtin_strlen ("abc")); + printf ("%zu\n", (size_t) __builtin_strlen ("abc")); +}