diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl2.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 71541e1..f0d1301 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 9cc95b6..b332e6e 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) { |