Make sure THEN block has any insns at before testing for indirect jump

From-SVN: r35813

Make sure THEN block has any insns at before testing for indirect jump
From-SVN: r35813
34c9e848 · Michael Meissner · Michael Meissner · f1e42c81 · 34c9e848 · 34c9e848
Commit 34c9e848 authored Aug 20, 2000 by Michael Meissner Committed by Michael Meissner Aug 20, 2000
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

gcc/ChangeLog
+3 -0

gcc/ifcvt.c
+6 -3

No files found.
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
 2000-08-19  Michael Meissner  <meissner@redhat.com>

+	* ifcvt.c (find_if_block): Do not assume that a THEN block has any
+	instructions in it before checking for indirect jumps.
+
 	* ifcvt.c (find_if_block): Do not consider a THEN block that ends
 	in a indirect jump as a potential for conditional execution.


--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -1510,10 +1510,13 @@ find_if_block (test_bb, then_edge, else_edge)
 	{
 	  rtx last_insn = then_bb->end;

-	  if (GET_CODE (last_insn) == NOTE)
-	    last_insn = prev_nonnote_insn (last_insn);
+	  while (last_insn
+		 && GET_CODE (last_insn) == NOTE
+		 && last_insn != then_bb->head)
+	    last_insn = PREV_INSN (last_insn);

-	  if (GET_CODE (last_insn) == JUMP_INSN
+	  if (last_insn
+	      && GET_CODE (last_insn) == JUMP_INSN
 	      && ! simplejump_p (last_insn))
 	    return FALSE;