[3/5] bfin: update for emit-rtl.h changes

Message ID 1528829652-43336-4-git-send-email-dmalcolm@redhat.com
State New
Headers show
Series
  • More rtx->rtx_insn * cleanups
Related show

Commit Message

David Malcolm June 12, 2018, 6:54 p.m.
gcc/ChangeLog:
	* config/bfin/bfin.c (hwloop_optimize): Strengthen local "label"
	from rtx to rtx_insn *.
	(add_sched_insns_for_speculation): Likewise local for "target",
	converting usage of JUMP_LABEL to JUMP_LABEL_AS_INSN.
---
 gcc/config/bfin/bfin.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jeff Law June 12, 2018, 8:45 p.m. | #1
On 06/12/2018 12:54 PM, David Malcolm wrote:
> gcc/ChangeLog:
> 	* config/bfin/bfin.c (hwloop_optimize): Strengthen local "label"
> 	from rtx to rtx_insn *.
> 	(add_sched_insns_for_speculation): Likewise local for "target",
> 	converting usage of JUMP_LABEL to JUMP_LABEL_AS_INSN.
OK when prereqs are approved.

jeff

Patch

diff --git a/gcc/config/bfin/bfin.c b/gcc/config/bfin/bfin.c
index b656f13..1d98e55 100644
--- a/gcc/config/bfin/bfin.c
+++ b/gcc/config/bfin/bfin.c
@@ -3773,7 +3773,7 @@  hwloop_optimize (hwloop_info loop)
      point.  */
   if (!loop->incoming_src && loop->head != loop->incoming_dest)
     {
-      rtx label = BB_HEAD (loop->incoming_dest);
+      rtx_insn *label = BB_HEAD (loop->incoming_dest);
       /* If we're jumping to the final basic block in the loop, and there's
 	 only one cheap instruction before the end (typically an increment of
 	 an induction variable), we can just emit a copy here instead of a
@@ -4607,7 +4607,7 @@  add_sched_insns_for_speculation (void)
 	  && any_condjump_p (insn)
 	  && (cbranch_predicted_taken_p (insn)))
 	{
-	  rtx target = JUMP_LABEL (insn);
+	  rtx_insn *target = JUMP_LABEL_AS_INSN (insn);
 	  rtx_insn *next = next_real_insn (target);
 
 	  if (GET_CODE (PATTERN (next)) == UNSPEC_VOLATILE