diff options
author | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-17 20:45:46 +0000 |
---|---|---|
committer | gdr <gdr@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-12-17 20:45:46 +0000 |
commit | a9c6c0e340f7b8deeb93cd6f5c918c5d154e4cba (patch) | |
tree | 50983d29e1f2d95d1c133d691fc5d44215ddacbf /gcc/tree-inline.c | |
parent | fb6e45cd3925cef0b7ac1fec78669cda196eeda9 (diff) | |
download | gcc-a9c6c0e340f7b8deeb93cd6f5c918c5d154e4cba.tar.gz |
* tree-inline.c (copy_body_r): Use explicit cast when
converting
from void *.
(copy_bb): Likewise.
(copy_edges_for_bb): Likewise.
(remap_decl_1): Likewise.
(estimate_num_insns_1): Likewise.
* cgraph.c (hash_node): Use explicit cast when converting from
void *.
(eq_node): Likewise.
(cgraph_create_node): Use GGC_CNEW.
(cgraph_create_edge): Use GGC_NEW.
(cgraph_remove_node): Use explicit cast when converting from
void *.
(hash_varpool_node): Likewise.
(eq_varpool_node): Likewise.
(cgraph_varpool_node): Use GGC_CNEW.
* lambda.h (lambda_vector_new): Use GGC_CNEWVEC.
* tree-scalar-evolution.c (new_scev_info_str): Use XNEW.
(eq_scev_info): Use explicit cast when converting from void *.
(find_var_scev_info): Likewise.
(set_instantiated_value): Likewise.
(gather_stats_on_scev_database_1): Likewise.
* cfgloop.h (simple_loop_desc): Use explicit cast when
converting
from void *.
* c-pch.c (c_common_write_pch): Use XNEWVEC.
(c_common_read_pch): Likewise.
* prefix.c (save_string): Use XNEWVEC.
(translate_name): Use explicit cast when converting from void
*.
* c-ppoutput.c (print_line): Use explicit cast when converting
from void *.
(pp_dir_change): Likewise.
* c-cppbuiltin.c (builtin_define_std): Likewise.
(builtin_define_with_value): Likewise.
(builtin_define_with_value_n): Likewise.
(builtin_define_with_int_value): Likewise.
(builtin_define_type_max): Likewise.
* c-incpath.c (add_env_var_paths): Use XNEWVEC.
(add_path): Use XNEW.
* c-format.c (check_format_info_main): Use GGC_NEW.
(format_type_warning): Use explicit cast when converting from
void *.
* c-typeck.c (alloc_tagged_tu_seen_cache): Use XNEW instead of
xmalloc.
(start_init): Likewise.
* tree-flow-inline.h (first_referenced_var): Use explicit cast
when converting from void *.
(next_referenced_var): Likewise.
* c-pragma.c (push_alignment): Use GGC_NEW instead of
ggc_alloc.
* gensupport.c (lookup_predicate): Use explicit cast to
convert
from void *.
(init_predicate_table): Use XCNEW instead of xcalloc.
* genpreds.c (process_define_predicate): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@108723 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-inline.c')
-rw-r--r-- | gcc/tree-inline.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index a0cfb608294..d3265253b20 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -544,7 +544,7 @@ copy_body_r (tree *tp, int *walk_subtrees, void *data) else /* Else the RETURN_EXPR returns no value. */ { *tp = NULL; - return (void *)1; + return (tree) (void *)1; } } @@ -724,7 +724,8 @@ copy_bb (inline_data *id, basic_block bb, int frequency_scale, int count_scale) /* create_basic_block() will append every new block to basic_block_info automatically. */ - copy_basic_block = create_basic_block (NULL, (void *) 0, bb->prev_bb->aux); + copy_basic_block = create_basic_block (NULL, (void *) 0, + (basic_block) bb->prev_bb->aux); copy_basic_block->count = bb->count * count_scale / REG_BR_PROB_BASE; copy_basic_block->frequency = (bb->frequency * frequency_scale / REG_BR_PROB_BASE); @@ -827,7 +828,7 @@ copy_bb (inline_data *id, basic_block bb, int frequency_scale, int count_scale) static void copy_edges_for_bb (basic_block bb, int count_scale) { - basic_block new_bb = bb->aux; + basic_block new_bb = (basic_block) bb->aux; edge_iterator ei; edge old_edge; block_stmt_iterator bsi; @@ -846,7 +847,7 @@ copy_edges_for_bb (basic_block bb, int count_scale) if (old_edge->dest->index == EXIT_BLOCK && !old_edge->flags && old_edge->dest->aux != EXIT_BLOCK_PTR) flags |= EDGE_FALLTHRU; - new = make_edge (new_bb, old_edge->dest->aux, flags); + new = make_edge (new_bb, (basic_block) old_edge->dest->aux, flags); new->count = old_edge->count * count_scale / REG_BR_PROB_BASE; new->probability = old_edge->probability; } @@ -895,7 +896,7 @@ copy_edges_for_bb (basic_block bb, int count_scale) static tree remap_decl_1 (tree decl, void *data) { - return remap_decl (decl, data); + return remap_decl (decl, (inline_data *) data); } /* Make a copy of the body of FN so that it can be inserted inline in @@ -1614,7 +1615,7 @@ estimate_move_cost (tree type) static tree estimate_num_insns_1 (tree *tp, int *walk_subtrees, void *data) { - int *count = data; + int *count = (int *) data; tree x = *tp; if (IS_TYPE_OR_DECL_P (x)) |