From: Trevor Saunders <tbsaunde+...@tbsaunde.org> gcc/ChangeLog:
2017-07-27 Trevor Saunders <tbsaunde+...@tbsaunde.org> * gimple.c (gimple_build_debug_bind_stat): Remove _stat from name. (gimple_build_debug_bind_source_stat): Likewise. * gimple.h (gimple_build_debug_bind): Remove macro. (gimple_build_debug_bind_source): Likewise. --- gcc/gimple.c | 4 ++-- gcc/gimple.h | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gcc/gimple.c b/gcc/gimple.c index 13a68284879..3a32b530cce 100644 --- a/gcc/gimple.c +++ b/gcc/gimple.c @@ -796,7 +796,7 @@ gimple_build_eh_dispatch (int region) VAR is bound to VALUE; block and location are taken from STMT. */ gdebug * -gimple_build_debug_bind_stat (tree var, tree value, gimple *stmt MEM_STAT_DECL) +gimple_build_debug_bind (tree var, tree value, gimple *stmt MEM_STAT_DECL) { gdebug *p = as_a <gdebug *> (gimple_build_with_ops_stat (GIMPLE_DEBUG, @@ -816,7 +816,7 @@ gimple_build_debug_bind_stat (tree var, tree value, gimple *stmt MEM_STAT_DECL) VAR is bound to VALUE; block and location are taken from STMT. */ gdebug * -gimple_build_debug_source_bind_stat (tree var, tree value, +gimple_build_debug_source_bind (tree var, tree value, gimple *stmt MEM_STAT_DECL) { gdebug *p diff --git a/gcc/gimple.h b/gcc/gimple.h index d9945648215..6213c49b91f 100644 --- a/gcc/gimple.h +++ b/gcc/gimple.h @@ -1453,12 +1453,8 @@ gresx *gimple_build_resx (int); gswitch *gimple_build_switch_nlabels (unsigned, tree, tree); gswitch *gimple_build_switch (tree, tree, vec<tree> ); geh_dispatch *gimple_build_eh_dispatch (int); -gdebug *gimple_build_debug_bind_stat (tree, tree, gimple * MEM_STAT_DECL); -#define gimple_build_debug_bind(var,val,stmt) \ - gimple_build_debug_bind_stat ((var), (val), (stmt) MEM_STAT_INFO) -gdebug *gimple_build_debug_source_bind_stat (tree, tree, gimple * MEM_STAT_DECL); -#define gimple_build_debug_source_bind(var,val,stmt) \ - gimple_build_debug_source_bind_stat ((var), (val), (stmt) MEM_STAT_INFO) +gdebug *gimple_build_debug_bind (tree, tree, gimple * CXX_MEM_STAT_INFO); +gdebug *gimple_build_debug_source_bind (tree, tree, gimple * CXX_MEM_STAT_INFO); gomp_critical *gimple_build_omp_critical (gimple_seq, tree, tree); gomp_for *gimple_build_omp_for (gimple_seq, int, tree, size_t, gimple_seq); gomp_parallel *gimple_build_omp_parallel (gimple_seq, tree, tree, tree); -- 2.11.0