diff options
author | Sebastian Pop <sebastian.pop@amd.com> | 2010-08-11 20:27:27 +0000 |
---|---|---|
committer | Sebastian Pop <sebastian.pop@amd.com> | 2010-08-11 20:27:27 +0000 |
commit | d0fe13ecc63fb4942211118484b1fb28be414fd7 (patch) | |
tree | 7f700e5bb8641840e4fb50dafc92ef69091832cf /gcc/tree-chrec.c | |
parent | c58acb02cd02f6ad9e367a04604d94e1a7250347 (diff) |
chrec_apply should only apply to the specified variable.
2010-07-15 Sebastian Pop <sebastian.pop@amd.com>
* tree-chrec.c (chrec_apply): Should only apply to the specified
variable. Also handle multivariate chains of recurrences that
satisfy evolution_function_is_affine_p. Also handle CASE_CONVERT.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@163140 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/tree-chrec.c')
-rw-r--r-- | gcc/tree-chrec.c | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c index c92b6b9837c..92f8de9f0eb 100644 --- a/gcc/tree-chrec.c +++ b/gcc/tree-chrec.c @@ -599,23 +599,40 @@ chrec_apply (unsigned var, if (TREE_CODE (x) == INTEGER_CST && SCALAR_FLOAT_TYPE_P (type)) x = build_real_from_int_cst (type, x); - if (evolution_function_is_affine_p (chrec)) + switch (TREE_CODE (chrec)) { - /* "{a, +, b} (x)" -> "a + b*x". */ - x = chrec_convert_rhs (type, x, NULL); - res = chrec_fold_multiply (TREE_TYPE (x), CHREC_RIGHT (chrec), x); - res = chrec_fold_plus (type, CHREC_LEFT (chrec), res); - } + case POLYNOMIAL_CHREC: + if (evolution_function_is_affine_p (chrec)) + { + if (CHREC_VARIABLE (chrec) != var) + return build_polynomial_chrec + (CHREC_VARIABLE (chrec), + chrec_apply (var, CHREC_LEFT (chrec), x), + chrec_apply (var, CHREC_RIGHT (chrec), x)); + + /* "{a, +, b} (x)" -> "a + b*x". */ + x = chrec_convert_rhs (type, x, NULL); + res = chrec_fold_multiply (TREE_TYPE (x), CHREC_RIGHT (chrec), x); + res = chrec_fold_plus (type, CHREC_LEFT (chrec), res); + } + else if (TREE_CODE (x) == INTEGER_CST + && tree_int_cst_sgn (x) == 1) + /* testsuite/.../ssa-chrec-38.c. */ + res = chrec_evaluate (var, chrec, x, 0); + else + res = chrec_dont_know; + break; - else if (TREE_CODE (chrec) != POLYNOMIAL_CHREC) - res = chrec; + CASE_CONVERT: + res = chrec_convert (TREE_TYPE (chrec), + chrec_apply (var, TREE_OPERAND (chrec, 0), x), + NULL); + break; - else if (TREE_CODE (x) == INTEGER_CST - && tree_int_cst_sgn (x) == 1) - /* testsuite/.../ssa-chrec-38.c. */ - res = chrec_evaluate (var, chrec, x, 0); - else - res = chrec_dont_know; + default: + res = chrec; + break; + } if (dump_file && (dump_flags & TDF_DETAILS)) { |