re PR c++/49568 (g++.dg/torture/pr41257-2.C FAILs to link on Tru64 UNIX)

	PR c++/49568
	* method.c (make_thunk, use_thunk): Copy DECL_COMDAT.

From-SVN: r175938

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ed94e066f44f1b4fdb89c2f669a6550e33a5c6fd..8a25c89de87baab5f87bc95fa9583197caa00cf2 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-06  Jason Merrill  <jason@redhat.com>
+
+       PR c++/49568
+       * method.c (make_thunk, use_thunk): Copy DECL_COMDAT.
+
 2011-07-05  Jason Merrill  <jason@redhat.com>
 
        PR c++/48157

diff --git a/gcc/cp/method.c b/gcc/cp/method.c
index 9b9eb9a9df9c7a3f8c076a3b5026fdfa4227d1b1..d41a4dd4238d11fb5cf4ca6e37fde112911d8df6 100644 (file)
--- a/gcc/cp/method.c
+++ b/gcc/cp/method.c
@@ -140,11 +140,12 @@ make_thunk (tree function, bool this_adjusting,
   THUNK_VIRTUAL_OFFSET (thunk) = virtual_offset;
   THUNK_ALIAS (thunk) = NULL_TREE;
 
-  /* The thunk itself is not a constructor or destructor, even if
-     the thing it is thunking to is.  */
   DECL_INTERFACE_KNOWN (thunk) = 1;
   DECL_NOT_REALLY_EXTERN (thunk) = 1;
+  DECL_COMDAT (thunk) = DECL_COMDAT (function);
   DECL_SAVED_FUNCTION_DATA (thunk) = NULL;
+  /* The thunk itself is not a constructor or destructor, even if
+     the thing it is thunking to is.  */
   DECL_DESTRUCTOR_P (thunk) = 0;
   DECL_CONSTRUCTOR_P (thunk) = 0;
   DECL_EXTERNAL (thunk) = 1;
@@ -342,6 +343,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);
+  DECL_COMDAT (thunk_fndecl) = DECL_COMDAT (function);
   if (DECL_ONE_ONLY (function) || DECL_WEAK (function))
     make_decl_one_only (thunk_fndecl, cxx_comdat_group (thunk_fndecl));