builtins.c (simplify_builtin_strrchr, [...]): Add missing casts.

	* builtins.c (simplify_builtin_strrchr, simplify_builtin_strpbrk): Add
	missing casts.

From-SVN: r73296

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dd0789dbf012e824c27d31af6899477a297bf601..1fc4e771a91287abd000c78e78bf633a3af65256 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-06  Jan Hubicka  <jh@suse.cz>
+
+       * builtins.c (simplify_builtin_strrchr, simplify_builtin_strpbrk): Add
+       missing casts.
+
 2003-11-06  Zack Weinberg  <zack@codesourcery.com>
 
        * genmodes.c: Change the word "bitsize" to "precision" throughout.

diff --git a/gcc/builtins.c b/gcc/builtins.c
index 23b0acfb801ea6ecf18247216c7ab4cc8dae5d32..7ff87899925109bd4215a479d316c68f72b8ec5a 100644 (file)
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -2261,7 +2261,8 @@ expand_builtin_strstr (tree arglist, rtx target, enum machine_mode mode)
 
          /* Return an offset into the constant string argument.  */
          return expand_expr (fold (build (PLUS_EXPR, TREE_TYPE (s1),
-                                          s1, ssize_int (r - p1))),
+                                          s1, convert (TREE_TYPE (s1),
+                                                       ssize_int (r - p1)))),
                              target, mode, EXPAND_NORMAL);
        }
 
@@ -2318,7 +2319,8 @@ expand_builtin_strchr (tree arglist, rtx target, enum machine_mode mode)
 
          /* Return an offset into the constant string argument.  */
          return expand_expr (fold (build (PLUS_EXPR, TREE_TYPE (s1),
-                                          s1, ssize_int (r - p1))),
+                                          s1, convert (TREE_TYPE (s1),
+                                                       ssize_int (r - p1)))),
                              target, mode, EXPAND_NORMAL);
        }
 
@@ -2362,7 +2364,8 @@ expand_builtin_strrchr (tree arglist, rtx target, enum machine_mode mode)
 
          /* Return an offset into the constant string argument.  */
          return expand_expr (fold (build (PLUS_EXPR, TREE_TYPE (s1),
-                                          s1, ssize_int (r - p1))),
+                                          s1, convert (TREE_TYPE (s1),
+                                                       ssize_int (r - p1)))),
                              target, mode, EXPAND_NORMAL);
        }
 
@@ -2408,7 +2411,8 @@ expand_builtin_strpbrk (tree arglist, rtx target, enum machine_mode mode)
 
          /* Return an offset into the constant string argument.  */
          return expand_expr (fold (build (PLUS_EXPR, TREE_TYPE (s1),
-                                          s1, ssize_int (r - p1))),
+                                          s1, convert (TREE_TYPE (s1),
+                                                       ssize_int (r - p1)))),
                              target, mode, EXPAND_NORMAL);
        }