From 39d970d7d25c7c6f766768fc2901ba5e39b34bf7 Mon Sep 17 00:00:00 2001 From: Trevor Saunders Date: Sat, 29 Jul 2017 01:38:00 +0000 Subject: [PATCH] use c++ instead of _stat for copy_node_stat gcc/cp/ChangeLog: 2017-07-28 Trevor Saunders * lex.c (copy_decl): Adjust. (copy_type): Likewise. gcc/ChangeLog: 2017-07-28 Trevor Saunders * tree.c (copy_node_stat): Rename to copy_node. (build_distinct_type_copy): Adjust. * tree.h (copy_node_stat): Adjust prototype. (copy_node): Remove macro. From-SVN: r250695 --- gcc/ChangeLog | 7 +++++++ gcc/cp/ChangeLog | 5 +++++ gcc/cp/lex.c | 4 ++-- gcc/tree.c | 4 ++-- gcc/tree.h | 3 +-- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8513aa07910..1e7c2b8d8df 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2017-07-28 Trevor Saunders + + * tree.c (copy_node_stat): Rename to copy_node. + (build_distinct_type_copy): Adjust. + * tree.h (copy_node_stat): Adjust prototype. + (copy_node): Remove macro. + 2017-07-28 Trevor Saunders * tree.c (make_node_stat): rename to make_node. diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bf3d249c0ec..806235fcd75 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2017-07-28 Trevor Saunders + + * lex.c (copy_decl): Adjust. + (copy_type): Likewise. + 2017-07-26 Paolo Carlini PR c++/71570 diff --git a/gcc/cp/lex.c b/gcc/cp/lex.c index 961b705a546..097fbb547d2 100644 --- a/gcc/cp/lex.c +++ b/gcc/cp/lex.c @@ -766,7 +766,7 @@ copy_decl (tree decl MEM_STAT_DECL) { tree copy; - copy = copy_node_stat (decl PASS_MEM_STAT); + copy = copy_node (decl PASS_MEM_STAT); cxx_dup_lang_specific_decl (copy); return copy; } @@ -799,7 +799,7 @@ copy_type (tree type MEM_STAT_DECL) { tree copy; - copy = copy_node_stat (type PASS_MEM_STAT); + copy = copy_node (type PASS_MEM_STAT); copy_lang_type (copy); return copy; } diff --git a/gcc/tree.c b/gcc/tree.c index 49c54bbb4c7..1bd4cfcc1d5 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -1128,7 +1128,7 @@ free_node (tree node) TREE_CHAIN, if it has one, is zero and it has a fresh uid. */ tree -copy_node_stat (tree node MEM_STAT_DECL) +copy_node (tree node MEM_STAT_DECL) { tree t; enum tree_code code = TREE_CODE (node); @@ -6684,7 +6684,7 @@ build_aligned_type (tree type, unsigned int align) tree build_distinct_type_copy (tree type MEM_STAT_DECL) { - tree t = copy_node_stat (type PASS_MEM_STAT); + tree t = copy_node (type PASS_MEM_STAT); TYPE_POINTER_TO (t) = 0; TYPE_REFERENCE_TO (t) = 0; diff --git a/gcc/tree.h b/gcc/tree.h index 554356c2ee1..64bc369c239 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -3897,8 +3897,7 @@ extern void free_node (tree); /* Make a copy of a node, with all the same contents. */ -extern tree copy_node_stat (tree MEM_STAT_DECL); -#define copy_node(t) copy_node_stat (t MEM_STAT_INFO) +extern tree copy_node (tree CXX_MEM_STAT_INFO); /* Make a copy of a chain of TREE_LIST nodes. */ -- 2.30.2