OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR69545: revert patch 

Revert 'assert instead of silently failing code gen' that produces an ICE with isl-0.14.

From-SVN: r232966
This commit is contained in:
Sebastian Pop 2016-01-29 04:31:40 +00:00 committed by Sebastian Pop
parent e9f690692b
commit 8dffffd00c
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -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

21
gcc/graphite-isl-ast-to-gimple.c
View File

@ -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)
{