From 75cf42ccffa6a661cce421e0d9eb0e0689d75aae Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Sat, 23 Apr 2005 21:34:40 +0000 Subject: [PATCH] re PR middle-end/21082 (&a[b] - &a[c] is not folded to b - c) 2005-04-23 Richard Guenther PR middle-end/21082 * fold-const.c: Fold &a[i]-&a[j] to i-j. * g++.dg/tree-ssa/pr21082.C: New testcase. From-SVN: r98636 --- gcc/ChangeLog | 5 +++++ gcc/fold-const.c | 23 ++++++++++++++++++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/tree-ssa/pr21082.C | 13 +++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr21082.C diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8d7e156..e0a065b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2005-04-23 Richard Guenther + + PR middle-end/21082 + * fold-const.c: Fold &a[i]-&a[j] to i-j. + 2005-04-23 Zdenek Dvorak * tree-ssa-loop-niter.c (tree_simplify_using_condition): Expand simple diff --git a/gcc/fold-const.c b/gcc/fold-const.c index e928025..a75d1a2 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -7841,7 +7841,28 @@ fold_binary (enum tree_code code, tree type, tree op0, tree op1) && ptr_difference_const (arg0, arg1, &diff)) return build_int_cst_type (type, diff); } - + + /* Fold &a[i] - &a[j] to i-j. */ + if (TREE_CODE (arg0) == ADDR_EXPR + && TREE_CODE (TREE_OPERAND (arg0, 0)) == ARRAY_REF + && TREE_CODE (arg1) == ADDR_EXPR + && TREE_CODE (TREE_OPERAND (arg1, 0)) == ARRAY_REF) + { + tree aref0 = TREE_OPERAND (arg0, 0); + tree aref1 = TREE_OPERAND (arg1, 0); + if (operand_equal_p (TREE_OPERAND (aref0, 0), + TREE_OPERAND (aref1, 0), 0)) + { + tree op0 = fold_convert (type, TREE_OPERAND (aref0, 1)); + tree op1 = fold_convert (type, TREE_OPERAND (aref1, 1)); + tree esz = array_ref_element_size (aref0); + tree diff = build2 (MINUS_EXPR, type, op0, op1); + return fold_build2 (MULT_EXPR, type, diff, + fold_convert (type, esz)); + + } + } + /* Try replacing &a[i1] - c * i2 with &a[i1 - i2], if c is step of the array. Loop optimizer sometimes produce this type of expressions. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 819bb05..48e1d30 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-04-23 Richard Guenther + + PR middle-end/21082 + * g++.dg/tree-ssa/pr21082.C: New testcase. + 2005-04-23 Zdenek Dvorak * gcc.dg/vect/vect-99.c: New test. diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr21082.C b/gcc/testsuite/g++.dg/tree-ssa/pr21082.C new file mode 100644 index 0000000..dab630f --- /dev/null +++ b/gcc/testsuite/g++.dg/tree-ssa/pr21082.C @@ -0,0 +1,13 @@ +/* { dg-do link } */ + +void link_error(); + +int a[4]; +long b, c; + +int main() +{ + if (&a[b] - &a[c] != b - c) + link_error(); + return 0; +} -- 2.7.4