diff options
Diffstat (limited to 'gcc/lto/lto-symtab.c')
| -rw-r--r-- | gcc/lto/lto-symtab.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c index aae865a0290..cf000760713 100644 --- a/gcc/lto/lto-symtab.c +++ b/gcc/lto/lto-symtab.c @@ -46,9 +46,9 @@ lto_cgraph_replace_node (struct cgraph_node *node, struct cgraph_edge *e, *next; bool compatible_p; - if (cgraph_dump_file) + if (symtab->dump_file) { - fprintf (cgraph_dump_file, "Replacing cgraph node %s/%i by %s/%i" + fprintf (symtab->dump_file, "Replacing cgraph node %s/%i by %s/%i" " for symbol %s\n", node->name (), node->order, prevailing_node->name (), @@ -75,7 +75,7 @@ lto_cgraph_replace_node (struct cgraph_node *node, for (e = node->callers; e; e = next) { next = e->next_caller; - cgraph_redirect_edge_callee (e, prevailing_node); + e->redirect_callee (prevailing_node); /* If there is a mismatch between the supposed callee return type and the real one do not attempt to inline this function. ??? We really need a way to match function signatures for ABI @@ -443,13 +443,13 @@ lto_symtab_merge_decls_1 (symtab_node *first) symtab_node *prevailing; bool diagnosed_p = false; - if (cgraph_dump_file) + if (symtab->dump_file) { - fprintf (cgraph_dump_file, "Merging nodes for %s. Candidates:\n", + fprintf (symtab->dump_file, "Merging nodes for %s. Candidates:\n", first->asm_name ()); for (e = first; e; e = e->next_sharing_asm_name) if (TREE_PUBLIC (e->decl)) - e->dump (cgraph_dump_file); + e->dump (symtab->dump_file); } /* Compute the symbol resolutions. This is a no-op when using the @@ -497,7 +497,7 @@ lto_symtab_merge_decls_1 (symtab_node *first) } } - symtab_prevail_in_asm_name_hash (prevailing); + symtab->symtab_prevail_in_asm_name_hash (prevailing); /* Diagnose mismatched objects. */ for (e = prevailing->next_sharing_asm_name; @@ -539,11 +539,11 @@ lto_symtab_merge_decls_1 (symtab_node *first) mismatches. */ lto_symtab_merge_decls_2 (prevailing, diagnosed_p); - if (cgraph_dump_file) + if (symtab->dump_file) { - fprintf (cgraph_dump_file, "After resolution:\n"); + fprintf (symtab->dump_file, "After resolution:\n"); for (e = prevailing; e; e = e->next_sharing_asm_name) - e->dump (cgraph_dump_file); + e->dump (symtab->dump_file); } } @@ -555,7 +555,7 @@ lto_symtab_merge_decls (void) symtab_node *node; /* Populate assembler name hash. */ - symtab_initialize_asm_name_hash (); + symtab->symtab_initialize_asm_name_hash (); FOR_EACH_SYMBOL (node) if (!node->previous_sharing_asm_name @@ -599,7 +599,7 @@ lto_symtab_merge_symbols (void) if (!flag_ltrans) { - symtab_initialize_asm_name_hash (); + symtab->symtab_initialize_asm_name_hash (); /* Do the actual merging. At this point we invalidate hash translating decls into symtab nodes @@ -621,7 +621,7 @@ lto_symtab_merge_symbols (void) if (!node->analyzed && node->alias_target) { - symtab_node *tgt = symtab_node_for_asm (node->alias_target); + symtab_node *tgt = symtab_node::get_for_asmname (node->alias_target); gcc_assert (node->weakref); if (tgt) node->resolve_alias (tgt); @@ -688,7 +688,7 @@ lto_symtab_prevailing_decl (tree decl) gcc_assert (DECL_ASSEMBLER_NAME_SET_P (decl)); /* Walk through the list of candidates and return the one we merged to. */ - ret = symtab_node_for_asm (DECL_ASSEMBLER_NAME (decl)); + ret = symtab_node::get_for_asmname (DECL_ASSEMBLER_NAME (decl)); if (!ret) return decl; |