diff options
author | Martin Jambor <mjambor@suse.cz> | 2011-07-12 12:29:39 +0200 |
---|---|---|
committer | Martin Jambor <jamborm@gcc.gnu.org> | 2011-07-12 12:29:39 +0200 |
commit | ab079773d37409fa62d457b87564fb611d1b3f7e (patch) | |
tree | a04dc3565788ff2e63b0e35430afcd50fda331d1 | |
parent | d5fed62d7296fd18f8cd55d95cafef1de7f62816 (diff) | |
download | gcc-ab079773d37409fa62d457b87564fb611d1b3f7e.zip gcc-ab079773d37409fa62d457b87564fb611d1b3f7e.tar.gz gcc-ab079773d37409fa62d457b87564fb611d1b3f7e.tar.bz2 |
cgraph.h (cgraph_get_node_or_alias): Removed declaration.
2011-07-12 Martin Jambor <mjambor@suse.cz>
* cgraph.h (cgraph_get_node_or_alias): Removed declaration.
* cgraph.c (cgraph_get_node_or_alias): Removed.
(change_decl_assembler_name): Changed all calls to
cgraph_get_node_or_alias to a call to cgraph_get_node.
(cgraph_make_decl_local): Likewise.
* lto-symtab.c (lto_symtab_resolve_symbols): Likewise.
* varasm.c (default_binds_local_p_1): Likewise.
(decl_binds_to_current_def_p): Likewise.
From-SVN: r176196
-rw-r--r-- | gcc/ChangeLog | 11 | ||||
-rw-r--r-- | gcc/cgraph.c | 29 | ||||
-rw-r--r-- | gcc/cgraph.h | 1 | ||||
-rw-r--r-- | gcc/lto-symtab.c | 2 | ||||
-rw-r--r-- | gcc/varasm.c | 4 |
5 files changed, 17 insertions, 30 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2599e73..d121c5c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2011-07-12 Martin Jambor <mjambor@suse.cz> + + * cgraph.h (cgraph_get_node_or_alias): Removed declaration. + * cgraph.c (cgraph_get_node_or_alias): Removed. + (change_decl_assembler_name): Changed all calls to + cgraph_get_node_or_alias to a call to cgraph_get_node. + (cgraph_make_decl_local): Likewise. + * lto-symtab.c (lto_symtab_resolve_symbols): Likewise. + * varasm.c (default_binds_local_p_1): Likewise. + (decl_binds_to_current_def_p): Likewise. + 2011-07-12 Jakub Jelinek <jakub@redhat.com> PR tree-optimization/49712 diff --git a/gcc/cgraph.c b/gcc/cgraph.c index 09aad60..c37158d 100644 --- a/gcc/cgraph.c +++ b/gcc/cgraph.c @@ -642,29 +642,6 @@ cgraph_add_thunk (struct cgraph_node *decl_node ATTRIBUTE_UNUSED, is assigned. */ struct cgraph_node * -cgraph_get_node_or_alias (const_tree decl) -{ - struct cgraph_node key, *node = NULL, **slot; - - gcc_assert (TREE_CODE (decl) == FUNCTION_DECL); - - if (!cgraph_hash) - return NULL; - - key.decl = CONST_CAST2 (tree, const_tree, decl); - - slot = (struct cgraph_node **) htab_find_slot (cgraph_hash, &key, - NO_INSERT); - - if (slot && *slot) - node = *slot; - return node; -} - -/* Returns the cgraph node assigned to DECL or NULL if no cgraph node - is assigned. */ - -struct cgraph_node * cgraph_get_node (const_tree decl) { struct cgraph_node key, *node = NULL, **slot; @@ -1984,7 +1961,7 @@ change_decl_assembler_name (tree decl, tree name) if (assembler_name_hash && TREE_CODE (decl) == FUNCTION_DECL - && (node = cgraph_get_node_or_alias (decl)) != NULL) + && (node = cgraph_get_node (decl)) != NULL) { tree old_name = DECL_ASSEMBLER_NAME (decl); slot = htab_find_slot_with_hash (assembler_name_hash, old_name, @@ -2002,7 +1979,7 @@ change_decl_assembler_name (tree decl, tree name) } if (assembler_name_hash && TREE_CODE (decl) == FUNCTION_DECL - && (node = cgraph_get_node_or_alias (decl)) != NULL) + && (node = cgraph_get_node (decl)) != NULL) { slot = htab_find_slot_with_hash (assembler_name_hash, name, decl_assembler_name_hash (name), @@ -2525,7 +2502,7 @@ cgraph_make_decl_local (tree decl) old_name = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (decl)); if (TREE_CODE (decl) == FUNCTION_DECL) { - struct cgraph_node *node = cgraph_get_node_or_alias (decl); + struct cgraph_node *node = cgraph_get_node (decl); change_decl_assembler_name (decl, clone_function_name (decl, "local")); if (node->local.lto_file_data) diff --git a/gcc/cgraph.h b/gcc/cgraph.h index 5d6ff7c..cfc2479 100644 --- a/gcc/cgraph.h +++ b/gcc/cgraph.h @@ -480,7 +480,6 @@ struct cgraph_edge *cgraph_create_indirect_edge (struct cgraph_node *, gimple, int, gcov_type, int); struct cgraph_indirect_call_info *cgraph_allocate_init_indirect_info (void); struct cgraph_node * cgraph_get_node (const_tree); -struct cgraph_node * cgraph_get_node_or_alias (const_tree); struct cgraph_node * cgraph_create_node (tree); struct cgraph_node * cgraph_get_create_node (tree); struct cgraph_node * cgraph_same_body_alias (struct cgraph_node *, tree, tree); diff --git a/gcc/lto-symtab.c b/gcc/lto-symtab.c index 2bbf064..3a7c783 100644 --- a/gcc/lto-symtab.c +++ b/gcc/lto-symtab.c @@ -438,7 +438,7 @@ lto_symtab_resolve_symbols (void **slot) for (e = (lto_symtab_entry_t) *slot; e; e = e->next) { if (TREE_CODE (e->decl) == FUNCTION_DECL) - e->node = cgraph_get_node_or_alias (e->decl); + e->node = cgraph_get_node (e->decl); else if (TREE_CODE (e->decl) == VAR_DECL) e->vnode = varpool_get_node (e->decl); } diff --git a/gcc/varasm.c b/gcc/varasm.c index b0690f50..045d619 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -6720,7 +6720,7 @@ default_binds_local_p_1 (const_tree exp, int shlib) } else if (TREE_CODE (exp) == FUNCTION_DECL && TREE_PUBLIC (exp)) { - struct cgraph_node *node = cgraph_get_node_or_alias (exp); + struct cgraph_node *node = cgraph_get_node (exp); if (node && resolution_local_p (node->resolution)) resolved_locally = true; @@ -6808,7 +6808,7 @@ decl_binds_to_current_def_p (tree decl) } else if (TREE_CODE (decl) == FUNCTION_DECL) { - struct cgraph_node *node = cgraph_get_node_or_alias (decl); + struct cgraph_node *node = cgraph_get_node (decl); if (node && node->resolution != LDPR_UNKNOWN) return resolution_to_local_definition_p (node->resolution); |