Re: [PATCH 2/2] Remove cgraph_local_info structure.
On 10/30/19 4:06 PM, Joseph Myers wrote: > On Wed, 30 Oct 2019, Joseph Myers wrote: > >> This appears to have broken the build for Arm. > > And probably bfin and c6x as well, based on grep, but my bot only covers > glibc targets so doesn't test those. > bfin and c6x are definitely affected. My tester flagged them. jeff
Re: [PATCH 2/2] Remove cgraph_local_info structure.
On Wed, 30 Oct 2019, Joseph Myers wrote: > This appears to have broken the build for Arm. And probably bfin and c6x as well, based on grep, but my bot only covers glibc targets so doesn't test those. -- Joseph S. Myers jos...@codesourcery.com
Re: [PATCH 2/2] Remove cgraph_local_info structure.
This appears to have broken the build for Arm. /scratch/jmyers/glibc-bot/src/gcc/gcc/config/arm/arm.c: In function 'arm_pcs arm_get_pcs_model(const_tree, const_tree)': /scratch/jmyers/glibc-bot/src/gcc/gcc/config/arm/arm.c:5959:4: error: 'cgraph_local_info' was not declared in this scope cgraph_local_info *i = cgraph_node::local_info (CONST_CAST_TREE(decl)); ^ /scratch/jmyers/glibc-bot/src/gcc/gcc/config/arm/arm.c:5959:23: error: 'i' was not declared in this scope cgraph_local_info *i = cgraph_node::local_info (CONST_CAST_TREE(decl)); ^ /scratch/jmyers/glibc-bot/src/gcc/gcc/config/arm/arm.c:5959:27: error: 'local_info' is not a member of 'cgraph_node' cgraph_local_info *i = cgraph_node::local_info (CONST_CAST_TREE(decl)); ^ Makefile:2277: recipe for target 'arm.o' failed make[3]: *** [arm.o] Error 1 -- Joseph S. Myers jos...@codesourcery.com
Re: [PATCH 2/2] Remove cgraph_local_info structure.
On 10/25/19 7:38 AM, Martin Liska wrote: > > gcc/ChangeLog: > > 2019-10-25 Martin Liska > > * cgraph.c (cgraph_node::local_info): Transform to ... > (cgraph_node::local_info_node): ... this. > (cgraph_node::dump): Remove cgraph_local_info and > put its fields directly into cgraph_node. > (cgraph_node::get_availability): Likewise. > (cgraph_node::make_local): Likewise. > (cgraph_node::verify_node): Likewise. > * cgraph.h (struct GTY): Likewise. > * cgraphclones.c (set_new_clone_decl_and_node_flags): Likewise. > (duplicate_thunk_for_node): Likewise. > (cgraph_node::create_clone): Likewise. > (cgraph_node::create_virtual_clone): Likewise. > (cgraph_node::create_version_clone): Likewise. > * cgraphunit.c (cgraph_node::reset): Likewise. > (cgraph_node::finalize_function): Likewise. > (cgraph_node::add_new_function): Likewise. > (analyze_functions): Likewise. > * combine.c (setup_incoming_promotions): Likewise. > * config/i386/i386.c (ix86_function_regparm): Likewise. > (ix86_function_sseregparm): Likewise. > (init_cumulative_args): Likewise. > * ipa-cp.c (determine_versionability): Likewise. > (count_callers): Likewise. > (set_single_call_flag): Likewise. > (initialize_node_lattices): Likewise. > (estimate_local_effects): Likewise. > (create_specialized_node): Likewise. > (identify_dead_nodes): Likewise. > * ipa-fnsummary.c (compute_fn_summary): Likewise. > (ipa_fn_summary_generate): Likewise. > * ipa-hsa.c (check_warn_node_versionable): Likewise. > (process_hsa_functions): Likewise. > * ipa-icf.c (set_local): Likewise. > * ipa-inline-analysis.c (initialize_inline_failed): Likewise. > * ipa-inline.c (speculation_useful_p): Likewise. > * ipa-profile.c (ipa_propagate_frequency): Likewise. > (ipa_profile): Likewise. > * ipa-split.c (split_function): Likewise. > (execute_split_functions): Likewise. > * ipa-sra.c (ipa_sra_preliminary_function_checks): Likewise. > (ipa_sra_ipa_function_checks): Likewise. > * ipa-visibility.c (function_and_variable_visibility): Likewise. > * ipa.c (symbol_table::remove_unreachable_nodes): Likewise. > * lto-cgraph.c (lto_output_node): Likewise. > (input_overwrite_node): Likewise. > * multiple_target.c (expand_target_clones): Likewise. > * omp-simd-clone.c (simd_clone_create): Likewise. > * trans-mem.c (expand_call_tm): Likewise. > (ipa_tm_mayenterirr_function): Likewise. > (ipa_tm_diagnose_tm_safe): Likewise. > (ipa_tm_diagnose_transaction): Likewise. > (ipa_tm_create_version): Likewise. > (ipa_tm_transform_calls_redirect): Likewise. > (ipa_tm_execute): Likewise. > * tree-inline.c (expand_call_inline): Likewise. Both patches in this series are fine. jeff
[PATCH 2/2] Remove cgraph_local_info structure.
gcc/ChangeLog: 2019-10-25 Martin Liska * cgraph.c (cgraph_node::local_info): Transform to ... (cgraph_node::local_info_node): ... this. (cgraph_node::dump): Remove cgraph_local_info and put its fields directly into cgraph_node. (cgraph_node::get_availability): Likewise. (cgraph_node::make_local): Likewise. (cgraph_node::verify_node): Likewise. * cgraph.h (struct GTY): Likewise. * cgraphclones.c (set_new_clone_decl_and_node_flags): Likewise. (duplicate_thunk_for_node): Likewise. (cgraph_node::create_clone): Likewise. (cgraph_node::create_virtual_clone): Likewise. (cgraph_node::create_version_clone): Likewise. * cgraphunit.c (cgraph_node::reset): Likewise. (cgraph_node::finalize_function): Likewise. (cgraph_node::add_new_function): Likewise. (analyze_functions): Likewise. * combine.c (setup_incoming_promotions): Likewise. * config/i386/i386.c (ix86_function_regparm): Likewise. (ix86_function_sseregparm): Likewise. (init_cumulative_args): Likewise. * ipa-cp.c (determine_versionability): Likewise. (count_callers): Likewise. (set_single_call_flag): Likewise. (initialize_node_lattices): Likewise. (estimate_local_effects): Likewise. (create_specialized_node): Likewise. (identify_dead_nodes): Likewise. * ipa-fnsummary.c (compute_fn_summary): Likewise. (ipa_fn_summary_generate): Likewise. * ipa-hsa.c (check_warn_node_versionable): Likewise. (process_hsa_functions): Likewise. * ipa-icf.c (set_local): Likewise. * ipa-inline-analysis.c (initialize_inline_failed): Likewise. * ipa-inline.c (speculation_useful_p): Likewise. * ipa-profile.c (ipa_propagate_frequency): Likewise. (ipa_profile): Likewise. * ipa-split.c (split_function): Likewise. (execute_split_functions): Likewise. * ipa-sra.c (ipa_sra_preliminary_function_checks): Likewise. (ipa_sra_ipa_function_checks): Likewise. * ipa-visibility.c (function_and_variable_visibility): Likewise. * ipa.c (symbol_table::remove_unreachable_nodes): Likewise. * lto-cgraph.c (lto_output_node): Likewise. (input_overwrite_node): Likewise. * multiple_target.c (expand_target_clones): Likewise. * omp-simd-clone.c (simd_clone_create): Likewise. * trans-mem.c (expand_call_tm): Likewise. (ipa_tm_mayenterirr_function): Likewise. (ipa_tm_diagnose_tm_safe): Likewise. (ipa_tm_diagnose_transaction): Likewise. (ipa_tm_create_version): Likewise. (ipa_tm_transform_calls_redirect): Likewise. (ipa_tm_execute): Likewise. * tree-inline.c (expand_call_inline): Likewise. --- gcc/cgraph.c | 18 +- gcc/cgraph.h | 40 ++- gcc/cgraphclones.c| 21 +++- gcc/cgraphunit.c | 7 +++ gcc/combine.c | 3 ++- gcc/config/i386/i386.c| 13 ++--- gcc/ipa-cp.c | 20 ++-- gcc/ipa-fnsummary.c | 10 +- gcc/ipa-hsa.c | 4 ++-- gcc/ipa-icf.c | 2 +- gcc/ipa-inline-analysis.c | 2 +- gcc/ipa-inline.c | 2 +- gcc/ipa-profile.c | 8 gcc/ipa-split.c | 4 ++-- gcc/ipa-sra.c | 4 ++-- gcc/ipa-visibility.c | 6 +++--- gcc/ipa.c | 4 ++-- gcc/lto-cgraph.c | 16 gcc/multiple_target.c | 4 ++-- gcc/omp-simd-clone.c | 2 +- gcc/trans-mem.c | 22 ++--- gcc/tree-inline.c | 2 +- 22 files changed, 102 insertions(+), 112 deletions(-) diff --git a/gcc/cgraph.c b/gcc/cgraph.c index 2dc91a3a99b..33fba5a8f1c 100644 --- a/gcc/cgraph.c +++ b/gcc/cgraph.c @@ -1834,16 +1834,16 @@ cgraph_node::mark_address_taken (void) node->address_taken = 1; } -/* Return local info for the compiled function. */ +/* Return local info node for the compiled function. */ -cgraph_local_info * -cgraph_node::local_info (tree decl) +cgraph_node * +cgraph_node::local_info_node (tree decl) { gcc_assert (TREE_CODE (decl) == FUNCTION_DECL); cgraph_node *node = get (decl); if (!node) return NULL; - return >ultimate_alias_target ()->local; + return node->ultimate_alias_target (); } /* Return RTL info for the compiled function. */ @@ -1991,9 +1991,9 @@ cgraph_node::dump (FILE *f) fprintf (f, " body"); if (process) fprintf (f, " process"); - if (local.local) + if (local) fprintf (f, " local"); - if (local.redefined_extern_inline) + if (redefined_extern_inline) fprintf (f, " redefined_extern_inline"); if (only_called_at_startup) fprintf (f, " only_called_at_startup"); @@ -2217,7 +2217,7 @@ cgraph_node::get_availability