diff options
author | Martin Liska <mliska@suse.cz> | 2014-07-24 14:07:13 +0200 |
---|---|---|
committer | Martin Liska <marxin@gcc.gnu.org> | 2014-07-24 12:07:13 +0000 |
commit | d52f529517da6e1143714a274d71dcfd64b7a2f0 (patch) | |
tree | 4dd09f8eb18392a620ad92b028d01fbda5d27ee7 /gcc/trans-mem.c | |
parent | 785129aa1660f4210ff4c58dfb1df3a4506aa6d4 (diff) | |
download | gcc-d52f529517da6e1143714a274d71dcfd64b7a2f0.tar.gz |
IPA C++ refactoring 1/N
* cgraph.h (symtab_node):
(void register_symbol (void)): created from symtab_register_node
(void remove (void)): created from symtab_remove_node
(void dump (FILE *f)): created from dump_symtab_node
(void DEBUG_FUNCTION debug (void)): created from debug_symtab_node
(void DEBUG_FUNCTION verify (void)): created from verify_symtab_node
(struct ipa_ref *add_reference (symtab_node *referred_node,
enum ipa_ref_use use_type)): created from add_reference
(struct ipa_ref *add_reference (symtab_node *referred_node,
enum ipa_ref_use use_type, gimple stmt)): created from add_reference
(struct ipa_ref *maybe_add_reference (tree val, enum ipa_ref_use use_type,
gimple stmt)): created from maybe_add_reference
(bool semantically_equivalent_p (symtab_node *target)): created from
symtab_semantically_equivalent_p
(void remove_from_same_comdat_group (void)): created from
remove_from_same_comdat_group
(void add_to_same_comdat_group (symtab_node *old_node)): created from
symtab_add_to_same_comdat_group
(void dissolve_same_comdat_group_list (void)): created from
symtab_dissolve_same_comdat_group_list
(bool used_from_object_file_p (void)): created from symtab_used_from_object_file_p
(symtab_node *ultimate_alias_target (enum availability *avail = NULL)):
created from symtab_alias_ultimate_target
(inline symtab_node *next_defined_symbol (void)): created from
symtab_next_defined_symbol
(bool resolve_alias (symtab_node *target)): created from
symtab_resolve_alias
(bool call_for_symbol_and_aliases (bool (*callback) (symtab_node *, void *),
void *data, bool include_overwrite)): created from symtab_for_node_and_aliases
(symtab_node *noninterposable_alias (void)): created from symtab_nonoverwritable_alias
(inline symtab_node *get_alias_target (void)): created from symtab_alias_target
(void set_section (const char *section)): created from set_section_1
(enum availability get_availability (void)): created from symtab_node_availability
(void make_decl_local (void)): created from symtab_make_decl_local
(bool real_symbol_p (void)): created from symtab_read_node
(can_be_discarded_p (void)): created from symtab_can_be_discarded
(inline bool comdat_local_p (void)): created from symtab_comdat_local_p
(inline bool in_same_comdat_group_p (symtab_node *target)): created from
symtab_in_same_comdat_p;
(bool address_taken_from_non_vtable_p (void)): created from
address_taken_from_non_vtable_p
(static inline symtab_node *get (const_tree decl)): created from symtab_get_node
(static void dump_table (FILE *)): created from dump_symtab
(static inline DEBUG_FUNCTION void debug_symtab (void)): created from debug_symtab
(static DEBUG_FUNCTION void verify_symtab_nodes (void)): created from verify_symtab
(static bool used_from_object_file_p_worker (symtab_node *node)): created from
symtab_used_from_object_file_p
(void dump_base (FILE *)): created from dump_symtab_base
(bool DEBUG_FUNCTION verify_base (void)): created from verify_symtab_base
(void unregister (void)): created from symtab_unregister_node
(struct symbol_priority_map *priority_info (void)): created from symtab_priority_info
(static bool set_implicit_section (symtab_node *n, void *)): created from set_implicit_section
(static bool noninterposable_alias (symtab_node *node, void *data)): created from
symtab_nonoverwritable_alias_1
* cgraph.h (cgraph_node):
(bool remove_symbol_and_inline_clones (cgraph_node *forbidden_node = NULL)):
created from cgraph_remove_node_and_inline_clones
(void record_stmt_references (gimple stmt)): created from ipa_record_stmt_references
(void set_call_stmt_including_clones (gimple old_stmt, gimple new_stmt,
bool update_speculative = true)): created from cgraph_set_call_stmt_including_clones
(cgraph_node *function_symbol (enum availability *avail = NULL)):
created from cgraph_function_node
(cgraph_node *create_clone (tree decl, gcov_type count, int freq, bool update_original,
vec<cgraph_edge *> redirect_callers, bool call_duplication_hook,
struct cgraph_node *new_inlined_to, bitmap args_to_skip)):
created from cgraph_create_clone
(cgraph_node *create_virtual_clone (vec<cgraph_edge *> redirect_callers,
vec<ipa_replace_map *, va_gc> *tree_map, bitmap args_to_skip, const char * suffix)):
created from cgraph_create_virtual_clone
(cgraph_node *find_replacement (void)): created from cgraph_find_replacement_node
(cgraph_node *create_version_clone (tree new_decl, vec<cgraph_edge *> redirect_callers,
bitmap bbs_to_copy)): created from cgraph_copy_node_for_versioning
(cgraph_node *create_version_clone_with_body (vec<cgraph_edge *> redirect_callers,
vec<ipa_replace_map *, va_gc> *tree_map, bitmap args_to_skip, bool skip_return,
bitmap bbs_to_copy, basic_block new_entry_block, const char *clone_name)):
created from cgraph_function_version_info
(struct cgraph_function_version_info *insert_new_function_version (void)):
created from insert_new_cgraph_node_version
(struct cgraph_function_version_info *function_version (void)): created from
get_cgraph_node_version
(void analyze (void)): created from analyze_function
(cgraph_node * create_thunk (tree alias, tree, bool this_adjusting,
HOST_WIDE_INT fixed_offset, HOST_WIDE_INT virtual_value, tree virtual_offset,
tree real_alias) cgraph_add_thunk
(inline cgraph_node *get_alias_target (void)): created from cgraph_alias_target
(cgraph_node *ultimate_alias_target (availability *availability = NULL)):
created from cgraph_function_or_thunk_node
(bool expand_thunk (bool output_asm_thunks, bool force_gimple_thunk)):
created from expand_thunk
(void reset (void)): created from cgraph_reset_node
(void create_wrapper (cgraph_node *target)): created from cgraph_make_wrapper
(void DEBUG_FUNCTION verify_node (void)): created from verify_cgraph_node
(void remove (void)): created from cgraph_remove_node
(void dump (FILE *f)): created from dump_cgraph_node
(void DEBUG_FUNCTION debug (void)): created from debug_cgraph_node
(bool get_body (void)): created from cgraph_get_body
(void release_body (void)): created from cgraph_release_function_body
(void unnest (void)): created from cgraph_unnest_node
(void make_local (void)): created from cgraph_make_node_local
(void mark_address_taken (void)): created from cgraph_mark_address_taken_node
(struct cgraph_edge *create_edge (cgraph_node *callee, gimple call_stmt,
gcov_type count, int freq)): created from cgraph_create_edge
(struct cgraph_edge *create_indirect_edge (gimple call_stmt, int ecf_flags,
gcov_type count, int freq)): created from cgraph_create_indirect_edge
(void create_edge_including_clones (struct cgraph_node *callee, gimple old_stmt,
gimple stmt, gcov_type count, int freq, cgraph_inline_failed_t reason)):
created from cgraph_create_edge_including_clones
(cgraph_edge *get_edge (gimple call_stmt)): created from cgraph_edge
(vec<cgraph_edge *> collect_callers (void)): created from collect_callers_of_node
(void remove_callers (void)): created from cgraph_node_remove_callers
(void remove_callees (void)): created from cgraph_node_remove_callees
(enum availability get_availability (void)): created from cgraph_function_body_availability
(void set_nothrow_flag (bool nothrow)): created from cgraph_set_nothrow_flag
(void set_const_flag (bool readonly, bool looping)): created from cgraph_set_const_flag
(void set_pure_flag (bool pure, bool looping)): created from cgraph_set_pure_flag
(void call_duplication_hooks (cgraph_node *node2)): created from
cgraph_call_node_duplication_hooks
(bool call_for_symbol_and_aliases (bool (*callback) (cgraph_node *, void *),
void *data, bool include_overwritable)): created from cgraph_for_node_and_aliases
(bool call_for_symbol_thunks_and_aliases (bool (*callback) (cgraph_node *node, void *data),
void *data, bool include_overwritable)): created from cgraph_for_node_thunks_and_aliases
(void call_function_insertion_hooks (void)):
created from cgraph_call_function_insertion_hooks
(inline void mark_force_output (void)): created from cgraph_mark_force_output_node
(bool local_p (void)): created from cgraph_local_node
(bool can_be_local_p (void)): created from cgraph_node_can_be_local_p
(bool cannot_return_p (void)): created from cgraph_node_cannot_return
(bool only_called_directly_p (void)): created from cgraph_only_called_directly_p
(inline bool only_called_directly_or_aliased_p (void)):
created from cgraph_only_called_directly_or_aliased_p
(bool will_be_removed_from_program_if_no_direct_calls_p (void)):
created from cgraph_will_be_removed_from_program_if_no_direct_calls
(bool can_remove_if_no_direct_calls_and_refs_p (void)):
created from cgraph_can_remove_if_no_direct_calls_and_refs_p
(bool can_remove_if_no_direct_calls_p (void)):
created from cgraph_can_remove_if_no_direct_calls_p
(inline bool has_gimple_body_p (void)):
created from cgraph_function_with_gimple_body_p
(bool optimize_for_size_p (void)): created from cgraph_optimize_for_size_p
(static void dump_cgraph (FILE *f)): created from dump_cgraph
(static inline void debug_cgraph (void)): created from debug_cgraph
(static void record_function_versions (tree decl1, tree decl2)):
created from record_function_versions
(static void delete_function_version (tree decl)):
created from delete_function_version
(static void add_new_function (tree fndecl, bool lowered)):
created from cgraph_add_new_function
(static inline cgraph_node *get (const_tree decl)): created from cgraph_get_node
(static cgraph_node * create (tree decl)): created from cgraph_create_node
(static cgraph_node * create_empty (void)): created from cgraph_create_empty_node
(static cgraph_node * get_create (tree)): created from cgraph_get_create_node
(static cgraph_node *get_for_asmname (tree asmname)):
created from cgraph_node_for_asm
(static cgraph_node * create_same_body_alias (tree alias, tree decl)):
created from cgraph_same_body_alias
(static bool used_from_object_file_p_worker (cgraph_node *node,
void *): new function
(static bool non_local_p (cgraph_node *node, void *)):
created from cgraph_non_local_node_p_1
(static void DEBUG_FUNCTION verify_cgraph_nodes (void)):
created from verify_cgraph
(static bool make_local (cgraph_node *node, void *)):
created from cgraph_make_node_local
(static cgraph_node *create_alias (tree alias, tree target)):
created from cgraph_create_function_alias
(static cgraph_edge * create_edge (cgraph_node *caller, cgraph_node *callee,
gimple call_stmt, gcov_type count, int freq, bool indir_unknown_callee)):
created from cgraph_create_edge_1
* cgraph.h (varpool_node):
(void remove (void)): created from varpool_remove_node
(void dump (FILE *f)): created from dump_varpool_node
From-SVN: r212982
Diffstat (limited to 'gcc/trans-mem.c')
-rw-r--r-- | gcc/trans-mem.c | 79 |
1 files changed, 39 insertions, 40 deletions
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c index 9697a4c5a9c..f33b52f5305 100644 --- a/gcc/trans-mem.c +++ b/gcc/trans-mem.c @@ -2369,7 +2369,7 @@ expand_call_tm (struct tm_region *region, return false; } - node = cgraph_get_node (fn_decl); + node = cgraph_node::get (fn_decl); /* All calls should have cgraph here. */ if (!node) { @@ -2389,7 +2389,7 @@ expand_call_tm (struct tm_region *region, { gimple_call_set_fndecl (stmt, repl); update_stmt (stmt); - node = cgraph_create_node (repl); + node = cgraph_node::create (repl); node->local.tm_may_enter_irr = false; return expand_call_tm (region, gsi); } @@ -4032,7 +4032,7 @@ struct tm_ipa_cg_data bool want_irr_scan_normal; }; -typedef vec<cgraph_node_ptr> cgraph_node_queue; +typedef vec<cgraph_node *> cgraph_node_queue; /* Return the ipa data associated with NODE, allocating zeroed memory if necessary. TRAVERSE_ALIASES is true if we must traverse aliases @@ -4044,7 +4044,7 @@ get_cg_data (struct cgraph_node **node, bool traverse_aliases) struct tm_ipa_cg_data *d; if (traverse_aliases && (*node)->alias) - *node = cgraph_alias_target (*node); + *node = (*node)->get_alias_target (); d = (struct tm_ipa_cg_data *) (*node)->aux; @@ -4128,7 +4128,7 @@ ipa_tm_scan_calls_block (cgraph_node_queue *callees_p, if (find_tm_replacement_function (fndecl)) continue; - node = cgraph_get_node (fndecl); + node = cgraph_node::get (fndecl); gcc_assert (node != NULL); d = get_cg_data (&node, true); @@ -4295,7 +4295,7 @@ ipa_tm_scan_irr_block (basic_block bb) if (find_tm_replacement_function (fn)) break; - node = cgraph_get_node (fn); + node = cgraph_node::get (fn); d = get_cg_data (&node, true); /* Return true if irrevocable, but above all, believe @@ -4468,7 +4468,7 @@ ipa_tm_decrement_clone_counts (basic_block bb, bool for_clone) if (find_tm_replacement_function (fndecl)) continue; - tnode = cgraph_get_node (fndecl); + tnode = cgraph_node::get (fndecl); d = get_cg_data (&tnode, true); pcallers = (for_clone ? &d->tm_callers_clone @@ -4610,7 +4610,7 @@ ipa_tm_mayenterirr_function (struct cgraph_node *node) /* If we aren't seeing the final version of the function we don't know what it will contain at runtime. */ - if (cgraph_function_body_availability (node) < AVAIL_AVAILABLE) + if (node->get_availability () < AVAIL_AVAILABLE) return true; /* If the function must go irrevocable, then of course true. */ @@ -4631,7 +4631,7 @@ ipa_tm_mayenterirr_function (struct cgraph_node *node) result in one of the bits above being set so that we will not have to recurse next time. */ if (node->alias) - return ipa_tm_mayenterirr_function (cgraph_get_node (node->thunk.alias)); + return ipa_tm_mayenterirr_function (cgraph_node::get (node->thunk.alias)); /* What remains is unmarked local functions without items that force the function to go irrevocable. */ @@ -4789,7 +4789,7 @@ tm_mangle (tree old_asm_id) static inline void ipa_tm_mark_force_output_node (struct cgraph_node *node) { - cgraph_mark_force_output_node (node); + node->mark_force_output (); node->analyzed = true; } @@ -4845,7 +4845,7 @@ ipa_tm_create_version_alias (struct cgraph_node *node, void *data) if (DECL_ONE_ONLY (new_decl)) varpool_get_node (new_decl)->set_comdat_group (tm_mangle (decl_comdat_group_id (old_decl))); - new_node = cgraph_same_body_alias (NULL, new_decl, info->new_decl); + new_node = cgraph_node::create_same_body_alias (new_decl, info->new_decl); new_node->tm_clone = true; new_node->externally_visible = info->old_node->externally_visible; /* ?? Do not traverse aliases here. */ @@ -4886,14 +4886,14 @@ ipa_tm_create_version (struct cgraph_node *old_node) varpool_get_node (new_decl)->set_comdat_group (tm_mangle (DECL_COMDAT_GROUP (old_decl))); gcc_assert (!old_node->ipa_transforms_to_apply.exists ()); - new_node = cgraph_copy_node_for_versioning (old_node, new_decl, vNULL, NULL); + new_node = old_node->create_version_clone (new_decl, vNULL, NULL); new_node->local.local = false; new_node->externally_visible = old_node->externally_visible; new_node->lowered = true; new_node->tm_clone = 1; get_cg_data (&old_node, true)->clone = new_node; - if (cgraph_function_body_availability (old_node) >= AVAIL_OVERWRITABLE) + if (old_node->get_availability () >= AVAIL_INTERPOSABLE) { /* Remap extern inline to static inline. */ /* ??? Is it worth trying to use make_decl_one_only? */ @@ -4911,7 +4911,7 @@ ipa_tm_create_version (struct cgraph_node *old_node) record_tm_clone_pair (old_decl, new_decl); - cgraph_call_function_insertion_hooks (new_node); + new_node->call_function_insertion_hooks (); if (old_node->force_output || old_node->ref_list.first_referring ()) ipa_tm_mark_force_output_node (new_node); @@ -4923,8 +4923,8 @@ ipa_tm_create_version (struct cgraph_node *old_node) struct create_version_alias_info data; data.old_node = old_node; data.new_decl = new_decl; - cgraph_for_node_and_aliases (old_node, ipa_tm_create_version_alias, - &data, true); + old_node->call_for_symbol_thunks_and_aliases (ipa_tm_create_version_alias, + &data, true); } } @@ -4946,12 +4946,11 @@ ipa_tm_insert_irr_call (struct cgraph_node *node, struct tm_region *region, gsi = gsi_after_labels (bb); gsi_insert_before (&gsi, g, GSI_SAME_STMT); - cgraph_create_edge (node, - cgraph_get_create_node - (builtin_decl_explicit (BUILT_IN_TM_IRREVOCABLE)), - g, 0, - compute_call_stmt_bb_frequency (node->decl, - gimple_bb (g))); + node->create_edge (cgraph_node::get_create + (builtin_decl_explicit (BUILT_IN_TM_IRREVOCABLE)), + g, 0, + compute_call_stmt_bb_frequency (node->decl, + gimple_bb (g))); } /* Construct a call to TM_GETTMCLONE and insert it before GSI. */ @@ -4976,9 +4975,9 @@ ipa_tm_insert_gettmclone_call (struct cgraph_node *node, technically taking the address of the original function and its clone. Explain this so inlining will know this function is needed. */ - cgraph_mark_address_taken_node (cgraph_get_node (fndecl)); + cgraph_node::get (fndecl)->mark_address_taken () ; if (clone) - cgraph_mark_address_taken_node (cgraph_get_node (clone)); + cgraph_node::get (clone)->mark_address_taken (); } safe = is_tm_safe (TREE_TYPE (old_fn)); @@ -4999,9 +4998,9 @@ ipa_tm_insert_gettmclone_call (struct cgraph_node *node, gsi_insert_before (gsi, g, GSI_SAME_STMT); - cgraph_create_edge (node, cgraph_get_create_node (gettm_fn), g, 0, - compute_call_stmt_bb_frequency (node->decl, - gimple_bb (g))); + node->create_edge (cgraph_node::get_create (gettm_fn), g, 0, + compute_call_stmt_bb_frequency (node->decl, + gimple_bb (g))); /* Cast return value from tm_gettmclone* into appropriate function pointer. */ @@ -5057,7 +5056,7 @@ ipa_tm_transform_calls_redirect (struct cgraph_node *node, { gimple stmt = gsi_stmt (*gsi); struct cgraph_node *new_node; - struct cgraph_edge *e = cgraph_edge (node, stmt); + struct cgraph_edge *e = node->get_edge (stmt); tree fndecl = gimple_call_fndecl (stmt); /* For indirect calls, pass the address through the runtime. */ @@ -5087,7 +5086,7 @@ ipa_tm_transform_calls_redirect (struct cgraph_node *node, fndecl = find_tm_replacement_function (fndecl); if (fndecl) { - new_node = cgraph_get_create_node (fndecl); + new_node = cgraph_node::get_create (fndecl); /* ??? Mark all transaction_wrap functions tm_may_enter_irr. @@ -5292,7 +5291,7 @@ ipa_tm_execute (void) unsigned int i; #ifdef ENABLE_CHECKING - verify_cgraph (); + cgraph_node::verify_cgraph_nodes (); #endif bitmap_obstack_initialize (&tm_obstack); @@ -5301,7 +5300,7 @@ ipa_tm_execute (void) /* For all local functions marked tm_callable, queue them. */ FOR_EACH_DEFINED_FUNCTION (node) if (is_tm_callable (node->decl) - && cgraph_function_body_availability (node) >= AVAIL_OVERWRITABLE) + && node->get_availability () >= AVAIL_INTERPOSABLE) { d = get_cg_data (&node, true); maybe_push_queue (node, &tm_callees, &d->in_callee_queue); @@ -5310,7 +5309,7 @@ ipa_tm_execute (void) /* For all local reachable functions... */ FOR_EACH_DEFINED_FUNCTION (node) if (node->lowered - && cgraph_function_body_availability (node) >= AVAIL_OVERWRITABLE) + && node->get_availability () >= AVAIL_INTERPOSABLE) { /* ... marked tm_pure, record that fact for the runtime by indicating that the pure function is its own tm_callable. @@ -5350,7 +5349,7 @@ ipa_tm_execute (void) for (i = 0; i < tm_callees.length (); ++i) { node = tm_callees[i]; - a = cgraph_function_body_availability (node); + a = node->get_availability (); d = get_cg_data (&node, true); /* Put it in the worklist so we can scan the function later @@ -5365,7 +5364,7 @@ ipa_tm_execute (void) else if (a <= AVAIL_NOT_AVAILABLE && !is_tm_safe_or_pure (node->decl)) ipa_tm_note_irrevocable (node, &irr_worklist); - else if (a >= AVAIL_OVERWRITABLE) + else if (a >= AVAIL_INTERPOSABLE) { if (!tree_versionable_function_p (node->decl)) ipa_tm_note_irrevocable (node, &irr_worklist); @@ -5375,7 +5374,7 @@ ipa_tm_execute (void) we need not scan the callees now, as the base will do. */ if (node->alias) { - node = cgraph_get_node (node->thunk.alias); + node = cgraph_node::get (node->thunk.alias); d = get_cg_data (&node, true); maybe_push_queue (node, &tm_callees, &d->in_callee_queue); continue; @@ -5461,7 +5460,7 @@ ipa_tm_execute (void) /* Propagate back to referring aliases as well. */ FOR_EACH_ALIAS (node, ref) { - caller = cgraph (ref->referring); + caller = dyn_cast<cgraph_node *> (ref->referring); if (!caller->local.tm_may_enter_irr) { /* ?? Do not traverse aliases here. */ @@ -5475,7 +5474,7 @@ ipa_tm_execute (void) other functions. */ FOR_EACH_DEFINED_FUNCTION (node) if (node->lowered - && cgraph_function_body_availability (node) >= AVAIL_OVERWRITABLE) + && node->get_availability () >= AVAIL_INTERPOSABLE) { d = get_cg_data (&node, true); if (is_tm_safe (node->decl)) @@ -5495,7 +5494,7 @@ ipa_tm_execute (void) if (node->cpp_implicit_alias) continue; - a = cgraph_function_body_availability (node); + a = node->get_availability (); d = get_cg_data (&node, true); if (a <= AVAIL_NOT_AVAILABLE) @@ -5523,7 +5522,7 @@ ipa_tm_execute (void) } FOR_EACH_DEFINED_FUNCTION (node) if (node->lowered - && cgraph_function_body_availability (node) >= AVAIL_OVERWRITABLE) + && node->get_availability () >= AVAIL_INTERPOSABLE) { d = get_cg_data (&node, true); if (d->all_tm_regions) @@ -5540,7 +5539,7 @@ ipa_tm_execute (void) node->aux = NULL; #ifdef ENABLE_CHECKING - verify_cgraph (); + cgraph_node::verify_cgraph_nodes (); #endif return 0; |