Fix null pointer crash and a merge error

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

1 files changed, 3 insertions, 11 deletions

diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 61dd48d7ce3..3ce996f8edd 100644
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -426,17 +426,6 @@ cond_exec_process_if_block (ce_info, do_multiple_p)
 #ifdef IFCVT_MODIFY_TESTS
   /* If the machine description needs to modify the tests, such as setting a
      conditional execution register from a comparison, it can do so here.  */
-  IFCVT_MODIFY_TESTS (true_expr, false_expr, test_bb, then_bb, else_bb,
-		      join_bb);
-
-  /* See if the conversion failed */
-  if (!true_expr || !false_expr)
-    goto fail;
-#endif
-
-#ifdef IFCVT_MODIFY_TESTS
-  /* If the machine description needs to modify the tests, such as setting a
-     conditional execution register from a comparison, it can do so here.  */
   IFCVT_MODIFY_TESTS (ce_info, true_expr, false_expr);
 
   /* See if the conversion failed */
@@ -460,6 +449,9 @@ cond_exec_process_if_block (ce_info, do_multiple_p)
       basic_block bb = test_bb;
       basic_block last_test_bb = ce_info->last_test_bb;
 
+      if (! false_expr)
+	goto fail;
+
       do
 	{
 	  rtx start, end;