From: rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 20 Aug 2011 18:55:49 +0000 (+0000)
Subject: gcc/
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=be06fcd64b97d61fbc3d6836c8fd8f3eb3f4841c;p=pf3gnuchains%2Fgcc-fork.git

gcc/
	* config/mips/mips.c (mips_reorg_process_insns): Check for jumps
	before checking for annulled branches.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177930 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2217302f643..ee94a7956b2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-20  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/mips/mips.c (mips_reorg_process_insns): Check for jumps
+	before checking for annulled branches.
+
 2011-08-20  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.c (ix86_binary_operator_ok): Use
diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 1c9b86697af..5a410eb0464 100644
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -14831,6 +14831,7 @@ mips_reorg_process_insns (void)
 		 executed.  */
 	      else if (recog_memoized (insn) == CODE_FOR_r10k_cache_barrier
 		       && last_insn
+		       && JUMP_P (SEQ_BEGIN (last_insn))
 		       && INSN_ANNULLED_BRANCH_P (SEQ_BEGIN (last_insn)))
 		delete_insn (insn);
 	      else