aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/loop-unroll.c12
2 files changed, 16 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 51a0554..1d1e5b5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-22 Jeff Law <law@redhat.com>
+
+ * loop-unroll.c (analyze_iv_to_split_insn): Handle
+ iv_analyze_result returning false.
+
2006-03-22 Jie Zhang <jie.zhang@analog.com>
* config/bfin/bfin.h (ASM_FORMAT_PRIVATE_NAME): Remove.
diff --git a/gcc/loop-unroll.c b/gcc/loop-unroll.c
index 6ef5947..5c28eaf 100644
--- a/gcc/loop-unroll.c
+++ b/gcc/loop-unroll.c
@@ -1670,7 +1670,17 @@ analyze_iv_to_split_insn (rtx insn)
return NULL;
ok = iv_analyze_result (insn, dest, &iv);
- gcc_assert (ok);
+
+ /* This used to be an assert under the assumption that if biv_p returns
+ true that iv_analyze_result must also return true. However, that
+ assumption is not strictly correct as evidenced by pr25569.
+
+ Returning NULL when iv_analyze_result returns false is safe and
+ avoids the problems in pr25569 until the iv_analyze_* routines
+ can be fixed, which is apparently hard and time consuming
+ according to their author. */
+ if (! ok)
+ return NULL;
if (iv.step == const0_rtx
|| iv.mode != iv.extend_mode)