re PR middle-end/9967 (Some standard C function calls should not be replaced when...

gcc:
	PR middle-end/9967
	* builtins.c (expand_builtin_fputs): When optimizing for size,
	don't transform fputs into fwrite.
testsuite:
	PR middle-end/9967
	* gcc.c-torture/execute/stdio-opt-1.c: Adjust test for change to
	builtin fputs.

From-SVN: r65033

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c52ea6011631410627750cc87d30d0c5a11c5a31..5bb34b36c4af877a7caa0301a4a2813399f0d029 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-29  Arpad Beszedes <beszedes@cc.u-szeged.hu>
+
+       PR middle-end/9967
+       * builtins.c (expand_builtin_fputs): When optimizing for size,
+       don't transform fputs into fwrite.
+
 2003-03-29  Albert Chin-A-Young  <china@thewrittenword.com>
        DJ Delorie  <dj at redhat dot com>,
        Bruce Korb  <bkorb at gnu dot org>

diff --git a/gcc/builtins.c b/gcc/builtins.c
index 29dfa26e148c7240bca20ba0566ac64c37613442..ca39c0bdce049a619bb1be1cde8569483c815334 100644 (file)
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -3385,8 +3385,12 @@ expand_builtin_fputs (arglist, ignore, unlocked)
       /* FALLTHROUGH */
     case 1: /* length is greater than 1, call fwrite.  */
       {
-       tree string_arg = TREE_VALUE (arglist);
+       tree string_arg;
 
+       /* If optimizing for size keep fputs. */
+       if (optimize_size)
+         return 0;
+       string_arg = TREE_VALUE (arglist);
        /* New argument list transforming fputs(string, stream) to
           fwrite(string, 1, len, stream).  */
        arglist = build_tree_list (NULL_TREE, TREE_VALUE (TREE_CHAIN (arglist)));

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0459d46ffd10683ac13adad78b12f08b7b759da5..8e1b1b8e34308f0c4882e8f607b58f0259d1edad 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-29  Arpad Beszedes <beszedes@cc.u-szeged.hu>
+
+       PR middle-end/9967
+       * gcc.c-torture/execute/stdio-opt-1.c: Adjust test for change to
+       builtin fputs.
+
 2003-03-29  Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
 
        * gcc.dg/20030323-1.c: New test.

diff --git a/gcc/testsuite/gcc.c-torture/execute/stdio-opt-1.c b/gcc/testsuite/gcc.c-torture/execute/stdio-opt-1.c
index dbdc812fe6b3eb2b9114db8d482f1857729dcbda..63708408235a45e180f43be9478d7f35c16e8684 100644 (file)
--- a/gcc/testsuite/gcc.c-torture/execute/stdio-opt-1.c
+++ b/gcc/testsuite/gcc.c-torture/execute/stdio-opt-1.c
@@ -54,7 +54,7 @@ int main()
   return 0;
 }
 
-#ifdef __OPTIMIZE__
+#if defined (__OPTIMIZE__) && ! defined (__OPTIMIZE_SIZE__)
 /* When optimizing, all the above cases should be transformed into
    something else.  So any remaining calls to the original function
    should abort.  */