diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/tree-data-ref.c | 17 |
2 files changed, 14 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f88f45c773a..74b58ff59c2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-08-19 Richard Guenther <rguenther@suse.de> + + PR tree-optimization/50067 + * tree-data-ref.c (dr_analyze_indices): Simplify, strip MEM_REF + offset only if we accounted for it. + 2011-08-19 Andrew Stubbs <ams@codesourcery.com> * config/arm/arm.md (maddhidi4): Remove '*' from name. diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c index 51badb48dd9..f7c7ae5e45a 100644 --- a/gcc/tree-data-ref.c +++ b/gcc/tree-data-ref.c @@ -863,17 +863,20 @@ dr_analyze_indices (struct data_reference *dr, loop_p nest, loop_p loop) } if (nest - && (INDIRECT_REF_P (aref) - || TREE_CODE (aref) == MEM_REF)) + && TREE_CODE (aref) == MEM_REF) { op = TREE_OPERAND (aref, 0); access_fn = analyze_scalar_evolution (loop, op); access_fn = instantiate_scev (before_loop, loop, access_fn); base = initial_condition (access_fn); split_constant_offset (base, &base, &off); - if (TREE_CODE (aref) == MEM_REF) - off = size_binop (PLUS_EXPR, off, - fold_convert (ssizetype, TREE_OPERAND (aref, 1))); + if (!integer_zerop (TREE_OPERAND (aref, 1))) + { + off = size_binop (PLUS_EXPR, off, + fold_convert (ssizetype, TREE_OPERAND (aref, 1))); + TREE_OPERAND (aref, 1) + = build_int_cst (TREE_TYPE (TREE_OPERAND (aref, 1)), 0); + } access_fn = chrec_replace_initial_condition (access_fn, fold_convert (TREE_TYPE (base), off)); @@ -881,10 +884,6 @@ dr_analyze_indices (struct data_reference *dr, loop_p nest, loop_p loop) VEC_safe_push (tree, heap, access_fns, access_fn); } - if (TREE_CODE (aref) == MEM_REF) - TREE_OPERAND (aref, 1) - = build_int_cst (TREE_TYPE (TREE_OPERAND (aref, 1)), 0); - if (TREE_CODE (ref) == MEM_REF && TREE_CODE (TREE_OPERAND (ref, 0)) == ADDR_EXPR && integer_zerop (TREE_OPERAND (ref, 1))) |