From 5fa9163d3fff5a66711fae4c54b09ed6b4cb226d Mon Sep 17 00:00:00 2001 From: Andrew MacLeod Date: Fri, 26 Jun 2015 23:30:37 +0000 Subject: [PATCH] gimple.c (gimple_call_set_fndecl): Remove. 2015-06-26 Andrew MacLeod * gimple.c (gimple_call_set_fndecl): Remove. * gimple.h (gimple_call_set_fndecl): Relocate to gimple.h and call build1_loc directly instead of build_fold_addr_expr_loc. From-SVN: r225090 --- gcc/ChangeLog | 6 ++++++ gcc/gimple.c | 10 ---------- gcc/gimple.h | 14 +++++++++++++- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6f54c22927a..31ee3cb3ef5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2015-06-26 Andrew MacLeod + + * gimple.c (gimple_call_set_fndecl): Remove. + * gimple.h (gimple_call_set_fndecl): Relocate to gimple.h and call + build1_loc directly instead of build_fold_addr_expr_loc. + 2015-06-26 Richard Sandiford * hash-map.h (hash_map::traverse): Use the definition of the diff --git a/gcc/gimple.c b/gcc/gimple.c index bd788be9649..b32c6b5ada4 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -199,16 +199,6 @@ gimple_build_return (tree retval) return s; } -/* Set FNDECL to be the function called by call statement GS. */ - -void -gimple_call_set_fndecl (gimple gs, tree decl) -{ - GIMPLE_CHECK (gs, GIMPLE_CALL); - gcc_gimple_checking_assert (!gimple_call_internal_p (gs)); - gimple_set_op (gs, 1, build_fold_addr_expr_loc (gimple_location (gs), decl)); -} - /* Reset alias information on call S. */ void diff --git a/gcc/gimple.h b/gcc/gimple.h index 96a43d843f6..253f4385dec 100644 --- a/gcc/gimple.h +++ b/gcc/gimple.h @@ -1296,7 +1296,6 @@ extern gimple currently_expanding_gimple_stmt; #define gimple_alloc(c, n) gimple_alloc_stat (c, n MEM_STAT_INFO) gimple gimple_alloc_stat (enum gimple_code, unsigned MEM_STAT_DECL); greturn *gimple_build_return (tree); -void gimple_call_set_fndecl (gimple, tree); void gimple_call_reset_alias_info (gcall *); gcall *gimple_build_call_vec (tree, vec ); gcall *gimple_build_call (tree, unsigned, ...); @@ -2760,6 +2759,19 @@ gimple_call_set_fn (gcall *gs, tree fn) } +/* Set FNDECL to be the function called by call statement GS. */ + +static inline void +gimple_call_set_fndecl (gimple gs, tree decl) +{ + GIMPLE_CHECK (gs, GIMPLE_CALL); + gcc_gimple_checking_assert (!gimple_call_internal_p (gs)); + gimple_set_op (gs, 1, build1_loc (gimple_location (gs), ADDR_EXPR, + build_pointer_type (TREE_TYPE (decl)), + decl)); +} + + /* Set internal function FN to be the function called by call statement CALL_STMT. */ static inline void -- 2.30.2