From 87ac59a062abf0f2a9276fb0123f1d904acadc67 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Mon, 21 Nov 2016 06:16:08 +0000 Subject: [PATCH] make prologue_epilogue_contains take a rtx_insn * gcc/ChangeLog: 2016-11-21 Trevor Saunders * function.c (contains): Change argument type to rtx_insn *. (prologue_contains): Likewise. (epilogue_contains): Likewise. (prologue_epilogue_contains): Likewise. * function.h: Adjust prototype. From-SVN: r242655 --- gcc/ChangeLog | 8 ++++++++ gcc/function.c | 12 ++++++------ gcc/function.h | 6 +++--- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 226bf3e9eb9..fb54d763225 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2016-11-21 Trevor Saunders + + * function.c (contains): Change argument type to rtx_insn *. + (prologue_contains): Likewise. + (epilogue_contains): Likewise. + (prologue_epilogue_contains): Likewise. + * function.h: Adjust prototype. + 2016-11-21 Trevor Saunders * optabs.c (emit_libcall_block): Change argument type to diff --git a/gcc/function.c b/gcc/function.c index 491f3d1d2d6..f191b57bee2 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -142,7 +142,7 @@ extern tree debug_find_var_in_block_tree (tree, tree); can always export `prologue_epilogue_contains'. */ static void record_insns (rtx_insn *, rtx, hash_table **) ATTRIBUTE_UNUSED; -static bool contains (const_rtx, hash_table *); +static bool contains (const rtx_insn *, hash_table *); static void prepare_function_start (void); static void do_clobber_return_reg (rtx, void *); static void do_use_return_reg (rtx, void *); @@ -5733,7 +5733,7 @@ maybe_copy_prologue_epilogue_insn (rtx insn, rtx copy) we can be running after reorg, SEQUENCE rtl is possible. */ static bool -contains (const_rtx insn, hash_table *hash) +contains (const rtx_insn *insn, hash_table *hash) { if (hash == NULL) return false; @@ -5748,23 +5748,23 @@ contains (const_rtx insn, hash_table *hash) return false; } - return hash->find (const_cast (insn)) != NULL; + return hash->find (const_cast (insn)) != NULL; } int -prologue_contains (const_rtx insn) +prologue_contains (const rtx_insn *insn) { return contains (insn, prologue_insn_hash); } int -epilogue_contains (const_rtx insn) +epilogue_contains (const rtx_insn *insn) { return contains (insn, epilogue_insn_hash); } int -prologue_epilogue_contains (const_rtx insn) +prologue_epilogue_contains (const rtx_insn *insn) { if (contains (insn, prologue_insn_hash)) return 1; diff --git a/gcc/function.h b/gcc/function.h index b564f4533f2..1aebd90aa39 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -631,9 +631,9 @@ extern void clobber_return_register (void); extern void expand_function_end (void); extern rtx get_arg_pointer_save_area (void); extern void maybe_copy_prologue_epilogue_insn (rtx, rtx); -extern int prologue_contains (const_rtx); -extern int epilogue_contains (const_rtx); -extern int prologue_epilogue_contains (const_rtx); +extern int prologue_contains (const rtx_insn *); +extern int epilogue_contains (const rtx_insn *); +extern int prologue_epilogue_contains (const rtx_insn *); extern void record_prologue_seq (rtx_insn *); extern void record_epilogue_seq (rtx_insn *); extern void emit_return_into_block (bool simple_p, basic_block bb); -- 2.30.2