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

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

From-SVN: r111685
This commit is contained in:
Mike Stump 2006-03-03 20:37:50 +00:00 committed by Mike Stump
parent d07548f9ca
commit 67a70df65b
2 changed files with 7 additions and 4 deletions

View File

@ -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> 2006-03-02 Richard Sandiford <richard@codesourcery.com>
* decl.c (start_decl): Use have_global_bss_p when deciding * decl.c (start_decl): Use have_global_bss_p when deciding

View File

@ -1790,8 +1790,7 @@ import_export_decl (tree decl)
to arrange for comdat even though to arrange for comdat even though
class_data_always_comdat is false. */ class_data_always_comdat is false. */
if (!CLASSTYPE_KEY_METHOD (class_type) if (!CLASSTYPE_KEY_METHOD (class_type)
|| (DECL_DECLARED_INLINE_P (CLASSTYPE_KEY_METHOD (class_type)) || DECL_DECLARED_INLINE_P (CLASSTYPE_KEY_METHOD (class_type))
&& targetm.cxx.key_method_may_be_inline ())
|| targetm.cxx.class_data_always_comdat ()) || targetm.cxx.class_data_always_comdat ())
{ {
/* The ABI requires COMDAT linkage. Normally, we /* The ABI requires COMDAT linkage. Normally, we
@ -1832,8 +1831,7 @@ import_export_decl (tree decl)
{ {
comdat_p = (targetm.cxx.class_data_always_comdat () comdat_p = (targetm.cxx.class_data_always_comdat ()
|| (CLASSTYPE_KEY_METHOD (type) || (CLASSTYPE_KEY_METHOD (type)
&& DECL_DECLARED_INLINE_P (CLASSTYPE_KEY_METHOD (type)) && DECL_DECLARED_INLINE_P (CLASSTYPE_KEY_METHOD (type))));
&& targetm.cxx.key_method_may_be_inline ()));
mark_needed (decl); mark_needed (decl);
if (!flag_weak) if (!flag_weak)
{ {