From 6acfd18c395cca3d0c5acf9d62a3c1556ea58d90 Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Wed, 24 Jan 2018 09:37:41 +0000 Subject: [PATCH] re PR tree-optimization/83176 ([graphite] ICE in set_codegen_error, at graphite-isl-ast-to-gimple.c:206) 2018-01-24 Richard Biener PR tree-optimization/83176 * tree-chrec.c (chrec_fold_plus_1): Handle (signed T){(T) .. } operands. * gcc.dg/graphite/pr83176.c: New testcase. From-SVN: r257013 --- gcc/ChangeLog | 6 +++++ gcc/testsuite/ChangeLog | 5 ++++ gcc/testsuite/gcc.dg/graphite/pr83176.c | 42 +++++++++++++++++++++++++++++++++ gcc/tree-chrec.c | 38 +++++++++++++++++++++++++---- 4 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/graphite/pr83176.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 12341ea..0e48b86 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,11 @@ 2018-01-24 Richard Biener + PR tree-optimization/83176 + * tree-chrec.c (chrec_fold_plus_1): Handle (signed T){(T) .. } + operands. + +2018-01-24 Richard Biener + PR tree-optimization/82819 * graphite-isl-ast-to-gimple.c (binary_op_to_tree): Avoid code generating pluses that are no-ops in the target precision. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index eed77ed..b13ec74 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2018-01-24 Richard Biener + PR tree-optimization/83176 + * gcc.dg/graphite/pr83176.c: New testcase. + +2018-01-24 Richard Biener + PR tree-optimization/82819 * gcc.dg/graphite/pr82819.c: New testcase. diff --git a/gcc/testsuite/gcc.dg/graphite/pr83176.c b/gcc/testsuite/gcc.dg/graphite/pr83176.c new file mode 100644 index 0000000..4c3df44 --- /dev/null +++ b/gcc/testsuite/gcc.dg/graphite/pr83176.c @@ -0,0 +1,42 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -floop-nest-optimize" } */ + +int wx, qi; + +void +yj (int gw) +{ + int *ak = &gw; + + while (wx != 0) + { + int k2 = (__INTPTR_TYPE__)&ak; + int **xq = (int **)&k2; + +ja: + *xq = &gw; + + while (qi < 1) + { + unsigned short int ey; + +be: + for (ey = 0; ey < 251; ++ey) + { + for (wx = 0; wx < 2; ++wx) + { + } + + *ak += 8555712; + k2 += *ak; + } + ++qi; + } + } + + gw = 1; + if (gw != 0) + goto ja; + else + goto be; +} diff --git a/gcc/tree-chrec.c b/gcc/tree-chrec.c index 924df04..896ff35 100644 --- a/gcc/tree-chrec.c +++ b/gcc/tree-chrec.c @@ -295,8 +295,23 @@ chrec_fold_plus_1 (enum tree_code code, tree type, return chrec_fold_plus_poly_poly (code, type, op0, op1); CASE_CONVERT: - if (tree_contains_chrecs (op1, NULL)) - return chrec_dont_know; + { + /* We can strip sign-conversions to signed by performing the + operation in unsigned. */ + tree optype = TREE_TYPE (TREE_OPERAND (op1, 0)); + if (INTEGRAL_TYPE_P (type) + && INTEGRAL_TYPE_P (optype) + && tree_nop_conversion_p (type, optype) + && TYPE_UNSIGNED (optype)) + return chrec_convert (type, + chrec_fold_plus_1 (code, optype, + chrec_convert (optype, + op0, NULL), + TREE_OPERAND (op1, 0)), + NULL); + if (tree_contains_chrecs (op1, NULL)) + return chrec_dont_know; + } /* FALLTHRU */ default: @@ -313,8 +328,23 @@ chrec_fold_plus_1 (enum tree_code code, tree type, } CASE_CONVERT: - if (tree_contains_chrecs (op0, NULL)) - return chrec_dont_know; + { + /* We can strip sign-conversions to signed by performing the + operation in unsigned. */ + tree optype = TREE_TYPE (TREE_OPERAND (op0, 0)); + if (INTEGRAL_TYPE_P (type) + && INTEGRAL_TYPE_P (optype) + && tree_nop_conversion_p (type, optype) + && TYPE_UNSIGNED (optype)) + return chrec_convert (type, + chrec_fold_plus_1 (code, optype, + TREE_OPERAND (op0, 0), + chrec_convert (optype, + op1, NULL)), + NULL); + if (tree_contains_chrecs (op0, NULL)) + return chrec_dont_know; + } /* FALLTHRU */ default: -- 2.7.4