re PR c++/15882 (Check for return type of overloaded operator new too early)

	PR c++/15882
	* method.c (use_thunk): Check DECL_WEAK as well as
	DECL_ONE_ONLY.

From-SVN: r153909

gcc/cp/ChangeLog

 2009-11-04  Jason Merrill  <jason@redhat.com>
 
+	PR c++/15882
+	* method.c (use_thunk): Check DECL_WEAK as well as
+	DECL_ONE_ONLY.
+
 	PR c++/17365, DR 218
 	* name-lookup.c (add_function): Ignore non-functions.
 

gcc/cp/method.c

@@ -378,7 +378,7 @@ use_thunk (tree thunk_fndecl, bool emit_p)
   DECL_VISIBILITY (thunk_fndecl) = DECL_VISIBILITY (function);
   DECL_VISIBILITY_SPECIFIED (thunk_fndecl)
     = DECL_VISIBILITY_SPECIFIED (function);
-  if (DECL_ONE_ONLY (function))
+  if (DECL_ONE_ONLY (function) || DECL_WEAK (function))
     make_decl_one_only (thunk_fndecl, cxx_comdat_group (thunk_fndecl));
 
   if (flag_syntax_only)

gcc/testsuite/ChangeLog

+2009-11-04  Jason Merrill  <jason@redhat.com>
+
+	PR c++/15882
+	* g++.dg/abi/thunk5.C: New.
+
 2009-11-04  Andrew Pinski  <andrew_pinski@playstation.sony.com>
 
 	PR rtl-opt/41833

gcc/testsuite/g++.dg/abi/thunk5.C

+// PR c++/15882
+// The thunks should be weak even on targets without one-only support.
+// { dg-require-weak "" }
+// { dg-final { scan-assembler "weak.*ZTv" } }
+
+struct A
+{
+  virtual ~A() { }
+};
+
+struct B: virtual A { };
+
+B b;