Convert set_block_for_insn from a macro to an inline function

gcc/ChangeLog:
2014-09-05  David Malcolm  <dmalcolm@redhat.com>

	* basic-block.h (set_block_for_insn): Eliminate this macro in
	favor of...
	* rtl.h (set_block_for_insn): New inline function, imposing the
	requirement that the "insn" param is an rtx_insn *.

From-SVN: r214963

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ca2c64d23520eb316fd5fe1b0b9e8adb3c6b785..0a7e49957ae3e1ef4b83ecd661e8d63e226a9074 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2014-09-05  David Malcolm  <dmalcolm@redhat.com>
+
+       * basic-block.h (set_block_for_insn): Eliminate this macro in
+       favor of...
+       * rtl.h (set_block_for_insn): New inline function, imposing the
+       requirement that the "insn" param is an rtx_insn *.
+
 2014-09-05  David Malcolm  <dmalcolm@redhat.com>
 
        * caller-save.c (setup_save_areas): Strengthen local "insn" from

diff --git a/gcc/basic-block.h b/gcc/basic-block.h
index dd727c2776fcd3677d60db3e67d2c4f6e3a32bb2..fb1c498bb5d654fd6a8eeb85c175d8985fb1250a 100644 (file)
--- a/gcc/basic-block.h
+++ b/gcc/basic-block.h
@@ -385,8 +385,6 @@ struct GTY(()) control_flow_graph {
 /* The two blocks that are always in the cfg.  */
 #define NUM_FIXED_BLOCKS (2)
 
-#define set_block_for_insn(INSN, BB)  (BLOCK_FOR_INSN (INSN) = BB)
-
 extern void compute_bb_for_insn (void);
 extern unsigned int free_bb_for_insn (void);
 extern void update_bb_for_insn (basic_block);

diff --git a/gcc/rtl.h b/gcc/rtl.h
index cd2f2e7ae157199669265bc1c4e4b42b72c2d5cb..b36fc3dfed42c5a409fab4c3ba885841bce43d50 100644 (file)
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -1353,6 +1353,11 @@ inline basic_block& BLOCK_FOR_INSN (rtx insn)
   return XBBDEF (insn, 2);
 }
 
+inline void set_block_for_insn (rtx_insn *insn, basic_block bb)
+{
+  BLOCK_FOR_INSN (insn) = bb;
+}
+
 /* The body of an insn.  */
 inline rtx PATTERN (const_rtx insn)
 {