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

gcc/ChangeLog

+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

gcc/testsuite/ChangeLog

+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

gcc/testsuite/gcc.dg/attr-weak-hidden-1.c

+/* { 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; }

gcc/testsuite/gcc.dg/attr-weak-hidden-1a.c

+void abort (void);
+int __attribute__((weak, visibility("hidden"))) foo (void) { return 1; }
+int
+main (void)
+{
+  if (foo ())
+    abort ();
+  return 0;
+}

gcc/tree.h

@@ -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