From b568d54c07535234aaaa93c87d63732048c28ee9 Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Fri, 19 Jun 2009 12:23:16 +0000 Subject: [PATCH] backport: [multiple changes] 2009-06-19 Richard Guenther Backport from mainline: 2009-04-22 Jakub Jelinek PR c/39855 * fold-const.c (fold_binary) : When optimizing into 0, use omit_one_operand. * gcc.dg/torture/pr39855.c: New test. 2009-01-30 Jakub Jelinek 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 --- gcc/ChangeLog | 15 ++++++++++++++ gcc/c-decl.c | 15 ++++++++------ gcc/fold-const.c | 3 ++- gcc/testsuite/ChangeLog | 14 +++++++++++++ gcc/testsuite/gcc.dg/torture/pr39855.c | 24 +++++++++++++++++++++++ gcc/testsuite/gcc.target/i386/pr39013-1.c | 15 ++++++++++++++ gcc/testsuite/gcc.target/i386/pr39013-2.c | 15 ++++++++++++++ 7 files changed, 94 insertions(+), 7 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/torture/pr39855.c create mode 100644 gcc/testsuite/gcc.target/i386/pr39013-1.c create mode 100644 gcc/testsuite/gcc.target/i386/pr39013-2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4abea244d06d..8666ed380743 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +2009-06-19 Richard Guenther + + Backport from mainline: + 2009-01-30 Jakub Jelinek + + PR target/39013 + * c-decl.c (pop_scope): Set DECL_EXTERNAL for functions declared + inline but never defined. + + 2009-04-22 Jakub Jelinek + + PR c/39855 + * fold-const.c (fold_binary) : When optimizing + into 0, use omit_one_operand. + 2009-06-18 H.J. Lu Backport from mainline: diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 67d36362286e..ba56608283e6 100644 --- 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 c0a57bb45145..a9010ebafd43 100644 --- 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 5d3e2cc9b611..ac9f4b1602d1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,17 @@ +2009-06-19 Richard Guenther + + Backport from mainline: + 2009-01-30 Jakub Jelinek + + PR target/39013 + * gcc.target/i386/pr39013-1.c: New test. + * gcc.target/i386/pr39013-2.c: New test. + + 2009-04-22 Jakub Jelinek + + PR c/39855 + * gcc.dg/torture/pr39855.c: New test. + 2009-06-18 H.J. Lu 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 index 000000000000..6d75c38a907a --- /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 index 000000000000..25f02fcdba65 --- /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 index 000000000000..615d54900f84 --- /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" } } */ -- 2.47.2