From 226b828937458a958cd6d681f9a6d3288b46f58e Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Sat, 29 Jul 2017 01:39:48 +0000 Subject: [PATCH] use c++ for fold_buildN_loc gcc/ChangeLog: 2017-07-28 Trevor Saunders * fold-const.c (fold_build1_stat_loc): Remove _stat from name. (fold_build2_stat_loc): Likewise. (fold_build3_stat_loc): Likewise. * fold-const.h (fold_build1, fold_build2, fold_build3): Adjust. (fold_build1_loc): Remove macro. (fold_build2_loc): Likewise. (fold_build3_loc): Likewise. From-SVN: r250712 --- gcc/ChangeLog | 10 ++++++++++ gcc/fold-const.c | 8 ++++---- gcc/fold-const.h | 24 +++++++++--------------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 193f169fb98..2aafa710294 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2017-07-28 Trevor Saunders + + * fold-const.c (fold_build1_stat_loc): Remove _stat from name. + (fold_build2_stat_loc): Likewise. + (fold_build3_stat_loc): Likewise. + * fold-const.h (fold_build1, fold_build2, fold_build3): Adjust. + (fold_build1_loc): Remove macro. + (fold_build2_loc): Likewise. + (fold_build3_loc): Likewise. + 2017-07-28 Trevor Saunders * gimple.c (gimple_build_debug_bind_stat): Remove _stat from name. diff --git a/gcc/fold-const.c b/gcc/fold-const.c index 5c1bd4360dd..524208ae564 100644 --- a/gcc/fold-const.c +++ b/gcc/fold-const.c @@ -12195,8 +12195,8 @@ debug_fold_checksum (const_tree t) expression with code CODE of type TYPE with an operand OP0. */ tree -fold_build1_stat_loc (location_t loc, - enum tree_code code, tree type, tree op0 MEM_STAT_DECL) +fold_build1_loc (location_t loc, + enum tree_code code, tree type, tree op0 MEM_STAT_DECL) { tree tem; #ifdef ENABLE_FOLD_CHECKING @@ -12232,7 +12232,7 @@ fold_build1_stat_loc (location_t loc, OP0 and OP1. */ tree -fold_build2_stat_loc (location_t loc, +fold_build2_loc (location_t loc, enum tree_code code, tree type, tree op0, tree op1 MEM_STAT_DECL) { @@ -12285,7 +12285,7 @@ fold_build2_stat_loc (location_t loc, type TYPE with operands OP0, OP1, and OP2. */ tree -fold_build3_stat_loc (location_t loc, enum tree_code code, tree type, +fold_build3_loc (location_t loc, enum tree_code code, tree type, tree op0, tree op1, tree op2 MEM_STAT_DECL) { tree tem; diff --git a/gcc/fold-const.h b/gcc/fold-const.h index 780e5c781b7..8380d420ddb 100644 --- a/gcc/fold-const.h +++ b/gcc/fold-const.h @@ -49,23 +49,17 @@ extern tree fold_binary_loc (location_t, enum tree_code, tree, tree, tree); fold_ternary_loc (UNKNOWN_LOCATION, CODE, T1, T2, T3, T4) extern tree fold_ternary_loc (location_t, enum tree_code, tree, tree, tree, tree); #define fold_build1(c,t1,t2)\ - fold_build1_stat_loc (UNKNOWN_LOCATION, c, t1, t2 MEM_STAT_INFO) -#define fold_build1_loc(l,c,t1,t2)\ - fold_build1_stat_loc (l, c, t1, t2 MEM_STAT_INFO) -extern tree fold_build1_stat_loc (location_t, enum tree_code, tree, - tree MEM_STAT_DECL); + fold_build1_loc (UNKNOWN_LOCATION, c, t1, t2 MEM_STAT_INFO) +extern tree fold_build1_loc (location_t, enum tree_code, tree, + tree CXX_MEM_STAT_INFO); #define fold_build2(c,t1,t2,t3)\ - fold_build2_stat_loc (UNKNOWN_LOCATION, c, t1, t2, t3 MEM_STAT_INFO) -#define fold_build2_loc(l,c,t1,t2,t3)\ - fold_build2_stat_loc (l, c, t1, t2, t3 MEM_STAT_INFO) -extern tree fold_build2_stat_loc (location_t, enum tree_code, tree, tree, - tree MEM_STAT_DECL); + fold_build2_loc (UNKNOWN_LOCATION, c, t1, t2, t3 MEM_STAT_INFO) +extern tree fold_build2_loc (location_t, enum tree_code, tree, tree, + tree CXX_MEM_STAT_INFO); #define fold_build3(c,t1,t2,t3,t4)\ - fold_build3_stat_loc (UNKNOWN_LOCATION, c, t1, t2, t3, t4 MEM_STAT_INFO) -#define fold_build3_loc(l,c,t1,t2,t3,t4)\ - fold_build3_stat_loc (l, c, t1, t2, t3, t4 MEM_STAT_INFO) -extern tree fold_build3_stat_loc (location_t, enum tree_code, tree, tree, tree, - tree MEM_STAT_DECL); + fold_build3_loc (UNKNOWN_LOCATION, c, t1, t2, t3, t4 MEM_STAT_INFO) +extern tree fold_build3_loc (location_t, enum tree_code, tree, tree, tree, + tree CXX_MEM_STAT_INFO); extern tree fold_build1_initializer_loc (location_t, enum tree_code, tree, tree); extern tree fold_build2_initializer_loc (location_t, enum tree_code, tree, tree, tree); #define fold_build_call_array(T1,T2,N,T4)\ -- 2.30.2