From 817f9ef2e52bbe4568264487acfa86c5bb2882d4 Mon Sep 17 00:00:00 2001 From: James E Wilson Date: Fri, 18 Nov 2005 18:25:25 -0800 Subject: [PATCH] Fix spurious warning for strstr (s, ""). * builtins.c (fold_builtin_strstr): Pass s1 through fold_convert before returning it. * gcc.dg/builtin-strstr.c: New. From-SVN: r107206 --- gcc/ChangeLog | 5 +++++ gcc/builtins.c | 4 +++- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/builtin-strstr.c | 8 ++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.dg/builtin-strstr.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c4f105fecd8..b128468e400 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2005-11-18 James E Wilson + + * builtins.c (fold_builtin_strstr): Pass s1 through fold_convert before + returning it. + 2005-11-18 Mike Stump * c-common.c (handle_cleanup_attribute): Use a lang hook for lookup_name. diff --git a/gcc/builtins.c b/gcc/builtins.c index 359ff646e98..6cca5fbe37e 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -9199,8 +9199,10 @@ fold_builtin_strstr (tree arglist, tree type) return fold_convert (type, tem); } + /* The argument is const char *, and the result is char *, so we need + a type conversion here to avoid a warning. */ if (p2[0] == '\0') - return s1; + return fold_convert (type, s1); if (p2[1] != '\0') return 0; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 046330f52ad..570041ea26f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2005-11-18 James E Wilson + + * gcc.dg/builtin-strstr.c: New. + 2005-11-18 Richard Henderson * gcc.target/ia64/20010423-1.c, gcc.target/ia64/20020313-1.c, diff --git a/gcc/testsuite/gcc.dg/builtin-strstr.c b/gcc/testsuite/gcc.dg/builtin-strstr.c new file mode 100644 index 00000000000..b8201f41642 --- /dev/null +++ b/gcc/testsuite/gcc.dg/builtin-strstr.c @@ -0,0 +1,8 @@ +/* The strstr call is expanded to just "s", which should not result in a + warning about discarding qualifiers in an assignment. */ +/* { dg-do compile } */ +extern char * strstr (const char *s1, const char * s2); +void foo(const char *s){ + char * cp; + cp = strstr(s, ""); +} -- 2.30.2