diff options
| author | Steven Bosscher <steven@gcc.gnu.org> | 2003-05-01 14:39:37 +0000 |
|---|---|---|
| committer | Steven Bosscher <steven@gcc.gnu.org> | 2003-05-01 14:39:37 +0000 |
| commit | 85209a3c3b3432c276c4d332e24839b07f0483de (patch) | |
| tree | c91b1eedeace3317db7f085a74ab6ec1cda4b3e3 | |
| parent | 4f9335cdd957ddfc4a25c6713843fccba7ec4c29 (diff) | |
| download | gcc-85209a3c3b3432c276c4d332e24839b07f0483de.zip gcc-85209a3c3b3432c276c4d332e24839b07f0483de.tar.gz gcc-85209a3c3b3432c276c4d332e24839b07f0483de.tar.bz2 | |
cp-tree.h (struct lang_id2): Remove.
* cp-tree.h (struct lang_id2): Remove. Move fields from here...
(struct lang_identifier): ... to here.
(LANG_ID_FIELD): Remove.
(SET_LANG_ID): Remove.
(IDENTIFIER_LABEL_VALUE): Adjust for new lang_identifier.
(SET_IDENTIFIER_LABEL_VALUE): Likewise.
(IDENTIFIER_IMPLICIT_DECL): Likewise.
(SET_IDENTIFIERL_IMPLICIT_DECL): Likewise.
(IDENTIFIER_ERROR_LOCUS): Likewise.
(SET_IDENTIFIER_ERROR_LOCUS): Likewise.
From-SVN: r66328
| -rw-r--r-- | gcc/cp/ChangeLog | 13 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 33 |
2 files changed, 22 insertions, 24 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index c68ca29..15cca9a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,16 @@ +2003-05-01 Steven Bosscher <steven@gcc.gnu.org> + + * cp-tree.h (struct lang_id2): Remove. Move fields from here... + (struct lang_identifier): ... to here. + (LANG_ID_FIELD): Remove. + (SET_LANG_ID): Remove. + (IDENTIFIER_LABEL_VALUE): Adjust for new lang_identifier. + (SET_IDENTIFIER_LABEL_VALUE): Likewise. + (IDENTIFIER_IMPLICIT_DECL): Likewise. + (SET_IDENTIFIERL_IMPLICIT_DECL): Likewise. + (IDENTIFIER_ERROR_LOCUS): Likewise. + (SET_IDENTIFIER_ERROR_LOCUS): Likewise. + 2003-05-01 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> PR c++/8772 diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 73e0766..2da12e2 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -224,7 +224,9 @@ struct lang_identifier GTY(()) cxx_binding *bindings; tree class_value; tree class_template_info; - struct lang_id2 *x; + tree label_value; + tree implicit_decl; + tree error_locus; }; /* In an IDENTIFIER_NODE, nonzero if this identifier is actually a @@ -236,13 +238,6 @@ struct lang_identifier GTY(()) #define LANG_IDENTIFIER_CAST(NODE) \ ((struct lang_identifier*)IDENTIFIER_NODE_CHECK (NODE)) -struct lang_id2 GTY(()) -{ - tree label_value; - tree implicit_decl; - tree error_locus; -}; - typedef struct template_parm_index_s GTY(()) { struct tree_common common; @@ -392,30 +387,20 @@ struct tree_wrapper GTY(()) #define SET_IDENTIFIER_TYPE_VALUE(NODE,TYPE) (TREE_TYPE (NODE) = (TYPE)) #define IDENTIFIER_HAS_TYPE_VALUE(NODE) (IDENTIFIER_TYPE_VALUE (NODE) ? 1 : 0) -#define LANG_ID_FIELD(NAME, NODE) \ - (LANG_IDENTIFIER_CAST (NODE)->x \ - ? LANG_IDENTIFIER_CAST (NODE)->x->NAME : 0) - -#define SET_LANG_ID(NODE, VALUE, NAME) \ - (LANG_IDENTIFIER_CAST (NODE)->x == 0 \ - ? LANG_IDENTIFIER_CAST (NODE)->x \ - = (struct lang_id2 *)ggc_alloc_cleared (sizeof (struct lang_id2)) : 0, \ - LANG_IDENTIFIER_CAST (NODE)->x->NAME = (VALUE)) - #define IDENTIFIER_LABEL_VALUE(NODE) \ - LANG_ID_FIELD (label_value, NODE) + (LANG_IDENTIFIER_CAST (NODE)->label_value) #define SET_IDENTIFIER_LABEL_VALUE(NODE, VALUE) \ - SET_LANG_ID (NODE, VALUE, label_value) + IDENTIFIER_LABEL_VALUE (NODE) = (VALUE) #define IDENTIFIER_IMPLICIT_DECL(NODE) \ - LANG_ID_FIELD (implicit_decl, NODE) + (LANG_IDENTIFIER_CAST (NODE)->implicit_decl) #define SET_IDENTIFIER_IMPLICIT_DECL(NODE, VALUE) \ - SET_LANG_ID (NODE, VALUE, implicit_decl) + IDENTIFIER_IMPLICIT_DECL (NODE) = (VALUE) #define IDENTIFIER_ERROR_LOCUS(NODE) \ - LANG_ID_FIELD (error_locus, NODE) + (LANG_IDENTIFIER_CAST (NODE)->error_locus) #define SET_IDENTIFIER_ERROR_LOCUS(NODE, VALUE) \ - SET_LANG_ID (NODE, VALUE, error_locus) + IDENTIFIER_ERROR_LOCUS (NODE) = (VALUE) /* Nonzero if this identifier is used as a virtual function name somewhere (optimizes searches). */ |