From eeeca7d418efdd5ff1260bb3baf611531bc47ee3 Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Wed, 4 Nov 2009 14:34:25 -0500
Subject: [PATCH] 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                  |  4 ++++
 gcc/cp/method.c                   |  2 +-
 gcc/testsuite/ChangeLog           |  5 +++++
 gcc/testsuite/g++.dg/abi/thunk5.C | 13 +++++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 gcc/testsuite/g++.dg/abi/thunk5.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1014832241d3..484e5101746d 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 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.
 
diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 266406c7cd0f..f13d99df20f7 100644
--- a/gcc/cp/method.c
+++ b/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)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a0e861bc6c51..86c9b11cac5c 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/gcc/testsuite/g++.dg/abi/thunk5.C b/gcc/testsuite/g++.dg/abi/thunk5.C
new file mode 100644
index 000000000000..623b9bcd850d
--- /dev/null
+++ b/gcc/testsuite/g++.dg/abi/thunk5.C
@@ -0,0 +1,13 @@
+// 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;