assert instead of silently failing code gen

	* graphite-isl-ast-to-gimple.c (get_rename_from_scev): Assert instead of
	setting codegen_error to fail codegen.

From-SVN: r232932

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 997428028b2b8dc4d8b000cee4333bf627f35e2f..338a045abd93b5a9c30eba2717ec0701d4ba0a07 100644 (file)
--- 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): Assert instead of
+       setting codegen_error to fail codegen.
+
 2016-01-28  Jason Merrill  <jason@redhat.com>
 
        * tree.h (BINFO_FLAG_0): Rename from BINFO_MARKED.

diff --git a/gcc/graphite-isl-ast-to-gimple.c b/gcc/graphite-isl-ast-to-gimple.c
index 81ed3046e1dbf5b322d8e44d86f902b8a3807972..47225ef8a3edf71c580fac3fc430fa05e98b0a5c 100644 (file)
--- a/gcc/graphite-isl-ast-to-gimple.c
+++ b/gcc/graphite-isl-ast-to-gimple.c
@@ -1833,31 +1833,18 @@ 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: 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));
-    }
+     scalar SSA_NAME used in the scop.  */
+  gcc_assert (!chrec_contains_undetermined (scev));
 
-  new_expr = chrec_apply_map (scev, iv_map);
+  tree 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.  */
-  if (chrec_contains_undetermined (new_expr)
-      || tree_contains_chrecs (new_expr, NULL))
-    {
-      codegen_error = true;
-      return build_zero_cst (TREE_TYPE (old_name));
-    }
+  gcc_assert (!chrec_contains_undetermined (new_expr)
+             && !tree_contains_chrecs (new_expr, NULL));
 
-  /* We should check all the operands and all of them should dominate the use at
-     new_expr.  */
   if (TREE_CODE (new_expr) == SSA_NAME)
     {
       basic_block bb = gimple_bb (SSA_NAME_DEF_STMT (new_expr));
@@ -1898,8 +1885,7 @@ get_rename_from_scev (tree old_name, gimple_seq *stmts, loop_p loop,
    substitution map RENAME_MAP, inserting the gimplification code at
    GSI_TGT, for the translation REGION, with the original copied
    statement in LOOP, and using the induction variable renaming map
-   IV_MAP.  Returns true when something has been renamed.  codegen_error
-   is set when the code generation cannot continue.  */
+   IV_MAP.  Returns true when something has been renamed.  */
 
 bool
 translate_isl_ast_to_gimple::rename_uses (gimple *copy,