The attached trivial patch updates the signature of control_flow_insn_p, since all in-tree users now pass in an rtx_insn * rather than just an rtx.
This falls under the pre-approval granted by Jeff here: https://gcc.gnu.org/ml/gcc-patches/2014-08/msg01310.html Bootstrapped on x86_64-unknown-linux-gnu (Fedora 20), and has been rebuilt as part of a config-list.mk build for all working configurations (albeit with other patches for the latter case). Committed to trunk as r215028
Index: gcc/ChangeLog =================================================================== --- gcc/ChangeLog (revision 215027) +++ gcc/ChangeLog (revision 215028) @@ -1,5 +1,11 @@ 2014-09-08 David Malcolm <dmalc...@redhat.com> + * basic-block.h (control_flow_insn_p): Strengthen param from + const_rtx to const rtx_insn *. + * cfgbuild.c (control_flow_insn_p): Likewise. + +2014-09-08 David Malcolm <dmalc...@redhat.com> + * gcse.c (modify_mem_list): Strengthen this variable from vec<rtx> * to vec<rtx_insn *> *. (vec_rtx_heap): Strengthen this typedef from vec<rtx> to Index: gcc/cfgbuild.c =================================================================== --- gcc/cfgbuild.c (revision 215027) +++ gcc/cfgbuild.c (revision 215028) @@ -73,7 +73,7 @@ the basic block. */ bool -control_flow_insn_p (const_rtx insn) +control_flow_insn_p (const rtx_insn *insn) { switch (GET_CODE (insn)) { Index: gcc/basic-block.h =================================================================== --- gcc/basic-block.h (revision 215027) +++ gcc/basic-block.h (revision 215028) @@ -821,7 +821,7 @@ extern void update_br_prob_note (basic_block); extern bool inside_basic_block_p (const rtx_insn *); -extern bool control_flow_insn_p (const_rtx); +extern bool control_flow_insn_p (const rtx_insn *); extern rtx_insn *get_last_bb_insn (basic_block); /* In dominance.c */