C++ misc patch cp-tree.h
Graham Stott
grahams@redhat.com
Wed Jan 2 23:47:00 GMT 2002
All,
This is a long and very boring patch the changelog look longer to
do than the patch itself.
The attached patch tidies up cp-tree.h w.r.t whitespace, long lines
and use of parenthesis in macros.
Bootstrapped x86-pc-linux-gnu + with and without enable-checking
+ all languages no regressions.
Graham
ChangeLog
* cp-tree.h (VAR_OR_FUNCTION_DECL_CHECK): Add parenthesis.
(VAR_FUNCTION_OR_PARM_DECL_CHECK): Likewise.
(VAR_TEMPL_TYPE_OR_FUNCTION_DECL_CHECK) Likewise.
(RECORD_OR_UNION_TYPE_CHECK): Likewise.
(BOUND_TEMPLATE_TEMPLATE_PARM_TYPE_CHECK): Likewise.
(C_IS_RESERVED_WORD): Uppercase macro parameter.
(C_RID_YYCODE) Likewise.
(ptrmem_cst): Use rtx.
(LOCAL_BINDING_P): Add whitespace.
(INHERITED_VALUE_BINDING_P): Likewise.
(BINDING_SCOPE): Wrap long line.
(BINDING_HAS_LEVEL_P): Remove parenthesis.
(BINDING_VALUE): Wrap long line.
(BINDING_TYPE): Whitespace.
(IDENTIFIER_GLOBAL_VALUE): Add parenthesis.
(SET_IDENTIFIER_GLOBAL_VALUE): Likewise.
(IDENTIFIER_NAMESPACE_VALUE): Likewise.
(SET_IDENTIFIER_NAMESPACE_VALUE: Likewise.
(same_type_p): Uppercase macro parameters.
(same_type_ignoring_top_level_qualifiers_p): Likewise.
(OVL_FUNCTION): Wrap long line.
(OVL_CHAIN): Whitespace.
(OVL_CURRENT): Add paranthesis and whitespace.
(OVL_NEXT): Whitespace.
(OVL_USED): Likewise.
(IDENTIFIER_TYPE_VALUE): Likewise.
(REAL_IDENTIFIER_TYPE_VALUE): Remove parenthesis.
(SET_IDENTIFIER_TYPE_VALUE): Add parenthesis and whitespace.
(LANG_ID_FIELD): Whitespace.
(SET_LANG_ID(NODE,VALUE,NAME): Likewise.
(IDENTIFIER_LABEL_VALUE): Whitespace and wrap.
(SET_IDENTIFIER_LABEL_VALUE): Whitespace.
(IDENTIFIER_IMPLICIT_DECL): Whitespace and wrap.
(SET_IDENTIFIER_IMPLICIT_DECL); Whitespace.
(IDENTIFIER_ERROR_LOCUS): Whitespace and wrap.
(SET_IDENTIFIER_ERROR_LOCUS); Whitespace.
(IDENTIFIER_VIRTUAL_P): Likewise.
(IDENTIFIER_OPNAME_P): Likewise.
(IDENTIFIER_TYPENAME_P): Remove parenthesis.
(C_TYPE_FIELDS_READONLY): Uppercase macro parameters.
(C_SET_EXP_ORIGINAL_CODE): Likewise.
(TYPE_ASSEMBLER_NAME_STRING): Wrap long line.
(TYPE_ASSEMBLER_NAME_LENGTH): Likewise.
(IS_AGGR_TYPE): Uppercase macro parameter.
(CLASS_TYPE_P): Likewise.
(IS_AGGR_TYPE_CODE): Uppercase macro parameter and parenthesis.
(IS_AGGR_TYPE_2): Whitespace.
(TAGGED_TYPE_P): Uppercase macro parameter.
(TYPE_BUILT_IN): Whitespace.
(TYPE_FOR_JAVA): Likewise.
(FUNCTION_ARG_CHAIN): Remove parenthesis.
(FUNCTION_FIRST_USER_PARMTYPE): Add parenthesis.
(FUNCTION_FIRST_USER_PARAM): Likewise.
(PROMOTES_TO_AGGR_TYPE): Whitespace.
(DERIVED_FROM_P): Add parenthesis and wrap.
(UNIQUELY_DERIVED_FROM_P): Likewise.
(ACCESSIBLY_UNIQUELY_DERIVED_P): Likewise.
(PUBLICLY_UNIQUELY_DERIVED_P): Likewise.
(CLASSTYPE_USE_TEMPLATE): Whitespace.
(CLASSTYPE_INLINE_FRIENDS): Remove parenthesis.
(TYPE_GETS_DELETE): Add parenthesis.
(TYPE_HAS_CONVERSION): Add parenthesis and wrap.
(TYPE_HAS_ASSIGN_REF): Likewise,
(TYPE_HAS_CONST_ASSIGN_REF): Likewise.
(TYPE_HAS_INIT_REF): Likewise.
(TYPE_HAS_CONST_INIT_REF): Likewise.
(TYPE_BEING_DEFINED): Likewise.
(TYPE_LANG_SPECIFIC): Likewise.
(CLASSTYPE_RTTI): Likewise.
(TYPE_OVERLOADS_CALL_EXPR): Likewise.
(TYPE_OVERLOADS_ARRAY_REF): Likewise.
(TYPE_OVERLOADS_ARROW): Likewise.
(TYPE_USES_MULTIPLE_INHERITANCE): Likewise.
(TYPE_USES_VIRTUAL_BASECLASSES): Add parenthesis.
(CLASSTYPE_METHOD_VEC): Likewise.
(CLASSTYPE_MARKED_N): Likewise.
(CLASSTYPE_MARKED): Likewise.
(CLASSTYPE_MARKED2): Likewise.
(CLASSTYPE_MARKED3): Likewise.
(CLASSTYPE_MARKED4): Likewise.
(CLASSTYPE_MARKED5): Likewise.
(CLASSTYPE_MARKED6): Likewise.
(SET_CLASSTYPE_MARKED): Whitespace.
(CLEAR_CLASSTYPE_MARKED): Likewise.
(SET_CLASSTYPE_MARKED2): Likewise.
(CLEAR_CLASSTYPE_MARKED2): Likewise.
(SET_CLASSTYPE_MARKED3): Likewise.
(CLEAR_CLASSTYPE_MARKED3): Likewise.
(SET_CLASSTYPE_MARKED4): Likewise.
(CLEAR_CLASSTYPE_MARKED4): Likewise.
(SET_CLASSTYPE_MARKED5): Likewise.
(CLEAR_CLASSTYPE_MARKED5): Likewise.
(SET_CLASSTYPE_MARKED6): Likewise.
(CLEAR_CLASSTYPE_MARKED6): Likewise.
(CLASSTYPE_TAGS): Likewise.
(CLASSTYPE_VSIZE): Likewise.
(CLASSTYPE_VBASECLASSES): Likewise.
(CANONICAL_BINFO): Add parenthesis.
(CLASSTYPE_SIZE(NODE): Likewise.
(CLASSTYPE_SIZE_UNIT): Likewise.
(CLASSTYPE_ALIGN(NODE): Likewise.
(CLASSTYPE_USER_ALIGN): Likewise.
(TYPE_JAVA_INTERFACE): Likewise.
(CLASSTYPE_PURE_VIRTUALS): Likewise.
(CLASSTYPE_NEEDS_VIRTUAL_REINIT): Whitespace and wrap.
(TYPE_HAS_DEFAULT_CONSTRUCTOR): Likewise.
(CLASSTYPE_HAS_MUTABLE): Likewise.
(CLASSTYPE_FRIEND_CLASSES): Likewise. Likewise.
(CLASSTYPE_DECLARED_CLASS): Whitespace and wrap.
(CLASSTYPE_READONLY_FIELDS_NEED_INIT): Likewise.
(CLASSTYPE_REF_FIELDS_NEED_INIT): Likewise.
(CLASSTYPE_INTERFACE_ONLY): Likewise.
(CLASSTYPE_INTERFACE_KNOWN): Likewise.
(CLASSTYPE_INTERFACE_UNKNOWN): Likewise.
(SET_CLASSTYPE_INTERFACE_UNKNOWN_X): Likewise.
(SET_CLASSTYPE_INTERFACE_UNKNOWN): Likewise.
(SET_CLASSTYPE_INTERFACE_KNOWN): Likewise.
(CLASSTYPE_DEBUG_REQUESTED): Whitespace and wrap.
(BINFO_UNSHARED_MARKED): Whitespace.
(BINFO_MARKED): Whitespace and wrap.
(SET_BINFO_MARKED): Likewise.
(CLEAR_BINFO_MARKED): Likewise.
(BINFO_VTABLE_PATH_MARKED): Likewise.
(SET_BINFO_VTABLE_PATH_MARKED): Likewise.
(CLEAR_BINFO_VTABLE_PATH_MARKED): Likewise.
(BINFO_SUBVTT_INDEX): Remove parenthesis.
(BINFO_VPTR_INDEX): Likewise.
(BINFO_PRIMARY_BASE_OF): Likewise,
(CLASSTYPE_VFIELDS): Whitespace.
(VF_DERIVED_VALUE): Wrap long line.
(NAMESPACE_LEVEL): Whitespace.
(CAN_HAVE_FULL_LANG_DECL_P): Remove parenthesis.
(DEFARG_POINTER): Whitespace.
(DECL_NEEDED_P): Remove parenthesis.
(DECL_LANGUAGE): Whitespace.
(SET_DECL_LANGUAGE): Add parenthesis.
(DECL_CONSTRUCTOR_P): Whitespace and wrap.
(DECL_OVERLOADED_OPERATOR_P): Remove parenthesis.
(DECL_IN_AGGR_P): Whitespace.
(DECL_FRIEND_P): Likewise.
(DECL_BEFRIENDING_CLASSES): Likewise.
(DECL_STATIC_FUNCTION_P): Whitespace and wrap.
(DECL_NONCONVERTING_P): Whitespace.
(DECL_PURE_VIRTUAL_P): Likewise.
(DECL_NEEDS_FINAL_OVERRIDER_P): Likewise.
(DECL_PENDING_INLINE_INFO): Whitespace.
(DECL_SORTED_FIELDS): Likewise.
(DECL_DEFERRED_FN): Likewise.
(DECL_TEMPLATE_INFO): Likewise.
(CLASSTYPE_TEMPLATE_INFO): Whitespace and wrap.
(TEMPLATE_TEMPLATE_PARM_TEMPLATE_INFO); Likewise.
(SET_TYPE_TEMPLATE_INFO): Add parenthesis.
(TMPL_ARGS_LEVEL): Likewise.
(SET_TMPL_ARGS_LEVEL): Likewise.
(INNERMOST_TEMPLATE_PARMS): Whitespace.
(C_TYPEDEF_EXPLICITLY_SIGNED): Uppercase macro parameter.
(INTEGRAL_CODE_P(CODE): Add parenthesis.
(CP_INTEGRAL_TYPE_P): Remove parenthesis.
(TYPE_HAS_CONSTRUCTOR): Whitespace.
(TREE_HAS_CONSTRUCTOR): Likewise.
(TYPE_HAS_DESTRUCTOR): Likewise.
(TYPE_HAS_REAL_ASSIGN_REF): Likewise.
(TYPE_HAS_COMPLEX_ASSIGN_REF): Likewise.
(TYPE_HAS_ABSTRACT_ASSIGN_REF): Likewise.
(TYPE_HAS_COMPLEX_INIT_REF): Likewise.
(TYPE_HAS_NONTRIVIAL_DESTRUCTOR): Likewise.
(TYPE_PTRMEMFUNC_P): Likewise.
(TYPE_PTRMEMFUNC_FLAG): Likewise.
(TYPE_GET_PTRMEMFUNC_TYPE): Likewise.
(TYPE_SET_PTRMEMFUNC_TYPE): Likewise.
(TYPE_PTRMEM_CLASS_TYPE): Remove paranthesis.
(TYPE_PTRMEM_POINTED_TO_TYPE): Likewise.
(DECL_ACCESS): Whitespace.
(DECL_GLOBAL_CTOR_P): Remove paranthesis.
(DECL_GLOBAL_DTOR_P): Likewise.
(GLOBAL_INIT_PRIORITY): Likewise.
(DECL_TEMPLATE_PARMS): Likewise.
(DECL_TEMPLATE_RESULT): Likewise.
(DECL_NEEDED_P): Remove parenthesis.
(DECL_LANGUAGE): Whitespace.
(SET_DECL_LANGUAGE): Add parenthesis.
(DECL_CONSTRUCTOR_P): Whitespace and wrap.
(DECL_OVERLOADED_OPERATOR_P): Remove parenthesis.
(DECL_IN_AGGR_P): Whitespace.
(DECL_FRIEND_P): Likewise.
(DECL_BEFRIENDING_CLASSES): Likewise.
(DECL_STATIC_FUNCTION_P): Whitespace and wrap.
(DECL_NONCONVERTING_P): Whitespace.
(DECL_PURE_VIRTUAL_P): Likewise.
(DECL_NEEDS_FINAL_OVERRIDER_P): Likewise.
(DECL_PENDING_INLINE_INFO): Whitespace.
(DECL_SORTED_FIELDS): Likewise.
(DECL_DEFERRED_FN): Likewise.
(DECL_TEMPLATE_INFO): Likewise.
(CLASSTYPE_TEMPLATE_INFO): Whitespace and wrap.
(TEMPLATE_TEMPLATE_PARM_TEMPLATE_INFO); Likewise.
(SET_TYPE_TEMPLATE_INFO): Add parenthesis.
(TMPL_ARGS_LEVEL): Likewise.
(SET_TMPL_ARGS_LEVEL): Likewise.
(INNERMOST_TEMPLATE_PARMS): Whitespace.
(C_TYPEDEF_EXPLICITLY_SIGNED): Uppercase macro parameter.
(INTEGRAL_CODE_P(CODE): Add parenthesis.
(CP_INTEGRAL_TYPE_P): Remove parenthesis.
(TYPE_HAS_CONSTRUCTOR): Whitespace.
(TREE_HAS_CONSTRUCTOR): Likewise.
(TYPE_HAS_DESTRUCTOR): Likewise.
(TYPE_HAS_REAL_ASSIGN_REF): Likewise.
(TYPE_HAS_COMPLEX_ASSIGN_REF): Likewise.
(TYPE_HAS_ABSTRACT_ASSIGN_REF): Likewise.
(TYPE_HAS_COMPLEX_INIT_REF): Likewise.
(TYPE_HAS_NONTRIVIAL_DESTRUCTOR): Likewise.
(TYPE_PTRMEMFUNC_P): Likewise.
(TYPE_PTRMEMFUNC_FLAG): Likewise.
(TYPE_GET_PTRMEMFUNC_TYPE): Likewise.
(TYPE_SET_PTRMEMFUNC_TYPE): Likewise.
(TYPE_PTRMEM_CLASS_TYPE): Remove paranthesis.
(TYPE_PTRMEM_POINTED_TO_TYPE): Likewise.
(DECL_ACCESS): Whitespace.
(DECL_GLOBAL_CTOR_P): Remove paranthesis.
(DECL_GLOBAL_DTOR_P): Likewise.
(GLOBAL_INIT_PRIORITY): Likewise.
(DECL_TEMPLATE_PARMS): Likewise.
(DECL_TEMPLATE_RESULT): Likewise.
(DECL_TEMPLATE_INSTANTIATIONS): Likewise.
(ECL_TEMPLATE_SPECIALIZATIONS): Likewise.
(DECL_IMPLICIT_TYPEDEF_P): Remove parenthesis.
(SET_DECL_IMPLICIT_TYPEDEF_P): Likewise.
(PRIMARY_TEMPLATE_P): Add parenthesis.
(DECL_USE_TEMPLATE): Whitespace.
(CLASSTYPE_IMPLICIT_INSTANTIATION): Likewise.
(SET_CLASSTYPE_IMPLICIT_INSTANTIATION): Likewise.
(CLASSTYPE_EXPLICIT_INSTANTIATION): Likewise.
(SET_CLASSTYPE_EXPLICIT_INSTANTIATION): Likewise.
(CALL_DECLARATOR_PARMS): Remove parenthesis.
(CALL_DECLARATOR_QUALS): Likewise.
(CALL_DECLARATOR_EXCEPTION_SPEC): Likewise.
(TEMP_NAME_P): Wrap.
(VFIELD_NAME_P): Likewise.
(B_SET): Uppercase macro parameters and add parenthesis.
(B_CLR): Likewise.
(B_TST): Likewise.
(LOOKUP_NAMESPACES_ONLY): Uppercase macro parameters.
(LOOKUP_TYPES_ONLY): Uppercase macro parameters.
(LOOKUP_QUALIFIERS_ONLY): Uppercase macro parameters.
(same_or_base_type_p): Likewise.
(cp_deprecated): Likewise.
-------------- next part --------------
Index: cp-tree.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/cp-tree.h,v
retrieving revision 1.669
diff -c -p -r1.669 cp-tree.h
*** cp-tree.h 2002/01/02 12:50:09 1.669
--- cp-tree.h 2002/01/03 05:44:51
*************** Boston, MA 02111-1307, USA. */
*** 154,180 ****
#if defined ENABLE_TREE_CHECKING && (GCC_VERSION >= 2007)
#define VAR_OR_FUNCTION_DECL_CHECK(NODE) \
! ({ const tree __t = NODE; \
! enum tree_code __c = TREE_CODE(__t); \
if (__c != VAR_DECL && __c != FUNCTION_DECL) \
tree_check_failed (__t, VAR_DECL, __FILE__, __LINE__, \
__FUNCTION__); \
__t; })
#define VAR_FUNCTION_OR_PARM_DECL_CHECK(NODE) \
! ({ const tree __t = NODE; \
! enum tree_code __c = TREE_CODE(__t); \
! if (__c != VAR_DECL \
! && __c != FUNCTION_DECL \
&& __c != PARM_DECL) \
tree_check_failed (__t, VAR_DECL, __FILE__, __LINE__, \
__FUNCTION__); \
__t; })
#define VAR_TEMPL_TYPE_OR_FUNCTION_DECL_CHECK(NODE) \
! ({ const tree __t = NODE; \
! enum tree_code __c = TREE_CODE(__t); \
! if (__c != VAR_DECL \
&& __c != FUNCTION_DECL \
&& __c != TYPE_DECL \
&& __c != TEMPLATE_DECL) \
--- 154,180 ----
#if defined ENABLE_TREE_CHECKING && (GCC_VERSION >= 2007)
#define VAR_OR_FUNCTION_DECL_CHECK(NODE) \
! ({ const tree __t = (NODE); \
! enum tree_code const __c = TREE_CODE(__t); \
if (__c != VAR_DECL && __c != FUNCTION_DECL) \
tree_check_failed (__t, VAR_DECL, __FILE__, __LINE__, \
__FUNCTION__); \
__t; })
#define VAR_FUNCTION_OR_PARM_DECL_CHECK(NODE) \
! ({ const tree __t = (NODE); \
! enum tree_code const __c = TREE_CODE(__t); \
! if (__c != VAR_DECL \
! && __c != FUNCTION_DECL \
&& __c != PARM_DECL) \
tree_check_failed (__t, VAR_DECL, __FILE__, __LINE__, \
__FUNCTION__); \
__t; })
#define VAR_TEMPL_TYPE_OR_FUNCTION_DECL_CHECK(NODE) \
! ({ const tree __t = (NODE); \
! enum tree_code const __c = TREE_CODE(__t); \
! if (__c != VAR_DECL \
&& __c != FUNCTION_DECL \
&& __c != TYPE_DECL \
&& __c != TEMPLATE_DECL) \
*************** Boston, MA 02111-1307, USA. */
*** 183,198 ****
__t; })
#define RECORD_OR_UNION_TYPE_CHECK(NODE) \
! ({ const tree __t = NODE; \
! enum tree_code __c = TREE_CODE(__t); \
if (__c != RECORD_TYPE && __c != UNION_TYPE) \
tree_check_failed (__t, RECORD_TYPE, __FILE__, __LINE__, \
__FUNCTION__); \
__t; })
#define BOUND_TEMPLATE_TEMPLATE_PARM_TYPE_CHECK(NODE) \
! ({ const tree __t = NODE; \
! enum tree_code __c = TREE_CODE(__t); \
if (__c != BOUND_TEMPLATE_TEMPLATE_PARM) \
tree_check_failed (__t, BOUND_TEMPLATE_TEMPLATE_PARM, \
__FILE__, __LINE__, __FUNCTION__); \
--- 183,198 ----
__t; })
#define RECORD_OR_UNION_TYPE_CHECK(NODE) \
! ({ const tree __t = (NODE); \
! enum tree_code const __c = TREE_CODE(__t); \
if (__c != RECORD_TYPE && __c != UNION_TYPE) \
tree_check_failed (__t, RECORD_TYPE, __FILE__, __LINE__, \
__FUNCTION__); \
__t; })
#define BOUND_TEMPLATE_TEMPLATE_PARM_TYPE_CHECK(NODE) \
! ({ const tree __t = (NODE); \
! enum tree_code const __c = TREE_CODE(__t); \
if (__c != BOUND_TEMPLATE_TEMPLATE_PARM) \
tree_check_failed (__t, BOUND_TEMPLATE_TEMPLATE_PARM, \
__FILE__, __LINE__, __FUNCTION__); \
*************** Boston, MA 02111-1307, USA. */
*** 200,210 ****
#else /* not ENABLE_TREE_CHECKING, or not gcc */
! #define VAR_OR_FUNCTION_DECL_CHECK(NODE) NODE
! #define VAR_FUNCTION_OR_PARM_DECL_CHECK(NODE) NODE
! #define VAR_TEMPL_TYPE_OR_FUNCTION_DECL_CHECK(NODE) NODE
! #define RECORD_OR_UNION_TYPE_CHECK(NODE) NODE
! #define BOUND_TEMPLATE_TEMPLATE_PARM_TYPE_CHECK(NODE) NODE
#endif
--- 200,210 ----
#else /* not ENABLE_TREE_CHECKING, or not gcc */
! #define VAR_OR_FUNCTION_DECL_CHECK(NODE) (NODE)
! #define VAR_FUNCTION_OR_PARM_DECL_CHECK(NODE) (NODE)
! #define VAR_TEMPL_TYPE_OR_FUNCTION_DECL_CHECK(NODE) (NODE)
! #define RECORD_OR_UNION_TYPE_CHECK(NODE) (NODE)
! #define BOUND_TEMPLATE_TEMPLATE_PARM_TYPE_CHECK(NODE) (NODE)
#endif
*************** struct lang_identifier
*** 242,251 ****
keyword. C_RID_CODE (node) is then the RID_* value of the keyword,
and C_RID_YYCODE is the token number wanted by Yacc. */
! #define C_IS_RESERVED_WORD(id) TREE_LANG_FLAG_5 (id)
extern const short rid_to_yy[RID_MAX];
! #define C_RID_YYCODE(id) rid_to_yy[C_RID_CODE (id)]
#define LANG_IDENTIFIER_CAST(NODE) \
((struct lang_identifier*)IDENTIFIER_NODE_CHECK (NODE))
--- 242,251 ----
keyword. C_RID_CODE (node) is then the RID_* value of the keyword,
and C_RID_YYCODE is the token number wanted by Yacc. */
! #define C_IS_RESERVED_WORD(ID) TREE_LANG_FLAG_5 (ID)
extern const short rid_to_yy[RID_MAX];
! #define C_RID_YYCODE(ID) rid_to_yy[C_RID_CODE (ID)]
#define LANG_IDENTIFIER_CAST(NODE) \
((struct lang_identifier*)IDENTIFIER_NODE_CHECK (NODE))
*************** typedef struct ptrmem_cst
*** 277,319 ****
struct tree_common common;
/* This isn't used, but the middle-end expects all constants to have
this field. */
! struct rtx_def *rtl;
tree member;
}* ptrmem_cst_t;
/* Nonzero if this binding is for a local scope, as opposed to a class
or namespace scope. */
! #define LOCAL_BINDING_P(NODE) TREE_LANG_FLAG_0(NODE)
/* Nonzero if BINDING_VALUE is from a base class of the class which is
currently being defined. */
! #define INHERITED_VALUE_BINDING_P(NODE) TREE_LANG_FLAG_1(NODE)
/* For a binding between a name and an entity at a non-local scope,
defines the scope where the binding is declared. (Either a class
_TYPE node, or a NAMESPACE_DECL.) This macro should be used only
for namespace-level bindings; on the IDENTIFIER_BINDING list
BINDING_LEVEL is used instead. */
! #define BINDING_SCOPE(NODE) (((struct tree_binding*)CPLUS_BINDING_CHECK (NODE))->scope.scope)
/* Nonzero if NODE has BINDING_LEVEL, rather than BINDING_SCOPE. */
! #define BINDING_HAS_LEVEL_P(NODE) TREE_LANG_FLAG_2 ((NODE))
/* This is the declaration bound to the name. Possible values:
variable, overloaded function, namespace, template, enumerator. */
! #define BINDING_VALUE(NODE) (((struct tree_binding*)CPLUS_BINDING_CHECK (NODE))->value)
/* If name is bound to a type, this is the type (struct, union, enum). */
! #define BINDING_TYPE(NODE) TREE_TYPE(NODE)
#define IDENTIFIER_GLOBAL_VALUE(NODE) \
! namespace_binding (NODE, global_namespace)
#define SET_IDENTIFIER_GLOBAL_VALUE(NODE, VAL) \
! set_namespace_binding (NODE, global_namespace, VAL)
#define IDENTIFIER_NAMESPACE_VALUE(NODE) \
! namespace_binding (NODE, current_namespace)
#define SET_IDENTIFIER_NAMESPACE_VALUE(NODE, VAL) \
! set_namespace_binding (NODE, current_namespace, VAL)
#define CLEANUP_P(NODE) TREE_LANG_FLAG_0 (TRY_BLOCK_CHECK (NODE))
#define CLEANUP_DECL(NODE) TREE_OPERAND (CLEANUP_STMT_CHECK (NODE), 0)
--- 277,321 ----
struct tree_common common;
/* This isn't used, but the middle-end expects all constants to have
this field. */
! rtx rtl;
tree member;
}* ptrmem_cst_t;
/* Nonzero if this binding is for a local scope, as opposed to a class
or namespace scope. */
! #define LOCAL_BINDING_P(NODE) TREE_LANG_FLAG_0 (NODE)
/* Nonzero if BINDING_VALUE is from a base class of the class which is
currently being defined. */
! #define INHERITED_VALUE_BINDING_P(NODE) TREE_LANG_FLAG_1 (NODE)
/* For a binding between a name and an entity at a non-local scope,
defines the scope where the binding is declared. (Either a class
_TYPE node, or a NAMESPACE_DECL.) This macro should be used only
for namespace-level bindings; on the IDENTIFIER_BINDING list
BINDING_LEVEL is used instead. */
! #define BINDING_SCOPE(NODE) \
! (((struct tree_binding*)CPLUS_BINDING_CHECK (NODE))->scope.scope)
/* Nonzero if NODE has BINDING_LEVEL, rather than BINDING_SCOPE. */
! #define BINDING_HAS_LEVEL_P(NODE) TREE_LANG_FLAG_2 (NODE)
/* This is the declaration bound to the name. Possible values:
variable, overloaded function, namespace, template, enumerator. */
! #define BINDING_VALUE(NODE) \
! (((struct tree_binding*)CPLUS_BINDING_CHECK (NODE))->value)
/* If name is bound to a type, this is the type (struct, union, enum). */
! #define BINDING_TYPE(NODE) TREE_TYPE (NODE)
#define IDENTIFIER_GLOBAL_VALUE(NODE) \
! namespace_binding ((NODE), global_namespace)
#define SET_IDENTIFIER_GLOBAL_VALUE(NODE, VAL) \
! set_namespace_binding ((NODE), global_namespace, (VAL))
#define IDENTIFIER_NAMESPACE_VALUE(NODE) \
! namespace_binding ((NODE), current_namespace)
#define SET_IDENTIFIER_NAMESPACE_VALUE(NODE, VAL) \
! set_namespace_binding ((NODE), current_namespace, (VAL))
#define CLEANUP_P(NODE) TREE_LANG_FLAG_0 (TRY_BLOCK_CHECK (NODE))
#define CLEANUP_DECL(NODE) TREE_OPERAND (CLEANUP_STMT_CHECK (NODE), 0)
*************** typedef struct ptrmem_cst
*** 321,333 ****
/* Returns nonzero iff TYPE1 and TYPE2 are the same type, in the usual
sense of `same'. */
! #define same_type_p(type1, type2) \
! comptypes ((type1), (type2), COMPARE_STRICT)
/* Returns nonzero iff TYPE1 and TYPE2 are the same type, ignoring
top-level qualifiers. */
! #define same_type_ignoring_top_level_qualifiers_p(type1, type2) \
! same_type_p (TYPE_MAIN_VARIANT (type1), TYPE_MAIN_VARIANT (type2))
/* Non-zero if we are presently building a statement tree, rather
than expanding each statement as we encounter it. */
--- 323,335 ----
/* Returns nonzero iff TYPE1 and TYPE2 are the same type, in the usual
sense of `same'. */
! #define same_type_p(TYPE1, TYPE2) \
! comptypes ((TYPE1), (TYPE2), COMPARE_STRICT)
/* Returns nonzero iff TYPE1 and TYPE2 are the same type, ignoring
top-level qualifiers. */
! #define same_type_ignoring_top_level_qualifiers_p(TYPE1, TYPE2) \
! same_type_p (TYPE_MAIN_VARIANT (TYPE1), TYPE_MAIN_VARIANT (TYPE2))
/* Non-zero if we are presently building a statement tree, rather
than expanding each statement as we encounter it. */
*************** struct tree_binding
*** 352,368 ****
};
/* The overloaded FUNCTION_DECL. */
! #define OVL_FUNCTION(NODE) (((struct tree_overload*)OVERLOAD_CHECK (NODE))->function)
! #define OVL_CHAIN(NODE) TREE_CHAIN(NODE)
/* Polymorphic access to FUNCTION and CHAIN. */
#define OVL_CURRENT(NODE) \
! ((TREE_CODE(NODE)==OVERLOAD) ? OVL_FUNCTION(NODE) : NODE)
#define OVL_NEXT(NODE) \
! ((TREE_CODE(NODE)==OVERLOAD) ? TREE_CHAIN(NODE) : NULL_TREE)
/* If set, this was imported in a using declaration.
This is not to confuse with being used somewhere, which
is not important for this node. */
! #define OVL_USED(NODE) TREE_USED(NODE)
struct tree_overload
{
--- 354,371 ----
};
/* The overloaded FUNCTION_DECL. */
! #define OVL_FUNCTION(NODE) \
! (((struct tree_overload*)OVERLOAD_CHECK (NODE))->function)
! #define OVL_CHAIN(NODE) TREE_CHAIN (NODE)
/* Polymorphic access to FUNCTION and CHAIN. */
#define OVL_CURRENT(NODE) \
! ((TREE_CODE (NODE) == OVERLOAD) ? OVL_FUNCTION (NODE) : (NODE))
#define OVL_NEXT(NODE) \
! ((TREE_CODE (NODE) == OVERLOAD) ? TREE_CHAIN (NODE) : NULL_TREE)
/* If set, this was imported in a using declaration.
This is not to confuse with being used somewhere, which
is not important for this node. */
! #define OVL_USED(NODE) TREE_USED (NODE)
struct tree_overload
{
*************** struct tree_srcloc
*** 435,479 ****
type. For namespace scope, the presence of a type in any namespace
is indicated with global_type_node, and the real type behind must
be found through lookup. */
! #define IDENTIFIER_TYPE_VALUE(NODE) (identifier_type_value(NODE))
! #define REAL_IDENTIFIER_TYPE_VALUE(NODE) (TREE_TYPE (NODE))
! #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 *)perm_calloc (1, sizeof (struct lang_id2)) : 0, \
LANG_IDENTIFIER_CAST (NODE)->x->NAME = (VALUE))
! #define IDENTIFIER_LABEL_VALUE(NODE) LANG_ID_FIELD(label_value, NODE)
! #define SET_IDENTIFIER_LABEL_VALUE(NODE,VALUE) \
! SET_LANG_ID(NODE, VALUE, label_value)
!
! #define IDENTIFIER_IMPLICIT_DECL(NODE) LANG_ID_FIELD(implicit_decl, NODE)
! #define SET_IDENTIFIER_IMPLICIT_DECL(NODE,VALUE) \
! SET_LANG_ID(NODE, VALUE, implicit_decl)
!
! #define IDENTIFIER_ERROR_LOCUS(NODE) LANG_ID_FIELD(error_locus, NODE)
! #define SET_IDENTIFIER_ERROR_LOCUS(NODE,VALUE) \
! SET_LANG_ID(NODE, VALUE, error_locus)
/* Nonzero if this identifier is used as a virtual function name somewhere
(optimizes searches). */
! #define IDENTIFIER_VIRTUAL_P(NODE) TREE_LANG_FLAG_1(NODE)
/* Nonzero if this identifier is the prefix for a mangled C++ operator
name. */
! #define IDENTIFIER_OPNAME_P(NODE) TREE_LANG_FLAG_2(NODE)
/* Nonzero if this identifier is the name of a type-conversion
operator. */
#define IDENTIFIER_TYPENAME_P(NODE) \
! (TREE_LANG_FLAG_4 (NODE))
/* Nonzero if this identifier is the name of a constructor or
destructor. */
--- 438,485 ----
type. For namespace scope, the presence of a type in any namespace
is indicated with global_type_node, and the real type behind must
be found through lookup. */
! #define IDENTIFIER_TYPE_VALUE(NODE) identifier_type_value (NODE)
! #define REAL_IDENTIFIER_TYPE_VALUE(NODE) TREE_TYPE (NODE)
! #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 *)perm_calloc (1, sizeof (struct lang_id2)) : 0, \
LANG_IDENTIFIER_CAST (NODE)->x->NAME = (VALUE))
! #define IDENTIFIER_LABEL_VALUE(NODE) \
! LANG_ID_FIELD (label_value, NODE)
! #define SET_IDENTIFIER_LABEL_VALUE(NODE, VALUE) \
! SET_LANG_ID (NODE, VALUE, label_value)
!
! #define IDENTIFIER_IMPLICIT_DECL(NODE) \
! LANG_ID_FIELD (implicit_decl, NODE)
! #define SET_IDENTIFIER_IMPLICIT_DECL(NODE, VALUE) \
! SET_LANG_ID (NODE, VALUE, implicit_decl)
!
! #define IDENTIFIER_ERROR_LOCUS(NODE) \
! LANG_ID_FIELD (error_locus, NODE)
! #define SET_IDENTIFIER_ERROR_LOCUS(NODE, VALUE) \
! SET_LANG_ID (NODE, VALUE, error_locus)
/* Nonzero if this identifier is used as a virtual function name somewhere
(optimizes searches). */
! #define IDENTIFIER_VIRTUAL_P(NODE) TREE_LANG_FLAG_1 (NODE)
/* Nonzero if this identifier is the prefix for a mangled C++ operator
name. */
! #define IDENTIFIER_OPNAME_P(NODE) TREE_LANG_FLAG_2 (NODE)
/* Nonzero if this identifier is the name of a type-conversion
operator. */
#define IDENTIFIER_TYPENAME_P(NODE) \
! TREE_LANG_FLAG_4 (NODE)
/* Nonzero if this identifier is the name of a constructor or
destructor. */
*************** struct tree_srcloc
*** 481,491 ****
TREE_LANG_FLAG_3 (NODE)
/* In a RECORD_TYPE or UNION_TYPE, nonzero if any component is read-only. */
! #define C_TYPE_FIELDS_READONLY(type) TYPE_LANG_FLAG_0 (type)
/* Store a value in that field. */
! #define C_SET_EXP_ORIGINAL_CODE(exp, code) \
! (TREE_COMPLEXITY (exp) = (int)(code))
/* If non-zero, a VAR_DECL whose cleanup will cause a throw to the
next exception handler. */
--- 487,497 ----
TREE_LANG_FLAG_3 (NODE)
/* In a RECORD_TYPE or UNION_TYPE, nonzero if any component is read-only. */
! #define C_TYPE_FIELDS_READONLY(TYPE) TYPE_LANG_FLAG_0 (TYPE)
/* Store a value in that field. */
! #define C_SET_EXP_ORIGINAL_CODE(EXP, CODE) \
! (TREE_COMPLEXITY (EXP) = (int)(CODE))
/* If non-zero, a VAR_DECL whose cleanup will cause a throw to the
next exception handler. */
*************** enum languages { lang_c, lang_cplusplus,
*** 1076,1083 ****
#define TYPE_NAME_STRING(NODE) (IDENTIFIER_POINTER (TYPE_IDENTIFIER (NODE)))
#define TYPE_NAME_LENGTH(NODE) (IDENTIFIER_LENGTH (TYPE_IDENTIFIER (NODE)))
! #define TYPE_ASSEMBLER_NAME_STRING(NODE) (IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (TYPE_NAME (NODE))))
! #define TYPE_ASSEMBLER_NAME_LENGTH(NODE) (IDENTIFIER_LENGTH (DECL_ASSEMBLER_NAME (TYPE_NAME (NODE))))
/* Nonzero if NODE has no name for linkage purposes. */
#define TYPE_ANONYMOUS_P(NODE) \
--- 1082,1091 ----
#define TYPE_NAME_STRING(NODE) (IDENTIFIER_POINTER (TYPE_IDENTIFIER (NODE)))
#define TYPE_NAME_LENGTH(NODE) (IDENTIFIER_LENGTH (TYPE_IDENTIFIER (NODE)))
! #define TYPE_ASSEMBLER_NAME_STRING(NODE) \
! (IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (TYPE_NAME (NODE))))
! #define TYPE_ASSEMBLER_NAME_LENGTH(NODE) \
! (IDENTIFIER_LENGTH (DECL_ASSEMBLER_NAME (TYPE_NAME (NODE))))
/* Nonzero if NODE has no name for linkage purposes. */
#define TYPE_ANONYMOUS_P(NODE) \
*************** enum languages { lang_c, lang_cplusplus,
*** 1091,1102 ****
template template parameters. Despite its name,
this macro has nothing to do with the definition of aggregate given
in the standard. Think of this macro as MAYBE_CLASS_TYPE_P. */
! #define IS_AGGR_TYPE(t) \
! (TREE_CODE (t) == TEMPLATE_TYPE_PARM \
! || TREE_CODE (t) == TYPENAME_TYPE \
! || TREE_CODE (t) == TYPEOF_TYPE \
! || TREE_CODE (t) == BOUND_TEMPLATE_TEMPLATE_PARM \
! || TYPE_LANG_FLAG_5 (t))
/* Set IS_AGGR_TYPE for T to VAL. T must be a class, struct, or
union type. */
--- 1099,1110 ----
template template parameters. Despite its name,
this macro has nothing to do with the definition of aggregate given
in the standard. Think of this macro as MAYBE_CLASS_TYPE_P. */
! #define IS_AGGR_TYPE(T) \
! (TREE_CODE (T) == TEMPLATE_TYPE_PARM \
! || TREE_CODE (T) == TYPENAME_TYPE \
! || TREE_CODE (T) == TYPEOF_TYPE \
! || TREE_CODE (T) == BOUND_TEMPLATE_TEMPLATE_PARM \
! || TYPE_LANG_FLAG_5 (T))
/* Set IS_AGGR_TYPE for T to VAL. T must be a class, struct, or
union type. */
*************** enum languages { lang_c, lang_cplusplus,
*** 1105,1126 ****
/* Nonzero if T is a class type. Zero for template type parameters,
typename types, and so forth. */
! #define CLASS_TYPE_P(t) \
! (IS_AGGR_TYPE_CODE (TREE_CODE (t)) && IS_AGGR_TYPE (t))
! #define IS_AGGR_TYPE_CODE(t) (t == RECORD_TYPE || t == UNION_TYPE)
! #define IS_AGGR_TYPE_2(TYPE1,TYPE2) \
(TREE_CODE (TYPE1) == TREE_CODE (TYPE2) \
&& IS_AGGR_TYPE (TYPE1) && IS_AGGR_TYPE (TYPE2))
! #define TAGGED_TYPE_P(t) \
! (CLASS_TYPE_P (t) || TREE_CODE (t) == ENUMERAL_TYPE)
#define IS_OVERLOAD_TYPE(T) TAGGED_TYPE_P (T)
/* In a *_TYPE, nonzero means a built-in type. */
! #define TYPE_BUILT_IN(NODE) TYPE_LANG_FLAG_6(NODE)
/* True if this a "Java" type, defined in 'extern "Java"'. */
! #define TYPE_FOR_JAVA(NODE) TYPE_LANG_FLAG_3(NODE)
/* Nonzero if this type is const-qualified. */
#define CP_TYPE_CONST_P(NODE) \
--- 1113,1134 ----
/* Nonzero if T is a class type. Zero for template type parameters,
typename types, and so forth. */
! #define CLASS_TYPE_P(T) \
! (IS_AGGR_TYPE_CODE (TREE_CODE (T)) && IS_AGGR_TYPE (T))
! #define IS_AGGR_TYPE_CODE(T) ((T) == RECORD_TYPE || (T) == UNION_TYPE)
! #define IS_AGGR_TYPE_2(TYPE1, TYPE2) \
(TREE_CODE (TYPE1) == TREE_CODE (TYPE2) \
&& IS_AGGR_TYPE (TYPE1) && IS_AGGR_TYPE (TYPE2))
! #define TAGGED_TYPE_P(T) \
! (CLASS_TYPE_P (T) || TREE_CODE (T) == ENUMERAL_TYPE)
#define IS_OVERLOAD_TYPE(T) TAGGED_TYPE_P (T)
/* In a *_TYPE, nonzero means a built-in type. */
! #define TYPE_BUILT_IN(NODE) TYPE_LANG_FLAG_6 (NODE)
/* True if this a "Java" type, defined in 'extern "Java"'. */
! #define TYPE_FOR_JAVA(NODE) TYPE_LANG_FLAG_3 (NODE)
/* Nonzero if this type is const-qualified. */
#define CP_TYPE_CONST_P(NODE) \
*************** enum languages { lang_c, lang_cplusplus,
*** 1143,1175 ****
== TYPE_QUAL_CONST)
#define FUNCTION_ARG_CHAIN(NODE) \
! (TREE_CHAIN (TYPE_ARG_TYPES (TREE_TYPE (NODE))))
/* Given a FUNCTION_DECL, returns the first TREE_LIST out of TYPE_ARG_TYPES
which refers to a user-written parameter. */
#define FUNCTION_FIRST_USER_PARMTYPE(NODE) \
! (skip_artificial_parms_for (NODE, TYPE_ARG_TYPES (TREE_TYPE (NODE))))
/* Similarly, but for DECL_ARGUMENTS. */
#define FUNCTION_FIRST_USER_PARM(NODE) \
! (skip_artificial_parms_for (NODE, DECL_ARGUMENTS (NODE)))
! #define PROMOTES_TO_AGGR_TYPE(NODE,CODE) \
(((CODE) == TREE_CODE (NODE) \
! && IS_AGGR_TYPE (TREE_TYPE (NODE))) \
|| IS_AGGR_TYPE (NODE))
/* Nonzero iff TYPE is derived from PARENT. Ignores accessibility and
ambiguity issues. */
! #define DERIVED_FROM_P(PARENT, TYPE) (lookup_base (TYPE, PARENT, ba_any, NULL))
/* Nonzero iff TYPE is uniquely derived from PARENT. Ignores
accessibility. */
! #define UNIQUELY_DERIVED_FROM_P(PARENT, TYPE) (lookup_base (TYPE, PARENT, ba_ignore | ba_quiet, NULL))
/* Nonzero iff TYPE is accessible in the current scope and uniquely
derived from PARENT. */
! #define ACCESSIBLY_UNIQUELY_DERIVED_P(PARENT, TYPE) (lookup_base (TYPE, PARENT, ba_check | ba_quiet, NULL))
/* Nonzero iff TYPE is publicly & uniquely derived from PARENT. */
! #define PUBLICLY_UNIQUELY_DERIVED_P(PARENT, TYPE) (lookup_base (TYPE, PARENT, ba_not_special | ba_quiet, NULL))
/* This structure provides additional information above and beyond
what is provide in the ordinary tree_type. In the past, we used it
--- 1151,1187 ----
== TYPE_QUAL_CONST)
#define FUNCTION_ARG_CHAIN(NODE) \
! TREE_CHAIN (TYPE_ARG_TYPES (TREE_TYPE (NODE)))
/* Given a FUNCTION_DECL, returns the first TREE_LIST out of TYPE_ARG_TYPES
which refers to a user-written parameter. */
#define FUNCTION_FIRST_USER_PARMTYPE(NODE) \
! skip_artificial_parms_for ((NODE), TYPE_ARG_TYPES (TREE_TYPE (NODE)))
/* Similarly, but for DECL_ARGUMENTS. */
#define FUNCTION_FIRST_USER_PARM(NODE) \
! skip_artificial_parms_for ((NODE), DECL_ARGUMENTS (NODE))
! #define PROMOTES_TO_AGGR_TYPE(NODE, CODE) \
(((CODE) == TREE_CODE (NODE) \
! && IS_AGGR_TYPE (TREE_TYPE (NODE))) \
|| IS_AGGR_TYPE (NODE))
/* Nonzero iff TYPE is derived from PARENT. Ignores accessibility and
ambiguity issues. */
! #define DERIVED_FROM_P(PARENT, TYPE) \
! lookup_base ((TYPE), PARENT, ba_any, NULL)
/* Nonzero iff TYPE is uniquely derived from PARENT. Ignores
accessibility. */
! #define UNIQUELY_DERIVED_FROM_P(PARENT, TYPE) \
! lookup_base ((TYPE), (PARENT), ba_ignore | ba_quiet, NULL)
/* Nonzero iff TYPE is accessible in the current scope and uniquely
derived from PARENT. */
! #define ACCESSIBLY_UNIQUELY_DERIVED_P(PARENT, TYPE) \
! lookup_base ((TYPE), (PARENT), ba_check | ba_quiet, NULL)
/* Nonzero iff TYPE is publicly & uniquely derived from PARENT. */
! #define PUBLICLY_UNIQUELY_DERIVED_P(PARENT, TYPE) \
! lookup_base ((TYPE), (PARENT), ba_not_special | ba_quiet, NULL)
/* This structure provides additional information above and beyond
what is provide in the ordinary tree_type. In the past, we used it
*************** struct lang_type
*** 1265,1280 ****
1=implicit template instantiation
2=explicit template specialization
3=explicit template instantiation */
! #define CLASSTYPE_USE_TEMPLATE(NODE) (TYPE_LANG_SPECIFIC(NODE)->use_template)
/* Fields used for storing information before the class is defined.
After the class is defined, these fields hold other information. */
/* List of friends which were defined inline in this class definition. */
! #define CLASSTYPE_INLINE_FRIENDS(NODE) (CLASSTYPE_PURE_VIRTUALS (NODE))
/* Nonzero for _CLASSTYPE means that operator delete is defined. */
! #define TYPE_GETS_DELETE(NODE) (TYPE_LANG_SPECIFIC(NODE)->gets_delete)
#define TYPE_GETS_REG_DELETE(NODE) (TYPE_GETS_DELETE (NODE) & 1)
/* Nonzero if `new NODE[x]' should cause the allocation of extra
--- 1277,1292 ----
1=implicit template instantiation
2=explicit template specialization
3=explicit template instantiation */
! #define CLASSTYPE_USE_TEMPLATE(NODE) (TYPE_LANG_SPECIFIC (NODE)->use_template)
/* Fields used for storing information before the class is defined.
After the class is defined, these fields hold other information. */
/* List of friends which were defined inline in this class definition. */
! #define CLASSTYPE_INLINE_FRIENDS(NODE) CLASSTYPE_PURE_VIRTUALS (NODE)
/* Nonzero for _CLASSTYPE means that operator delete is defined. */
! #define TYPE_GETS_DELETE(NODE) (TYPE_LANG_SPECIFIC (NODE)->gets_delete)
#define TYPE_GETS_REG_DELETE(NODE) (TYPE_GETS_DELETE (NODE) & 1)
/* Nonzero if `new NODE[x]' should cause the allocation of extra
*************** struct lang_type
*** 1285,1299 ****
/* Nonzero means that this _CLASSTYPE node defines ways of converting
itself to other types. */
! #define TYPE_HAS_CONVERSION(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_type_conversion)
/* Nonzero means that this _CLASSTYPE node overloads operator=(X&). */
! #define TYPE_HAS_ASSIGN_REF(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_assign_ref)
! #define TYPE_HAS_CONST_ASSIGN_REF(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_const_assign_ref)
/* Nonzero means that this _CLASSTYPE node has an X(X&) constructor. */
! #define TYPE_HAS_INIT_REF(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_init_ref)
! #define TYPE_HAS_CONST_INIT_REF(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_const_init_ref)
/* Nonzero if this class defines an overloaded operator new. (An
operator new [] doesn't count.) */
--- 1297,1314 ----
/* Nonzero means that this _CLASSTYPE node defines ways of converting
itself to other types. */
! #define TYPE_HAS_CONVERSION(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->has_type_conversion)
/* Nonzero means that this _CLASSTYPE node overloads operator=(X&). */
! #define TYPE_HAS_ASSIGN_REF(NODE) (TYPE_LANG_SPECIFIC (NODE)->has_assign_ref)
! #define TYPE_HAS_CONST_ASSIGN_REF(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->has_const_assign_ref)
/* Nonzero means that this _CLASSTYPE node has an X(X&) constructor. */
! #define TYPE_HAS_INIT_REF(NODE) (TYPE_LANG_SPECIFIC (NODE)->has_init_ref)
! #define TYPE_HAS_CONST_INIT_REF(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->has_const_init_ref)
/* Nonzero if this class defines an overloaded operator new. (An
operator new [] doesn't count.) */
*************** struct lang_type
*** 1306,1337 ****
/* Nonzero means that this type is being defined. I.e., the left brace
starting the definition of this type has been seen. */
! #define TYPE_BEING_DEFINED(NODE) (TYPE_LANG_SPECIFIC(NODE)->being_defined)
/* Nonzero means that this type has been redefined. In this case, if
convenient, don't reprocess any methods that appear in its redefinition. */
! #define TYPE_REDEFINED(NODE) (TYPE_LANG_SPECIFIC(NODE)->redefined)
/* The is the basetype that contains NODE's rtti. */
! #define CLASSTYPE_RTTI(NODE) (TYPE_LANG_SPECIFIC(NODE)->rtti)
/* Nonzero means that this _CLASSTYPE node overloads operator(). */
! #define TYPE_OVERLOADS_CALL_EXPR(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_call_overloaded)
/* Nonzero means that this _CLASSTYPE node overloads operator[]. */
! #define TYPE_OVERLOADS_ARRAY_REF(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_array_ref_overloaded)
/* Nonzero means that this _CLASSTYPE node overloads operator->. */
! #define TYPE_OVERLOADS_ARROW(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_arrow_overloaded)
/* Nonzero means that this _CLASSTYPE (or one of its ancestors) uses
multiple inheritance. If this is 0 for the root of a type
hierarchy, then we can use more efficient search techniques. */
! #define TYPE_USES_MULTIPLE_INHERITANCE(NODE) (TYPE_LANG_SPECIFIC(NODE)->uses_multiple_inheritance)
/* Nonzero means that this _CLASSTYPE (or one of its ancestors) uses
virtual base classes. If this is 0 for the root of a type
hierarchy, then we can use more efficient search techniques. */
! #define TYPE_USES_VIRTUAL_BASECLASSES(NODE) (TREE_LANG_FLAG_3(NODE))
/* Vector member functions defined in this class. Each element is
either a FUNCTION_DECL, a TEMPLATE_DECL, or an OVERLOAD. All
--- 1321,1356 ----
/* Nonzero means that this type is being defined. I.e., the left brace
starting the definition of this type has been seen. */
! #define TYPE_BEING_DEFINED(NODE) (TYPE_LANG_SPECIFIC (NODE)->being_defined)
/* Nonzero means that this type has been redefined. In this case, if
convenient, don't reprocess any methods that appear in its redefinition. */
! #define TYPE_REDEFINED(NODE) (TYPE_LANG_SPECIFIC (NODE)->redefined)
/* The is the basetype that contains NODE's rtti. */
! #define CLASSTYPE_RTTI(NODE) (TYPE_LANG_SPECIFIC (NODE)->rtti)
/* Nonzero means that this _CLASSTYPE node overloads operator(). */
! #define TYPE_OVERLOADS_CALL_EXPR(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->has_call_overloaded)
/* Nonzero means that this _CLASSTYPE node overloads operator[]. */
! #define TYPE_OVERLOADS_ARRAY_REF(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->has_array_ref_overloaded)
/* Nonzero means that this _CLASSTYPE node overloads operator->. */
! #define TYPE_OVERLOADS_ARROW(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->has_arrow_overloaded)
/* Nonzero means that this _CLASSTYPE (or one of its ancestors) uses
multiple inheritance. If this is 0 for the root of a type
hierarchy, then we can use more efficient search techniques. */
! #define TYPE_USES_MULTIPLE_INHERITANCE(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->uses_multiple_inheritance)
/* Nonzero means that this _CLASSTYPE (or one of its ancestors) uses
virtual base classes. If this is 0 for the root of a type
hierarchy, then we can use more efficient search techniques. */
! #define TYPE_USES_VIRTUAL_BASECLASSES(NODE) (TREE_LANG_FLAG_3 (NODE))
/* Vector member functions defined in this class. Each element is
either a FUNCTION_DECL, a TEMPLATE_DECL, or an OVERLOAD. All
*************** struct lang_type
*** 1339,1345 ****
two elements are for constructors, and destructors, respectively.
Any conversion operators are next, followed by ordinary member
functions. There may be empty entries at the end of the vector. */
! #define CLASSTYPE_METHOD_VEC(NODE) (TYPE_LANG_SPECIFIC(NODE)->methods)
/* The slot in the CLASSTYPE_METHOD_VEC where constructors go. */
#define CLASSTYPE_CONSTRUCTOR_SLOT 0
--- 1358,1364 ----
two elements are for constructors, and destructors, respectively.
Any conversion operators are next, followed by ordinary member
functions. There may be empty entries at the end of the vector. */
! #define CLASSTYPE_METHOD_VEC(NODE) (TYPE_LANG_SPECIFIC (NODE)->methods)
/* The slot in the CLASSTYPE_METHOD_VEC where constructors go. */
#define CLASSTYPE_CONSTRUCTOR_SLOT 0
*************** struct lang_type
*** 1366,1372 ****
/* Get the value of the Nth mark bit. */
#define CLASSTYPE_MARKED_N(NODE, N) \
(((CLASS_TYPE_P (NODE) ? TYPE_LANG_SPECIFIC (NODE)->marks \
! : ((unsigned) TYPE_ALIAS_SET (NODE))) & (1 << N)) != 0)
/* Set the Nth mark bit. */
#define SET_CLASSTYPE_MARKED_N(NODE, N) \
--- 1385,1391 ----
/* Get the value of the Nth mark bit. */
#define CLASSTYPE_MARKED_N(NODE, N) \
(((CLASS_TYPE_P (NODE) ? TYPE_LANG_SPECIFIC (NODE)->marks \
! : ((unsigned) TYPE_ALIAS_SET (NODE))) & (1 << (N))) != 0)
/* Set the Nth mark bit. */
#define SET_CLASSTYPE_MARKED_N(NODE, N) \
*************** struct lang_type
*** 1381,1412 ****
: (void) (TYPE_ALIAS_SET (NODE) &= ~(1 << (N))))
/* Get the value of the mark bits. */
! #define CLASSTYPE_MARKED(NODE) CLASSTYPE_MARKED_N(NODE, 0)
! #define CLASSTYPE_MARKED2(NODE) CLASSTYPE_MARKED_N(NODE, 1)
! #define CLASSTYPE_MARKED3(NODE) CLASSTYPE_MARKED_N(NODE, 2)
! #define CLASSTYPE_MARKED4(NODE) CLASSTYPE_MARKED_N(NODE, 3)
! #define CLASSTYPE_MARKED5(NODE) CLASSTYPE_MARKED_N(NODE, 4)
! #define CLASSTYPE_MARKED6(NODE) CLASSTYPE_MARKED_N(NODE, 5)
/* Macros to modify the above flags */
! #define SET_CLASSTYPE_MARKED(NODE) SET_CLASSTYPE_MARKED_N(NODE, 0)
! #define CLEAR_CLASSTYPE_MARKED(NODE) CLEAR_CLASSTYPE_MARKED_N(NODE, 0)
! #define SET_CLASSTYPE_MARKED2(NODE) SET_CLASSTYPE_MARKED_N(NODE, 1)
! #define CLEAR_CLASSTYPE_MARKED2(NODE) CLEAR_CLASSTYPE_MARKED_N(NODE, 1)
! #define SET_CLASSTYPE_MARKED3(NODE) SET_CLASSTYPE_MARKED_N(NODE, 2)
! #define CLEAR_CLASSTYPE_MARKED3(NODE) CLEAR_CLASSTYPE_MARKED_N(NODE, 2)
! #define SET_CLASSTYPE_MARKED4(NODE) SET_CLASSTYPE_MARKED_N(NODE, 3)
! #define CLEAR_CLASSTYPE_MARKED4(NODE) CLEAR_CLASSTYPE_MARKED_N(NODE, 3)
! #define SET_CLASSTYPE_MARKED5(NODE) SET_CLASSTYPE_MARKED_N(NODE, 4)
! #define CLEAR_CLASSTYPE_MARKED5(NODE) CLEAR_CLASSTYPE_MARKED_N(NODE, 4)
! #define SET_CLASSTYPE_MARKED6(NODE) SET_CLASSTYPE_MARKED_N(NODE, 5)
! #define CLEAR_CLASSTYPE_MARKED6(NODE) CLEAR_CLASSTYPE_MARKED_N(NODE, 5)
/* A list of the nested tag-types (class, struct, union, or enum)
found within this class. The TREE_PURPOSE of each node is the name
of the type; the TREE_VALUE is the type itself. This list includes
nested member class templates. */
! #define CLASSTYPE_TAGS(NODE) (TYPE_LANG_SPECIFIC(NODE)->tags)
/* Nonzero if NODE has a primary base class, i.e., a base class with
which it shares the virtual function table pointer. */
--- 1400,1431 ----
: (void) (TYPE_ALIAS_SET (NODE) &= ~(1 << (N))))
/* Get the value of the mark bits. */
! #define CLASSTYPE_MARKED(NODE) CLASSTYPE_MARKED_N (NODE, 0)
! #define CLASSTYPE_MARKED2(NODE) CLASSTYPE_MARKED_N (NODE, 1)
! #define CLASSTYPE_MARKED3(NODE) CLASSTYPE_MARKED_N (NODE, 2)
! #define CLASSTYPE_MARKED4(NODE) CLASSTYPE_MARKED_N (NODE, 3)
! #define CLASSTYPE_MARKED5(NODE) CLASSTYPE_MARKED_N (NODE, 4)
! #define CLASSTYPE_MARKED6(NODE) CLASSTYPE_MARKED_N (NODE, 5)
/* Macros to modify the above flags */
! #define SET_CLASSTYPE_MARKED(NODE) SET_CLASSTYPE_MARKED_N (NODE, 0)
! #define CLEAR_CLASSTYPE_MARKED(NODE) CLEAR_CLASSTYPE_MARKED_N (NODE, 0)
! #define SET_CLASSTYPE_MARKED2(NODE) SET_CLASSTYPE_MARKED_N (NODE, 1)
! #define CLEAR_CLASSTYPE_MARKED2(NODE) CLEAR_CLASSTYPE_MARKED_N (NODE, 1)
! #define SET_CLASSTYPE_MARKED3(NODE) SET_CLASSTYPE_MARKED_N (NODE, 2)
! #define CLEAR_CLASSTYPE_MARKED3(NODE) CLEAR_CLASSTYPE_MARKED_N (NODE, 2)
! #define SET_CLASSTYPE_MARKED4(NODE) SET_CLASSTYPE_MARKED_N (NODE, 3)
! #define CLEAR_CLASSTYPE_MARKED4(NODE) CLEAR_CLASSTYPE_MARKED_N (NODE, 3)
! #define SET_CLASSTYPE_MARKED5(NODE) SET_CLASSTYPE_MARKED_N (NODE, 4)
! #define CLEAR_CLASSTYPE_MARKED5(NODE) CLEAR_CLASSTYPE_MARKED_N (NODE, 4)
! #define SET_CLASSTYPE_MARKED6(NODE) SET_CLASSTYPE_MARKED_N (NODE, 5)
! #define CLEAR_CLASSTYPE_MARKED6(NODE) CLEAR_CLASSTYPE_MARKED_N (NODE, 5)
/* A list of the nested tag-types (class, struct, union, or enum)
found within this class. The TREE_PURPOSE of each node is the name
of the type; the TREE_VALUE is the type itself. This list includes
nested member class templates. */
! #define CLASSTYPE_TAGS(NODE) (TYPE_LANG_SPECIFIC (NODE)->tags)
/* Nonzero if NODE has a primary base class, i.e., a base class with
which it shares the virtual function table pointer. */
*************** struct lang_type
*** 1421,1427 ****
/* The number of virtual functions present in this class' virtual
function table. */
! #define CLASSTYPE_VSIZE(NODE) (TYPE_LANG_SPECIFIC(NODE)->vsize)
/* A chain of BINFOs for the direct and indirect virtual base classes
that this type uses in a post-order depth-first left-to-right
--- 1440,1446 ----
/* The number of virtual functions present in this class' virtual
function table. */
! #define CLASSTYPE_VSIZE(NODE) (TYPE_LANG_SPECIFIC (NODE)->vsize)
/* A chain of BINFOs for the direct and indirect virtual base classes
that this type uses in a post-order depth-first left-to-right
*************** struct lang_type
*** 1431,1437 ****
list are all "real"; they are the same BINFOs that will be
encountered when using dfs_unmarked_real_bases_queue_p and related
functions. */
! #define CLASSTYPE_VBASECLASSES(NODE) (TYPE_LANG_SPECIFIC(NODE)->vbases)
/* For a non-virtual BINFO, the BINFO itself; for a virtual BINFO, the
binfo_for_vbase. C is the most derived class for the hierarchy
--- 1450,1456 ----
list are all "real"; they are the same BINFOs that will be
encountered when using dfs_unmarked_real_bases_queue_p and related
functions. */
! #define CLASSTYPE_VBASECLASSES(NODE) (TYPE_LANG_SPECIFIC (NODE)->vbases)
/* For a non-virtual BINFO, the BINFO itself; for a virtual BINFO, the
binfo_for_vbase. C is the most derived class for the hierarchy
*************** struct lang_type
*** 1439,1445 ****
#define CANONICAL_BINFO(BINFO, C) \
(TREE_VIA_VIRTUAL (BINFO) \
? binfo_for_vbase (BINFO_TYPE (BINFO), C) \
! : BINFO)
/* Number of direct baseclasses of NODE. */
#define CLASSTYPE_N_BASECLASSES(NODE) \
--- 1458,1464 ----
#define CANONICAL_BINFO(BINFO, C) \
(TREE_VIA_VIRTUAL (BINFO) \
? binfo_for_vbase (BINFO_TYPE (BINFO), C) \
! : (BINFO))
/* Number of direct baseclasses of NODE. */
#define CLASSTYPE_N_BASECLASSES(NODE) \
*************** struct lang_type
*** 1447,1456 ****
/* These are the size and alignment of the type without its virtual
base classes, for when we use this type as a base itself. */
! #define CLASSTYPE_SIZE(NODE) (TYPE_LANG_SPECIFIC(NODE)->size)
! #define CLASSTYPE_SIZE_UNIT(NODE) (TYPE_LANG_SPECIFIC(NODE)->size_unit)
! #define CLASSTYPE_ALIGN(NODE) (TYPE_LANG_SPECIFIC(NODE)->align)
! #define CLASSTYPE_USER_ALIGN(NODE) (TYPE_LANG_SPECIFIC(NODE)->user_align)
/* The alignment of NODE, without its virtual bases, in bytes. */
#define CLASSTYPE_ALIGN_UNIT(NODE) \
--- 1466,1475 ----
/* These are the size and alignment of the type without its virtual
base classes, for when we use this type as a base itself. */
! #define CLASSTYPE_SIZE(NODE) (TYPE_LANG_SPECIFIC (NODE)->size)
! #define CLASSTYPE_SIZE_UNIT(NODE) (TYPE_LANG_SPECIFIC (NODE)->size_unit)
! #define CLASSTYPE_ALIGN(NODE) (TYPE_LANG_SPECIFIC (NODE)->align)
! #define CLASSTYPE_USER_ALIGN(NODE) (TYPE_LANG_SPECIFIC (NODE)->user_align)
/* The alignment of NODE, without its virtual bases, in bytes. */
#define CLASSTYPE_ALIGN_UNIT(NODE) \
*************** struct lang_type
*** 1458,1469 ****
/* True if this a Java interface type, declared with
'__attribute__ ((java_interface))'. */
! #define TYPE_JAVA_INTERFACE(NODE) (TYPE_LANG_SPECIFIC(NODE)->java_interface)
/* A cons list of virtual functions which cannot be inherited by
derived classes. When deriving from this type, the derived
class must provide its own definition for each of these functions. */
! #define CLASSTYPE_PURE_VIRTUALS(NODE) (TYPE_LANG_SPECIFIC(NODE)->pure_virtuals)
/* Nonzero means that this aggr type has been `closed' by a semicolon. */
#define CLASSTYPE_GOT_SEMICOLON(NODE) (TYPE_LANG_SPECIFIC (NODE)->got_semicolon)
--- 1477,1488 ----
/* True if this a Java interface type, declared with
'__attribute__ ((java_interface))'. */
! #define TYPE_JAVA_INTERFACE(NODE) (TYPE_LANG_SPECIFIC (NODE)->java_interface)
/* A cons list of virtual functions which cannot be inherited by
derived classes. When deriving from this type, the derived
class must provide its own definition for each of these functions. */
! #define CLASSTYPE_PURE_VIRTUALS(NODE) (TYPE_LANG_SPECIFIC (NODE)->pure_virtuals)
/* Nonzero means that this aggr type has been `closed' by a semicolon. */
#define CLASSTYPE_GOT_SEMICOLON(NODE) (TYPE_LANG_SPECIFIC (NODE)->got_semicolon)
*************** struct lang_type
*** 1472,1484 ****
set because base constructors have placed the wrong value there.
If this is zero, it means that they placed the right value there,
and there is no need to change it. */
! #define CLASSTYPE_NEEDS_VIRTUAL_REINIT(NODE) (TYPE_LANG_SPECIFIC(NODE)->needs_virtual_reinit)
/* Nonzero means that this type has an X() constructor. */
! #define TYPE_HAS_DEFAULT_CONSTRUCTOR(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_default_ctor)
/* Nonzero means that this type contains a mutable member */
! #define CLASSTYPE_HAS_MUTABLE(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_mutable)
#define TYPE_HAS_MUTABLE_P(NODE) (cp_has_mutable_p (NODE))
/* Nonzero means that this class type is a non-POD class. */
--- 1491,1505 ----
set because base constructors have placed the wrong value there.
If this is zero, it means that they placed the right value there,
and there is no need to change it. */
! #define CLASSTYPE_NEEDS_VIRTUAL_REINIT(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->needs_virtual_reinit)
/* Nonzero means that this type has an X() constructor. */
! #define TYPE_HAS_DEFAULT_CONSTRUCTOR(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->has_default_ctor)
/* Nonzero means that this type contains a mutable member */
! #define CLASSTYPE_HAS_MUTABLE(NODE) (TYPE_LANG_SPECIFIC (NODE)->has_mutable)
#define TYPE_HAS_MUTABLE_P(NODE) (cp_has_mutable_p (NODE))
/* Nonzero means that this class type is a non-POD class. */
*************** struct lang_type
*** 1492,1515 ****
/* A list of class types of which this type is a friend. The
TREE_VALUE is normally a TYPE, but will be a TEMPLATE_DECL in the
case of a template friend. */
! #define CLASSTYPE_FRIEND_CLASSES(NODE) (TYPE_LANG_SPECIFIC(NODE)->friend_classes)
/* A list of the classes which grant friendship to this class. */
#define CLASSTYPE_BEFRIENDING_CLASSES(NODE) \
(TYPE_LANG_SPECIFIC (NODE)->befriending_classes)
/* Say whether this node was declared as a "class" or a "struct". */
! #define CLASSTYPE_DECLARED_CLASS(NODE) (TYPE_LANG_SPECIFIC(NODE)->declared_class)
/* Nonzero if this class has const members which have no specified initialization. */
! #define CLASSTYPE_READONLY_FIELDS_NEED_INIT(NODE) (TYPE_LANG_SPECIFIC(NODE)->const_needs_init)
/* Nonzero if this class has ref members which have no specified initialization. */
! #define CLASSTYPE_REF_FIELDS_NEED_INIT(NODE) (TYPE_LANG_SPECIFIC(NODE)->ref_needs_init)
/* Nonzero if this class is included from a header file which employs
`#pragma interface', and it is not included in its implementation file. */
! #define CLASSTYPE_INTERFACE_ONLY(NODE) (TYPE_LANG_SPECIFIC(NODE)->interface_only)
/* True if we have already determined whether or not vtables, VTTs,
typeinfo, and other similar per-class data should be emitted in
--- 1513,1541 ----
/* A list of class types of which this type is a friend. The
TREE_VALUE is normally a TYPE, but will be a TEMPLATE_DECL in the
case of a template friend. */
! #define CLASSTYPE_FRIEND_CLASSES(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->friend_classes)
/* A list of the classes which grant friendship to this class. */
#define CLASSTYPE_BEFRIENDING_CLASSES(NODE) \
(TYPE_LANG_SPECIFIC (NODE)->befriending_classes)
/* Say whether this node was declared as a "class" or a "struct". */
! #define CLASSTYPE_DECLARED_CLASS(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->declared_class)
/* Nonzero if this class has const members which have no specified initialization. */
! #define CLASSTYPE_READONLY_FIELDS_NEED_INIT(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->const_needs_init)
/* Nonzero if this class has ref members which have no specified initialization. */
! #define CLASSTYPE_REF_FIELDS_NEED_INIT(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->ref_needs_init)
/* Nonzero if this class is included from a header file which employs
`#pragma interface', and it is not included in its implementation file. */
! #define CLASSTYPE_INTERFACE_ONLY(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->interface_only)
/* True if we have already determined whether or not vtables, VTTs,
typeinfo, and other similar per-class data should be emitted in
*************** struct lang_type
*** 1517,1536 ****
these items should be emitted; it only indicates that we know one
way or the other. */
#define CLASSTYPE_INTERFACE_KNOWN(NODE) \
! (TYPE_LANG_SPECIFIC(NODE)->interface_unknown == 0)
/* The opposite of CLASSTYPE_INTERFANCE_KNOWN. */
#define CLASSTYPE_INTERFACE_UNKNOWN(NODE) \
! (TYPE_LANG_SPECIFIC(NODE)->interface_unknown)
#define SET_CLASSTYPE_INTERFACE_UNKNOWN_X(NODE,X) \
! (TYPE_LANG_SPECIFIC(NODE)->interface_unknown = !!(X))
#define SET_CLASSTYPE_INTERFACE_UNKNOWN(NODE) \
! (TYPE_LANG_SPECIFIC(NODE)->interface_unknown = 1)
#define SET_CLASSTYPE_INTERFACE_KNOWN(NODE) \
! (TYPE_LANG_SPECIFIC(NODE)->interface_unknown = 0)
/* Nonzero if a _DECL node requires us to output debug info for this class. */
! #define CLASSTYPE_DEBUG_REQUESTED(NODE) (TYPE_LANG_SPECIFIC(NODE)->debug_requested)
/* Additional macros for inheritance information. */
--- 1543,1563 ----
these items should be emitted; it only indicates that we know one
way or the other. */
#define CLASSTYPE_INTERFACE_KNOWN(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->interface_unknown == 0)
/* The opposite of CLASSTYPE_INTERFANCE_KNOWN. */
#define CLASSTYPE_INTERFACE_UNKNOWN(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->interface_unknown)
#define SET_CLASSTYPE_INTERFACE_UNKNOWN_X(NODE,X) \
! (TYPE_LANG_SPECIFIC (NODE)->interface_unknown = !!(X))
#define SET_CLASSTYPE_INTERFACE_UNKNOWN(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->interface_unknown = 1)
#define SET_CLASSTYPE_INTERFACE_KNOWN(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->interface_unknown = 0)
/* Nonzero if a _DECL node requires us to output debug info for this class. */
! #define CLASSTYPE_DEBUG_REQUESTED(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->debug_requested)
/* Additional macros for inheritance information. */
*************** struct lang_type
*** 1547,1566 ****
/* Mark the binfo, whether shared or not. Each instance of a virtual
base can be separately marked. */
! #define BINFO_UNSHARED_MARKED(NODE) TREE_LANG_FLAG_0(NODE)
/* Nonzero means marked by DFS or BFS search. */
! #define BINFO_MARKED(NODE) (TREE_VIA_VIRTUAL(NODE)?CLASSTYPE_MARKED(BINFO_TYPE(NODE)):TREE_LANG_FLAG_0(NODE))
/* Macros needed because of C compilers that don't allow conditional
expressions to be lvalues. Grr! */
! #define SET_BINFO_MARKED(NODE) (TREE_VIA_VIRTUAL(NODE)?SET_CLASSTYPE_MARKED(BINFO_TYPE(NODE)):(TREE_LANG_FLAG_0(NODE)=1))
! #define CLEAR_BINFO_MARKED(NODE) (TREE_VIA_VIRTUAL(NODE)?CLEAR_CLASSTYPE_MARKED(BINFO_TYPE(NODE)):(TREE_LANG_FLAG_0(NODE)=0))
/* Nonzero means that this class is on a path leading to a new vtable. */
! #define BINFO_VTABLE_PATH_MARKED(NODE) \
! (TREE_VIA_VIRTUAL(NODE)?CLASSTYPE_MARKED3(BINFO_TYPE(NODE)):TREE_LANG_FLAG_3(NODE))
! #define SET_BINFO_VTABLE_PATH_MARKED(NODE) (TREE_VIA_VIRTUAL(NODE)?SET_CLASSTYPE_MARKED3(BINFO_TYPE(NODE)):(TREE_LANG_FLAG_3(NODE)=1))
! #define CLEAR_BINFO_VTABLE_PATH_MARKED(NODE) (TREE_VIA_VIRTUAL(NODE)?CLEAR_CLASSTYPE_MARKED3(BINFO_TYPE(NODE)):(TREE_LANG_FLAG_3(NODE)=0))
/* Nonzero means B (a BINFO) has its own vtable. Under the old ABI,
secondary vtables are sometimes shared. Any copies will not have
--- 1574,1610 ----
/* Mark the binfo, whether shared or not. Each instance of a virtual
base can be separately marked. */
! #define BINFO_UNSHARED_MARKED(NODE) TREE_LANG_FLAG_0 (NODE)
/* Nonzero means marked by DFS or BFS search. */
! #define BINFO_MARKED(NODE) \
! (TREE_VIA_VIRTUAL (NODE) \
! ? CLASSTYPE_MARKED (BINFO_TYPE (NODE)) \
! : TREE_LANG_FLAG_0 (NODE))
/* Macros needed because of C compilers that don't allow conditional
expressions to be lvalues. Grr! */
! #define SET_BINFO_MARKED(NODE) \
! (TREE_VIA_VIRTUAL(NODE) \
! ? SET_CLASSTYPE_MARKED (BINFO_TYPE (NODE)) \
! : (TREE_LANG_FLAG_0 (NODE) = 1))
! #define CLEAR_BINFO_MARKED(NODE) \
! (TREE_VIA_VIRTUAL (NODE) \
! ? CLEAR_CLASSTYPE_MARKED (BINFO_TYPE (NODE)) \
! : (TREE_LANG_FLAG_0 (NODE) = 0))
/* Nonzero means that this class is on a path leading to a new vtable. */
! #define BINFO_VTABLE_PATH_MARKED(NODE) \
! (TREE_VIA_VIRTUAL (NODE) \
! ? CLASSTYPE_MARKED3 (BINFO_TYPE (NODE)) \
! : TREE_LANG_FLAG_3 (NODE))
! #define SET_BINFO_VTABLE_PATH_MARKED(NODE) \
! (TREE_VIA_VIRTUAL(NODE) \
! ? SET_CLASSTYPE_MARKED3 (BINFO_TYPE (NODE)) \
! : (TREE_LANG_FLAG_3 (NODE) = 1))
! #define CLEAR_BINFO_VTABLE_PATH_MARKED(NODE) \
! (TREE_VIA_VIRTUAL (NODE) \
! ? CLEAR_CLASSTYPE_MARKED3 (BINFO_TYPE (NODE))\
! : (TREE_LANG_FLAG_3 (NODE) = 0))
/* Nonzero means B (a BINFO) has its own vtable. Under the old ABI,
secondary vtables are sometimes shared. Any copies will not have
*************** struct lang_type
*** 1575,1581 ****
derived class and never become non-primary.) */
#define SET_BINFO_NEW_VTABLE_MARKED(B, C) \
(BINFO_NEW_VTABLE_MARKED (B, C) = 1, \
! my_friendly_assert (!BINFO_PRIMARY_P (B) || TREE_VIA_VIRTUAL (B), 20000517), \
my_friendly_assert (CLASSTYPE_VFIELDS (BINFO_TYPE (B)) != NULL_TREE, \
20000517))
--- 1619,1626 ----
derived class and never become non-primary.) */
#define SET_BINFO_NEW_VTABLE_MARKED(B, C) \
(BINFO_NEW_VTABLE_MARKED (B, C) = 1, \
! my_friendly_assert (!BINFO_PRIMARY_P (B) \
! || TREE_VIA_VIRTUAL (B), 20000517), \
my_friendly_assert (CLASSTYPE_VFIELDS (BINFO_TYPE (B)) != NULL_TREE, \
20000517))
*************** struct lang_type
*** 1595,1611 ****
/* The index in the VTT where this subobject's sub-VTT can be found.
NULL_TREE if there is no sub-VTT. */
! #define BINFO_SUBVTT_INDEX(NODE) TREE_VEC_ELT ((NODE), 8)
/* The index in the VTT where the vptr for this subobject can be
found. NULL_TREE if there is no secondary vptr in the VTT. */
! #define BINFO_VPTR_INDEX(NODE) TREE_VEC_ELT ((NODE), 9)
/* The binfo of which NODE is a primary base. (This is different from
BINFO_INHERITANCE_CHAIN for virtual base because a virtual base is
sometimes a primary base for a class for which it is not an
immediate base.) */
! #define BINFO_PRIMARY_BASE_OF(NODE) TREE_VEC_ELT ((NODE), 10)
/* Nonzero if this binfo has lost its primary base binfo (because that
is a nearly-empty virtual base that has been taken by some other
--- 1640,1656 ----
/* The index in the VTT where this subobject's sub-VTT can be found.
NULL_TREE if there is no sub-VTT. */
! #define BINFO_SUBVTT_INDEX(NODE) TREE_VEC_ELT (NODE, 8)
/* The index in the VTT where the vptr for this subobject can be
found. NULL_TREE if there is no secondary vptr in the VTT. */
! #define BINFO_VPTR_INDEX(NODE) TREE_VEC_ELT (NODE, 9)
/* The binfo of which NODE is a primary base. (This is different from
BINFO_INHERITANCE_CHAIN for virtual base because a virtual base is
sometimes a primary base for a class for which it is not an
immediate base.) */
! #define BINFO_PRIMARY_BASE_OF(NODE) TREE_VEC_ELT (NODE, 10)
/* Nonzero if this binfo has lost its primary base binfo (because that
is a nearly-empty virtual base that has been taken by some other
*************** struct lang_type
*** 1627,1633 ****
TREE_PURPOSE is NULL. Otherwise, the TREE_PURPOSE is the BINFO for
the class containing the vfield. The TREE_VALUE is the class where
the vfield was first defined. */
! #define CLASSTYPE_VFIELDS(NODE) (TYPE_LANG_SPECIFIC(NODE)->vfields)
/* Get the assoc info that caused this vfield to exist. */
#define VF_BINFO_VALUE(NODE) TREE_PURPOSE (NODE)
--- 1672,1678 ----
TREE_PURPOSE is NULL. Otherwise, the TREE_PURPOSE is the BINFO for
the class containing the vfield. The TREE_VALUE is the class where
the vfield was first defined. */
! #define CLASSTYPE_VFIELDS(NODE) (TYPE_LANG_SPECIFIC (NODE)->vfields)
/* Get the assoc info that caused this vfield to exist. */
#define VF_BINFO_VALUE(NODE) TREE_PURPOSE (NODE)
*************** struct lang_type
*** 1636,1642 ****
#define VF_BASETYPE_VALUE(NODE) TREE_VALUE (NODE)
/* Get the value of the top-most type dominating the non-`normal' vfields. */
! #define VF_DERIVED_VALUE(NODE) (VF_BINFO_VALUE (NODE) ? BINFO_TYPE (VF_BINFO_VALUE (NODE)) : NULL_TREE)
/* The number of bytes by which to adjust the `this' pointer when
calling this virtual function. */
--- 1681,1688 ----
#define VF_BASETYPE_VALUE(NODE) TREE_VALUE (NODE)
/* Get the value of the top-most type dominating the non-`normal' vfields. */
! #define VF_DERIVED_VALUE(NODE) \
! (VF_BINFO_VALUE (NODE) ? BINFO_TYPE (VF_BINFO_VALUE (NODE)) : NULL_TREE)
/* The number of bytes by which to adjust the `this' pointer when
calling this virtual function. */
*************** struct lang_type
*** 1673,1679 ****
/* The binding level associated with the namespace. */
#define NAMESPACE_LEVEL(NODE) \
! (DECL_LANG_SPECIFIC(NODE)->decl_flags.u.level)
/* If a DECL has DECL_LANG_SPECIFIC, it is either a lang_decl_flags or
--- 1719,1725 ----
/* The binding level associated with the namespace. */
#define NAMESPACE_LEVEL(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.u.level)
/* If a DECL has DECL_LANG_SPECIFIC, it is either a lang_decl_flags or
*************** struct lang_type
*** 1681,1690 ****
This macro is nonzero for tree nodes whose DECL_LANG_SPECIFIC is
the full lang_decl, and not just lang_decl_flags. */
#define CAN_HAVE_FULL_LANG_DECL_P(NODE) \
! (!(TREE_CODE ((NODE)) == VAR_DECL \
! || TREE_CODE ((NODE)) == CONST_DECL \
! || TREE_CODE ((NODE)) == FIELD_DECL \
! || TREE_CODE ((NODE)) == USING_DECL))
struct lang_decl_flags
{
--- 1727,1736 ----
This macro is nonzero for tree nodes whose DECL_LANG_SPECIFIC is
the full lang_decl, and not just lang_decl_flags. */
#define CAN_HAVE_FULL_LANG_DECL_P(NODE) \
! (!(TREE_CODE (NODE) == VAR_DECL \
! || TREE_CODE (NODE) == CONST_DECL \
! || TREE_CODE (NODE) == FIELD_DECL \
! || TREE_CODE (NODE) == USING_DECL))
struct lang_decl_flags
{
*************** struct lang_decl
*** 1770,1776 ****
} u2;
};
! #define DEFARG_POINTER(NODE) (DEFAULT_ARG_CHECK(NODE)->identifier.id.str)
/* DECL_NEEDED_P holds of a declaration when we need to emit its
definition. This is true when the back-end tells us that
--- 1816,1822 ----
} u2;
};
! #define DEFARG_POINTER(NODE) (DEFAULT_ARG_CHECK (NODE)->identifier.id.str)
/* DECL_NEEDED_P holds of a declaration when we need to emit its
definition. This is true when the back-end tells us that
*************** struct lang_decl
*** 1779,1789 ****
just been used somewhere, even if it's not really needed. We need
anything that isn't comdat, but we don't know for sure whether or
not something is comdat until end-of-file. */
! #define DECL_NEEDED_P(DECL) \
! ((at_eof && TREE_PUBLIC (DECL) && !DECL_COMDAT (DECL)) \
! || (DECL_ASSEMBLER_NAME_SET_P (DECL) \
! && TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME ((DECL)))) \
! || (flag_syntax_only && TREE_USED ((DECL))))
/* Non-zero iff DECL is memory-based. The DECL_RTL of
certain const variables might be a CONST_INT, or a REG
--- 1825,1835 ----
just been used somewhere, even if it's not really needed. We need
anything that isn't comdat, but we don't know for sure whether or
not something is comdat until end-of-file. */
! #define DECL_NEEDED_P(DECL) \
! ((at_eof && TREE_PUBLIC (DECL) && !DECL_COMDAT (DECL)) \
! || (DECL_ASSEMBLER_NAME_SET_P (DECL) \
! && TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (DECL))) \
! || (flag_syntax_only && TREE_USED (DECL)))
/* Non-zero iff DECL is memory-based. The DECL_RTL of
certain const variables might be a CONST_INT, or a REG
*************** struct lang_decl
*** 1804,1819 ****
we do create DECL_LANG_SPECIFIC for variables with non-C++ linkage. */
#define DECL_LANGUAGE(NODE) \
(DECL_LANG_SPECIFIC (NODE) \
! ? DECL_LANG_SPECIFIC(NODE)->decl_flags.language \
: (TREE_CODE (NODE) == FUNCTION_DECL \
? lang_c : lang_cplusplus))
/* Set the language linkage for NODE to LANGUAGE. */
#define SET_DECL_LANGUAGE(NODE, LANGUAGE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.language = LANGUAGE)
/* For FUNCTION_DECLs: nonzero means that this function is a constructor. */
! #define DECL_CONSTRUCTOR_P(NODE) (DECL_LANG_SPECIFIC(NODE)->decl_flags.constructor_attr)
/* Nonzero if NODE (a FUNCTION_DECL) is a constructor for a complete
object. */
--- 1850,1866 ----
we do create DECL_LANG_SPECIFIC for variables with non-C++ linkage. */
#define DECL_LANGUAGE(NODE) \
(DECL_LANG_SPECIFIC (NODE) \
! ? DECL_LANG_SPECIFIC (NODE)->decl_flags.language \
: (TREE_CODE (NODE) == FUNCTION_DECL \
? lang_c : lang_cplusplus))
/* Set the language linkage for NODE to LANGUAGE. */
#define SET_DECL_LANGUAGE(NODE, LANGUAGE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.language = (LANGUAGE))
/* For FUNCTION_DECLs: nonzero means that this function is a constructor. */
! #define DECL_CONSTRUCTOR_P(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.constructor_attr)
/* Nonzero if NODE (a FUNCTION_DECL) is a constructor for a complete
object. */
*************** struct lang_decl
*** 1914,1920 ****
value of ERROR_MARK is zero, this macro can be used as a predicate
to test whether or not NODE is an overloaded operator. */
#define DECL_OVERLOADED_OPERATOR_P(NODE) \
! (IDENTIFIER_OPNAME_P (DECL_NAME ((NODE))) \
? DECL_LANG_SPECIFIC (NODE)->u2.operator_code : ERROR_MARK)
/* Non-zero if NODE is an assignment operator. */
--- 1961,1967 ----
value of ERROR_MARK is zero, this macro can be used as a predicate
to test whether or not NODE is an overloaded operator. */
#define DECL_OVERLOADED_OPERATOR_P(NODE) \
! (IDENTIFIER_OPNAME_P (DECL_NAME (NODE)) \
? DECL_LANG_SPECIFIC (NODE)->u2.operator_code : ERROR_MARK)
/* Non-zero if NODE is an assignment operator. */
*************** struct lang_decl
*** 1936,1942 ****
detecting circularity in case members are multiply defined. In the
case of a VAR_DECL, it is also used to determine how program storage
should be allocated. */
! #define DECL_IN_AGGR_P(NODE) (DECL_LANG_FLAG_3(NODE))
/* Nonzero if the DECL was initialized in the class definition itself,
rather than outside the class. */
--- 1983,1989 ----
detecting circularity in case members are multiply defined. In the
case of a VAR_DECL, it is also used to determine how program storage
should be allocated. */
! #define DECL_IN_AGGR_P(NODE) (DECL_LANG_FLAG_3 (NODE))
/* Nonzero if the DECL was initialized in the class definition itself,
rather than outside the class. */
*************** struct lang_decl
*** 1946,1960 ****
/* Nonzero for FUNCTION_DECL means that this decl is just a
friend declaration, and should not be added to the list of
member functions for this class. */
! #define DECL_FRIEND_P(NODE) (DECL_LANG_SPECIFIC(NODE)->decl_flags.friend_attr)
/* A TREE_LIST of the types which have befriended this FUNCTION_DECL. */
#define DECL_BEFRIENDING_CLASSES(NODE) \
! (DECL_LANG_SPECIFIC(NODE)->befriending_classes)
/* Nonzero for FUNCTION_DECL means that this decl is a static
member function. */
! #define DECL_STATIC_FUNCTION_P(NODE) (DECL_LANG_SPECIFIC(NODE)->decl_flags.static_function)
/* Nonzero for FUNCTION_DECL means that this decl is a non-static
member function. */
--- 1993,2008 ----
/* Nonzero for FUNCTION_DECL means that this decl is just a
friend declaration, and should not be added to the list of
member functions for this class. */
! #define DECL_FRIEND_P(NODE) (DECL_LANG_SPECIFIC (NODE)->decl_flags.friend_attr)
/* A TREE_LIST of the types which have befriended this FUNCTION_DECL. */
#define DECL_BEFRIENDING_CLASSES(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->befriending_classes)
/* Nonzero for FUNCTION_DECL means that this decl is a static
member function. */
! #define DECL_STATIC_FUNCTION_P(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.static_function)
/* Nonzero for FUNCTION_DECL means that this decl is a non-static
member function. */
*************** struct lang_decl
*** 1992,2006 ****
/* Nonzero for _DECL means that this constructor is a non-converting
constructor. */
! #define DECL_NONCONVERTING_P(NODE) (DECL_LANG_SPECIFIC(NODE)->decl_flags.nonconverting)
/* Nonzero for FUNCTION_DECL means that this member function is a pure
virtual function. */
! #define DECL_PURE_VIRTUAL_P(NODE) (DECL_LANG_SPECIFIC(NODE)->decl_flags.pure_virtual)
/* Nonzero for FUNCTION_DECL means that this member function
must be overridden by derived classes. */
! #define DECL_NEEDS_FINAL_OVERRIDER_P(NODE) (DECL_LANG_SPECIFIC(NODE)->decl_flags.needs_final_overrider)
/* Nonzero if NODE is a thunk, rather than an ordinary function. */
#define DECL_THUNK_P(NODE) \
--- 2040,2057 ----
/* Nonzero for _DECL means that this constructor is a non-converting
constructor. */
! #define DECL_NONCONVERTING_P(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.nonconverting)
/* Nonzero for FUNCTION_DECL means that this member function is a pure
virtual function. */
! #define DECL_PURE_VIRTUAL_P(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.pure_virtual)
/* Nonzero for FUNCTION_DECL means that this member function
must be overridden by derived classes. */
! #define DECL_NEEDS_FINAL_OVERRIDER_P(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.needs_final_overrider)
/* Nonzero if NODE is a thunk, rather than an ordinary function. */
#define DECL_THUNK_P(NODE) \
*************** struct lang_decl
*** 2120,2144 ****
/* If DECL_PENDING_INLINE_P holds, this is the saved text of the
function. */
#define DECL_PENDING_INLINE_INFO(NODE) \
! (DECL_LANG_SPECIFIC(NODE)->u.pending_inline_info)
/* For a TYPE_DECL: if this function has many fields, we'll sort them
and put them into a TREE_VEC. */
#define DECL_SORTED_FIELDS(NODE) \
! (DECL_LANG_SPECIFIC (TYPE_DECL_CHECK (NODE))->u.sorted_fields)
/* True if on the deferred_fns (see decl2.c) list. */
#define DECL_DEFERRED_FN(DECL) \
! (DECL_LANG_SPECIFIC(DECL)->decl_flags.deferred)
/* For a VAR_DECL, FUNCTION_DECL, TYPE_DECL or TEMPLATE_DECL:
template-specific information. */
#define DECL_TEMPLATE_INFO(NODE) \
! (DECL_LANG_SPECIFIC(VAR_TEMPL_TYPE_OR_FUNCTION_DECL_CHECK (NODE))->decl_flags.u.template_info)
/* Template information for a RECORD_TYPE or UNION_TYPE. */
#define CLASSTYPE_TEMPLATE_INFO(NODE) \
! (TYPE_LANG_SPECIFIC(RECORD_OR_UNION_TYPE_CHECK (NODE))->template_info)
/* Template information for an ENUMERAL_TYPE. Although an enumeration may
not be a primary template, it may be declared within the scope of a
--- 2171,2196 ----
/* If DECL_PENDING_INLINE_P holds, this is the saved text of the
function. */
#define DECL_PENDING_INLINE_INFO(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->u.pending_inline_info)
/* For a TYPE_DECL: if this function has many fields, we'll sort them
and put them into a TREE_VEC. */
#define DECL_SORTED_FIELDS(NODE) \
! (DECL_LANG_SPECIFIC (TYPE_DECL_CHECK (NODE))->u.sorted_fields)
/* True if on the deferred_fns (see decl2.c) list. */
#define DECL_DEFERRED_FN(DECL) \
! (DECL_LANG_SPECIFIC (DECL)->decl_flags.deferred)
/* For a VAR_DECL, FUNCTION_DECL, TYPE_DECL or TEMPLATE_DECL:
template-specific information. */
#define DECL_TEMPLATE_INFO(NODE) \
! (DECL_LANG_SPECIFIC (VAR_TEMPL_TYPE_OR_FUNCTION_DECL_CHECK (NODE)) \
! ->decl_flags.u.template_info)
/* Template information for a RECORD_TYPE or UNION_TYPE. */
#define CLASSTYPE_TEMPLATE_INFO(NODE) \
! (TYPE_LANG_SPECIFIC (RECORD_OR_UNION_TYPE_CHECK (NODE))->template_info)
/* Template information for an ENUMERAL_TYPE. Although an enumeration may
not be a primary template, it may be declared within the scope of a
*************** struct lang_decl
*** 2148,2154 ****
/* Template information for a template template parameter. */
#define TEMPLATE_TEMPLATE_PARM_TEMPLATE_INFO(NODE) \
! (TYPE_LANG_SPECIFIC(BOUND_TEMPLATE_TEMPLATE_PARM_TYPE_CHECK (NODE)) \
->template_info)
/* Template information for an ENUMERAL_, RECORD_, or UNION_TYPE. */
--- 2200,2206 ----
/* Template information for a template template parameter. */
#define TEMPLATE_TEMPLATE_PARM_TEMPLATE_INFO(NODE) \
! (TYPE_LANG_SPECIFIC (BOUND_TEMPLATE_TEMPLATE_PARM_TYPE_CHECK (NODE)) \
->template_info)
/* Template information for an ENUMERAL_, RECORD_, or UNION_TYPE. */
*************** struct lang_decl
*** 2165,2172 ****
UNION_TYPE to VAL. */
#define SET_TYPE_TEMPLATE_INFO(NODE, VAL) \
(TREE_CODE (NODE) == ENUMERAL_TYPE \
! ? (ENUM_TEMPLATE_INFO (NODE) = VAL) \
! : (CLASSTYPE_TEMPLATE_INFO (NODE) = VAL))
#define TI_TEMPLATE(NODE) (TREE_PURPOSE (NODE))
#define TI_ARGS(NODE) (TREE_VALUE (NODE))
--- 2217,2224 ----
UNION_TYPE to VAL. */
#define SET_TYPE_TEMPLATE_INFO(NODE, VAL) \
(TREE_CODE (NODE) == ENUMERAL_TYPE \
! ? (ENUM_TEMPLATE_INFO (NODE) = (VAL)) \
! : (CLASSTYPE_TEMPLATE_INFO (NODE) = (VAL)))
#define TI_TEMPLATE(NODE) (TREE_PURPOSE (NODE))
#define TI_ARGS(NODE) (TREE_VALUE (NODE))
*************** struct lang_decl
*** 2187,2193 ****
/* Non-zero if the template arguments is actually a vector of vectors,
rather than just a vector. */
#define TMPL_ARGS_HAVE_MULTIPLE_LEVELS(NODE) \
! (NODE != NULL_TREE \
&& TREE_CODE (NODE) == TREE_VEC \
&& TREE_VEC_LENGTH (NODE) > 0 \
&& TREE_VEC_ELT (NODE, 0) != NULL_TREE \
--- 2239,2245 ----
/* Non-zero if the template arguments is actually a vector of vectors,
rather than just a vector. */
#define TMPL_ARGS_HAVE_MULTIPLE_LEVELS(NODE) \
! ((NODE) != NULL_TREE \
&& TREE_CODE (NODE) == TREE_VEC \
&& TREE_VEC_LENGTH (NODE) > 0 \
&& TREE_VEC_ELT (NODE, 0) != NULL_TREE \
*************** struct lang_decl
*** 2205,2216 ****
args is level 1, not level 0. */
#define TMPL_ARGS_LEVEL(ARGS, LEVEL) \
(TMPL_ARGS_HAVE_MULTIPLE_LEVELS (ARGS) \
! ? TREE_VEC_ELT ((ARGS), (LEVEL) - 1) : ARGS)
/* Set the LEVELth level of the template ARGS to VAL. This macro does
not work with single-level argument vectors. */
#define SET_TMPL_ARGS_LEVEL(ARGS, LEVEL, VAL) \
! (TREE_VEC_ELT ((ARGS), (LEVEL) - 1) = (VAL))
/* Accesses the IDXth parameter in the LEVELth level of the ARGS. */
#define TMPL_ARG(ARGS, LEVEL, IDX) \
--- 2257,2268 ----
args is level 1, not level 0. */
#define TMPL_ARGS_LEVEL(ARGS, LEVEL) \
(TMPL_ARGS_HAVE_MULTIPLE_LEVELS (ARGS) \
! ? TREE_VEC_ELT (ARGS, (LEVEL) - 1) : (ARGS))
/* Set the LEVELth level of the template ARGS to VAL. This macro does
not work with single-level argument vectors. */
#define SET_TMPL_ARGS_LEVEL(ARGS, LEVEL, VAL) \
! (TREE_VEC_ELT (ARGS, (LEVEL) - 1) = (VAL))
/* Accesses the IDXth parameter in the LEVELth level of the ARGS. */
#define TMPL_ARG(ARGS, LEVEL, IDX) \
*************** struct lang_decl
*** 2278,2284 ****
#define TYPE_TI_ARGS(NODE) \
(TI_ARGS (TYPE_TEMPLATE_INFO (NODE)))
! #define INNERMOST_TEMPLATE_PARMS(NODE) TREE_VALUE(NODE)
/* Nonzero if the NODE corresponds to the template parameters for a
member template, whose inline definition is being processed after
--- 2330,2336 ----
#define TYPE_TI_ARGS(NODE) \
(TI_ARGS (TYPE_TEMPLATE_INFO (NODE)))
! #define INNERMOST_TEMPLATE_PARMS(NODE) TREE_VALUE (NODE)
/* Nonzero if the NODE corresponds to the template parameters for a
member template, whose inline definition is being processed after
*************** extern int flag_new_for_scope;
*** 2366,2372 ****
(DECL_LANG_SPECIFIC (DECL_CHECK (NODE))->decl_flags.anticipated_p)
/* Record whether a typedef for type `int' was actually `signed int'. */
! #define C_TYPEDEF_EXPLICITLY_SIGNED(exp) DECL_LANG_FLAG_1 ((exp))
/* Returns non-zero if DECL has external linkage, as specified by the
language standard. (This predicate may hold even when the
--- 2418,2424 ----
(DECL_LANG_SPECIFIC (DECL_CHECK (NODE))->decl_flags.anticipated_p)
/* Record whether a typedef for type `int' was actually `signed int'. */
! #define C_TYPEDEF_EXPLICITLY_SIGNED(EXP) DECL_LANG_FLAG_1 (EXP)
/* Returns non-zero if DECL has external linkage, as specified by the
language standard. (This predicate may hold even when the
*************** extern int flag_new_for_scope;
*** 2376,2382 ****
(decl_linkage (DECL) == lk_external)
#define INTEGRAL_CODE_P(CODE) \
! (CODE == INTEGER_TYPE || CODE == ENUMERAL_TYPE || CODE == BOOLEAN_TYPE)
/* [basic.fundamental]
--- 2428,2434 ----
(decl_linkage (DECL) == lk_external)
#define INTEGRAL_CODE_P(CODE) \
! ((CODE) == INTEGER_TYPE || (CODE) == ENUMERAL_TYPE || (CODE) == BOOLEAN_TYPE)
/* [basic.fundamental]
*************** extern int flag_new_for_scope;
*** 2386,2393 ****
Note that INTEGRAL_TYPE_P, as defined in tree.h, allows enumeration
types as well, which is incorrect in C++. */
#define CP_INTEGRAL_TYPE_P(TYPE) \
! (TREE_CODE ((TYPE)) == BOOLEAN_TYPE \
! || TREE_CODE ((TYPE)) == INTEGER_TYPE)
/* [basic.fundamental]
--- 2438,2445 ----
Note that INTEGRAL_TYPE_P, as defined in tree.h, allows enumeration
types as well, which is incorrect in C++. */
#define CP_INTEGRAL_TYPE_P(TYPE) \
! (TREE_CODE (TYPE) == BOOLEAN_TYPE \
! || TREE_CODE (TYPE) == INTEGER_TYPE)
/* [basic.fundamental]
*************** extern int flag_new_for_scope;
*** 2398,2404 ****
/* Nonzero for _TYPE means that the _TYPE defines
at least one constructor. */
! #define TYPE_HAS_CONSTRUCTOR(NODE) (TYPE_LANG_FLAG_1(NODE))
/* When appearing in an INDIRECT_REF, it means that the tree structure
underneath is actually a call to a constructor. This is needed
--- 2450,2456 ----
/* Nonzero for _TYPE means that the _TYPE defines
at least one constructor. */
! #define TYPE_HAS_CONSTRUCTOR(NODE) (TYPE_LANG_FLAG_1 (NODE))
/* When appearing in an INDIRECT_REF, it means that the tree structure
underneath is actually a call to a constructor. This is needed
*************** extern int flag_new_for_scope;
*** 2414,2427 ****
When appearing in a FIELD_DECL, it means that this field
has been duly initialized in its constructor. */
! #define TREE_HAS_CONSTRUCTOR(NODE) (TREE_LANG_FLAG_4(NODE))
#define EMPTY_CONSTRUCTOR_P(NODE) (TREE_CODE (NODE) == CONSTRUCTOR \
&& CONSTRUCTOR_ELTS (NODE) == NULL_TREE \
&& ! TREE_HAS_CONSTRUCTOR (NODE))
/* Nonzero for _TYPE means that the _TYPE defines a destructor. */
! #define TYPE_HAS_DESTRUCTOR(NODE) (TYPE_LANG_FLAG_2(NODE))
/* Nonzero means that an object of this type can not be initialized using
an initializer list. */
--- 2466,2479 ----
When appearing in a FIELD_DECL, it means that this field
has been duly initialized in its constructor. */
! #define TREE_HAS_CONSTRUCTOR(NODE) (TREE_LANG_FLAG_4 (NODE))
#define EMPTY_CONSTRUCTOR_P(NODE) (TREE_CODE (NODE) == CONSTRUCTOR \
&& CONSTRUCTOR_ELTS (NODE) == NULL_TREE \
&& ! TREE_HAS_CONSTRUCTOR (NODE))
/* Nonzero for _TYPE means that the _TYPE defines a destructor. */
! #define TYPE_HAS_DESTRUCTOR(NODE) (TYPE_LANG_FLAG_2 (NODE))
/* Nonzero means that an object of this type can not be initialized using
an initializer list. */
*************** extern int flag_new_for_scope;
*** 2431,2440 ****
(IS_AGGR_TYPE (NODE) && CLASSTYPE_NON_AGGREGATE (NODE))
/* Nonzero if there is a user-defined X::op=(x&) for this class. */
! #define TYPE_HAS_REAL_ASSIGN_REF(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_real_assign_ref)
! #define TYPE_HAS_COMPLEX_ASSIGN_REF(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_complex_assign_ref)
! #define TYPE_HAS_ABSTRACT_ASSIGN_REF(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_abstract_assign_ref)
! #define TYPE_HAS_COMPLEX_INIT_REF(NODE) (TYPE_LANG_SPECIFIC(NODE)->has_complex_init_ref)
/* Nonzero if TYPE has a trivial destructor. From [class.dtor]:
--- 2483,2492 ----
(IS_AGGR_TYPE (NODE) && CLASSTYPE_NON_AGGREGATE (NODE))
/* Nonzero if there is a user-defined X::op=(x&) for this class. */
! #define TYPE_HAS_REAL_ASSIGN_REF(NODE) (TYPE_LANG_SPECIFIC (NODE)->has_real_assign_ref)
! #define TYPE_HAS_COMPLEX_ASSIGN_REF(NODE) (TYPE_LANG_SPECIFIC (NODE)->has_complex_assign_ref)
! #define TYPE_HAS_ABSTRACT_ASSIGN_REF(NODE) (TYPE_LANG_SPECIFIC (NODE)->has_abstract_assign_ref)
! #define TYPE_HAS_COMPLEX_INIT_REF(NODE) (TYPE_LANG_SPECIFIC (NODE)->has_complex_init_ref)
/* Nonzero if TYPE has a trivial destructor. From [class.dtor]:
*************** extern int flag_new_for_scope;
*** 2455,2461 ****
involve a call to a destructor. This can apply to objects of
ARRAY_TYPE is the type of the elements needs a destructor. */
#define TYPE_HAS_NONTRIVIAL_DESTRUCTOR(NODE) \
! (TYPE_LANG_FLAG_4(NODE))
/* Nonzero for class type means that copy initialization of this type can use
a bitwise copy. */
--- 2507,2513 ----
involve a call to a destructor. This can apply to objects of
ARRAY_TYPE is the type of the elements needs a destructor. */
#define TYPE_HAS_NONTRIVIAL_DESTRUCTOR(NODE) \
! (TYPE_LANG_FLAG_4 (NODE))
/* Nonzero for class type means that copy initialization of this type can use
a bitwise copy. */
*************** extern int flag_new_for_scope;
*** 2488,2499 ****
/* Nonzero for _TYPE node means that this type is a pointer to member
function type. */
#define TYPE_PTRMEMFUNC_P(NODE) \
! (TREE_CODE(NODE) == RECORD_TYPE \
! && TYPE_LANG_SPECIFIC(NODE) \
&& TYPE_PTRMEMFUNC_FLAG (NODE))
#define TYPE_PTRMEMFUNC_FLAG(NODE) \
! (TYPE_LANG_SPECIFIC(NODE)->ptrmemfunc_flag)
/* Indicates when overload resolution may resolve to a pointer to
member function. [expr.unary.op]/3 */
--- 2540,2551 ----
/* Nonzero for _TYPE node means that this type is a pointer to member
function type. */
#define TYPE_PTRMEMFUNC_P(NODE) \
! (TREE_CODE (NODE) == RECORD_TYPE \
! && TYPE_LANG_SPECIFIC (NODE) \
&& TYPE_PTRMEMFUNC_FLAG (NODE))
#define TYPE_PTRMEMFUNC_FLAG(NODE) \
! (TYPE_LANG_SPECIFIC (NODE)->ptrmemfunc_flag)
/* Indicates when overload resolution may resolve to a pointer to
member function. [expr.unary.op]/3 */
*************** enum ptrmemfunc_vbit_where_t
*** 2537,2544 ****
/* These are use to manipulate the canonical RECORD_TYPE from the
hashed POINTER_TYPE, and can only be used on the POINTER_TYPE. */
! #define TYPE_GET_PTRMEMFUNC_TYPE(NODE) ((tree)TYPE_LANG_SPECIFIC(NODE))
! #define TYPE_SET_PTRMEMFUNC_TYPE(NODE, VALUE) (TYPE_LANG_SPECIFIC(NODE) = ((struct lang_type *)(void*)(VALUE)))
/* Returns the pfn field from a TYPE_PTRMEMFUNC_P. */
#define PFN_FROM_PTRMEMFUNC(NODE) pfn_from_ptrmemfunc ((NODE))
--- 2589,2598 ----
/* These are use to manipulate the canonical RECORD_TYPE from the
hashed POINTER_TYPE, and can only be used on the POINTER_TYPE. */
! #define TYPE_GET_PTRMEMFUNC_TYPE(NODE) \
! ((tree)TYPE_LANG_SPECIFIC (NODE))
! #define TYPE_SET_PTRMEMFUNC_TYPE(NODE, VALUE) \
! (TYPE_LANG_SPECIFIC (NODE) = ((struct lang_type *)(void*)(VALUE)))
/* Returns the pfn field from a TYPE_PTRMEMFUNC_P. */
#define PFN_FROM_PTRMEMFUNC(NODE) pfn_from_ptrmemfunc ((NODE))
*************** enum ptrmemfunc_vbit_where_t
*** 2548,2562 ****
TYPE_PTRMEM_POINTED_TO_TYPE; there, the first parameter will have
type `const X*'. */
#define TYPE_PTRMEM_CLASS_TYPE(NODE) \
! (TYPE_PTRMEM_P ((NODE)) \
! ? TYPE_OFFSET_BASETYPE (TREE_TYPE ((NODE))) \
! : TYPE_PTRMEMFUNC_OBJECT_TYPE ((NODE)))
/* For a pointer-to-member type of the form `T X::*', this is `T'. */
#define TYPE_PTRMEM_POINTED_TO_TYPE(NODE) \
! (TYPE_PTRMEM_P ((NODE)) \
? TREE_TYPE (TREE_TYPE (NODE)) \
! : TREE_TYPE (TYPE_PTRMEMFUNC_FN_TYPE ((NODE))))
/* For a pointer-to-member constant `X::Y' this is the RECORD_TYPE for
`X'. */
--- 2602,2616 ----
TYPE_PTRMEM_POINTED_TO_TYPE; there, the first parameter will have
type `const X*'. */
#define TYPE_PTRMEM_CLASS_TYPE(NODE) \
! (TYPE_PTRMEM_P (NODE) \
! ? TYPE_OFFSET_BASETYPE (TREE_TYPE (NODE)) \
! : TYPE_PTRMEMFUNC_OBJECT_TYPE (NODE))
/* For a pointer-to-member type of the form `T X::*', this is `T'. */
#define TYPE_PTRMEM_POINTED_TO_TYPE(NODE) \
! (TYPE_PTRMEM_P (NODE) \
? TREE_TYPE (TREE_TYPE (NODE)) \
! : TREE_TYPE (TYPE_PTRMEMFUNC_FN_TYPE (NODE)))
/* For a pointer-to-member constant `X::Y' this is the RECORD_TYPE for
`X'. */
*************** enum ptrmemfunc_vbit_where_t
*** 2620,2641 ****
For example, if a member that would normally be public in a
derived class is made protected, then the derived class and the
protected_access_node will appear in the DECL_ACCESS for the node. */
! #define DECL_ACCESS(NODE) (DECL_LANG_SPECIFIC(NODE)->decl_flags.u2.access)
/* Nonzero if the FUNCTION_DECL is a global constructor. */
#define DECL_GLOBAL_CTOR_P(NODE) \
! (DECL_LANG_SPECIFIC ((NODE))->decl_flags.global_ctor_p)
/* Nonzero if the FUNCTION_DECL is a global destructor. */
#define DECL_GLOBAL_DTOR_P(NODE) \
! (DECL_LANG_SPECIFIC ((NODE))->decl_flags.global_dtor_p)
/* If DECL_GLOBAL_CTOR_P or DECL_GLOBAL_DTOR_P holds, this macro
returns the initialization priority for the function. Constructors
with lower numbers should be run first. Destructors should be run
in the reverse order of constructors. */
#define GLOBAL_INIT_PRIORITY(NODE) \
! (DECL_LANG_SPECIFIC ((NODE))->decl_flags.u2.init_priority)
/* Accessor macros for C++ template decl nodes. */
--- 2674,2695 ----
For example, if a member that would normally be public in a
derived class is made protected, then the derived class and the
protected_access_node will appear in the DECL_ACCESS for the node. */
! #define DECL_ACCESS(NODE) (DECL_LANG_SPECIFIC (NODE)->decl_flags.u2.access)
/* Nonzero if the FUNCTION_DECL is a global constructor. */
#define DECL_GLOBAL_CTOR_P(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.global_ctor_p)
/* Nonzero if the FUNCTION_DECL is a global destructor. */
#define DECL_GLOBAL_DTOR_P(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.global_dtor_p)
/* If DECL_GLOBAL_CTOR_P or DECL_GLOBAL_DTOR_P holds, this macro
returns the initialization priority for the function. Constructors
with lower numbers should be run first. Destructors should be run
in the reverse order of constructors. */
#define GLOBAL_INIT_PRIORITY(NODE) \
! (DECL_LANG_SPECIFIC (NODE)->decl_flags.u2.init_priority)
/* Accessor macros for C++ template decl nodes. */
*************** enum ptrmemfunc_vbit_where_t
*** 2650,2662 ****
TEMPLATE_PARM_INDEX for the parameter is avilable as the
DECL_INITIAL (for a PARM_DECL) or as the TREE_TYPE (for a
TYPE_DECL). */
! #define DECL_TEMPLATE_PARMS(NODE) DECL_ARGUMENTS(NODE)
#define DECL_INNERMOST_TEMPLATE_PARMS(NODE) \
INNERMOST_TEMPLATE_PARMS (DECL_TEMPLATE_PARMS (NODE))
#define DECL_NTPARMS(NODE) \
TREE_VEC_LENGTH (DECL_INNERMOST_TEMPLATE_PARMS (NODE))
/* For function, method, class-data templates. */
! #define DECL_TEMPLATE_RESULT(NODE) DECL_RESULT_FLD(NODE)
/* For a static member variable template, the
DECL_TEMPLATE_INSTANTIATIONS list contains the explicitly and
implicitly generated instantiations of the variable. There are no
--- 2704,2716 ----
TEMPLATE_PARM_INDEX for the parameter is avilable as the
DECL_INITIAL (for a PARM_DECL) or as the TREE_TYPE (for a
TYPE_DECL). */
! #define DECL_TEMPLATE_PARMS(NODE) DECL_ARGUMENTS (NODE)
#define DECL_INNERMOST_TEMPLATE_PARMS(NODE) \
INNERMOST_TEMPLATE_PARMS (DECL_TEMPLATE_PARMS (NODE))
#define DECL_NTPARMS(NODE) \
TREE_VEC_LENGTH (DECL_INNERMOST_TEMPLATE_PARMS (NODE))
/* For function, method, class-data templates. */
! #define DECL_TEMPLATE_RESULT(NODE) DECL_RESULT_FLD (NODE)
/* For a static member variable template, the
DECL_TEMPLATE_INSTANTIATIONS list contains the explicitly and
implicitly generated instantiations of the variable. There are no
*************** enum ptrmemfunc_vbit_where_t
*** 2682,2688 ****
<class U> struct S1<T>::S2'.
This list is not used for function templates. */
! #define DECL_TEMPLATE_INSTANTIATIONS(NODE) DECL_VINDEX(NODE)
/* For a function template, the DECL_TEMPLATE_SPECIALIZATIONS lists
contains all instantiations and specializations of the function,
including partial instantiations. For a partial instantiation
--- 2736,2742 ----
<class U> struct S1<T>::S2'.
This list is not used for function templates. */
! #define DECL_TEMPLATE_INSTANTIATIONS(NODE) DECL_VINDEX (NODE)
/* For a function template, the DECL_TEMPLATE_SPECIALIZATIONS lists
contains all instantiations and specializations of the function,
including partial instantiations. For a partial instantiation
*************** enum ptrmemfunc_vbit_where_t
*** 2713,2719 ****
for the partial specialization.
This list is not used for static variable templates. */
! #define DECL_TEMPLATE_SPECIALIZATIONS(NODE) DECL_SIZE(NODE)
/* Nonzero for a DECL which is actually a template parameter. */
#define DECL_TEMPLATE_PARM_P(NODE) \
--- 2767,2773 ----
for the partial specialization.
This list is not used for static variable templates. */
! #define DECL_TEMPLATE_SPECIALIZATIONS(NODE) DECL_SIZE (NODE)
/* Nonzero for a DECL which is actually a template parameter. */
#define DECL_TEMPLATE_PARM_P(NODE) \
*************** enum ptrmemfunc_vbit_where_t
*** 2753,2761 ****
itself, so that you can say `S::S'. This macro does *not* hold for
those typedefs. */
#define DECL_IMPLICIT_TYPEDEF_P(NODE) \
! (TREE_CODE ((NODE)) == TYPE_DECL && DECL_LANG_FLAG_2 ((NODE)))
#define SET_DECL_IMPLICIT_TYPEDEF_P(NODE) \
! (DECL_LANG_FLAG_2 ((NODE)) = 1)
/* A `primary' template is one that has its own template header. A
member function of a class template is a template, but not primary.
--- 2807,2815 ----
itself, so that you can say `S::S'. This macro does *not* hold for
those typedefs. */
#define DECL_IMPLICIT_TYPEDEF_P(NODE) \
! (TREE_CODE (NODE) == TYPE_DECL && DECL_LANG_FLAG_2 (NODE))
#define SET_DECL_IMPLICIT_TYPEDEF_P(NODE) \
! (DECL_LANG_FLAG_2 (NODE) = 1)
/* A `primary' template is one that has its own template header. A
member function of a class template is a template, but not primary.
*************** enum ptrmemfunc_vbit_where_t
*** 2766,2772 ****
(TREE_TYPE (DECL_INNERMOST_TEMPLATE_PARMS (NODE)))
/* Returns non-zero if NODE is a primary template. */
! #define PRIMARY_TEMPLATE_P(NODE) (DECL_PRIMARY_TEMPLATE (NODE) == NODE)
#define CLASSTYPE_TEMPLATE_LEVEL(NODE) \
(TREE_INT_CST_LOW (TREE_PURPOSE (CLASSTYPE_TI_TEMPLATE (NODE))))
--- 2820,2826 ----
(TREE_TYPE (DECL_INNERMOST_TEMPLATE_PARMS (NODE)))
/* Returns non-zero if NODE is a primary template. */
! #define PRIMARY_TEMPLATE_P(NODE) (DECL_PRIMARY_TEMPLATE (NODE) == (NODE))
#define CLASSTYPE_TEMPLATE_LEVEL(NODE) \
(TREE_INT_CST_LOW (TREE_PURPOSE (CLASSTYPE_TI_TEMPLATE (NODE))))
*************** enum ptrmemfunc_vbit_where_t
*** 2777,2783 ****
1=implicit template instantiation
2=explicit template specialization, e.g. int min<int> (int, int);
3=explicit template instantiation, e.g. template int min<int> (int, int); */
! #define DECL_USE_TEMPLATE(NODE) (DECL_LANG_SPECIFIC(NODE)->decl_flags.use_template)
#define DECL_TEMPLATE_INSTANTIATION(NODE) (DECL_USE_TEMPLATE (NODE) & 1)
#define CLASSTYPE_TEMPLATE_INSTANTIATION(NODE) \
--- 2831,2837 ----
1=implicit template instantiation
2=explicit template specialization, e.g. int min<int> (int, int);
3=explicit template instantiation, e.g. template int min<int> (int, int); */
! #define DECL_USE_TEMPLATE(NODE) (DECL_LANG_SPECIFIC (NODE)->decl_flags.use_template)
#define DECL_TEMPLATE_INSTANTIATION(NODE) (DECL_USE_TEMPLATE (NODE) & 1)
#define CLASSTYPE_TEMPLATE_INSTANTIATION(NODE) \
*************** enum ptrmemfunc_vbit_where_t
*** 2793,2808 ****
#define DECL_IMPLICIT_INSTANTIATION(NODE) (DECL_USE_TEMPLATE (NODE) == 1)
#define SET_DECL_IMPLICIT_INSTANTIATION(NODE) (DECL_USE_TEMPLATE (NODE) = 1)
#define CLASSTYPE_IMPLICIT_INSTANTIATION(NODE) \
! (CLASSTYPE_USE_TEMPLATE(NODE) == 1)
#define SET_CLASSTYPE_IMPLICIT_INSTANTIATION(NODE) \
! (CLASSTYPE_USE_TEMPLATE(NODE) = 1)
#define DECL_EXPLICIT_INSTANTIATION(NODE) (DECL_USE_TEMPLATE (NODE) == 3)
#define SET_DECL_EXPLICIT_INSTANTIATION(NODE) (DECL_USE_TEMPLATE (NODE) = 3)
#define CLASSTYPE_EXPLICIT_INSTANTIATION(NODE) \
! (CLASSTYPE_USE_TEMPLATE(NODE) == 3)
#define SET_CLASSTYPE_EXPLICIT_INSTANTIATION(NODE) \
! (CLASSTYPE_USE_TEMPLATE(NODE) = 3)
/* Non-zero if DECL is a friend function which is an instantiation
from the point of view of the compiler, but not from the point of
--- 2847,2862 ----
#define DECL_IMPLICIT_INSTANTIATION(NODE) (DECL_USE_TEMPLATE (NODE) == 1)
#define SET_DECL_IMPLICIT_INSTANTIATION(NODE) (DECL_USE_TEMPLATE (NODE) = 1)
#define CLASSTYPE_IMPLICIT_INSTANTIATION(NODE) \
! (CLASSTYPE_USE_TEMPLATE (NODE) == 1)
#define SET_CLASSTYPE_IMPLICIT_INSTANTIATION(NODE) \
! (CLASSTYPE_USE_TEMPLATE (NODE) = 1)
#define DECL_EXPLICIT_INSTANTIATION(NODE) (DECL_USE_TEMPLATE (NODE) == 3)
#define SET_DECL_EXPLICIT_INSTANTIATION(NODE) (DECL_USE_TEMPLATE (NODE) = 3)
#define CLASSTYPE_EXPLICIT_INSTANTIATION(NODE) \
! (CLASSTYPE_USE_TEMPLATE (NODE) == 3)
#define SET_CLASSTYPE_EXPLICIT_INSTANTIATION(NODE) \
! (CLASSTYPE_USE_TEMPLATE (NODE) = 3)
/* Non-zero if DECL is a friend function which is an instantiation
from the point of view of the compiler, but not from the point of
*************** enum ptrmemfunc_vbit_where_t
*** 2912,2926 ****
/* The parameters for a call-declarator. */
#define CALL_DECLARATOR_PARMS(NODE) \
! (TREE_PURPOSE (TREE_OPERAND ((NODE), 1)))
/* The cv-qualifiers for a call-declarator. */
#define CALL_DECLARATOR_QUALS(NODE) \
! (TREE_VALUE (TREE_OPERAND ((NODE), 1)))
/* The exception-specification for a call-declarator. */
#define CALL_DECLARATOR_EXCEPTION_SPEC(NODE) \
! (TREE_TYPE ((NODE)))
/* An enumeration of the kind of tags that C++ accepts. */
enum tag_types { record_type, class_type, union_type, enum_type };
--- 2966,2980 ----
/* The parameters for a call-declarator. */
#define CALL_DECLARATOR_PARMS(NODE) \
! (TREE_PURPOSE (TREE_OPERAND (NODE, 1)))
/* The cv-qualifiers for a call-declarator. */
#define CALL_DECLARATOR_QUALS(NODE) \
! (TREE_VALUE (TREE_OPERAND (NODE, 1)))
/* The exception-specification for a call-declarator. */
#define CALL_DECLARATOR_EXCEPTION_SPEC(NODE) \
! (TREE_TYPE (NODE))
/* An enumeration of the kind of tags that C++ accepts. */
enum tag_types { record_type, class_type, union_type, enum_type };
*************** extern varray_type local_classes;
*** 3217,3224 ****
&& IDENTIFIER_POINTER (ID_NODE)[2] == 't' \
&& IDENTIFIER_POINTER (ID_NODE)[3] == JOINER)
! #define TEMP_NAME_P(ID_NODE) (!strncmp (IDENTIFIER_POINTER (ID_NODE), AUTO_TEMP_NAME, sizeof (AUTO_TEMP_NAME)-1))
! #define VFIELD_NAME_P(ID_NODE) (!strncmp (IDENTIFIER_POINTER (ID_NODE), VFIELD_NAME, sizeof(VFIELD_NAME)-1))
/* For anonymous aggregate types, we need some sort of name to
hold on to. In practice, this should not appear, but it should
--- 3271,3280 ----
&& IDENTIFIER_POINTER (ID_NODE)[2] == 't' \
&& IDENTIFIER_POINTER (ID_NODE)[3] == JOINER)
! #define TEMP_NAME_P(ID_NODE) \
! (!strncmp (IDENTIFIER_POINTER (ID_NODE), AUTO_TEMP_NAME, sizeof (AUTO_TEMP_NAME)-1))
! #define VFIELD_NAME_P(ID_NODE) \
! (!strncmp (IDENTIFIER_POINTER (ID_NODE), VFIELD_NAME, sizeof(VFIELD_NAME)-1))
/* For anonymous aggregate types, we need some sort of name to
hold on to. In practice, this should not appear, but it should
*************** extern tree static_dtors;
*** 3272,3280 ****
enum overload_flags { NO_SPECIAL = 0, DTOR_FLAG, OP_FLAG, TYPENAME_FLAG };
/* Some macros for char-based bitfields. */
! #define B_SET(a,x) (a[x>>3] |= (1 << (x&7)))
! #define B_CLR(a,x) (a[x>>3] &= ~(1 << (x&7)))
! #define B_TST(a,x) (a[x>>3] & (1 << (x&7)))
/* These are uses as bits in flags passed to build_method_call
to control its error reporting behavior.
--- 3328,3336 ----
enum overload_flags { NO_SPECIAL = 0, DTOR_FLAG, OP_FLAG, TYPENAME_FLAG };
/* Some macros for char-based bitfields. */
! #define B_SET(A,X) ((A)[(X)>>3] |= (1 << ((X)&7)))
! #define B_CLR(A,X) ((A)[(X)>>3] &= ~(1 << ((X)&7)))
! #define B_TST(A,X) ((A)[(X)>>3] & (1 << ((X)&7)))
/* These are uses as bits in flags passed to build_method_call
to control its error reporting behavior.
*************** enum overload_flags { NO_SPECIAL = 0, DT
*** 3326,3336 ****
#define LOOKUP_PREFER_BOTH (6144)
#define LOOKUP_TEMPLATES_EXPECTED (8192)
! #define LOOKUP_NAMESPACES_ONLY(f) \
! (((f) & LOOKUP_PREFER_NAMESPACES) && !((f) & LOOKUP_PREFER_TYPES))
! #define LOOKUP_TYPES_ONLY(f) \
! (!((f) & LOOKUP_PREFER_NAMESPACES) && ((f) & LOOKUP_PREFER_TYPES))
! #define LOOKUP_QUALIFIERS_ONLY(f) ((f) & LOOKUP_PREFER_BOTH)
/* These flags are used by the conversion code.
--- 3382,3392 ----
#define LOOKUP_PREFER_BOTH (6144)
#define LOOKUP_TEMPLATES_EXPECTED (8192)
! #define LOOKUP_NAMESPACES_ONLY(F) \
! (((F) & LOOKUP_PREFER_NAMESPACES) && !((F) & LOOKUP_PREFER_TYPES))
! #define LOOKUP_TYPES_ONLY(F) \
! (!((F) & LOOKUP_PREFER_NAMESPACES) && ((F) & LOOKUP_PREFER_TYPES))
! #define LOOKUP_QUALIFIERS_ONLY(F) ((F) & LOOKUP_PREFER_BOTH)
/* These flags are used by the conversion code.
*************** enum overload_flags { NO_SPECIAL = 0, DT
*** 3404,3411 ****
/* Returns nonzero iff TYPE1 and TYPE2 are the same type, or if TYPE2
is derived from TYPE1, or if TYPE2 is a pointer (reference) to a
class derived from the type pointed to (referred to) by TYPE1. */
! #define same_or_base_type_p(type1, type2) \
! comptypes ((type1), (type2), COMPARE_BASE)
/* These macros are used to access a TEMPLATE_PARM_INDEX. */
#define TEMPLATE_PARM_INDEX_CAST(NODE) \
--- 3460,3467 ----
/* Returns nonzero iff TYPE1 and TYPE2 are the same type, or if TYPE2
is derived from TYPE1, or if TYPE2 is a pointer (reference) to a
class derived from the type pointed to (referred to) by TYPE1. */
! #define same_or_base_type_p(TYPE1, TYPE2) \
! comptypes ((TYPE1), (TYPE2), COMPARE_BASE)
/* These macros are used to access a TEMPLATE_PARM_INDEX. */
#define TEMPLATE_PARM_INDEX_CAST(NODE) \
*************** extern tree set_guard
*** 3781,3795 ****
/* in parse.y */
extern void cp_parse_init PARAMS ((void));
/* XXX Not i18n clean. */
! #define cp_deprecated(str) \
do { if (warn_deprecated) \
warning("%s is deprecated, please see the documentation for details", \
! str); \
} while (0)
/* in error.c */
--- 3837,3851 ----
/* in parse.y */
extern void cp_parse_init PARAMS ((void));
/* XXX Not i18n clean. */
! #define cp_deprecated(STR) \
do { if (warn_deprecated) \
warning("%s is deprecated, please see the documentation for details", \
! (STR)); \
} while (0)
/* in error.c */
More information about the Gcc-patches
mailing list