From e7c44276618b5ee91df8eb2f9bdd3e4a79829226 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 28 Aug 2014 06:23:39 +0000 Subject: [PATCH] jump.c (eh_returnjump_p_1): Delete. gcc/ * jump.c (eh_returnjump_p_1): Delete. (eh_returnjump_p): Use FOR_EACH_SUBRTX rather than for_each_rtx. Remove handling of null rtxes. From-SVN: r214644 --- gcc/ChangeLog | 6 ++++++ gcc/jump.c | 17 ++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 32f519d0c2b..1b3ab28e567 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-08-28 Richard Sandiford + + * jump.c (eh_returnjump_p_1): Delete. + (eh_returnjump_p): Use FOR_EACH_SUBRTX rather than for_each_rtx. + Remove handling of null rtxes. + 2014-08-28 Richard Sandiford * jump.c: Include rtl-iter.h. diff --git a/gcc/jump.c b/gcc/jump.c index 2a0bea79503..05c8138db56 100644 --- a/gcc/jump.c +++ b/gcc/jump.c @@ -953,18 +953,17 @@ returnjump_p (rtx insn) /* Return true if INSN is a (possibly conditional) return insn. */ -static int -eh_returnjump_p_1 (rtx *loc, void *data ATTRIBUTE_UNUSED) -{ - return *loc && GET_CODE (*loc) == EH_RETURN; -} - int eh_returnjump_p (rtx insn) { - if (!JUMP_P (insn)) - return 0; - return for_each_rtx (&PATTERN (insn), eh_returnjump_p_1, NULL); + if (JUMP_P (insn)) + { + subrtx_iterator::array_type array; + FOR_EACH_SUBRTX (iter, array, PATTERN (insn), NONCONST) + if (GET_CODE (*iter) == EH_RETURN) + return true; + } + return false; } /* Return true if INSN is a jump that only transfers control and -- 2.30.2