backport: [multiple changes]

2009-06-19  Richard Guenther  <rguenther@suse.de>

	Backport from mainline:
	2009-04-22  Jakub Jelinek  <jakub@redhat.com>

	PR c/39855
	* fold-const.c (fold_binary) <case LSHIFT_EXPR>: When optimizing
	into 0, use omit_one_operand.

	* gcc.dg/torture/pr39855.c: New test.

	2009-01-30  Jakub Jelinek  <jakub@redhat.com>

	PR target/39013
	* c-decl.c (pop_scope): Set DECL_EXTERNAL for functions declared
	inline but never defined.

	* gcc.target/i386/pr39013-1.c: New test.
	* gcc.target/i386/pr39013-2.c: New test.

From-SVN: r148700

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4abea244d06d09b617ff6667cf390e501f35dc8d..8666ed38074336b5f8348ee597e68c21fbab9e16 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,18 @@
+2009-06-19  Richard Guenther  <rguenther@suse.de>
+
+       Backport from mainline:
+       2009-01-30  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/39013
+       * c-decl.c (pop_scope): Set DECL_EXTERNAL for functions declared
+       inline but never defined.
+
+       2009-04-22  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/39855
+       * fold-const.c (fold_binary) <case LSHIFT_EXPR>: When optimizing
+       into 0, use omit_one_operand.
+
 2009-06-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        Backport from mainline:

diff --git a/gcc/c-decl.c b/gcc/c-decl.c
index 67d36362286ed87a32ca26e6e39f3150c388a3a6..ba56608283e637438ffb631f3575908ffedd11f5 100644 (file)
--- a/gcc/c-decl.c
+++ b/gcc/c-decl.c
@@ -779,14 +779,17 @@ pop_scope (void)
              error ("nested function %q+D declared but never defined", p);
              undef_nested_function = true;
            }
-         /* C99 6.7.4p6: "a function with external linkage... declared
-            with an inline function specifier ... shall also be defined in the
-            same translation unit."  */
          else if (DECL_DECLARED_INLINE_P (p)
                   && TREE_PUBLIC (p)
-                  && !DECL_INITIAL (p)
-                  && !flag_gnu89_inline)
-           pedwarn ("inline function %q+D declared but never defined", p);
+                  && !DECL_INITIAL (p))
+           {
+             /* C99 6.7.4p6: "a function with external linkage... declared
+                with an inline function specifier ... shall also be defined
+                in the same translation unit."  */
+             if (!flag_gnu89_inline)
+               pedwarn ("inline function %q+D declared but never defined", p);
+             DECL_EXTERNAL (p) = 1;
+           }
 
          goto common_symbol;
 

diff --git a/gcc/fold-const.c b/gcc/fold-const.c
index c0a57bb4514542a9d33d7ea477496ef6b1e15363..a9010ebafd43f6b73d97a937399b6e8b722f8d47 100644 (file)
--- a/gcc/fold-const.c
+++ b/gcc/fold-const.c
@@ -11724,7 +11724,8 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1)
              if (code == LROTATE_EXPR || code == RROTATE_EXPR)
                low = low % TYPE_PRECISION (type);
              else if (TYPE_UNSIGNED (type) || code == LSHIFT_EXPR)
-               return build_int_cst (type, 0);
+               return omit_one_operand (type, build_int_cst (type, 0),
+                                        TREE_OPERAND (arg0, 0));
              else
                low = TYPE_PRECISION (type) - 1;
            }

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5d3e2cc9b611aeea7e25291c6516afc8d26a01cc..ac9f4b1602d164fe1f75a7b5e11884c27d61bcd6 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,17 @@
+2009-06-19  Richard Guenther  <rguenther@suse.de>
+
+       Backport from mainline:
+       2009-01-30  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/39013
+       * gcc.target/i386/pr39013-1.c: New test.
+       * gcc.target/i386/pr39013-2.c: New test.
+
+       2009-04-22  Jakub Jelinek  <jakub@redhat.com>
+
+       PR c/39855
+       * gcc.dg/torture/pr39855.c: New test.
+
 2009-06-18  H.J. Lu  <hongjiu.lu@intel.com>
 
        Backport from mainline:

diff --git a/gcc/testsuite/gcc.dg/torture/pr39855.c b/gcc/testsuite/gcc.dg/torture/pr39855.c
new file mode 100644 (file)
index 0000000..6d75c38
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/torture/pr39855.c
@@ -0,0 +1,24 @@
+/* PR c/39855 */
+/* { dg-do run { target { int32plus } } } */
+
+extern void abort (void);
+
+int i, j, k;
+
+int
+foo (void)
+{
+  return ++i;
+}
+
+int
+main ()
+{
+  if (__CHAR_BIT__ != 8 || sizeof (int) != 4)
+    return 0;
+  j = foo () << 30 << 2;
+  k = (unsigned) foo () >> 16 >> 16;
+  if (i != 2 || j != 0 || k != 0)
+    abort ();
+  return 0;
+}

diff --git a/gcc/testsuite/gcc.target/i386/pr39013-1.c b/gcc/testsuite/gcc.target/i386/pr39013-1.c
new file mode 100644 (file)
index 0000000..25f02fc
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr39013-1.c
@@ -0,0 +1,15 @@
+/* PR target/39013 */
+/* { dg-do compile { target *-*-linux* } } */
+/* { dg-options "-O2 -fpie -std=gnu89" } */
+
+inline int foo (void);
+extern inline int bar (void);
+
+int
+main (void)
+{
+  return foo () + bar ();
+}
+
+/* { dg-final { scan-assembler "foo@PLT" } } */
+/* { dg-final { scan-assembler "bar@PLT" } } */

diff --git a/gcc/testsuite/gcc.target/i386/pr39013-2.c b/gcc/testsuite/gcc.target/i386/pr39013-2.c
new file mode 100644 (file)
index 0000000..615d549
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr39013-2.c
@@ -0,0 +1,15 @@
+/* PR target/39013 */
+/* { dg-do compile { target *-*-linux* } } */
+/* { dg-options "-O2 -fpie -std=gnu99" } */
+
+inline int foo (void);         /* { dg-warning "declared but never defined" } */
+extern inline int bar (void);  /* { dg-warning "declared but never defined" } */
+
+int
+main (void)
+{
+  return foo () + bar ();
+}
+
+/* { dg-final { scan-assembler "foo@PLT" } } */
+/* { dg-final { scan-assembler "bar@PLT" } } */