reorg.c (get_branch_condition): Deal with conditional returns.

	* reorg.c (get_branch_condition): Deal with conditional returns.
	(fill_simple_delay_slots): Remove dead code dealing with jumps.

From-SVN: r197340

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7c7db0c3080176410031fb7c9c718f1fee915e52..f1064e6aa617484c23292b15053cc47a437696db 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-02  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * reorg.c (get_branch_condition): Deal with conditional returns.
+       (fill_simple_delay_slots): Remove dead code dealing with jumps.
+
 2013-04-01  Wei Mi  <wmi@google.com>
 
        * config/i386/i386.md (*ashl<mode>3_mask): Rewrite as define_insn.

diff --git a/gcc/reorg.c b/gcc/reorg.c
index 82b54e2a14e0e7924b2b3db14ba37f0ec7b44dfd..f89598276b16d586eebc4fa29fd3755de6bc5d85 100644 (file)
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -921,8 +921,8 @@ get_branch_condition (rtx insn, rtx target)
   if (condjump_in_parallel_p (insn))
     pat = XVECEXP (pat, 0, 0);
 
-  if (ANY_RETURN_P (pat))
-    return pat == target ? const_true_rtx : 0;
+  if (ANY_RETURN_P (pat) && pat == target)
+    return const_true_rtx;
 
   if (GET_CODE (pat) != SET || SET_DEST (pat) != pc_rtx)
     return 0;
@@ -933,14 +933,16 @@ get_branch_condition (rtx insn, rtx target)
 
   else if (GET_CODE (src) == IF_THEN_ELSE
           && XEXP (src, 2) == pc_rtx
-          && GET_CODE (XEXP (src, 1)) == LABEL_REF
-          && XEXP (XEXP (src, 1), 0) == target)
+          && ((GET_CODE (XEXP (src, 1)) == LABEL_REF
+               && XEXP (XEXP (src, 1), 0) == target)
+              || (ANY_RETURN_P (XEXP (src, 1)) && XEXP (src, 1) == target)))
     return XEXP (src, 0);
 
   else if (GET_CODE (src) == IF_THEN_ELSE
           && XEXP (src, 1) == pc_rtx
-          && GET_CODE (XEXP (src, 2)) == LABEL_REF
-          && XEXP (XEXP (src, 2), 0) == target)
+          && ((GET_CODE (XEXP (src, 2)) == LABEL_REF
+               && XEXP (XEXP (src, 2), 0) == target)
+              || (ANY_RETURN_P (XEXP (src, 2)) && XEXP (src, 2) == target)))
     {
       enum rtx_code rev;
       rev = reversed_comparison_code (XEXP (src, 0), insn);
@@ -2129,35 +2131,19 @@ fill_simple_delay_slots (int non_jumps_p)
             Presumably, we should also check to see if we could get
             back to this function via `setjmp'.  */
          && ! can_throw_internal (insn)
-         && (!JUMP_P (insn)
-             || ((condjump_p (insn) || condjump_in_parallel_p (insn))
-                 && ! simplejump_p (insn)
-                 && !ANY_RETURN_P (JUMP_LABEL (insn)))))
+         && !JUMP_P (insn))
        {
-         /* Invariant: If insn is a JUMP_INSN, the insn's jump
-            label.  Otherwise, zero.  */
-         rtx target = 0;
          int maybe_never = 0;
          rtx pat, trial_delay;
 
          CLEAR_RESOURCE (&needed);
          CLEAR_RESOURCE (&set);
+         mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
+         mark_referenced_resources (insn, &needed, true);
 
          if (CALL_P (insn))
-           {
-             mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
-             mark_referenced_resources (insn, &needed, true);
-             maybe_never = 1;
-           }
-         else
-           {
-             mark_set_resources (insn, &set, 0, MARK_SRC_DEST_CALL);
-             mark_referenced_resources (insn, &needed, true);
-             if (JUMP_P (insn))
-               target = JUMP_LABEL (insn);
-           }
+           maybe_never = 1;
 
-         if (target == 0 || ANY_RETURN_P (target))
            for (trial = next_nonnote_insn (insn); !stop_search_p (trial, 1);
                 trial = next_trial)
              {
@@ -2217,9 +2203,8 @@ fill_simple_delay_slots (int non_jumps_p)
                   slot since these insns could clobber the condition code.  */
                set.cc = 1;
 
-               /* If this is a call or jump, we might not get here.  */
-               if (CALL_P (trial_delay)
-                   || JUMP_P (trial_delay))
+               /* If this is a call, we might not get here.  */
+               if (CALL_P (trial_delay))
                  maybe_never = 1;
              }
 
@@ -2232,7 +2217,6 @@ fill_simple_delay_slots (int non_jumps_p)
              && trial
              && jump_to_label_p (trial)
              && simplejump_p (trial)
-             && (target == 0 || JUMP_LABEL (trial) == target)
              && (next_trial = next_active_insn (JUMP_LABEL (trial))) != 0
              && ! (NONJUMP_INSN_P (next_trial)
                    && GET_CODE (PATTERN (next_trial)) == SEQUENCE)
@@ -2264,11 +2248,6 @@ fill_simple_delay_slots (int non_jumps_p)
                                         delay_list);
                  slots_filled++;
                  reorg_redirect_jump (trial, new_label);
-
-                 /* If we merged because we both jumped to the same place,
-                    redirect the original insn also.  */
-                 if (target)
-                   reorg_redirect_jump (insn, new_label);
                }
            }
        }