diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b477d8be5e1..bc1fba79187 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,23 @@ +2009-06-15 Rafael Avila de Espindola + + * cgraphunit.c (cgraph_function_versioning,save_inline_function_body): + Use DECL_COMDAT_GROUP instead of DECL_ONE_ONLY. + * cgraph.c (cgraph_create_virtual_clone): Use DECL_COMDAT_GROUP. + * config/i386/i386.c (ix86_file_end): Compute DECL_COMDAT_GROUP. + * dwarf2asm.c(dw2_force_const_mem): Update call to make_decl_one_only. + * langhooks-def.h (lhd_comdat_group, LANG_HOOKS_COMDAT_GROUP): Remove. + (LANG_HOOKS_DECLS): Remove LANG_HOOKS_COMDAT_GROUP. + * langhooks.c (lhd_comdat_group): Remove. + * langhooks.h (lang_hooks_for_decls): Remove comdat_group. + * tree.h (DECL_COMDAT_GROUP): New. + (DECL_ONE_ONLY): Use DECL_COMDAT_GROUP. + (tree_decl_with_vis): Add comdat_group. Remove one_only. + (make_decl_one_only): Change signature. + * varasm.c (get_emutls_init_templ_addr, emutls_decl): Update call to + make_decl_one_only. + (make_decl_one_only): Change signature. + (default_elf_asm_named_section): Use DECL_COMDAT_GROUP. + 2009-06-15 Richard Guenther PR middle-end/40439 diff --git a/gcc/cgraph.c b/gcc/cgraph.c index 640d180f29b..5eb0f1812b1 100644 --- a/gcc/cgraph.c +++ b/gcc/cgraph.c @@ -1710,7 +1710,7 @@ cgraph_create_virtual_clone (struct cgraph_node *old_node, ??? We cannot use COMDAT linkage because there is no ABI support for this. */ DECL_EXTERNAL (new_node->decl) = 0; - DECL_ONE_ONLY (new_node->decl) = 0; + DECL_COMDAT_GROUP (new_node->decl) = 0; TREE_PUBLIC (new_node->decl) = 0; DECL_COMDAT (new_node->decl) = 0; DECL_WEAK (new_node->decl) = 0; diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c index 310e5f9cef9..53d99bf9cc3 100644 --- a/gcc/cgraphunit.c +++ b/gcc/cgraphunit.c @@ -1616,7 +1616,7 @@ cgraph_function_versioning (struct cgraph_node *old_version_node, ??? We cannot use COMDAT linkage because there is no ABI support for this. */ DECL_EXTERNAL (new_version_node->decl) = 0; - DECL_ONE_ONLY (new_version_node->decl) = 0; + DECL_COMDAT_GROUP (new_version_node->decl) = NULL_TREE; TREE_PUBLIC (new_version_node->decl) = 0; DECL_COMDAT (new_version_node->decl) = 0; DECL_WEAK (new_version_node->decl) = 0; @@ -1686,7 +1686,7 @@ save_inline_function_body (struct cgraph_node *node) tree_function_versioning (node->decl, first_clone->decl, NULL, true, NULL); DECL_EXTERNAL (first_clone->decl) = 0; - DECL_ONE_ONLY (first_clone->decl) = 0; + DECL_COMDAT_GROUP (first_clone->decl) = NULL_TREE; TREE_PUBLIC (first_clone->decl) = 0; DECL_COMDAT (first_clone->decl) = 0; VEC_free (ipa_opt_pass, heap, diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 9129fc39114..2c637631cae 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -7522,7 +7522,7 @@ ix86_file_end (void) error_mark_node); TREE_PUBLIC (decl) = 1; TREE_STATIC (decl) = 1; - DECL_ONE_ONLY (decl) = 1; + DECL_COMDAT_GROUP (decl) = DECL_ASSEMBLER_NAME (decl); (*targetm.asm_out.unique_section) (decl, 0); switch_to_section (get_named_section (decl, NULL, 0)); diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ec8cef035ed..1a0e93519f1 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,15 @@ +2009-06-15 Rafael Avila de Espindola + + * cp-objcp-common.h (LANG_HOOKS_COMDAT_GROUP): Remove. + * cp-tree.h (cxx_comdat_group): Change signature. + * decl.c (duplicate_decls): Use DECL_COMDAT_GROUP. + (cxx_comdat_group): Change signature. + * decl2.c (comdat_linkage, maybe_make_one_only): Update call to + make_decl_one_only. + (constrain_visibility, get_guard): Use DECL_COMDAT_GROUP. + * method.c (use_thunk): Update call to make_decl_one_only. + * optimize.c (maybe_clone_body): Use DECL_COMDAT_GROUP + 2009-06-12 Aldy Hernandez * typeck.c (cp_build_binary_op): Pass location to overflow_warning. diff --git a/gcc/cp/cp-objcp-common.h b/gcc/cp/cp-objcp-common.h index 1ce9d36a652..6723a853ced 100644 --- a/gcc/cp/cp-objcp-common.h +++ b/gcc/cp/cp-objcp-common.h @@ -78,8 +78,6 @@ extern bool cp_function_decl_explicit_p (tree decl); #define LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL cxx_warn_unused_global_decl #undef LANG_HOOKS_WRITE_GLOBALS #define LANG_HOOKS_WRITE_GLOBALS cp_write_global_declarations -#undef LANG_HOOKS_COMDAT_GROUP -#define LANG_HOOKS_COMDAT_GROUP cxx_comdat_group #undef LANG_HOOKS_BUILTIN_FUNCTION #define LANG_HOOKS_BUILTIN_FUNCTION cxx_builtin_function #undef LANG_HOOKS_BUILTIN_FUNCTION_EXT_SCOPE diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 19d61bfe208..4cb34f53700 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4372,7 +4372,7 @@ extern tree cxx_builtin_function (tree decl); extern tree cxx_builtin_function_ext_scope (tree decl); extern tree check_elaborated_type_specifier (enum tag_types, tree, bool); extern void warn_extern_redeclared_static (tree, tree); -extern const char *cxx_comdat_group (tree); +extern tree cxx_comdat_group (tree); extern bool cp_missing_noreturn_ok_p (tree); extern void initialize_artificial_var (tree, tree); extern tree check_var_type (tree, tree); diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 22c426b3247..296d1438515 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1835,7 +1835,9 @@ duplicate_decls (tree newdecl, tree olddecl, bool newdecl_is_friend) /* Merge the storage class information. */ merge_weak (newdecl, olddecl); - DECL_ONE_ONLY (newdecl) |= DECL_ONE_ONLY (olddecl); + if (DECL_ONE_ONLY (olddecl)) + DECL_COMDAT_GROUP (newdecl) = DECL_COMDAT_GROUP (olddecl); + DECL_DEFER_OUTPUT (newdecl) |= DECL_DEFER_OUTPUT (olddecl); TREE_PUBLIC (newdecl) = TREE_PUBLIC (olddecl); TREE_STATIC (olddecl) = TREE_STATIC (newdecl) |= TREE_STATIC (olddecl); @@ -12792,7 +12794,7 @@ cp_missing_noreturn_ok_p (tree decl) /* Return the COMDAT group into which DECL should be placed. */ -const char * +tree cxx_comdat_group (tree decl) { tree name; @@ -12822,7 +12824,7 @@ cxx_comdat_group (tree decl) name = DECL_ASSEMBLER_NAME (decl); } - return IDENTIFIER_POINTER (name); + return name; } #include "gt-cp-decl.h" diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index c540c08e932..495c8e7a089 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -1510,7 +1510,7 @@ void comdat_linkage (tree decl) { if (flag_weak) - make_decl_one_only (decl); + make_decl_one_only (decl, cxx_comdat_group (decl)); else if (TREE_CODE (decl) == FUNCTION_DECL || (TREE_CODE (decl) == VAR_DECL && DECL_ARTIFICIAL (decl))) /* We can just emit function and compiler-generated variables @@ -1582,7 +1582,7 @@ maybe_make_one_only (tree decl) || (! DECL_EXPLICIT_INSTANTIATION (decl) && ! DECL_TEMPLATE_SPECIALIZATION (decl))) { - make_decl_one_only (decl); + make_decl_one_only (decl, cxx_comdat_group (decl)); if (TREE_CODE (decl) == VAR_DECL) { @@ -1845,7 +1845,7 @@ constrain_visibility (tree decl, int visibility) if (!DECL_EXTERN_C_P (decl)) { TREE_PUBLIC (decl) = 0; - DECL_ONE_ONLY (decl) = 0; + DECL_COMDAT_GROUP (decl) = NULL_TREE; DECL_INTERFACE_KNOWN (decl) = 1; if (DECL_LANG_SPECIFIC (decl)) DECL_NOT_REALLY_EXTERN (decl) = 1; @@ -2504,7 +2504,7 @@ get_guard (tree decl) TREE_PUBLIC (guard) = TREE_PUBLIC (decl); TREE_STATIC (guard) = TREE_STATIC (decl); DECL_COMMON (guard) = DECL_COMMON (decl); - DECL_ONE_ONLY (guard) = DECL_ONE_ONLY (decl); + DECL_COMDAT_GROUP (guard) = DECL_COMDAT_GROUP (decl); if (TREE_PUBLIC (decl)) DECL_WEAK (guard) = DECL_WEAK (decl); DECL_VISIBILITY (guard) = DECL_VISIBILITY (decl); diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 0ceff668cd7..af58afe135e 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -383,7 +383,7 @@ use_thunk (tree thunk_fndecl, bool emit_p) DECL_VISIBILITY_SPECIFIED (thunk_fndecl) = DECL_VISIBILITY_SPECIFIED (function); if (DECL_ONE_ONLY (function)) - make_decl_one_only (thunk_fndecl); + make_decl_one_only (thunk_fndecl, cxx_comdat_group (thunk_fndecl)); if (flag_syntax_only) { diff --git a/gcc/cp/optimize.c b/gcc/cp/optimize.c index 8c7b9e82ccb..9d4a8c5f8e4 100644 --- a/gcc/cp/optimize.c +++ b/gcc/cp/optimize.c @@ -141,7 +141,12 @@ maybe_clone_body (tree fn) DECL_DECLARED_INLINE_P (clone) = DECL_DECLARED_INLINE_P (fn); DECL_COMDAT (clone) = DECL_COMDAT (fn); DECL_WEAK (clone) = DECL_WEAK (fn); - DECL_ONE_ONLY (clone) = DECL_ONE_ONLY (fn); + + /* We don't copy the comdat group from fn to clone because the assembler + name of fn was corrupted by write_mangled_name by adding *INTERNAL* + to it. By doing so, it also corrupted the comdat group. */ + if (DECL_ONE_ONLY (fn)) + DECL_COMDAT_GROUP (clone) = cxx_comdat_group (clone); DECL_SECTION_NAME (clone) = DECL_SECTION_NAME (fn); DECL_USE_TEMPLATE (clone) = DECL_USE_TEMPLATE (fn); DECL_EXTERNAL (clone) = DECL_EXTERNAL (fn); diff --git a/gcc/dwarf2asm.c b/gcc/dwarf2asm.c index fcd87185018..7b0fa7b6262 100644 --- a/gcc/dwarf2asm.c +++ b/gcc/dwarf2asm.c @@ -879,7 +879,7 @@ dw2_output_indirect_constant_1 (splay_tree_node node, if (TREE_PUBLIC (id)) { TREE_PUBLIC (decl) = 1; - make_decl_one_only (decl); + make_decl_one_only (decl, DECL_ASSEMBLER_NAME (decl)); } else TREE_STATIC (decl) = 1; diff --git a/gcc/langhooks-def.h b/gcc/langhooks-def.h index 506b527a844..2631ff8db7f 100644 --- a/gcc/langhooks-def.h +++ b/gcc/langhooks-def.h @@ -58,7 +58,6 @@ extern void lhd_incomplete_type_error (const_tree, const_tree); extern tree lhd_type_promotes_to (tree); extern void lhd_register_builtin_type (tree, const char *); extern bool lhd_decl_ok_for_sibcall (const_tree); -extern const char *lhd_comdat_group (tree); extern tree lhd_expr_size (const_tree); extern size_t lhd_tree_size (enum tree_code); extern HOST_WIDE_INT lhd_to_target_charset (HOST_WIDE_INT); @@ -191,7 +190,6 @@ extern tree lhd_make_node (enum tree_code); #define LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL lhd_warn_unused_global_decl #define LANG_HOOKS_WRITE_GLOBALS write_global_declarations #define LANG_HOOKS_DECL_OK_FOR_SIBCALL lhd_decl_ok_for_sibcall -#define LANG_HOOKS_COMDAT_GROUP lhd_comdat_group #define LANG_HOOKS_OMP_PRIVATIZE_BY_REFERENCE hook_bool_const_tree_false #define LANG_HOOKS_OMP_PREDETERMINED_SHARING lhd_omp_predetermined_sharing #define LANG_HOOKS_OMP_DISREGARD_VALUE_EXPR hook_bool_tree_bool_false @@ -211,7 +209,6 @@ extern tree lhd_make_node (enum tree_code); LANG_HOOKS_WARN_UNUSED_GLOBAL_DECL, \ LANG_HOOKS_WRITE_GLOBALS, \ LANG_HOOKS_DECL_OK_FOR_SIBCALL, \ - LANG_HOOKS_COMDAT_GROUP, \ LANG_HOOKS_OMP_PRIVATIZE_BY_REFERENCE, \ LANG_HOOKS_OMP_PREDETERMINED_SHARING, \ LANG_HOOKS_OMP_DISREGARD_VALUE_EXPR, \ diff --git a/gcc/langhooks.c b/gcc/langhooks.c index 85d77a8856c..ff20dd16600 100644 --- a/gcc/langhooks.c +++ b/gcc/langhooks.c @@ -300,14 +300,6 @@ lhd_decl_ok_for_sibcall (const_tree decl ATTRIBUTE_UNUSED) return true; } -/* Return the COMDAT group into which DECL should be placed. */ - -const char * -lhd_comdat_group (tree decl) -{ - return IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl)); -} - /* lang_hooks.decls.final_write_globals: perform final processing on global variables. */ void diff --git a/gcc/langhooks.h b/gcc/langhooks.h index 06ad6c1fc52..ed3e7e72919 100644 --- a/gcc/langhooks.h +++ b/gcc/langhooks.h @@ -176,15 +176,6 @@ struct lang_hooks_for_decls /* True if this decl may be called via a sibcall. */ bool (*ok_for_sibcall) (const_tree); - /* Return the COMDAT group into which this DECL should be placed. - It is known that the DECL belongs in *some* COMDAT group when - this hook is called. The return value will be used immediately, - but not explicitly deallocated, so implementations should not use - xmalloc to allocate the string returned. (Typically, the return - value will be the string already stored in an - IDENTIFIER_NODE.) */ - const char * (*comdat_group) (tree); - /* True if OpenMP should privatize what this DECL points to rather than the DECL itself. */ bool (*omp_privatize_by_reference) (const_tree); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b03a70f2023..0fcde100f82 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2009-06-15 Rafael Avila de Espindola + + * g++.dg/abi/mangle11.C: Update warning line. + * g++.dg/abi/mangle12.C: Update warning line. + * g++.dg/abi/mangle17.C: Update warning line. + * g++.dg/abi/mangle20-2.C: Update warning line. + 2009-06-14 Andreas Krebbel * gcc.dg/optimize-bswap-1.c: Split into these two: diff --git a/gcc/testsuite/g++.dg/abi/mangle11.C b/gcc/testsuite/g++.dg/abi/mangle11.C index 6d09b51a6a1..a049a956671 100644 --- a/gcc/testsuite/g++.dg/abi/mangle11.C +++ b/gcc/testsuite/g++.dg/abi/mangle11.C @@ -1,10 +1,10 @@ // { dg-options "-Wabi -fabi-version=1" } template -void f (typename Q::X) {} // { dg-warning "mangle" } +void f (typename Q::X) {} struct S { typedef int X; }; -template void f (int); +template void f (int); // { dg-warning "mangle" } diff --git a/gcc/testsuite/g++.dg/abi/mangle12.C b/gcc/testsuite/g++.dg/abi/mangle12.C index a3bd9ff6fa7..7176fcd28dc 100644 --- a/gcc/testsuite/g++.dg/abi/mangle12.C +++ b/gcc/testsuite/g++.dg/abi/mangle12.C @@ -1,11 +1,11 @@ // { dg-options "-Wabi -fabi-version=1" } template