From: mrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 3 Mar 2006 20:37:50 +0000 (+0000)
Subject: 	* decl2.c (import_export_decl): Remove redundant call to
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=ef97a256497c8551d7b038367c70e91ff1eed3b9;p=pf3gnuchains%2Fgcc-fork.git

	* decl2.c (import_export_decl): Remove redundant call to
	targetm.cxx.key_method_may_be_inline ().


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111685 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 71541e1fe56..f0d1301b7c5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-02  Mike Stump  <mrs@apple.com>
+
+	* decl2.c (import_export_decl): Remove redundant call to
+	targetm.cxx.key_method_may_be_inline ().
+
 2006-03-02  Richard Sandiford  <richard@codesourcery.com>
 
 	* decl.c (start_decl): Use have_global_bss_p when deciding
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 9cc95b63006..b332e6e9113 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1790,8 +1790,7 @@ import_export_decl (tree decl)
 		 to arrange for comdat even though
 		 class_data_always_comdat is false.  */
 	      if (!CLASSTYPE_KEY_METHOD (class_type)
-		  || (DECL_DECLARED_INLINE_P (CLASSTYPE_KEY_METHOD (class_type))
-		      && targetm.cxx.key_method_may_be_inline ())
+		  || DECL_DECLARED_INLINE_P (CLASSTYPE_KEY_METHOD (class_type))
 		  || targetm.cxx.class_data_always_comdat ())
 		{
 		  /* The ABI requires COMDAT linkage.  Normally, we
@@ -1832,8 +1831,7 @@ import_export_decl (tree decl)
 		{
 		  comdat_p = (targetm.cxx.class_data_always_comdat ()
 			      || (CLASSTYPE_KEY_METHOD (type)
-				  && DECL_DECLARED_INLINE_P (CLASSTYPE_KEY_METHOD (type))
-				  && targetm.cxx.key_method_may_be_inline ()));
+				  && DECL_DECLARED_INLINE_P (CLASSTYPE_KEY_METHOD (type))));
 		  mark_needed (decl);
 		  if (!flag_weak)
 		    {