From: Trevor Saunders <tbsaunde+...@tbsaunde.org> gcc/cp/ChangeLog:
2017-07-27 Trevor Saunders <tbsaunde+...@tbsaunde.org> * lex.c (copy_decl): Adjust. (copy_type): Likewise. gcc/ChangeLog: 2017-07-27 Trevor Saunders <tbsaunde+...@tbsaunde.org> * 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. --- gcc/cp/lex.c | 4 ++-- gcc/tree.c | 4 ++-- gcc/tree.h | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) 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.11.0