diff options
| author | Richard Guenther <rguenther@suse.de> | 2011-08-19 14:26:13 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2011-08-19 14:26:13 +0000 |
| commit | 2946bd342db2de4c95a6b33481d05b0c9109d517 (patch) | |
| tree | 344cbc6a924b0938fd46d8936660a382d88f1139 /gcc/tree-data-ref.c | |
| parent | 5dfe80ba7191cbb482530fbec77bffbdda659108 (diff) | |
| download | gcc-2946bd342db2de4c95a6b33481d05b0c9109d517.zip gcc-2946bd342db2de4c95a6b33481d05b0c9109d517.tar.gz gcc-2946bd342db2de4c95a6b33481d05b0c9109d517.tar.bz2 | |
re PR tree-optimization/50067 (Wrong code with -fpredictive-commoning)
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.
From-SVN: r177903
Diffstat (limited to 'gcc/tree-data-ref.c')
| -rw-r--r-- | gcc/tree-data-ref.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c index 51badb4..f7c7ae5 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))) |