diff options
| author | James E Wilson <wilson@specifixinc.com> | 2005-11-18 18:25:25 -0800 |
|---|---|---|
| committer | Jim Wilson <wilson@gcc.gnu.org> | 2005-11-18 18:25:25 -0800 |
| commit | 817f9ef2e52bbe4568264487acfa86c5bb2882d4 (patch) | |
| tree | 875aa41b0e0cf9f95daa844c1be7324c0213984a /gcc/builtins.c | |
| parent | 7b767e311d47363e5f0f688faa121fe28798a393 (diff) | |
| download | gcc-817f9ef2e52bbe4568264487acfa86c5bb2882d4.zip gcc-817f9ef2e52bbe4568264487acfa86c5bb2882d4.tar.gz gcc-817f9ef2e52bbe4568264487acfa86c5bb2882d4.tar.bz2 | |
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
Diffstat (limited to 'gcc/builtins.c')
| -rw-r--r-- | gcc/builtins.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gcc/builtins.c b/gcc/builtins.c index 359ff64..6cca5fb 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; |