diff options
| author | Richard Sandiford <r.sandiford@uk.ibm.com> | 2010-07-10 08:35:58 +0000 |
|---|---|---|
| committer | Richard Sandiford <rsandifo@gcc.gnu.org> | 2010-07-10 08:35:58 +0000 |
| commit | 7e9b96974abe5a74beaab2f90d3b47bb52f97db1 (patch) | |
| tree | 47fefa28d0e5dd7ef562214409a73540f77eb359 /gcc | |
| parent | 058bfe530068df2d3ccc4131a1837b44a83acba4 (diff) | |
| download | gcc-7e9b96974abe5a74beaab2f90d3b47bb52f97db1.zip gcc-7e9b96974abe5a74beaab2f90d3b47bb52f97db1.tar.gz gcc-7e9b96974abe5a74beaab2f90d3b47bb52f97db1.tar.bz2 | |
tree.h (DECL_REPLACEABLE_P): Strengthen check for weak symbols.
gcc/
* tree.h (DECL_REPLACEABLE_P): Strengthen check for weak symbols.
gcc/testsuite/
* gcc.dg/attr-weak-hidden-1.c, gcc.dg/attr-weak-hidden-1a.c: New test.
From-SVN: r162031
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/attr-weak-hidden-1.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/attr-weak-hidden-1a.c | 9 | ||||
| -rw-r--r-- | gcc/tree.h | 7 |
5 files changed, 29 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 45f780a..8349373 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2010-07-10 Richard Sandiford <r.sandiford@uk.ibm.com> + + * tree.h (DECL_REPLACEABLE_P): Strengthen check for weak symbols. + 2010-07-10 Iain Sandoe <iains@gcc.gnu.org> PR objc/44140 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6d0de14..f18f7b7 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2010-07-10 Richard Sandiford <r.sandiford@uk.ibm.com> + + * gcc.dg/attr-weak-hidden-1.c, gcc.dg/attr-weak-hidden-1a.c: New test. + 2010-07-10 Iain Sandoe <iains@gcc.gnu.org> PR objc/44140 diff --git a/gcc/testsuite/gcc.dg/attr-weak-hidden-1.c b/gcc/testsuite/gcc.dg/attr-weak-hidden-1.c new file mode 100644 index 0000000..968bab7 --- /dev/null +++ b/gcc/testsuite/gcc.dg/attr-weak-hidden-1.c @@ -0,0 +1,6 @@ +/* { dg-do run } */ +/* { dg-require-weak "" } */ +/* { dg-require-visibility "" } */ +/* { dg-options "-O2" } */ +/* { dg-additional-sources "attr-weak-hidden-1a.c" } */ +int __attribute__((weak, visibility("hidden"))) foo (void) { return 0; } diff --git a/gcc/testsuite/gcc.dg/attr-weak-hidden-1a.c b/gcc/testsuite/gcc.dg/attr-weak-hidden-1a.c new file mode 100644 index 0000000..b04d8d2 --- /dev/null +++ b/gcc/testsuite/gcc.dg/attr-weak-hidden-1a.c @@ -0,0 +1,9 @@ +void abort (void); +int __attribute__((weak, visibility("hidden"))) foo (void) { return 1; } +int +main (void) +{ + if (foo ()) + abort (); + return 0; +} @@ -3012,6 +3012,11 @@ struct GTY(()) tree_parm_decl { not be treated as replaceable so that use of C++ template instantiations is not penalized. + In other respects, the condition is usually equivalent to whether + the function binds to the current module (shared library or executable). + However, weak functions can always be overridden by earlier TUs + in the same module, even if they bind locally to that module. + For example, DECL_REPLACEABLE is used to determine whether or not a function (including a template instantiation) which is not explicitly declared "inline" can be inlined. If the function is @@ -3020,7 +3025,7 @@ struct GTY(()) tree_parm_decl { function that is not DECL_REPLACEABLE can be inlined, since all versions of the function will be functionally identical. */ #define DECL_REPLACEABLE_P(NODE) \ - (!DECL_COMDAT (NODE) && !targetm.binds_local_p (NODE)) + (!DECL_COMDAT (NODE) && (DECL_WEAK (NODE) || !targetm.binds_local_p (NODE))) /* The name of the object as the assembler will see it (but before any translations made by ASM_OUTPUT_LABELREF). Often this is the same |