Return rtx_insn from get_insns/get_last_insn

2014-08-19  David Malcolm  <dmalcolm@redhat.com>

	* emit-rtl.h (get_insns): Strengthen return type from rtx to
	rtx_insn *, adding a checked cast for now.
	(get_last_insn): Likewise.

From-SVN: r214180

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8c472a8..d86b78b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2014-08-19  David Malcolm  <dmalcolm@redhat.com>
 
+       * emit-rtl.h (get_insns): Strengthen return type from rtx to
+       rtx_insn *, adding a checked cast for now.
+       (get_last_insn): Likewise.
+
+2014-08-19  David Malcolm  <dmalcolm@redhat.com>
+
        * rtl.h (gen_label_rtx): Strengthen return type from rtx to
        rtx_code_label *.
 

diff --git a/gcc/emit-rtl.h b/gcc/emit-rtl.h
index 8439750..e97e0cb 100644 (file)
--- a/gcc/emit-rtl.h
+++ b/gcc/emit-rtl.h
@@ -77,10 +77,11 @@ extern bool need_atomic_barrier_p (enum memmodel, bool);
 
 /* Return the first insn of the current sequence or current function.  */
 
-static inline rtx
+static inline rtx_insn *
 get_insns (void)
 {
-  return crtl->emit.x_first_insn;
+  rtx insn = crtl->emit.x_first_insn;
+  return safe_as_a <rtx_insn *> (insn);
 }
 
 /* Specify a new insn as the first in the chain.  */
@@ -94,10 +95,11 @@ set_first_insn (rtx insn)
 
 /* Return the last insn emitted in current sequence or current function.  */
 
-static inline rtx
+static inline rtx_insn *
 get_last_insn (void)
 {
-  return crtl->emit.x_last_insn;
+  rtx insn = crtl->emit.x_last_insn;
+  return safe_as_a <rtx_insn *> (insn);
 }
 
 /* Specify a new insn as the last in the chain.  */