From: Trevor Saunders <tbsaunde+...@tbsaunde.org>

gcc/ChangeLog:

2017-07-27  Trevor Saunders  <tbsaunde+...@tbsaunde.org>

        * tree.c (make_node_stat): rename to make_node.
        (build_tree_list_stat): Adjust.
        (build0_stat): Likewise.
        (build2_stat): Likewise.
        (build3_stat): Likewise.
        (build4_stat): Likewise.
        (build5_stat): Likewise.
        (build_decl_stat): Likewise.
        * tree.h (make_node_stat): Adjust prototype.
        (make_node): remove macro.
---
 gcc/tree.c | 16 ++++++++--------
 gcc/tree.h |  3 +--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/gcc/tree.c b/gcc/tree.c
index 48fb2ce0651..49c54bbb4c7 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -997,7 +997,7 @@ allocate_decl_uid (void)
    Achoo!  I got a code in the node.  */
 
 tree
-make_node_stat (enum tree_code code MEM_STAT_DECL)
+make_node (enum tree_code code MEM_STAT_DECL)
 {
   tree t;
   enum tree_code_class type = TREE_CODE_CLASS (code);
@@ -2870,7 +2870,7 @@ nreverse (tree t)
 tree
 build_tree_list_stat (tree parm, tree value MEM_STAT_DECL)
 {
-  tree t = make_node_stat (TREE_LIST PASS_MEM_STAT);
+  tree t = make_node (TREE_LIST PASS_MEM_STAT);
   TREE_PURPOSE (t) = parm;
   TREE_VALUE (t) = value;
   return t;
@@ -4371,7 +4371,7 @@ build0_stat (enum tree_code code, tree tt MEM_STAT_DECL)
 
   gcc_assert (TREE_CODE_LENGTH (code) == 0);
 
-  t = make_node_stat (code PASS_MEM_STAT);
+  t = make_node (code PASS_MEM_STAT);
   TREE_TYPE (t) = tt;
 
   return t;
@@ -4474,7 +4474,7 @@ build2_stat (enum tree_code code, tree tt, tree arg0, 
tree arg1 MEM_STAT_DECL)
     gcc_assert (POINTER_TYPE_P (tt) && POINTER_TYPE_P (TREE_TYPE (arg0))
                && ptrofftype_p (TREE_TYPE (arg1)));
 
-  t = make_node_stat (code PASS_MEM_STAT);
+  t = make_node (code PASS_MEM_STAT);
   TREE_TYPE (t) = tt;
 
   /* Below, we automatically set TREE_SIDE_EFFECTS and TREE_READONLY for the
@@ -4543,7 +4543,7 @@ build3_stat (enum tree_code code, tree tt, tree arg0, 
tree arg1,
   gcc_assert (TREE_CODE_LENGTH (code) == 3);
   gcc_assert (TREE_CODE_CLASS (code) != tcc_vl_exp);
 
-  t = make_node_stat (code PASS_MEM_STAT);
+  t = make_node (code PASS_MEM_STAT);
   TREE_TYPE (t) = tt;
 
   read_only = 1;
@@ -4583,7 +4583,7 @@ build4_stat (enum tree_code code, tree tt, tree arg0, 
tree arg1,
 
   gcc_assert (TREE_CODE_LENGTH (code) == 4);
 
-  t = make_node_stat (code PASS_MEM_STAT);
+  t = make_node (code PASS_MEM_STAT);
   TREE_TYPE (t) = tt;
 
   side_effects = TREE_SIDE_EFFECTS (t);
@@ -4610,7 +4610,7 @@ build5_stat (enum tree_code code, tree tt, tree arg0, 
tree arg1,
 
   gcc_assert (TREE_CODE_LENGTH (code) == 5);
 
-  t = make_node_stat (code PASS_MEM_STAT);
+  t = make_node (code PASS_MEM_STAT);
   TREE_TYPE (t) = tt;
 
   side_effects = TREE_SIDE_EFFECTS (t);
@@ -4745,7 +4745,7 @@ build_decl_stat (location_t loc, enum tree_code code, 
tree name,
 {
   tree t;
 
-  t = make_node_stat (code PASS_MEM_STAT);
+  t = make_node (code PASS_MEM_STAT);
   DECL_SOURCE_LOCATION (t) = loc;
 
 /*  if (type == error_mark_node)
diff --git a/gcc/tree.h b/gcc/tree.h
index 819938c4458..554356c2ee1 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -3889,8 +3889,7 @@ extern int allocate_decl_uid (void);
    The TREE_CODE is the only argument.  Contents are initialized
    to zero except for a few of the common fields.  */
 
-extern tree make_node_stat (enum tree_code MEM_STAT_DECL);
-#define make_node(t) make_node_stat (t MEM_STAT_INFO)
+extern tree make_node (enum tree_code CXX_MEM_STAT_INFO);
 
 /* Free tree node.  */
 
-- 
2.11.0

Reply via email to