diff options
Diffstat (limited to 'gcc/objc')
| -rw-r--r-- | gcc/objc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/objc/objc-act.h | 14 |
2 files changed, 13 insertions, 7 deletions
diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 04ef7f7..363e611 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,9 @@ +2011-05-11 Nathan Froyd <froydnj@codesourcery.com> + + * objc-act.h (CLASS_NAME, CLASS_SUPER_NAME): Use proper accessors. + (CLASS_NST_METHODS, CLASS_CLS_METHODS): Likewise. + (PROTOCOL_NAME, PROTOCOL_NST_METHODS, PROTOCOL_CLS_METHODS): Likewise. + 2011-05-05 Nathan Froyd <froydnj@codesourcery.com> * objc-runtime-shared-support.h (get_arg_type_list): Delete. diff --git a/gcc/objc/objc-act.h b/gcc/objc/objc-act.h index d31bb7d..99551a8 100644 --- a/gcc/objc/objc-act.h +++ b/gcc/objc/objc-act.h @@ -152,24 +152,24 @@ typedef enum objc_property_assign_semantics { CATEGORY_INTERFACE_TYPE, CATEGORY_IMPLEMENTATION_TYPE, PROTOCOL_INTERFACE_TYPE */ /* CLASS_NAME is the name of the class. */ -#define CLASS_NAME(CLASS) ((CLASS)->type.name) +#define CLASS_NAME(CLASS) (TYPE_NAME (CLASS)) /* CLASS_SUPER_NAME is the name of the superclass, or, in the case of categories, it is the name of the category itself. */ -#define CLASS_SUPER_NAME(CLASS) (TYPE_CHECK (CLASS)->type.context) +#define CLASS_SUPER_NAME(CLASS) (TYPE_CONTEXT (CLASS)) #define CLASS_IVARS(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 0) #define CLASS_RAW_IVARS(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 1) -#define CLASS_NST_METHODS(CLASS) ((CLASS)->type.minval) -#define CLASS_CLS_METHODS(CLASS) ((CLASS)->type.maxval) +#define CLASS_NST_METHODS(CLASS) (TYPE_MINVAL (CLASS)) +#define CLASS_CLS_METHODS(CLASS) (TYPE_MAXVAL (CLASS)) #define CLASS_STATIC_TEMPLATE(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 2) #define CLASS_CATEGORY_LIST(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 3) #define CLASS_PROTOCOL_LIST(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 4) #define TOTAL_CLASS_RAW_IVARS(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 5) #define CLASS_HAS_EXCEPTION_ATTR(CLASS) (TYPE_LANG_FLAG_0 (CLASS)) -#define PROTOCOL_NAME(CLASS) ((CLASS)->type.name) +#define PROTOCOL_NAME(CLASS) (TYPE_NAME (CLASS)) #define PROTOCOL_LIST(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 0) -#define PROTOCOL_NST_METHODS(CLASS) ((CLASS)->type.minval) -#define PROTOCOL_CLS_METHODS(CLASS) ((CLASS)->type.maxval) +#define PROTOCOL_NST_METHODS(CLASS) (TYPE_MINVAL (CLASS)) +#define PROTOCOL_CLS_METHODS(CLASS) (TYPE_MAXVAL (CLASS)) #define PROTOCOL_FORWARD_DECL(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 1) #define PROTOCOL_DEFINED(CLASS) TREE_USED (CLASS) #define PROTOCOL_OPTIONAL_CLS_METHODS(CLASS) TREE_VEC_ELT (TYPE_LANG_SLOT_1 (CLASS), 2) |