Tighten up params of create_basic_block_structure

gcc/
	* basic-block.h (create_basic_block_structure): Strengthen params
	1 "head" and 2 "end" from rtx to rtx_insn *.
	* cfgrtl.c (create_basic_block_structure): Likewise.
	(rtl_create_basic_block): Update casts from void * to rtx to
	rtx_insn *, so that we can pass them as rtx_insn * to
	create_basic_block_structure.
	* sel-sched-ir.c (sel_create_basic_block): Likewise.

From-SVN: r214533

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 798c50f96a27b8ede411371843342fb3f95739d5..1287a5e8735e8786783a2ab9813ed5ca2392ea06 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2014-08-26  David Malcolm  <dmalcolm@redhat.com>
+
+       * basic-block.h (create_basic_block_structure): Strengthen params
+       1 "head" and 2 "end" from rtx to rtx_insn *.
+       * cfgrtl.c (create_basic_block_structure): Likewise.
+       (rtl_create_basic_block): Update casts from void * to rtx to
+       rtx_insn *, so that we can pass them as rtx_insn * to
+       create_basic_block_structure.
+       * sel-sched-ir.c (sel_create_basic_block): Likewise.
+
 2014-08-26  David Malcolm  <dmalcolm@redhat.com>
 
        * rtl.h (for_each_inc_dec): Strengthen param 1 from rtx * to

diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index 5efe98e7408ddc680bc089fd50ee8cfdf8763bb3..2122b4266a55d80b288fa7d897ff0b0fe2d0da8d 100644 (file)
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -411,8 +411,8 @@ extern void remove_edge_raw (edge);
 extern void redirect_edge_succ (edge, basic_block);
 extern edge redirect_edge_succ_nodup (edge, basic_block);
 extern void redirect_edge_pred (edge, basic_block);
-extern basic_block create_basic_block_structure (rtx, rtx, rtx_note *,
-                                                basic_block);
+extern basic_block create_basic_block_structure (rtx_insn *, rtx_insn *,
+                                                rtx_note *, basic_block);
 extern void clear_bb_flags (void);
 extern void dump_bb_info (FILE *, basic_block, int, int, bool, bool);
 extern void dump_edge_info (FILE *, edge, int, int);

diff --git a/gcc/cfgrtl.c b/gcc/cfgrtl.c
index ee98660d00fad3b0f912bddc2536419e16e8f8e6..2fe9593e0cf0907087288e4a19bcd02161b504f7 100644 (file)
--- a/gcc/cfgrtl.c
+++ b/gcc/cfgrtl.c
@@ -271,7 +271,7 @@ delete_insn_chain (rtx start, rtx finish, bool clear_bb)
    AFTER is the basic block we should be put after.  */
 
 basic_block
-create_basic_block_structure (rtx head, rtx end, rtx_note *bb_note,
+create_basic_block_structure (rtx_insn *head, rtx_insn *end, rtx_note *bb_note,
                              basic_block after)
 {
   basic_block bb;
@@ -351,7 +351,8 @@ create_basic_block_structure (rtx head, rtx end, rtx_note *bb_note,
 static basic_block
 rtl_create_basic_block (void *headp, void *endp, basic_block after)
 {
-  rtx head = (rtx) headp, end = (rtx) endp;
+  rtx_insn *head = (rtx_insn *) headp;
+  rtx_insn *end = (rtx_insn *) endp;
   basic_block bb;
 
   /* Grow the basic block array if needed.  */

diff --git a/gcc/sel-sched-ir.c b/gcc/sel-sched-ir.c
index 3cc51cb7346ce6411d71f5dbc0fb7c8c4e41c1e9..d9a144b1276d3eecceac6a5418cef2755d24c937 100644 (file)
--- a/gcc/sel-sched-ir.c
+++ b/gcc/sel-sched-ir.c
@@ -5358,7 +5358,8 @@ sel_create_basic_block (void *headp, void *endp, basic_block after)
     new_bb = orig_cfg_hooks.create_basic_block (headp, endp, after);
   else
     {
-      new_bb = create_basic_block_structure ((rtx) headp, (rtx) endp,
+      new_bb = create_basic_block_structure ((rtx_insn *) headp,
+                                            (rtx_insn *) endp,
                                             new_bb_note, after);
       new_bb->aux = NULL;
     }