Make INSN_HAS_LOCATION require an rtx_insn

gcc/
2014-08-28  David Malcolm  <dmalcolm@redhat.com>

	* rtl.h (INSN_HAS_LOCATION): Strengthen param from const_rtx to
	const rtx_insn *.

	* print-rtl.c (print_rtx): Add checked cast to const rtx_insn *
	in invocation of INSN_HAS_LOCATION.

From-SVN: r214700

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d1a1fdcb3ce3774bdc2ea84858305480feb24b0c..1c6df0d03cbae2fc15d4c3befeb1dbdebc1812f6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-28  David Malcolm  <dmalcolm@redhat.com>
+
+       * rtl.h (INSN_HAS_LOCATION): Strengthen param from const_rtx to
+       const rtx_insn *.
+
+       * print-rtl.c (print_rtx): Add checked cast to const rtx_insn *
+       in invocation of INSN_HAS_LOCATION.
+
 2014-08-28  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
 
        * config/rs6000/altivec.h (vec_xl): New #define.

diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index be1d01ac6c3598338311cbd92b835528bc32abf5..935145b5bd65c4fcec07fe76096bdf1bc7b0c455 100644 (file)
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -395,7 +395,7 @@ print_rtx (const_rtx in_rtx)
            /*  Pretty-print insn locations.  Ignore scoping as it is mostly
                redundant with line number information and do not print anything
                when there is no location information available.  */
-           if (INSN_HAS_LOCATION (in_rtx))
+           if (INSN_HAS_LOCATION (as_a <const rtx_insn *> (in_rtx)))
              {
                expanded_location xloc = insn_location (in_rtx);
                fprintf (outfile, " %s:%i", xloc.file, xloc.line);

diff --git a/gcc/rtl.h b/gcc/rtl.h
index 1c47c20abcca4bc013bab2d05cb7504b8fd3cb81..1bfb5bc703233b168cb022060a9f38a77d937281 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1374,7 +1374,7 @@ inline unsigned int& INSN_LOCATION (rtx insn)
   return XUINT (insn, 4);
 }
 
-inline bool INSN_HAS_LOCATION (const_rtx insn)
+inline bool INSN_HAS_LOCATION (const rtx_insn *insn)
 {
   return LOCATION_LOCUS (INSN_LOCATION (insn)) != UNKNOWN_LOCATION;
 }