@@ -1,5 +1,10 @@
2015-12-09 Andrew Burgess <andrew.burgess@embecosm.com>
+ * config/arc/arc.c (arc_loop_hazard): Don't convert the jump label
+ rtx to an rtx_insn until we confirm it's not a return rtx.
+
+2015-12-09 Andrew Burgess <andrew.burgess@embecosm.com>
+
* config/arc/arc.md (*storeqi_update): Use 'memory_operand' and
fix RTL pattern to include the plus.
(*storehi_update): Likewise.
@@ -7987,6 +7987,7 @@ static bool
arc_loop_hazard (rtx_insn *pred, rtx_insn *succ)
{
rtx_insn *jump = NULL;
+ rtx label_rtx = NULL_RTX;
rtx_insn *label = NULL;
basic_block succ_bb;
@@ -8013,22 +8014,22 @@ arc_loop_hazard (rtx_insn *pred, rtx_insn *succ)
else
return false;
- label = JUMP_LABEL_AS_INSN (jump);
- if (!label)
- return false;
-
/* Phase 2b: Make sure is not a millicode jump. */
if ((GET_CODE (PATTERN (jump)) == PARALLEL)
&& (XVECEXP (PATTERN (jump), 0, 0) == ret_rtx))
return false;
- /* Phase 2c: Make sure is not a simple_return. */
- if ((GET_CODE (PATTERN (jump)) == SIMPLE_RETURN)
- || (GET_CODE (label) == SIMPLE_RETURN))
+ label_rtx = JUMP_LABEL (jump);
+ if (!label_rtx)
+ return false;
+
+ /* Phase 2c: Make sure is not a return. */
+ if (ANY_RETURN_P (label_rtx))
return false;
/* Pahse 2d: Go to the target of the jump and check for aliveness of
LP_COUNT register. */
+ label = safe_as_a <rtx_insn *> (label_rtx);
succ_bb = BLOCK_FOR_INSN (label);
if (!succ_bb)
{
@@ -1,5 +1,9 @@
2015-12-09 Andrew Burgess <andrew.burgess@embecosm.com>
+ * gcc.target/arc/loop-hazard-1.c: New file.
+
+2015-12-09 Andrew Burgess <andrew.burgess@embecosm.com>
+
* gcc.target/arc/load-update.c: New file.
2015-12-09 Andrew Burgess <andrew.burgess@embecosm.com>
new file mode 100644
@@ -0,0 +1,16 @@
+/* { dg-do compile } */
+/* { dg-options "-Os" } */
+
+/* This caused an assertion within arc_loop_hazard. */
+
+unsigned a, b;
+
+long fn1()
+{
+ long c = 1, d = 0;
+ while (a && c && b)
+ c <<= 1;
+ while (c)
+ d |= c;
+ return d;
+}