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