From 4b216ab08a5f433c4c1ceae18953e14c88f25bd1 Mon Sep 17 00:00:00 2001 From: Sebastian Pop Date: Wed, 23 Dec 2009 07:50:00 +0000 Subject: re PR middle-end/42181 ([graphite] -fgraphite-identity miscompiles air.f90) Fix PR42181. 2009-12-14 Sebastian Pop PR middle-end/42181 * graphite-scop-detection.c (graphite_can_represent_scev): Handle more carefully PLUS_EXPR, MINUS_EXPR, and MULT_EXPR. * testsuite/gfortran.dg/graphite/pr42181.f90: New. From-SVN: r155417 --- gcc/graphite-scop-detection.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) (limited to 'gcc/graphite-scop-detection.c') diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c index a24420e..e30554f 100644 --- a/gcc/graphite-scop-detection.c +++ b/gcc/graphite-scop-detection.c @@ -213,15 +213,33 @@ graphite_can_represent_scev (tree scev, int outermost_loop) if (chrec_contains_undetermined (scev)) return false; - if (TREE_CODE (scev) == POLYNOMIAL_CHREC + switch (TREE_CODE (scev)) + { + case PLUS_EXPR: + case MINUS_EXPR: + return graphite_can_represent_scev (TREE_OPERAND (scev, 0), outermost_loop) + && graphite_can_represent_scev (TREE_OPERAND (scev, 1), outermost_loop); + + case MULT_EXPR: + return !CONVERT_EXPR_CODE_P (TREE_CODE (TREE_OPERAND (scev, 0))) + && !CONVERT_EXPR_CODE_P (TREE_CODE (TREE_OPERAND (scev, 1))) + && !(chrec_contains_symbols (TREE_OPERAND (scev, 0)) + && chrec_contains_symbols (TREE_OPERAND (scev, 1))) + && graphite_can_represent_scev (TREE_OPERAND (scev, 0), outermost_loop) + && graphite_can_represent_scev (TREE_OPERAND (scev, 1), outermost_loop); + case POLYNOMIAL_CHREC: /* Check for constant strides. With a non constant stride of - 'n' we would have a value of 'iv * n'. */ - && (!evolution_function_right_is_integer_cst (scev) + 'n' we would have a value of 'iv * n'. Also check that the + initial value can represented: for example 'n * m' cannot be + represented. */ + if (!evolution_function_right_is_integer_cst (scev) + || !graphite_can_represent_init (scev)) + return false; - /* Check the initial value: 'n * m' cannot be represented. */ - || !graphite_can_represent_init (scev))) - return false; + default: + break; + } /* Only affine functions can be represented. */ if (!scev_is_linear_expression (scev)) -- cgit v1.1