From c727aa5e2813c510b1da0d8e5f61160c1fa01ceb Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Thu, 29 Jun 2000 14:03:10 +0000 Subject: [PATCH] cp-tree.h (SET_DECL_ARTIFICIAL): Remove. * cp-tree.h (SET_DECL_ARTIFICIAL): Remove. * decl.c (create_implicit_typedef): Adjust. * decl2.c (build_artificial_parm): Adjust. * method.c (implicitly_declare_fn): Adjust. * pt.c (push_inline_template_parms_recursive): Adjust. (process_template_parm): Adjust. (overloaded_template_name): Adjust. * semantics.c (finish_template_template_parm): Adjust. From-SVN: r34780 --- gcc/cp/ChangeLog | 11 +++++++++++ gcc/cp/cp-tree.h | 3 --- gcc/cp/decl.c | 2 +- gcc/cp/decl2.c | 2 +- gcc/cp/method.c | 4 ++-- gcc/cp/pt.c | 6 +++--- gcc/cp/semantics.c | 2 +- 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 390bc1c..b441eec 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,14 @@ +2000-06-29 Nathan Sidwell + + * cp-tree.h (SET_DECL_ARTIFICIAL): Remove. + * decl.c (create_implicit_typedef): Adjust. + * decl2.c (build_artificial_parm): Adjust. + * method.c (implicitly_declare_fn): Adjust. + * pt.c (push_inline_template_parms_recursive): Adjust. + (process_template_parm): Adjust. + (overloaded_template_name): Adjust. + * semantics.c (finish_template_template_parm): Adjust. + 2000-06-28 Mark Mitchell * cp-tree.h (CLEAR_BINFO_NEW_VTABLE_MARKED): Remove. diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 9f8ba20..0276d68 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -2569,9 +2569,6 @@ extern int flag_new_for_scope; #define DECL_ANTICIPATED(NODE) \ (DECL_LANG_SPECIFIC (FUNCTION_DECL_CHECK (NODE))->decl_flags.anticipated_p) -/* This _DECL represents a compiler-generated entity. */ -#define SET_DECL_ARTIFICIAL(NODE) (DECL_ARTIFICIAL (NODE) = 1) - /* Record whether a typedef for type `int' was actually `signed int'. */ #define C_TYPEDEF_EXPLICITLY_SIGNED(exp) DECL_LANG_FLAG_1 ((exp)) diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index f5e28f7..dd117da 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2805,7 +2805,7 @@ create_implicit_typedef (name, type) tree decl; decl = build_decl (TYPE_DECL, name, type); - SET_DECL_ARTIFICIAL (decl); + DECL_ARTIFICIAL (decl) = 1; /* There are other implicit type declarations, like the one *within* a class that allows you to write `S::S'. We must distinguish amongst these. */ diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index af29ae0..e4dcdea 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -959,7 +959,7 @@ build_artificial_parm (name, type) tree parm; parm = build_decl (PARM_DECL, name, type); - SET_DECL_ARTIFICIAL (parm); + DECL_ARTIFICIAL (parm) = 1; DECL_ARG_TYPE (parm) = type; return parm; } diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 07543fc..f8e9bc2 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -2644,8 +2644,8 @@ implicitly_declare_fn (kind, type, const_p) my_friendly_assert (TREE_CODE (fn) == FUNCTION_DECL, 20000408); if (kind != sfk_constructor && kind != sfk_destructor) - SET_DECL_ARTIFICIAL (TREE_CHAIN (DECL_ARGUMENTS (fn))); - SET_DECL_ARTIFICIAL (fn); + DECL_ARTIFICIAL (TREE_CHAIN (DECL_ARGUMENTS (fn))) = 1; + DECL_ARTIFICIAL (fn) = 1; DECL_NOT_REALLY_EXTERN (fn) = 1; DECL_THIS_INLINE (fn) = 1; DECL_INLINE (fn) = 1; diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index e36d51b..28e2e72 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -347,7 +347,7 @@ push_inline_template_parms_recursive (parmlist, levels) available. */ tree decl = build_decl (CONST_DECL, DECL_NAME (parm), TREE_TYPE (parm)); - SET_DECL_ARTIFICIAL (decl); + DECL_ARTIFICIAL (decl) = 1; DECL_INITIAL (decl) = DECL_INITIAL (parm); SET_DECL_TEMPLATE_PARM_P (decl); pushdecl (decl); @@ -1871,7 +1871,7 @@ process_template_parm (list, next) processing_template_decl, decl, TREE_TYPE (parm)); } - SET_DECL_ARTIFICIAL (decl); + DECL_ARTIFICIAL (decl) = 1; SET_DECL_TEMPLATE_PARM_P (decl); pushdecl (decl); parm = build_tree_list (defval, parm); @@ -7545,7 +7545,7 @@ overload_template_name (type) return; decl = build_decl (TYPE_DECL, id, type); - SET_DECL_ARTIFICIAL (decl); + DECL_ARTIFICIAL (decl) = 1; pushdecl_class_level (decl); } diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index aa95da8..c0f64b0 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -2232,7 +2232,7 @@ finish_template_template_parm (aggr, identifier) tree tmpl = build_lang_decl (TEMPLATE_DECL, identifier, NULL_TREE); DECL_TEMPLATE_PARMS (tmpl) = current_template_parms; DECL_TEMPLATE_RESULT (tmpl) = decl; - SET_DECL_ARTIFICIAL (decl); + DECL_ARTIFICIAL (decl) = 1; end_template_decl (); return finish_template_type_parm (aggr, tmpl); -- 2.7.4