diff options
| author | spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-01-29 04:31:40 +0000 |
|---|---|---|
| committer | spop <spop@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-01-29 04:31:40 +0000 |
| commit | a3b6fb33cba462ee8f30db453f998b03aa099acc (patch) | |
| tree | a88a45090be7d2565dd5c7c6da2a7a3c55af4fcd | |
| parent | e6d2fce0f539196b887e6ceb98f168be08485cad (diff) | |
| download | gcc-a3b6fb33cba462ee8f30db453f998b03aa099acc.tar.gz | |
PR69545: revert patch
Revert 'assert instead of silently failing code gen' that produces an ICE with isl-0.14.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232966 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/graphite-isl-ast-to-gimple.c | 21 |
2 files changed, 21 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index fb0fb88d60d..bbdc5f7b92f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2016-01-28 Sebastian Pop <s.pop@samsung.com> + + * graphite-isl-ast-to-gimple.c (get_rename_from_scev): Revert assert + back to setting codegen_error to fail codegen. + 2016-01-28 Uros Bizjak <ubizjak@gmail.com> PR target/69459 diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c index 161b4347699..d3614e48cd8 100644 --- a/gcc/graphite-isl-ast-to-gimple.c +++ b/gcc/graphite-isl-ast-to-gimple.c @@ -1587,17 +1587,28 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop, tree scev = scalar_evolution_in_region (region->region, loop, old_name); /* At this point we should know the exact scev for each - scalar SSA_NAME used in the scop. */ - gcc_assert (!chrec_contains_undetermined (scev)); + scalar SSA_NAME used in the scop: all the other scalar + SSA_NAMEs should have been translated out of SSA using + arrays with one element. */ + tree new_expr; + if (chrec_contains_undetermined (scev)) + { + codegen_error = true; + return build_zero_cst (TREE_TYPE (old_name)); + } - tree new_expr = chrec_apply_map (scev, iv_map); + new_expr = chrec_apply_map (scev, iv_map); /* The apply should produce an expression tree containing the uses of the new induction variables. We should be able to use new_expr instead of the old_name in the newly generated loop nest. */ - gcc_assert (!chrec_contains_undetermined (new_expr) - && !tree_contains_chrecs (new_expr, NULL)); + if (chrec_contains_undetermined (new_expr) + || tree_contains_chrecs (new_expr, NULL)) + { + codegen_error = true; + return build_zero_cst (TREE_TYPE (old_name)); + } if (TREE_CODE (new_expr) == SSA_NAME) { |