diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/builtins.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/pr38700.c | 11 |
4 files changed, 26 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ba31727..5980890 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2009-01-03 Jakub Jelinek <jakub@redhat.com> + + PR c/38700 + * builtins.c (fold_builtin_expect): Only check DECL_WEAK for VAR_DECLs + and FUNCTION_DECLs. + 2009-01-02 Kenneth Zadeck <zadeck@naturalbridge.com> PR rtl-optimization/35805 diff --git a/gcc/builtins.c b/gcc/builtins.c index 607d7dd..cda94c3 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -1,6 +1,6 @@ /* Expand builtin functions. Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is part of GCC. @@ -7324,7 +7324,9 @@ fold_builtin_expect (tree arg0, tree arg1) } while (TREE_CODE (inner) == COMPONENT_REF || TREE_CODE (inner) == ARRAY_REF); - if (DECL_P (inner) && DECL_WEAK (inner)) + if ((TREE_CODE (inner) == VAR_DECL + || TREE_CODE (inner) == FUNCTION_DECL) + && DECL_WEAK (inner)) return NULL_TREE; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 199784f..4a0c0c6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2009-01-03 Jakub Jelinek <jakub@redhat.com> + + PR c/38700 + * gcc.dg/pr38700.c: New test. + 2009-01-02 Jason Merrill <jason@redhat.com> * g++.dg/cpp0x/initlist11.C: New test. diff --git a/gcc/testsuite/gcc.dg/pr38700.c b/gcc/testsuite/gcc.dg/pr38700.c new file mode 100644 index 0000000..bfa75b0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr38700.c @@ -0,0 +1,11 @@ +/* PR c/38700 */ +/* { dg-do compile } */ +/* { dg-options "-O0" } */ + +int +foo () +{ + __SIZE_TYPE__ s = __builtin_expect ((__SIZE_TYPE__)&&L, 0); +L: + return 0; +} |