diff options
| author | Richard Guenther <rguenther@suse.de> | 2011-03-24 11:23:29 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2011-03-24 11:23:29 +0000 |
| commit | cfef45c8097d122e7dfda42c5e2767bf21a7f649 (patch) | |
| tree | df3f9f4a9233142004cc074157b5b3c2abf3bcb5 /gcc/tree-ssa-pre.c | |
| parent | f3e8ab1973c02daace2d7be9dbf03be03a7b3669 (diff) | |
| download | gcc-cfef45c8097d122e7dfda42c5e2767bf21a7f649.zip gcc-cfef45c8097d122e7dfda42c5e2767bf21a7f649.tar.gz gcc-cfef45c8097d122e7dfda42c5e2767bf21a7f649.tar.bz2 | |
re PR tree-optimization/46562 (CCP currently needs iteration for &a[i])
2011-03-24 Richard Guenther <rguenther@suse.de>
PR tree-optimization/46562
* tree.c (build_invariant_address): New function.
* tree.h (build_invariant_address): Declare.
* tree-dfa.c (get_addr_base_and_unit_offset): Wrap around
a renamed function moved ...
* tree-flow-inline.h (get_addr_base_and_unit_offset_1): ... here.
Take valueization callback parameter.
* tree-flow.h (gimple_fold_stmt_to_constant): Declare.
* gimple-fold.h: New file.
* tree-ssa-ccp.c (ccp_fold): Use gimple_fold_stmt_to_constant_1.
(ccp_fold, fold_const_aggregate_ref,
fold_ctor_reference, fold_nonarray_ctor_reference,
fold_array_ctor_reference, fold_string_cst_ctor_reference,
get_base_constructor): Move ...
* gimple-fold.c: ... here.
(gimple_fold_stmt_to_constant_1): New function
split out from ccp_fold. Take a valueization callback parameter.
Valueize all operands.
(gimple_fold_stmt_to_constant): New wrapper function.
(fold_const_aggregate_ref_1): New function split out from
fold_const_aggregate_ref. Take a valueization callback parameter.
(fold_const_aggregate_ref): Wrap fold_const_aggregate_ref_1.
* tree-ssa-sccvn.c (simplify_binary_expression): Simplify
invariant POINTER_PLUS_EXPRs to invariant form.
(vn_valueize): New function.
(try_to_simplify): Simplify by using gimple_fold_stmt_to_constant.
* tree-vrp.c (vrp_valueize): New function.
(vrp_visit_assignment_or_call): Use gimple_fold_stmt_to_constant
to fold statements to constants.
* tree-ssa-pre.c (eliminate): Properly guard propagation of
function declarations.
* Makefile.in (tree-ssa-sccvn.o, tree-vrp.o, gimple-fold.o,
tree-ssa-ccp.o): Add gimple-fold.h dependencies.
* c-c++-common/pr46562-2.c: New testcase.
* c-c++-common/pr46562.c: Likewise.
From-SVN: r171386
Diffstat (limited to 'gcc/tree-ssa-pre.c')
| -rw-r--r-- | gcc/tree-ssa-pre.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c index f246643..0a6fa94 100644 --- a/gcc/tree-ssa-pre.c +++ b/gcc/tree-ssa-pre.c @@ -4380,9 +4380,12 @@ eliminate (void) if (is_gimple_call (stmt) && TREE_CODE (gimple_call_fn (stmt)) == SSA_NAME) { - tree fn = VN_INFO (gimple_call_fn (stmt))->valnum; + tree orig_fn = gimple_call_fn (stmt); + tree fn = VN_INFO (orig_fn)->valnum; if (TREE_CODE (fn) == ADDR_EXPR - && TREE_CODE (TREE_OPERAND (fn, 0)) == FUNCTION_DECL) + && TREE_CODE (TREE_OPERAND (fn, 0)) == FUNCTION_DECL + && useless_type_conversion_p (TREE_TYPE (orig_fn), + TREE_TYPE (fn))) { bool can_make_abnormal_goto = stmt_can_make_abnormal_goto (stmt); |