From 345b82befbb91d50a57ed875b8d5b9232ffa0736 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 5 Sep 2014 14:19:35 +0000 Subject: [PATCH] Convert set_block_for_insn from a macro to an inline function gcc/ChangeLog: 2014-09-05 David Malcolm * 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 --- gcc/ChangeLog | 7 +++++++ gcc/basic-block.h | 2 -- gcc/rtl.h | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6ca2c64d235..0a7e49957ae 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2014-09-05 David Malcolm + + * 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 * caller-save.c (setup_save_areas): Strengthen local "insn" from diff --git a/gcc/basic-block.h b/gcc/basic-block.h index dd727c2776f..fb1c498bb5d 100644 --- 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 cd2f2e7ae15..b36fc3dfed4 100644 --- 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) { -- 2.30.2