diff options
| author | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-14 12:19:16 +0000 |
|---|---|---|
| committer | rguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-14 12:19:16 +0000 |
| commit | f5d03f2759dd07621697933e41d3d43782f47b14 (patch) | |
| tree | 1c9854d1801c280bb54b4c80436d1f0834ed3417 /gcc/tree-ssa-forwprop.c | |
| parent | 9b14e0fdbdd7737bb357806d83d448e4a8951c46 (diff) | |
| download | gcc-f5d03f2759dd07621697933e41d3d43782f47b14.tar.gz | |
2010-07-14 Richard Guenther <rguenther@suse.de>
PR tree-optimization/44824
* tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Use
is_gimple_mem_ref_addr.
(tree_ssa_forward_propagate_single_use_vars): Do not propagate
non-decl_address_invariant_p addresses.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@162177 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-ssa-forwprop.c')
| -rw-r--r-- | gcc/tree-ssa-forwprop.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c index 5044afffcd9..b6278045c85 100644 --- a/gcc/tree-ssa-forwprop.c +++ b/gcc/tree-ssa-forwprop.c @@ -804,9 +804,7 @@ forward_propagate_addr_expr_1 (tree name, tree def_rhs, fold_convert (ptr_type_node, gimple_assign_rhs2 (use_stmt))); if (TREE_CODE (new_def_rhs) == MEM_REF - && TREE_CODE (TREE_OPERAND (new_def_rhs, 0)) == ADDR_EXPR - && !DECL_P (TREE_OPERAND (TREE_OPERAND (new_def_rhs, 0), 0)) - && !CONSTANT_CLASS_P (TREE_OPERAND (TREE_OPERAND (new_def_rhs, 0), 0))) + && !is_gimple_mem_ref_addr (TREE_OPERAND (new_def_rhs, 0))) return false; new_def_rhs = build_fold_addr_expr_with_type (new_def_rhs, TREE_TYPE (rhs)); @@ -1398,8 +1396,11 @@ tree_ssa_forward_propagate_single_use_vars (void) && TREE_CODE (rhs) == ADDR_EXPR && POINTER_TYPE_P (TREE_TYPE (lhs)))) { - STRIP_NOPS (rhs); - if (!stmt_references_abnormal_ssa_name (stmt) + tree base = get_base_address (TREE_OPERAND (rhs, 0)); + if ((!base + || !DECL_P (base) + || decl_address_invariant_p (base)) + && !stmt_references_abnormal_ssa_name (stmt) && forward_propagate_addr_expr (lhs, rhs)) { release_defs (stmt); |