PR rtl-optimization/59724

	* ifcvt.c (cond_exec_process_if_block): Don't call
	flow_find_head_matching_sequence with 0 longest_match.
	* cfgcleanup.c (flow_find_head_matching_sequence): Count even
	non-active insns if !stop_after.
	(try_head_merge_bb): Revert 2014-01-07 changes.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e4872f24a06efae1b9f6c94c379339b725118b72..7c691d2dbc28229f28e1e1b4356d663134adc6a5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-01-09  Jakub Jelinek  <jakub@redhat.com>
+
+       PR rtl-optimization/59724
+       * ifcvt.c (cond_exec_process_if_block): Don't call
+       flow_find_head_matching_sequence with 0 longest_match.
+       * cfgcleanup.c (flow_find_head_matching_sequence): Count even
+       non-active insns if !stop_after.
+       (try_head_merge_bb): Revert 2014-01-07 changes.
+
 2014-01-08  Jeff Law  <law@redhat.com>
 
        * ree.c (get_sub_rtx): New function, extracted from...

diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c
index 028f82886627d5da6a25d4670b908849f0d47cc9..77196ee6bf71e7ddd35e2589379bfd6da9932d84 100644 (file)
--- a/gcc/cfgcleanup.c
+++ b/gcc/cfgcleanup.c
@@ -1421,7 +1421,8 @@ flow_find_cross_jump (basic_block bb1, basic_block bb2, rtx *f1, rtx *f2,
 /* Like flow_find_cross_jump, except start looking for a matching sequence from
    the head of the two blocks.  Do not include jumps at the end.
    If STOP_AFTER is nonzero, stop after finding that many matching
-   instructions.  */
+   instructions.  If STOP_AFTER is zero, count all INSN_P insns, if it is
+   non-zero, only count active insns.  */
 
 int
 flow_find_head_matching_sequence (basic_block bb1, basic_block bb2, rtx *f1,
@@ -1493,7 +1494,7 @@ flow_find_head_matching_sequence (basic_block bb1, basic_block bb2, rtx *f1,
 
          beforelast1 = last1, beforelast2 = last2;
          last1 = i1, last2 = i2;
-         if (active_insn_p (i1))
+         if (!stop_after || active_insn_p (i1))
            ninsns++;
        }
 
@@ -2408,7 +2409,9 @@ try_head_merge_bb (basic_block bb)
       max_match--;
       if (max_match == 0)
        return false;
-      e0_last_head = prev_active_insn (e0_last_head);
+      do
+       e0_last_head = prev_real_insn (e0_last_head);
+      while (DEBUG_INSN_P (e0_last_head));
     }
 
   if (max_match == 0)
@@ -2428,14 +2431,16 @@ try_head_merge_bb (basic_block bb)
       basic_block merge_bb = EDGE_SUCC (bb, ix)->dest;
       rtx head = BB_HEAD (merge_bb);
 
-      if (!active_insn_p (head))
-       head = next_active_insn (head);
+      while (!NONDEBUG_INSN_P (head))
+       head = NEXT_INSN (head);
       headptr[ix] = head;
       currptr[ix] = head;
 
       /* Compute the end point and live information  */
       for (j = 1; j < max_match; j++)
-       head = next_active_insn (head);
+       do
+         head = NEXT_INSN (head);
+       while (!NONDEBUG_INSN_P (head));
       simulate_backwards_to_point (merge_bb, live, head);
       IOR_REG_SET (live_union, live);
     }

diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c
index 0afcfc3762f5c5b4c4e3f98a5d35fcfa938db8ca..51293651e9cc5fe63491bd6e45756ccb69a1fd74 100644 (file)
--- a/gcc/ifcvt.c
+++ b/gcc/ifcvt.c
@@ -522,7 +522,10 @@ cond_exec_process_if_block (ce_if_block * ce_info,
          n_insns -= 2 * n_matching;
        }
 
-      if (then_start && else_start)
+      if (then_start
+         && else_start
+         && then_n_insns > n_matching
+         && else_n_insns > n_matching)
        {
          int longest_match = MIN (then_n_insns - n_matching,
                                   else_n_insns - n_matching);