diff options
Diffstat (limited to 'gcc/cgraph.c')
| -rw-r--r-- | gcc/cgraph.c | 306 |
1 files changed, 153 insertions, 153 deletions
diff --git a/gcc/cgraph.c b/gcc/cgraph.c index 52d9ab006a3..4a4e9ac97d4 100644 --- a/gcc/cgraph.c +++ b/gcc/cgraph.c @@ -274,8 +274,8 @@ record_function_versions (tree decl1, tree decl2) /* Macros to access the next item in the list of free cgraph nodes and edges. */ -#define NEXT_FREE_NODE(NODE) cgraph ((NODE)->symbol.next) -#define SET_NEXT_FREE_NODE(NODE,NODE2) ((NODE))->symbol.next = (symtab_node)NODE2 +#define NEXT_FREE_NODE(NODE) cgraph ((NODE)->next) +#define SET_NEXT_FREE_NODE(NODE,NODE2) ((NODE))->next = NODE2 #define NEXT_FREE_EDGE(EDGE) (EDGE)->prev_caller /* Register HOOK to be called with DATA on each removed edge. */ @@ -513,7 +513,7 @@ cgraph_create_empty_node (void) { struct cgraph_node *node = cgraph_allocate_node (); - node->symbol.type = SYMTAB_FUNCTION; + node->type = SYMTAB_FUNCTION; node->frequency = NODE_FREQUENCY_NORMAL; node->count_materialization_scale = REG_BR_PROB_BASE; cgraph_n_nodes++; @@ -528,8 +528,8 @@ cgraph_create_node (tree decl) struct cgraph_node *node = cgraph_create_empty_node (); gcc_assert (TREE_CODE (decl) == FUNCTION_DECL); - node->symbol.decl = decl; - symtab_register_node ((symtab_node) node); + node->decl = decl; + symtab_register_node (node); if (DECL_CONTEXT (decl) && TREE_CODE (DECL_CONTEXT (decl)) == FUNCTION_DECL) { @@ -567,12 +567,12 @@ cgraph_create_function_alias (tree alias, tree target) || TREE_CODE (target) == IDENTIFIER_NODE); gcc_assert (TREE_CODE (alias) == FUNCTION_DECL); alias_node = cgraph_get_create_node (alias); - gcc_assert (!alias_node->symbol.definition); - alias_node->symbol.alias_target = target; - alias_node->symbol.definition = true; - alias_node->symbol.alias = true; + gcc_assert (!alias_node->definition); + alias_node->alias_target = target; + alias_node->definition = true; + alias_node->alias = true; if (lookup_attribute ("weakref", DECL_ATTRIBUTES (alias)) != NULL) - alias_node->symbol.weakref = true; + alias_node->weakref = true; return alias_node; } @@ -595,10 +595,10 @@ cgraph_same_body_alias (struct cgraph_node *decl_node ATTRIBUTE_UNUSED, tree ali return NULL; n = cgraph_create_function_alias (alias, decl); - n->symbol.cpp_implicit_alias = true; + n->cpp_implicit_alias = true; if (cpp_implicit_aliases_done) - symtab_resolve_alias ((symtab_node)n, - (symtab_node)cgraph_get_node (decl)); + symtab_resolve_alias (n, + cgraph_get_node (decl)); return n; } @@ -619,8 +619,8 @@ cgraph_add_thunk (struct cgraph_node *decl_node ATTRIBUTE_UNUSED, node = cgraph_get_node (alias); if (node) { - gcc_assert (node->symbol.definition); - gcc_assert (!node->symbol.alias); + gcc_assert (node->definition); + gcc_assert (!node->alias); gcc_assert (!node->thunk.thunk_p); cgraph_remove_node (node); } @@ -635,7 +635,7 @@ cgraph_add_thunk (struct cgraph_node *decl_node ATTRIBUTE_UNUSED, node->thunk.virtual_offset_p = virtual_offset != NULL; node->thunk.alias = real_alias; node->thunk.thunk_p = true; - node->symbol.definition = true; + node->definition = true; return node; } @@ -649,7 +649,7 @@ cgraph_node_for_asm (tree asmname) /* We do not want to look at inline clones. */ for (symtab_node node = symtab_node_for_asm (asmname); node; - node = node->symbol.next_sharing_asm_name) + node = node->next_sharing_asm_name) { cgraph_node *cn = dyn_cast <cgraph_node> (node); if (cn && !cn->global.inlined_to) @@ -804,7 +804,7 @@ cgraph_set_call_stmt (struct cgraph_edge *e, gimple new_stmt, e = cgraph_make_edge_direct (e, new_callee); } - push_cfun (DECL_STRUCT_FUNCTION (e->caller->symbol.decl)); + push_cfun (DECL_STRUCT_FUNCTION (e->caller->decl)); e->can_throw_external = stmt_can_throw_external (new_stmt); pop_cfun (); if (e->caller->call_site_hash) @@ -863,13 +863,13 @@ cgraph_create_edge_1 (struct cgraph_node *caller, struct cgraph_node *callee, gcc_assert (freq <= CGRAPH_FREQ_MAX); edge->call_stmt = call_stmt; - push_cfun (DECL_STRUCT_FUNCTION (caller->symbol.decl)); + push_cfun (DECL_STRUCT_FUNCTION (caller->decl)); edge->can_throw_external = call_stmt ? stmt_can_throw_external (call_stmt) : false; pop_cfun (); if (call_stmt - && callee && callee->symbol.decl - && !gimple_check_call_matching_types (call_stmt, callee->symbol.decl, + && callee && callee->decl + && !gimple_check_call_matching_types (call_stmt, callee->decl, false)) edge->call_stmt_cannot_inline_p = true; else @@ -1081,14 +1081,14 @@ cgraph_turn_edge_to_speculative (struct cgraph_edge *e, { fprintf (dump_file, "Indirect call -> speculative call" " %s/%i => %s/%i\n", - xstrdup (cgraph_node_name (n)), n->symbol.order, - xstrdup (cgraph_node_name (n2)), n2->symbol.order); + xstrdup (cgraph_node_name (n)), n->order, + xstrdup (cgraph_node_name (n2)), n2->order); } e->speculative = true; e2 = cgraph_create_edge (n, n2, e->call_stmt, direct_count, direct_frequency); initialize_inline_failed (e2); e2->speculative = true; - if (TREE_NOTHROW (n2->symbol.decl)) + if (TREE_NOTHROW (n2->decl)) e2->can_throw_external = false; else e2->can_throw_external = e->can_throw_external; @@ -1096,7 +1096,7 @@ cgraph_turn_edge_to_speculative (struct cgraph_edge *e, e->count -= e2->count; e->frequency -= e2->frequency; cgraph_call_edge_duplication_hooks (e, e2); - ref = ipa_record_reference ((symtab_node)n, (symtab_node)n2, + ref = ipa_record_reference (n, n2, IPA_REF_ADDR, e->call_stmt); ref->lto_stmt_uid = e->lto_stmt_uid; ref->speculative = e->speculative; @@ -1150,7 +1150,7 @@ cgraph_speculative_call_info (struct cgraph_edge *e, indirect = e2; reference = NULL; - for (i = 0; ipa_ref_list_reference_iterate (&e->caller->symbol.ref_list, + for (i = 0; ipa_ref_list_reference_iterate (&e->caller->ref_list, i, ref); i++) if (ref->speculative && ((ref->stmt && ref->stmt == e->call_stmt) @@ -1192,7 +1192,7 @@ cgraph_resolve_speculation (struct cgraph_edge *edge, tree callee_decl) gcc_assert (edge->speculative); cgraph_speculative_call_info (edge, e2, edge, ref); if (!callee_decl - || !symtab_semantically_equivalent_p ((symtab_node) ref->referred, + || !symtab_semantically_equivalent_p (ref->referred, symtab_get_node (callee_decl))) { if (dump_file) @@ -1201,16 +1201,16 @@ cgraph_resolve_speculation (struct cgraph_edge *edge, tree callee_decl) { fprintf (dump_file, "Speculative indirect call %s/%i => %s/%i has " "turned out to have contradicting known target ", - xstrdup (cgraph_node_name (edge->caller)), edge->caller->symbol.order, - xstrdup (cgraph_node_name (e2->callee)), e2->callee->symbol.order); + xstrdup (cgraph_node_name (edge->caller)), edge->caller->order, + xstrdup (cgraph_node_name (e2->callee)), e2->callee->order); print_generic_expr (dump_file, callee_decl, 0); fprintf (dump_file, "\n"); } else { fprintf (dump_file, "Removing speculative call %s/%i => %s/%i\n", - xstrdup (cgraph_node_name (edge->caller)), edge->caller->symbol.order, - xstrdup (cgraph_node_name (e2->callee)), e2->callee->symbol.order); + xstrdup (cgraph_node_name (edge->caller)), edge->caller->order, + xstrdup (cgraph_node_name (e2->callee)), e2->callee->order); } } } @@ -1252,7 +1252,7 @@ cgraph_make_edge_direct (struct cgraph_edge *edge, struct cgraph_node *callee) /* If we are redirecting speculative call, make it non-speculative. */ if (edge->indirect_unknown_callee && edge->speculative) { - edge = cgraph_resolve_speculation (edge, callee->symbol.decl); + edge = cgraph_resolve_speculation (edge, callee->decl); /* On successful speculation just return the pre existing direct edge. */ if (!edge->indirect_unknown_callee) @@ -1283,7 +1283,7 @@ cgraph_make_edge_direct (struct cgraph_edge *edge, struct cgraph_node *callee) if (edge->call_stmt) edge->call_stmt_cannot_inline_p - = !gimple_check_call_matching_types (edge->call_stmt, callee->symbol.decl, + = !gimple_check_call_matching_types (edge->call_stmt, callee->decl, false); /* We need to re-determine the inlining status of the edge. */ @@ -1320,23 +1320,23 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e) signature. We did not update the call statement yet, so compare it with the reference that still points to the proper type. */ else if (!gimple_check_call_matching_types (e->call_stmt, - ref->referred->symbol.decl, + ref->referred->decl, true)) { if (dump_file) fprintf (dump_file, "Not expanding speculative call of %s/%i -> %s/%i\n" "Type mismatch.\n", xstrdup (cgraph_node_name (e->caller)), - e->caller->symbol.order, + e->caller->order, xstrdup (cgraph_node_name (e->callee)), - e->callee->symbol.order); + e->callee->order); e = cgraph_resolve_speculation (e, NULL); /* We are producing the final function body and will throw away the callgraph edges really soon. Reset the counts/frequencies to keep verifier happy in the case of roundoff errors. */ e->count = gimple_bb (e->call_stmt)->count; e->frequency = compute_call_stmt_bb_frequency - (e->caller->symbol.decl, gimple_bb (e->call_stmt)); + (e->caller->decl, gimple_bb (e->call_stmt)); } /* Expand speculation into GIMPLE code. */ else @@ -1346,12 +1346,12 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e) "Expanding speculative call of %s/%i -> %s/%i count:" HOST_WIDEST_INT_PRINT_DEC"\n", xstrdup (cgraph_node_name (e->caller)), - e->caller->symbol.order, + e->caller->order, xstrdup (cgraph_node_name (e->callee)), - e->callee->symbol.order, + e->callee->order, (HOST_WIDEST_INT)e->count); gcc_assert (e2->speculative); - push_cfun (DECL_STRUCT_FUNCTION (e->caller->symbol.decl)); + push_cfun (DECL_STRUCT_FUNCTION (e->caller->decl)); new_stmt = gimple_ic (e->call_stmt, cgraph (ref->referred), e->count || e2->count ? RDIV (e->count * REG_BR_PROB_BASE, @@ -1365,9 +1365,9 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e) cgraph_set_call_stmt_including_clones (e->caller, e->call_stmt, new_stmt, false); e->frequency = compute_call_stmt_bb_frequency - (e->caller->symbol.decl, gimple_bb (e->call_stmt)); + (e->caller->decl, gimple_bb (e->call_stmt)); e2->frequency = compute_call_stmt_bb_frequency - (e2->caller->symbol.decl, gimple_bb (e2->call_stmt)); + (e2->caller->decl, gimple_bb (e2->call_stmt)); e2->speculative = false; ref->speculative = false; ref->stmt = NULL; @@ -1381,7 +1381,7 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e) } if (e->indirect_unknown_callee - || decl == e->callee->symbol.decl) + || decl == e->callee->decl) return e->call_stmt; #ifdef ENABLE_CHECKING @@ -1395,8 +1395,8 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e) if (cgraph_dump_file) { fprintf (cgraph_dump_file, "updating call of %s/%i -> %s/%i: ", - xstrdup (cgraph_node_name (e->caller)), e->caller->symbol.order, - xstrdup (cgraph_node_name (e->callee)), e->callee->symbol.order); + xstrdup (cgraph_node_name (e->caller)), e->caller->order, + xstrdup (cgraph_node_name (e->callee)), e->callee->order); print_gimple_stmt (cgraph_dump_file, e->call_stmt, 0, dump_flags); if (e->callee->clone.combined_args_to_skip) { @@ -1413,7 +1413,7 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e) new_stmt = gimple_call_copy_skip_args (e->call_stmt, e->callee->clone.combined_args_to_skip); - gimple_call_set_fndecl (new_stmt, e->callee->symbol.decl); + gimple_call_set_fndecl (new_stmt, e->callee->decl); gimple_call_set_fntype (new_stmt, gimple_call_fntype (e->call_stmt)); if (gimple_vdef (new_stmt) @@ -1436,7 +1436,7 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e) else { new_stmt = e->call_stmt; - gimple_call_set_fndecl (new_stmt, e->callee->symbol.decl); + gimple_call_set_fndecl (new_stmt, e->callee->decl); update_stmt (new_stmt); } @@ -1486,7 +1486,7 @@ cgraph_update_edges_for_call_stmt_node (struct cgraph_node *node, struct cgraph_node *callee = e->callee; while (callee) { - if (callee->symbol.decl == new_call + if (callee->decl == new_call || callee->former_clone_of == new_call) return; callee = callee->clone_of; @@ -1659,17 +1659,17 @@ cgraph_release_function_body (struct cgraph_node *node) node->ipa_transforms_to_apply.release (); if (!node->used_as_abstract_origin && cgraph_state != CGRAPH_STATE_PARSING) { - DECL_RESULT (node->symbol.decl) = NULL; - DECL_ARGUMENTS (node->symbol.decl) = NULL; + DECL_RESULT (node->decl) = NULL; + DECL_ARGUMENTS (node->decl) = NULL; } /* If the node is abstract and needed, then do not clear DECL_INITIAL of its associated function function declaration because it's needed to emit debug info later. */ - if (!node->used_as_abstract_origin && DECL_INITIAL (node->symbol.decl)) - DECL_INITIAL (node->symbol.decl) = error_mark_node; - release_function_body (node->symbol.decl); - if (node->symbol.lto_file_data) - lto_free_function_in_decl_state_for_node ((symtab_node) node); + if (!node->used_as_abstract_origin && DECL_INITIAL (node->decl)) + DECL_INITIAL (node->decl) = error_mark_node; + release_function_body (node->decl); + if (node->lto_file_data) + lto_free_function_in_decl_state_for_node (node); } /* Remove the node from cgraph. */ @@ -1687,8 +1687,8 @@ cgraph_remove_node (struct cgraph_node *node) /* Incremental inlining access removed nodes stored in the postorder list. */ - node->symbol.force_output = false; - node->symbol.forced_by_abi = false; + node->force_output = false; + node->forced_by_abi = false; for (n = node->nested; n; n = n->next_nested) n->origin = NULL; node->nested = NULL; @@ -1700,7 +1700,7 @@ cgraph_remove_node (struct cgraph_node *node) node2 = &(*node2)->next_nested; *node2 = node->next_nested; } - symtab_unregister_node ((symtab_node)node); + symtab_unregister_node (node); if (node->prev_sibling_clone) node->prev_sibling_clone->next_sibling_clone = node->next_sibling_clone; else if (node->clone_of) @@ -1744,18 +1744,18 @@ cgraph_remove_node (struct cgraph_node *node) */ if (cgraph_state != CGRAPH_LTO_STREAMING) { - n = cgraph_get_node (node->symbol.decl); + n = cgraph_get_node (node->decl); if (!n || (!n->clones && !n->clone_of && !n->global.inlined_to && (cgraph_global_info_ready - && (TREE_ASM_WRITTEN (n->symbol.decl) - || DECL_EXTERNAL (n->symbol.decl) - || !n->symbol.analyzed - || (!flag_wpa && n->symbol.in_other_partition))))) + && (TREE_ASM_WRITTEN (n->decl) + || DECL_EXTERNAL (n->decl) + || !n->analyzed + || (!flag_wpa && n->in_other_partition))))) cgraph_release_function_body (node); } - node->symbol.decl = NULL; + node->decl = NULL; if (node->call_site_hash) { htab_delete (node->call_site_hash); @@ -1766,7 +1766,7 @@ cgraph_remove_node (struct cgraph_node *node) /* Clear out the node to NULL all pointers and add the node to the free list. */ memset (node, 0, sizeof (*node)); - node->symbol.type = SYMTAB_FUNCTION; + node->type = SYMTAB_FUNCTION; node->uid = uid; SET_NEXT_FREE_NODE (node, free_nodes); free_nodes = node; @@ -1791,9 +1791,9 @@ cgraph_mark_address_taken_node (struct cgraph_node *node) of the object was taken (and thus it should be set on node alias is referring to). We should remove the first use and the remove the following set. */ - node->symbol.address_taken = 1; + node->address_taken = 1; node = cgraph_function_or_thunk_node (node, NULL); - node->symbol.address_taken = 1; + node->address_taken = 1; } /* Return local info for the compiled function. */ @@ -1835,7 +1835,7 @@ cgraph_rtl_info (tree decl) node = cgraph_get_node (decl); if (!node || (decl != current_function_decl - && !TREE_ASM_WRITTEN (node->symbol.decl))) + && !TREE_ASM_WRITTEN (node->decl))) return NULL; return &node->rtl; } @@ -1871,18 +1871,18 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node) struct cgraph_edge *edge; int indirect_calls_count = 0; - dump_symtab_base (f, (symtab_node) node); + dump_symtab_base (f, node); if (node->global.inlined_to) fprintf (f, " Function %s/%i is inline copy in %s/%i\n", xstrdup (cgraph_node_name (node)), - node->symbol.order, + node->order, xstrdup (cgraph_node_name (node->global.inlined_to)), - node->global.inlined_to->symbol.order); + node->global.inlined_to->order); if (node->clone_of) fprintf (f, " Clone of %s/%i\n", cgraph_node_asm_name (node->clone_of), - node->clone_of->symbol.order); + node->clone_of->order); if (cgraph_function_flags_ready) fprintf (f, " Availability: %s\n", cgraph_availability_names [cgraph_function_body_availability (node)]); @@ -1896,7 +1896,7 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node) (HOST_WIDEST_INT)node->count); if (node->origin) fprintf (f, " nested in: %s", cgraph_node_asm_name (node->origin)); - if (gimple_has_body_p (node->symbol.decl)) + if (gimple_has_body_p (node->decl)) fprintf (f, " body"); if (node->process) fprintf (f, " process"); @@ -1926,7 +1926,7 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node) (int)node->thunk.virtual_value, (int)node->thunk.virtual_offset_p); } - if (node->symbol.alias && node->thunk.alias + if (node->alias && node->thunk.alias && DECL_P (node->thunk.alias)) { fprintf (f, " Alias of %s", @@ -1942,7 +1942,7 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node) for (edge = node->callers; edge; edge = edge->next_caller) { fprintf (f, "%s/%i ", cgraph_node_asm_name (edge->caller), - edge->caller->symbol.order); + edge->caller->order); if (edge->count) fprintf (f, "("HOST_WIDEST_INT_PRINT_DEC"x) ", (HOST_WIDEST_INT)edge->count); @@ -1963,7 +1963,7 @@ dump_cgraph_node (FILE *f, struct cgraph_node *node) for (edge = node->callees; edge; edge = edge->next_callee) { fprintf (f, "%s/%i ", cgraph_node_asm_name (edge->callee), - edge->callee->symbol.order); + edge->callee->order); if (edge->speculative) fprintf (f, "(speculative) "); if (!edge->inline_failed) @@ -2047,20 +2047,20 @@ enum availability cgraph_function_body_availability (struct cgraph_node *node) { enum availability avail; - if (!node->symbol.analyzed) + if (!node->analyzed) avail = AVAIL_NOT_AVAILABLE; else if (node->local.local) avail = AVAIL_LOCAL; - else if (node->symbol.alias && node->symbol.weakref) + else if (node->alias && node->weakref) cgraph_function_or_thunk_node (node, &avail); - else if (lookup_attribute ("ifunc", DECL_ATTRIBUTES (node->symbol.decl))) + else if (lookup_attribute ("ifunc", DECL_ATTRIBUTES (node->decl))) avail = AVAIL_OVERWRITABLE; - else if (!node->symbol.externally_visible) + else if (!node->externally_visible) avail = AVAIL_AVAILABLE; /* Inline functions are safe to be analyzed even if their symbol can be overwritten at runtime. It is not meaningful to enforce any sane behaviour on replacing inline function by different body. */ - else if (DECL_DECLARED_INLINE_P (node->symbol.decl)) + else if (DECL_DECLARED_INLINE_P (node->decl)) avail = AVAIL_AVAILABLE; /* If the function can be overwritten, return OVERWRITABLE. Take @@ -2073,8 +2073,8 @@ cgraph_function_body_availability (struct cgraph_node *node) AVAIL_AVAILABLE here? That would be good reason to preserve this bit. */ - else if (decl_replaceable_p (node->symbol.decl) - && !DECL_EXTERNAL (node->symbol.decl)) + else if (decl_replaceable_p (node->decl) + && !DECL_EXTERNAL (node->decl)) avail = AVAIL_OVERWRITABLE; else avail = AVAIL_AVAILABLE; @@ -2086,12 +2086,12 @@ static bool cgraph_node_cannot_be_local_p_1 (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED) { - return !(!node->symbol.force_output - && ((DECL_COMDAT (node->symbol.decl) - && !node->symbol.forced_by_abi - && !symtab_used_from_object_file_p ((symtab_node) node) - && !node->symbol.same_comdat_group) - || !node->symbol.externally_visible)); + return !(!node->force_output + && ((DECL_COMDAT (node->decl) + && !node->forced_by_abi + && !symtab_used_from_object_file_p (node) + && !node->same_comdat_group) + || !node->externally_visible)); } /* Return true if NODE can be made local for API change. @@ -2101,7 +2101,7 @@ cgraph_node_cannot_be_local_p_1 (struct cgraph_node *node, bool cgraph_node_can_be_local_p (struct cgraph_node *node) { - return (!node->symbol.address_taken + return (!node->address_taken && !cgraph_for_node_and_aliases (node, cgraph_node_cannot_be_local_p_1, NULL, true)); @@ -2130,7 +2130,7 @@ cgraph_for_node_thunks_and_aliases (struct cgraph_node *node, if (cgraph_for_node_thunks_and_aliases (e->caller, callback, data, include_overwritable)) return true; - for (i = 0; ipa_ref_list_referring_iterate (&node->symbol.ref_list, i, ref); i++) + for (i = 0; ipa_ref_list_referring_iterate (&node->ref_list, i, ref); i++) if (ref->use == IPA_REF_ALIAS) { struct cgraph_node *alias = ipa_ref_referring_node (ref); @@ -2158,7 +2158,7 @@ cgraph_for_node_and_aliases (struct cgraph_node *node, if (callback (node, data)) return true; - for (i = 0; ipa_ref_list_referring_iterate (&node->symbol.ref_list, i, ref); i++) + for (i = 0; ipa_ref_list_referring_iterate (&node->ref_list, i, ref); i++) if (ref->use == IPA_REF_ALIAS) { struct cgraph_node *alias = ipa_ref_referring_node (ref); @@ -2177,16 +2177,16 @@ static bool cgraph_make_node_local_1 (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED) { gcc_checking_assert (cgraph_node_can_be_local_p (node)); - if (DECL_COMDAT (node->symbol.decl) || DECL_EXTERNAL (node->symbol.decl)) + if (DECL_COMDAT (node->decl) || DECL_EXTERNAL (node->decl)) { - symtab_make_decl_local (node->symbol.decl); + symtab_make_decl_local (node->decl); - node->symbol.externally_visible = false; - node->symbol.forced_by_abi = false; + node->externally_visible = false; + node->forced_by_abi = false; node->local.local = true; - node->symbol.unique_name = (node->symbol.resolution == LDPR_PREVAILING_DEF_IRONLY - || node->symbol.resolution == LDPR_PREVAILING_DEF_IRONLY_EXP); - node->symbol.resolution = LDPR_PREVAILING_DEF_IRONLY; + node->unique_name = (node->resolution == LDPR_PREVAILING_DEF_IRONLY + || node->resolution == LDPR_PREVAILING_DEF_IRONLY_EXP); + node->resolution = LDPR_PREVAILING_DEF_IRONLY; gcc_assert (cgraph_function_body_availability (node) == AVAIL_LOCAL); } return false; @@ -2208,7 +2208,7 @@ cgraph_set_nothrow_flag_1 (struct cgraph_node *node, void *data) { struct cgraph_edge *e; - TREE_NOTHROW (node->symbol.decl) = data != NULL; + TREE_NOTHROW (node->decl) = data != NULL; if (data != NULL) for (e = node->callers; e; e = e->next_caller) @@ -2235,13 +2235,13 @@ cgraph_set_const_flag_1 (struct cgraph_node *node, void *data) optimized out. */ if (data && !((size_t)data & 2)) { - if (DECL_STATIC_CONSTRUCTOR (node->symbol.decl)) - DECL_STATIC_CONSTRUCTOR (node->symbol.decl) = 0; - if (DECL_STATIC_DESTRUCTOR (node->symbol.decl)) - DECL_STATIC_DESTRUCTOR (node->symbol.decl) = 0; + if (DECL_STATIC_CONSTRUCTOR (node->decl)) + DECL_STATIC_CONSTRUCTOR (node->decl) = 0; + if (DECL_STATIC_DESTRUCTOR (node->decl)) + DECL_STATIC_DESTRUCTOR (node->decl) = 0; } - TREE_READONLY (node->symbol.decl) = data != NULL; - DECL_LOOPING_CONST_OR_PURE_P (node->symbol.decl) = ((size_t)data & 2) != 0; + TREE_READONLY (node->decl) = data != NULL; + DECL_LOOPING_CONST_OR_PURE_P (node->decl) = ((size_t)data & 2) != 0; return false; } @@ -2265,13 +2265,13 @@ cgraph_set_pure_flag_1 (struct cgraph_node *node, void *data) optimized out. */ if (data && !((size_t)data & 2)) { - if (DECL_STATIC_CONSTRUCTOR (node->symbol.decl)) - DECL_STATIC_CONSTRUCTOR (node->symbol.decl) = 0; - if (DECL_STATIC_DESTRUCTOR (node->symbol.decl)) - DECL_STATIC_DESTRUCTOR (node->symbol.decl) = 0; + if (DECL_STATIC_CONSTRUCTOR (node->decl)) + DECL_STATIC_CONSTRUCTOR (node->decl) = 0; + if (DECL_STATIC_DESTRUCTOR (node->decl)) + DECL_STATIC_DESTRUCTOR (node->decl) = 0; } - DECL_PURE_P (node->symbol.decl) = data != NULL; - DECL_LOOPING_CONST_OR_PURE_P (node->symbol.decl) = ((size_t)data & 2) != 0; + DECL_PURE_P (node->decl) = data != NULL; + DECL_LOOPING_CONST_OR_PURE_P (node->decl) = ((size_t)data & 2) != 0; return false; } @@ -2292,7 +2292,7 @@ cgraph_set_pure_flag (struct cgraph_node *node, bool pure, bool looping) bool cgraph_node_cannot_return (struct cgraph_node *node) { - int flags = flags_from_decl_or_type (node->symbol.decl); + int flags = flags_from_decl_or_type (node->decl); if (!flag_exceptions) return (flags & ECF_NORETURN) != 0; else @@ -2331,19 +2331,19 @@ cgraph_can_remove_if_no_direct_calls_and_refs_p (struct cgraph_node *node) { gcc_assert (!node->global.inlined_to); /* Extern inlines can always go, we will use the external definition. */ - if (DECL_EXTERNAL (node->symbol.decl)) + if (DECL_EXTERNAL (node->decl)) return true; /* When function is needed, we can not remove it. */ - if (node->symbol.force_output || node->symbol.used_from_other_partition) + if (node->force_output || node->used_from_other_partition) return false; - if (DECL_STATIC_CONSTRUCTOR (node->symbol.decl) - || DECL_STATIC_DESTRUCTOR (node->symbol.decl)) + if (DECL_STATIC_CONSTRUCTOR (node->decl) + || DECL_STATIC_DESTRUCTOR (node->decl)) return false; /* Only COMDAT functions can be removed if externally visible. */ - if (node->symbol.externally_visible - && (!DECL_COMDAT (node->symbol.decl) - || node->symbol.forced_by_abi - || symtab_used_from_object_file_p ((symtab_node) node))) + if (node->externally_visible + && (!DECL_COMDAT (node->decl) + || node->forced_by_abi + || symtab_used_from_object_file_p (node))) return false; return true; } @@ -2363,9 +2363,9 @@ bool cgraph_can_remove_if_no_direct_calls_p (struct cgraph_node *node) { /* Extern inlines can always go, we will use the external definition. */ - if (DECL_EXTERNAL (node->symbol.decl)) + if (DECL_EXTERNAL (node->decl)) return true; - if (node->symbol.address_taken) + if (node->address_taken) return false; return !cgraph_for_node_and_aliases (node, nonremovable_p, NULL, true); } @@ -2375,7 +2375,7 @@ cgraph_can_remove_if_no_direct_calls_p (struct cgraph_node *node) static bool used_from_object_file_p (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED) { - return symtab_used_from_object_file_p ((symtab_node) node); + return symtab_used_from_object_file_p (node); } /* Return true when function NODE can be expected to be removed @@ -2402,7 +2402,7 @@ cgraph_will_be_removed_from_program_if_no_direct_calls (struct cgraph_node *node return cgraph_only_called_directly_p (node); else { - if (DECL_EXTERNAL (node->symbol.decl)) + if (DECL_EXTERNAL (node->decl)) return true; return cgraph_can_remove_if_no_direct_calls_p (node); } @@ -2492,7 +2492,7 @@ verify_edge_count_and_frequency (struct cgraph_edge *e) error ("caller edge frequency is too large"); error_found = true; } - if (gimple_has_body_p (e->caller->symbol.decl) + if (gimple_has_body_p (e->caller->decl) && !e->caller->global.inlined_to && !e->speculative /* FIXME: Inline-analysis sets frequency to 0 when edge is optimized out. @@ -2502,12 +2502,12 @@ verify_edge_count_and_frequency (struct cgraph_edge *e) && ((inline_edge_summary_vec.length () <= (unsigned) e->uid) || !inline_edge_summary (e)->predicate))) && (e->frequency - != compute_call_stmt_bb_frequency (e->caller->symbol.decl, + != compute_call_stmt_bb_frequency (e->caller->decl, gimple_bb (e->call_stmt)))) { error ("caller edge frequency %i does not match BB frequency %i", e->frequency, - compute_call_stmt_bb_frequency (e->caller->symbol.decl, + compute_call_stmt_bb_frequency (e->caller->decl, gimple_bb (e->call_stmt))); error_found = true; } @@ -2549,11 +2549,11 @@ verify_edge_corresponds_to_fndecl (struct cgraph_edge *e, tree decl) /* We do not know if a node from a different partition is an alias or what it aliases and therefore cannot do the former_clone_of check reliably. */ - if (!node || node->symbol.in_other_partition || e->callee->symbol.in_other_partition) + if (!node || node->in_other_partition || e->callee->in_other_partition) return false; node = cgraph_function_or_thunk_node (node, NULL); - if (e->callee->former_clone_of != node->symbol.decl + if (e->callee->former_clone_of != node->decl /* IPA-CP sometimes redirect edge to clone and then back to the former function. This ping-pong has to go, eventually. */ && (node != cgraph_function_or_thunk_node (e->callee, NULL)) @@ -2568,7 +2568,7 @@ DEBUG_FUNCTION void verify_cgraph_node (struct cgraph_node *node) { struct cgraph_edge *e; - struct function *this_cfun = DECL_STRUCT_FUNCTION (node->symbol.decl); + struct function *this_cfun = DECL_STRUCT_FUNCTION (node->decl); basic_block this_block; gimple_stmt_iterator gsi; bool error_found = false; @@ -2577,7 +2577,7 @@ verify_cgraph_node (struct cgraph_node *node) return; timevar_push (TV_CGRAPH_VERIFY); - error_found |= verify_symtab_base ((symtab_node) node); + error_found |= verify_symtab_base (node); for (e = node->callees; e; e = e->next_callee) if (e->aux) { @@ -2591,27 +2591,27 @@ verify_cgraph_node (struct cgraph_node *node) error ("execution count is negative"); error_found = true; } - if (node->global.inlined_to && node->symbol.same_comdat_group) + if (node->global.inlined_to && node->same_comdat_group) { error ("inline clone in same comdat group list"); error_found = true; } - if (!node->symbol.definition && !node->symbol.in_other_partition && node->local.local) + if (!node->definition && !node->in_other_partition && node->local.local) { error ("local symbols must be defined"); error_found = true; } - if (node->global.inlined_to && node->symbol.externally_visible) + if (node->global.inlined_to && node->externally_visible) { error ("externally visible inline clone"); error_found = true; } - if (node->global.inlined_to && node->symbol.address_taken) + if (node->global.inlined_to && node->address_taken) { error ("inline clone with address taken"); error_found = true; } - if (node->global.inlined_to && node->symbol.force_output) + if (node->global.inlined_to && node->force_output) { error ("inline clone is forced to output"); error_found = true; @@ -2714,7 +2714,7 @@ verify_cgraph_node (struct cgraph_node *node) error_found = true; } - if (node->symbol.analyzed && node->symbol.alias) + if (node->analyzed && node->alias) { bool ref_found = false; int i; @@ -2725,7 +2725,7 @@ verify_cgraph_node (struct cgraph_node *node) error ("Alias has call edges"); error_found = true; } - for (i = 0; ipa_ref_list_reference_iterate (&node->symbol.ref_list, + for (i = 0; ipa_ref_list_reference_iterate (&node->ref_list, i, ref); i++) if (ref->use != IPA_REF_ALIAS) { @@ -2745,7 +2745,7 @@ verify_cgraph_node (struct cgraph_node *node) error_found = true; } } - if (node->symbol.analyzed && node->thunk.thunk_p) + if (node->analyzed && node->thunk.thunk_p) { if (!node->callees) { @@ -2757,15 +2757,15 @@ verify_cgraph_node (struct cgraph_node *node) error ("More than one edge out of thunk node"); error_found = true; } - if (gimple_has_body_p (node->symbol.decl)) + if (gimple_has_body_p (node->decl)) { error ("Thunk is not supposed to have body"); error_found = true; } } - else if (node->symbol.analyzed && gimple_has_body_p (node->symbol.decl) - && !TREE_ASM_WRITTEN (node->symbol.decl) - && (!DECL_EXTERNAL (node->symbol.decl) || node->global.inlined_to) + else if (node->analyzed && gimple_has_body_p (node->decl) + && !TREE_ASM_WRITTEN (node->decl) + && (!DECL_EXTERNAL (node->decl) || node->global.inlined_to) && !flag_wpa) { if (this_cfun->cfg) @@ -2804,7 +2804,7 @@ verify_cgraph_node (struct cgraph_node *node) if (verify_edge_corresponds_to_fndecl (e, decl)) { error ("edge points to wrong declaration:"); - debug_tree (e->callee->symbol.decl); + debug_tree (e->callee->decl); fprintf (stderr," Instead of:"); debug_tree (decl); error_found = true; @@ -2830,7 +2830,7 @@ verify_cgraph_node (struct cgraph_node *node) } } for (i = 0; - ipa_ref_list_reference_iterate (&node->symbol.ref_list, i, ref); + ipa_ref_list_reference_iterate (&node->ref_list, i, ref); i++) if (ref->stmt && !pointer_set_contains (stmts, ref->stmt)) { @@ -2919,17 +2919,17 @@ cgraph_get_create_real_symbol_node (tree decl) { first_clone->clone_of = node; node->clones = first_clone; - symtab_prevail_in_asm_name_hash ((symtab_node) node); - symtab_insert_node_to_hashtable ((symtab_node) node); + symtab_prevail_in_asm_name_hash (node); + symtab_insert_node_to_hashtable (node); if (dump_file) fprintf (dump_file, "Introduced new external node " "(%s/%i) and turned into root of the clone tree.\n", - xstrdup (cgraph_node_name (node)), node->symbol.order); + xstrdup (cgraph_node_name (node)), node->order); } else if (dump_file) fprintf (dump_file, "Introduced new external node " "(%s/%i).\n", xstrdup (cgraph_node_name (node)), - node->symbol.order); + node->order); return node; } @@ -2968,14 +2968,14 @@ cgraph_get_body (struct cgraph_node *node) struct lto_file_decl_data *file_data; const char *data, *name; size_t len; - tree decl = node->symbol.decl; + tree decl = node->decl; if (DECL_RESULT (decl)) return false; gcc_assert (in_lto_p); - file_data = node->symbol.lto_file_data; + file_data = node->lto_file_data; name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl)); /* We may have renamed the declaration, e.g., a static function. */ @@ -2997,7 +2997,7 @@ cgraph_get_body (struct cgraph_node *node) lto_stats.num_function_bodies++; lto_free_section_data (file_data, LTO_section_function_body, name, data, len); - lto_free_function_in_decl_state_for_node ((symtab_node) node); + lto_free_function_in_decl_state_for_node (node); return true; } |