function.c and shrink-wrap.*: more rtx_insn

gcc/
	* function.c (thread_prologue_and_epilogue_insns): Likewise for
	locals "returnjump", "epilogue_end", "insn", "next".

	* shrink-wrap.h (get_unconverted_simple_return): Strengthen param
	"returnjump" from rtx * to rtx_insn **.
	* shrink-wrap.c (get_unconverted_simple_return): Likewise.

From-SVN: r214472

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 64808645a8c0482fb987bcc78bedfd5bcdf1b358..8cb016471c341d2c6923854d8c57be98e3e23427 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-08-25  David Malcolm  <dmalcolm@redhat.com>
+
+       * function.c (thread_prologue_and_epilogue_insns): Likewise for
+       locals "returnjump", "epilogue_end", "insn", "next".
+
+       * shrink-wrap.h (get_unconverted_simple_return): Strengthen param
+       "returnjump" from rtx * to rtx_insn **.
+       * shrink-wrap.c (get_unconverted_simple_return): Likewise.
+
 2014-08-25  David Malcolm  <dmalcolm@redhat.com>
 
        * basic-block.h (struct edge_def). Strengthen "r" within

diff --git a/gcc/function.c b/gcc/function.c
index 4e43471045ac4c5fe12816ce929e1ae7719bd5b7..25f1519a93e4d18147298d2aafae687beb8593fb 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -5613,8 +5613,9 @@ thread_prologue_and_epilogue_insns (void)
   vec<edge> unconverted_simple_returns = vNULL;
   bitmap_head bb_flags;
 #endif
-  rtx returnjump;
-  rtx seq ATTRIBUTE_UNUSED, epilogue_end ATTRIBUTE_UNUSED;
+  rtx_insn *returnjump;
+  rtx seq ATTRIBUTE_UNUSED;
+  rtx_insn *epilogue_end ATTRIBUTE_UNUSED;
   rtx prologue_seq ATTRIBUTE_UNUSED, split_prologue_seq ATTRIBUTE_UNUSED;
   edge e, entry_edge, orig_entry_edge, exit_fallthru_edge;
   edge_iterator ei;
@@ -5625,8 +5626,8 @@ thread_prologue_and_epilogue_insns (void)
 
   inserted = false;
   seq = NULL_RTX;
-  epilogue_end = NULL_RTX;
-  returnjump = NULL_RTX;
+  epilogue_end = NULL;
+  returnjump = NULL;
 
   /* Can't deal with multiple successors of the entry block at the
      moment.  Function should always have at least one entry
@@ -5916,7 +5917,7 @@ epilogue_done:
 #ifdef HAVE_epilogue
   if (epilogue_end)
     {
-      rtx insn, next;
+      rtx_insn *insn, *next;
 
       /* Similarly, move any line notes that appear after the epilogue.
          There is no need, however, to be quite so anal about the existence

diff --git a/gcc/shrink-wrap.c b/gcc/shrink-wrap.c
index 0938f2c5b739a83ffcb23f1c62ccefbcdadfee49..2710d98e444a8fb6217719d0e9770a6b07a589ac 100644 (file)
--- a/gcc/shrink-wrap.c
+++ b/gcc/shrink-wrap.c
@@ -790,7 +790,7 @@ try_shrink_wrapping (edge *entry_edge, edge orig_entry_edge,
 edge
 get_unconverted_simple_return (edge exit_fallthru_edge, bitmap_head bb_flags,
                               vec<edge> *unconverted_simple_returns,
-                              rtx *returnjump)
+                              rtx_insn **returnjump)
 {
   if (optimize)
     {

diff --git a/gcc/shrink-wrap.h b/gcc/shrink-wrap.h
index 5576d367b8ef53a9ec88b3a2f4e2008783be7e22..66bd26dfdef10de58a50f83b3b9dab3610d47978 100644 (file)
--- a/gcc/shrink-wrap.h
+++ b/gcc/shrink-wrap.h
@@ -42,7 +42,7 @@ extern void dup_block_and_redirect (basic_block bb, basic_block copy_bb,
 extern void try_shrink_wrapping (edge *entry_edge, edge orig_entry_edge,
                                 bitmap_head *bb_flags, rtx prologue_seq);
 extern edge get_unconverted_simple_return (edge, bitmap_head,
-                                          vec<edge> *, rtx *);
+                                          vec<edge> *, rtx_insn **);
 extern void convert_to_simple_return (edge entry_edge, edge orig_entry_edge,
                                      bitmap_head bb_flags, rtx returnjump,
                                      vec<edge> unconverted_simple_returns);