From 4951efb6c95bd58056dae36cea2b9a89a3983ecd Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@redhat.com>
Date: Tue, 16 Aug 2011 19:25:52 -0400
Subject: [PATCH] pt.c (instantiate_class_template_1): If DECL_PRESERVE_P is
 set on a member function or static data member...

	* pt.c (instantiate_class_template_1): If DECL_PRESERVE_P is set
	on a member function or static data member, call mark_used.

From-SVN: r177811
---
 gcc/cp/ChangeLog                       |  3 +++
 gcc/cp/pt.c                            |  6 ++++++
 gcc/doc/extend.texi                    |  8 ++++++++
 gcc/testsuite/ChangeLog                |  2 ++
 gcc/testsuite/g++.dg/ext/attr-used-1.C | 17 +++++++++++++++++
 5 files changed, 36 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/ext/attr-used-1.C

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index ea1a8d086e0..c06a3078e44 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2011-08-16  Jason Merrill  <jason@redhat.com>
 
+	* pt.c (instantiate_class_template_1): If DECL_PRESERVE_P is set
+	on a member function or static data member, call mark_used.
+
 	PR c++/50054
 	* typeck2.c (cxx_incomplete_type_diagnostic): Handle
 	init_list_type_node.
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 10fdceda462..9a4419a0783 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -8675,6 +8675,9 @@ instantiate_class_template_1 (tree type)
 		--processing_template_decl;
 	      set_current_access_from_decl (r);
 	      finish_member_declaration (r);
+	      /* Instantiate members marked with attribute used.  */
+	      if (r != error_mark_node && DECL_PRESERVE_P (r))
+		mark_used (r);
 	    }
 	  else
 	    {
@@ -8724,6 +8727,9 @@ instantiate_class_template_1 (tree type)
 			 /*init_const_expr_p=*/false,
 			 /*asmspec_tree=*/NULL_TREE,
 			 /*flags=*/0);
+		      /* Instantiate members marked with attribute used.  */
+		      if (r != error_mark_node && DECL_PRESERVE_P (r))
+			mark_used (r);
 		    }
 		  else if (TREE_CODE (r) == FIELD_DECL)
 		    {
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index 49a81253593..786c18ddae2 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -3647,6 +3647,10 @@ for the function even if it appears that the function is not referenced.
 This is useful, for example, when the function is referenced only in
 inline assembly.
 
+When applied to a member function of a C++ class template, the
+attribute also means that the function will be instantiated if the
+class itself is instantiated.
+
 @item version_id
 @cindex @code{version_id} attribute
 This IA64 HP-UX attribute, attached to a global variable or function, renames a
@@ -4457,6 +4461,10 @@ variable.
 This attribute, attached to a variable, means that the variable must be
 emitted even if it appears that the variable is not referenced.
 
+When applied to a static data member of a C++ class template, the
+attribute also means that the member will be instantiated if the
+class itself is instantiated.
+
 @item vector_size (@var{bytes})
 This attribute specifies the vector size for the variable, measured in
 bytes.  For example, the declaration:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2e56e745e42..39107f93ee4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-08-16  Jason Merrill  <jason@redhat.com>
 
+	* g++.dg/ext/attr-used-1.C: New.
+
 	PR c++/50054
 	* g++.dg/cpp0x/initlist56.C: New.
 
diff --git a/gcc/testsuite/g++.dg/ext/attr-used-1.C b/gcc/testsuite/g++.dg/ext/attr-used-1.C
new file mode 100644
index 00000000000..6754c7ffb50
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ext/attr-used-1.C
@@ -0,0 +1,17 @@
+// Attribute used on a member function or static data member
+// of a template should cause them to be instantiated along
+// with the class itself.
+
+// { dg-final { scan-assembler "_ZN1AIiE1fEv" } }
+// { dg-final { scan-assembler "_ZN1AIiE1tE" } }
+
+template <class T> struct A
+{
+  void f() __attribute ((used));
+  static T t __attribute ((used));
+};
+
+template <class T> void A<T>::f() { }
+template <class T> T A<T>::t;
+
+A<int> a;
-- 
2.34.1