From 1bbbc4a3b75978bc6d40b66e966f7ec914a9476f Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 22 Aug 2014 20:53:56 +0000 Subject: [PATCH] rtlanal.c: Use rtx_insn gcc/ 2014-08-22 David Malcolm * rtlanal.c (reg_used_between_p): Strengthen local "insn" from rtx to rtx_insn *. (reg_set_between_p): Strengthen local "insn" from const_rtx to const rtx_insn *. (modified_between_p): Strengthen local "insn" from rtx to rtx_insn *. (remove_reg_equal_equiv_notes_for_regno): Likewise. (keep_with_call_p): Strengthen local "i2" from const_rtx to const rtx_insn *. From-SVN: r214373 --- gcc/ChangeLog | 12 ++++++++++++ gcc/rtlanal.c | 10 +++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 89eeba3..5b5a311 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,17 @@ 2014-08-22 David Malcolm + * rtlanal.c (reg_used_between_p): Strengthen local "insn" from rtx + to rtx_insn *. + (reg_set_between_p): Strengthen local "insn" from const_rtx to + const rtx_insn *. + (modified_between_p): Strengthen local "insn" from rtx to + rtx_insn *. + (remove_reg_equal_equiv_notes_for_regno): Likewise. + (keep_with_call_p): Strengthen local "i2" from const_rtx to + const rtx_insn *. + +2014-08-22 David Malcolm + * resource.c (next_insn_no_annul): Strengthen local "next" from rtx to rtx_insn *. (mark_referenced_resources): Likewise for local "insn". diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c index f8d28b2..dda6ae5 100644 --- a/gcc/rtlanal.c +++ b/gcc/rtlanal.c @@ -762,7 +762,7 @@ no_labels_between_p (const_rtx beg, const_rtx end) int reg_used_between_p (const_rtx reg, const_rtx from_insn, const_rtx to_insn) { - rtx insn; + rtx_insn *insn; if (from_insn == to_insn) return 0; @@ -858,7 +858,7 @@ reg_referenced_p (const_rtx x, const_rtx body) int reg_set_between_p (const_rtx reg, const_rtx from_insn, const_rtx to_insn) { - const_rtx insn; + const rtx_insn *insn; if (from_insn == to_insn) return 0; @@ -899,7 +899,7 @@ modified_between_p (const_rtx x, const_rtx start, const_rtx end) const enum rtx_code code = GET_CODE (x); const char *fmt; int i, j; - rtx insn; + rtx_insn *insn; if (start == end) return 0; @@ -2100,7 +2100,7 @@ remove_reg_equal_equiv_notes_for_regno (unsigned int regno) over the head. We plan to drain the list anyway. */ while ((eq_use = DF_REG_EQ_USE_CHAIN (regno)) != NULL) { - rtx insn = DF_REF_INSN (eq_use); + rtx_insn *insn = DF_REF_INSN (eq_use); rtx note = find_reg_equal_equiv_note (insn); /* This assert is generally triggered when someone deletes a REG_EQUAL @@ -3777,7 +3777,7 @@ keep_with_call_p (const_rtx insn) /* This CONST_CAST is okay because next_nonnote_insn just returns its argument and we assign it to a const_rtx variable. */ - const_rtx i2 = next_nonnote_insn (CONST_CAST_RTX (insn)); + const rtx_insn *i2 = next_nonnote_insn (CONST_CAST_RTX (insn)); if (i2 && keep_with_call_p (i2)) return true; } -- 2.7.4