Commit 944fb799 by Mike Stump

Fixup whitespacing.

From-SVN: r173388
parent 42375e2e
...@@ -93,7 +93,7 @@ objc/objc-next-runtime-abi-01.o: objc/objc-next-runtime-abi-01.c $(START_HDRS) \ ...@@ -93,7 +93,7 @@ objc/objc-next-runtime-abi-01.o: objc/objc-next-runtime-abi-01.c $(START_HDRS) \
objc/objc-next-runtime-abi-02.o: objc/objc-next-runtime-abi-02.c $(START_HDRS) \ objc/objc-next-runtime-abi-02.o: objc/objc-next-runtime-abi-02.c $(START_HDRS) \
$(GGC_H) objc/objc-runtime-hooks.h \ $(GGC_H) objc/objc-runtime-hooks.h \
objc/objc-next-metadata-tags.h gt-objc-objc-next-runtime-abi-02.h $(TARGET_H) \ objc/objc-next-metadata-tags.h gt-objc-objc-next-runtime-abi-02.h $(TARGET_H) \
objc/objc-runtime-shared-support.h $(OBSTACK_H) objc/objc-runtime-shared-support.h $(OBSTACK_H)
objc/objc-act.o : objc/objc-act.c $(START_HDRS) $(GGC_H) \ objc/objc-act.o : objc/objc-act.c $(START_HDRS) $(GGC_H) \
$(DIAGNOSTIC_CORE_H) toplev.h $(FLAGS_H) input.h $(FUNCTION_H) output.h debug.h \ $(DIAGNOSTIC_CORE_H) toplev.h $(FLAGS_H) input.h $(FUNCTION_H) output.h debug.h \
......
...@@ -129,7 +129,7 @@ typedef enum objc_property_assign_semantics { ...@@ -129,7 +129,7 @@ typedef enum objc_property_assign_semantics {
/* PROPERTY_REF_PROPERTY_DECL is the PROPERTY_DECL for the property /* PROPERTY_REF_PROPERTY_DECL is the PROPERTY_DECL for the property
used in the expression. From it, you can get the property type, used in the expression. From it, you can get the property type,
and the getter/setter names. This PROPERTY_DECL could be artificial and the getter/setter names. This PROPERTY_DECL could be artificial
if we are processing an 'object.component' syntax with no matching if we are processing an 'object.component' syntax with no matching
declared property. */ declared property. */
#define PROPERTY_REF_PROPERTY_DECL(NODE) TREE_OPERAND (PROPERTY_REF_CHECK (NODE), 1) #define PROPERTY_REF_PROPERTY_DECL(NODE) TREE_OPERAND (PROPERTY_REF_CHECK (NODE), 1)
...@@ -524,9 +524,9 @@ extern GTY(()) tree objc_global_trees[OCTI_MAX]; ...@@ -524,9 +524,9 @@ extern GTY(()) tree objc_global_trees[OCTI_MAX];
#define objc_setjmp_decl objc_global_trees[OCTI_SETJMP_DECL] #define objc_setjmp_decl objc_global_trees[OCTI_SETJMP_DECL]
#define objc_stack_exception_data \ #define objc_stack_exception_data \
objc_global_trees[OCTI_STACK_EXCEPTION_DATA_DECL] objc_global_trees[OCTI_STACK_EXCEPTION_DATA_DECL]
#define objc_caught_exception objc_global_trees[OCTI_LOCAL_EXCEPTION_DECL] #define objc_caught_exception objc_global_trees[OCTI_LOCAL_EXCEPTION_DECL]
#define objc_rethrow_exception objc_global_trees[OCTI_RETHROW_EXCEPTION_DECL] #define objc_rethrow_exception objc_global_trees[OCTI_RETHROW_EXCEPTION_DECL]
#define objc_eval_once objc_global_trees[OCTI_EVAL_ONCE_DECL] #define objc_eval_once objc_global_trees[OCTI_EVAL_ONCE_DECL]
#define objc_catch_type objc_global_trees[OCTI_CATCH_TYPE] #define objc_catch_type objc_global_trees[OCTI_CATCH_TYPE]
#define execclass_decl objc_global_trees[OCTI_EXECCLASS_DECL] #define execclass_decl objc_global_trees[OCTI_EXECCLASS_DECL]
...@@ -643,7 +643,7 @@ typedef enum string_section ...@@ -643,7 +643,7 @@ typedef enum string_section
#define METHOD_REF 1 #define METHOD_REF 1
/* (Decide if these can ever be validly changed.) */ /* (Decide if these can ever be validly changed.) */
#define OBJC_ENCODE_INLINE_DEFS 0 #define OBJC_ENCODE_INLINE_DEFS 0
#define OBJC_ENCODE_DONT_INLINE_DEFS 1 #define OBJC_ENCODE_DONT_INLINE_DEFS 1
#define BUFSIZE 1024 #define BUFSIZE 1024
...@@ -668,7 +668,7 @@ typedef enum string_section ...@@ -668,7 +668,7 @@ typedef enum string_section
#define OBJC_VOID_AT_END void_list_node #define OBJC_VOID_AT_END void_list_node
/* Exception handling constructs. We begin by having the parser do most /* Exception handling constructs. We begin by having the parser do most
of the work and passing us blocks. of the work and passing us blocks.
This allows us to handle different exceptions implementations. */ This allows us to handle different exceptions implementations. */
/* Stack of open try blocks. */ /* Stack of open try blocks. */
...@@ -706,7 +706,7 @@ struct objc_try_context ...@@ -706,7 +706,7 @@ struct objc_try_context
than making them externs. */ than making them externs. */
extern tree objc_create_temporary_var (tree, const char *); extern tree objc_create_temporary_var (tree, const char *);
#define objc_is_object_id(TYPE) (OBJC_TYPE_NAME (TYPE) == objc_object_id) #define objc_is_object_id(TYPE) (OBJC_TYPE_NAME (TYPE) == objc_object_id)
#define objc_is_class_id(TYPE) (OBJC_TYPE_NAME (TYPE) == objc_class_id) #define objc_is_class_id(TYPE) (OBJC_TYPE_NAME (TYPE) == objc_class_id)
......
...@@ -46,7 +46,7 @@ enum c_language_kind c_language = clk_objc; ...@@ -46,7 +46,7 @@ enum c_language_kind c_language = clk_objc;
#define LANG_HOOKS_INIT objc_init #define LANG_HOOKS_INIT objc_init
#undef LANG_HOOKS_DECL_PRINTABLE_NAME #undef LANG_HOOKS_DECL_PRINTABLE_NAME
#define LANG_HOOKS_DECL_PRINTABLE_NAME objc_printable_name #define LANG_HOOKS_DECL_PRINTABLE_NAME objc_printable_name
#undef LANG_HOOKS_GIMPLIFY_EXPR #undef LANG_HOOKS_GIMPLIFY_EXPR
#define LANG_HOOKS_GIMPLIFY_EXPR objc_gimplify_expr #define LANG_HOOKS_GIMPLIFY_EXPR objc_gimplify_expr
#undef LANG_HOOKS_INIT_TS #undef LANG_HOOKS_INIT_TS
#define LANG_HOOKS_INIT_TS objc_common_init_ts #define LANG_HOOKS_INIT_TS objc_common_init_ts
......
/* Declarations for meta-data attribute tags. /* Declarations for meta-data attribute tags.
Copyright (C) 2011 Free Software Foundation, Inc. Copyright (C) 2011 Free Software Foundation, Inc.
Contributed by Iain Sandoe Contributed by Iain Sandoe
This file is part of GCC. This file is part of GCC.
...@@ -25,29 +25,29 @@ enum objc_runtime_tree_index ...@@ -25,29 +25,29 @@ enum objc_runtime_tree_index
{ {
OCTI_RT_OBJC_META, OCTI_RT_OBJC_META,
OCTI_RT_META_BASE, OCTI_RT_META_BASE,
OCTI_RT_META_CLASS, OCTI_RT_META_CLASS,
OCTI_RT_META_METACLASS, OCTI_RT_META_METACLASS,
OCTI_RT_META_CATEGORY, OCTI_RT_META_CATEGORY,
OCTI_RT_META_PROTOCOL, OCTI_RT_META_PROTOCOL,
OCTI_RT_META_CLASS_CLS_VARS, OCTI_RT_META_CLASS_CLS_VARS,
OCTI_RT_META_CLASS_NST_VARS, OCTI_RT_META_CLASS_NST_VARS,
OCTI_RT_META_CLASS_CLS_METH, OCTI_RT_META_CLASS_CLS_METH,
OCTI_RT_META_CLASS_NST_METH, OCTI_RT_META_CLASS_NST_METH,
OCTI_RT_META_CATEG_CLS_METH, OCTI_RT_META_CATEG_CLS_METH,
OCTI_RT_META_CATEG_NST_METH, OCTI_RT_META_CATEG_NST_METH,
OCTI_RT_META_PROTO_CLS_METH, OCTI_RT_META_PROTO_CLS_METH,
OCTI_RT_META_PROTO_NST_METH, OCTI_RT_META_PROTO_NST_METH,
OCTI_RT_META_CLASS_PROT, OCTI_RT_META_CLASS_PROT,
OCTI_RT_META_CATEG_PROT, OCTI_RT_META_CATEG_PROT,
OCTI_RT_META_PROT_REFS, OCTI_RT_META_PROT_REFS,
OCTI_RT_META_MSG_REFS, OCTI_RT_META_MSG_REFS,
OCTI_RT_META_SEL_REFS, OCTI_RT_META_SEL_REFS,
OCTI_RT_META_CLSLST_REFS, OCTI_RT_META_CLSLST_REFS,
OCTI_RT_META_CLASS_REF, OCTI_RT_META_CLASS_REF,
OCTI_RT_META_SUPER_REF, OCTI_RT_META_SUPER_REF,
...@@ -56,34 +56,34 @@ enum objc_runtime_tree_index ...@@ -56,34 +56,34 @@ enum objc_runtime_tree_index
OCTI_RT_META_LAB_PROTOLIST, OCTI_RT_META_LAB_PROTOLIST,
OCTI_RT_META_LAB_NLZY_CAT, OCTI_RT_META_LAB_NLZY_CAT,
OCTI_RT_META_LAB_CAT, OCTI_RT_META_LAB_CAT,
OCTI_RT_META_PROPERTY_LIST, OCTI_RT_META_PROPERTY_LIST,
OCTI_RT_META_PROTOCOL_EXT, OCTI_RT_META_PROTOCOL_EXT,
OCTI_RT_META_CLASS_EXT, OCTI_RT_META_CLASS_EXT,
OCTI_RT_META_CLASS_NAME, OCTI_RT_META_CLASS_NAME,
OCTI_RT_META_METHD_NAME, OCTI_RT_META_METHD_NAME,
OCTI_RT_META_METHD_TYPE, OCTI_RT_META_METHD_TYPE,
OCTI_RT_META_PROPN_ATTR, OCTI_RT_META_PROPN_ATTR,
OCTI_RT_META_MODULES, OCTI_RT_META_MODULES,
OCTI_RT_META_SYMTAB, OCTI_RT_META_SYMTAB,
OCTI_RT_META_INFO, OCTI_RT_META_INFO,
OCTI_RT_META_EHTYPE, OCTI_RT_META_EHTYPE,
OCTI_RT_META_CONST_STR, OCTI_RT_META_CONST_STR,
OCTI_RT_META_MAX OCTI_RT_META_MAX
}; };
/* Tags for the META data so that the backend can put them in the correct /* Tags for the META data so that the backend can put them in the correct
sections for targets/runtimes (Darwin/NeXT) that require this. sections for targets/runtimes (Darwin/NeXT) that require this.
This information also survives LTO - which might produce mixed language This information also survives LTO - which might produce mixed language
output. */ output. */
/* Objective-C meta data attribute tag */ /* Objective-C meta data attribute tag */
#define objc_meta objc_rt_trees[OCTI_RT_OBJC_META] #define objc_meta objc_rt_trees[OCTI_RT_OBJC_META]
/* Attribute values, base = default section. */ /* Attribute values, base = default section. */
#define meta_base objc_rt_trees[OCTI_RT_META_BASE] #define meta_base objc_rt_trees[OCTI_RT_META_BASE]
......
/* Hooks to abstract the runtime meta-data generation for Objective C. /* Hooks to abstract the runtime meta-data generation for Objective C.
Copyright (C) 2011 Free Software Foundation, Inc. Copyright (C) 2011 Free Software Foundation, Inc.
Contributed by Iain Sandoe Contributed by Iain Sandoe
This file is part of GCC. This file is part of GCC.
...@@ -23,27 +23,27 @@ along with GCC; see the file COPYING3. If not see ...@@ -23,27 +23,27 @@ along with GCC; see the file COPYING3. If not see
/* A set of hooks for the front end to obtain runtime-specific actions. */ /* A set of hooks for the front end to obtain runtime-specific actions. */
/* Objective-C supports several runtime library variants: /* Objective-C supports several runtime library variants:
"GNU" runtime selected by -fgnu-runtime (currently at ABI version 8). "GNU" runtime selected by -fgnu-runtime (currently at ABI version 8).
"NeXT" runtime (selected by -fnext-runtime) and installed on OSX/Darwin "NeXT" runtime (selected by -fnext-runtime) and installed on OSX/Darwin
systems at API version 1 (for m32 code) and version 2 (for m64 code). systems at API version 1 (for m32 code) and version 2 (for m64 code).
The runtimes require different data types/layouts, method call mechanisms The runtimes require different data types/layouts, method call mechanisms
and so on, and the purpose of this interface is to abstract such and so on, and the purpose of this interface is to abstract such
differences from the parser's perspective. */ differences from the parser's perspective. */
/* TODO: Do we want the initial underscore ? */ /* TODO: Do we want the initial underscore ? */
typedef struct _objc_runtime_hooks_r typedef struct _objc_runtime_hooks_r
{ {
/* TODO: Expand comments in this file. */ /* TODO: Expand comments in this file. */
/* Initialize for this runtime. */ /* Initialize for this runtime. */
void (*initialize) (void); void (*initialize) (void);
const char *default_constant_string_class_name; const char *default_constant_string_class_name;
/* FIXME: Having to check this name should not be necessary. */ /* FIXME: Having to check this name should not be necessary. */
const char *tag_getclass; const char *tag_getclass;
/* id for superclass class field - named differently in the existing /* id for superclass class field - named differently in the existing
runtimes. */ runtimes. */
tree (*super_superclassfield_ident) (void); tree (*super_superclassfield_ident) (void);
...@@ -78,21 +78,21 @@ typedef struct _objc_runtime_hooks_r ...@@ -78,21 +78,21 @@ typedef struct _objc_runtime_hooks_r
tree (*get_arg_type_list_base) (tree, int, int); tree (*get_arg_type_list_base) (tree, int, int);
/* Build method call. */ /* Build method call. */
tree (*build_objc_method_call) (location_t, tree, tree, tree, tree, tree, int); tree (*build_objc_method_call) (location_t, tree, tree, tree, tree, tree, int);
/* Check for or otherwise handle a request to check that the constant /* Check for or otherwise handle a request to check that the constant
string class reference is set-up & OK. */ string class reference is set-up & OK. */
bool (*setup_const_string_class_decl) (void); bool (*setup_const_string_class_decl) (void);
/* Return the tree reprenting a const string constructor for the arg. /* Return the tree reprenting a const string constructor for the arg.
Most of the data are in global trees. */ Most of the data are in global trees. */
tree (*build_const_string_constructor) (location_t, tree, int); tree (*build_const_string_constructor) (location_t, tree, int);
/* Exceptions. */ /* Exceptions. */
tree (*build_throw_stmt) (location_t, tree, bool); tree (*build_throw_stmt) (location_t, tree, bool);
tree (*build_exc_ptr) (struct objc_try_context **); tree (*build_exc_ptr) (struct objc_try_context **);
tree (*begin_catch) (struct objc_try_context **, tree, tree, tree, bool); tree (*begin_catch) (struct objc_try_context **, tree, tree, tree, bool);
void (*finish_catch) (struct objc_try_context **, tree); void (*finish_catch) (struct objc_try_context **, tree);
tree (*finish_try_stmt) (struct objc_try_context **); tree (*finish_try_stmt) (struct objc_try_context **);
/* Emit all the metadata required by the runtime - based on the tables built /* Emit all the metadata required by the runtime - based on the tables built
during parsing. */ during parsing. */
void (*generate_metadata) (void); void (*generate_metadata) (void);
......
...@@ -159,8 +159,8 @@ build_selector (tree ident) ...@@ -159,8 +159,8 @@ build_selector (tree ident)
/* struct _objc_super { /* struct _objc_super {
struct _objc_object *self; struct _objc_object *self;
struct _objc_class *super_class; struct _objc_class *super_class;
[or Class cls; for the abi v2] [or Class cls; for the abi v2]
}; */ }; */
void void
...@@ -302,7 +302,7 @@ add_objc_string (tree ident, string_section section) ...@@ -302,7 +302,7 @@ add_objc_string (tree ident, string_section section)
{ {
tree *chain, decl, type; tree *chain, decl, type;
char buf[BUFSIZE]; char buf[BUFSIZE];
switch (section) switch (section)
{ {
case class_names: case class_names:
...@@ -336,13 +336,13 @@ add_objc_string (tree ident, string_section section) ...@@ -336,13 +336,13 @@ add_objc_string (tree ident, string_section section)
} }
type = build_sized_array_type (char_type_node, IDENTIFIER_LENGTH (ident) + 1); type = build_sized_array_type (char_type_node, IDENTIFIER_LENGTH (ident) + 1);
/* Get a runtime-specific string decl which will be finish_var()'ed in /* Get a runtime-specific string decl which will be finish_var()'ed in
generate_strings (). */ generate_strings (). */
decl = (*runtime.string_decl) (type, buf, section); decl = (*runtime.string_decl) (type, buf, section);
TREE_CONSTANT (decl) = 1; TREE_CONSTANT (decl) = 1;
*chain = tree_cons (decl, ident, NULL_TREE); *chain = tree_cons (decl, ident, NULL_TREE);
return convert (string_type_node, return convert (string_type_node,
build_unary_op (input_location, ADDR_EXPR, decl, 1)); build_unary_op (input_location, ADDR_EXPR, decl, 1));
} }
...@@ -442,7 +442,7 @@ init_module_descriptor (tree type, long vers) ...@@ -442,7 +442,7 @@ init_module_descriptor (tree type, long vers)
/* No really useful place to point to. */ /* No really useful place to point to. */
loc = UNKNOWN_LOCATION; loc = UNKNOWN_LOCATION;
/* version = { 1, ... } */ /* version = { 1, ... } */
expr = build_int_cst (long_integer_type_node, vers); expr = build_int_cst (long_integer_type_node, vers);
...@@ -463,7 +463,7 @@ init_module_descriptor (tree type, long vers) ...@@ -463,7 +463,7 @@ init_module_descriptor (tree type, long vers)
/* symtab = { ..., _OBJC_SYMBOLS, ... } */ /* symtab = { ..., _OBJC_SYMBOLS, ... } */
ltyp = build_pointer_type (xref_tag (RECORD_TYPE, ltyp = build_pointer_type (xref_tag (RECORD_TYPE,
get_identifier (UTAG_SYMTAB))); get_identifier (UTAG_SYMTAB)));
if (UOBJC_SYMBOLS_decl) if (UOBJC_SYMBOLS_decl)
expr = convert (ltyp, build_unary_op (loc, expr = convert (ltyp, build_unary_op (loc,
ADDR_EXPR, UOBJC_SYMBOLS_decl, 0)); ADDR_EXPR, UOBJC_SYMBOLS_decl, 0));
...@@ -519,7 +519,7 @@ build_module_descriptor (long vers, tree attr) ...@@ -519,7 +519,7 @@ build_module_descriptor (long vers, tree attr)
/* Allow the runtime to mark meta-data such that it can be assigned to target /* Allow the runtime to mark meta-data such that it can be assigned to target
specific sections by the back-end. */ specific sections by the back-end. */
if (attr) if (attr)
DECL_ATTRIBUTES (UOBJC_MODULES_decl) = attr; DECL_ATTRIBUTES (UOBJC_MODULES_decl) = attr;
finish_var_decl (UOBJC_MODULES_decl, finish_var_decl (UOBJC_MODULES_decl,
init_module_descriptor (TREE_TYPE (UOBJC_MODULES_decl), init_module_descriptor (TREE_TYPE (UOBJC_MODULES_decl),
...@@ -640,7 +640,7 @@ build_next_selector_translation_table (void) ...@@ -640,7 +640,7 @@ build_next_selector_translation_table (void)
if (warn_selector) if (warn_selector)
{ {
location_t loc; location_t loc;
if (decl) if (decl)
loc = DECL_SOURCE_LOCATION (decl); loc = DECL_SOURCE_LOCATION (decl);
else else
loc = UNKNOWN_LOCATION; loc = UNKNOWN_LOCATION;
...@@ -652,7 +652,7 @@ build_next_selector_translation_table (void) ...@@ -652,7 +652,7 @@ build_next_selector_translation_table (void)
if (decl) if (decl)
{ {
/* Entries of this form are used for references to methods. /* Entries of this form are used for references to methods.
The runtime re-writes these on start-up, but the compiler can't see The runtime re-writes these on start-up, but the compiler can't see
that and optimizes it away unless we force it. */ that and optimizes it away unless we force it. */
DECL_PRESERVE_P (decl) = 1; DECL_PRESERVE_P (decl) = 1;
finish_var_decl (decl, expr); finish_var_decl (decl, expr);
......
/* Support routines shared by all runtimes. /* Support routines shared by all runtimes.
Copyright (C) 2011 Free Software Foundation, Inc. Copyright (C) 2011 Free Software Foundation, Inc.
Contributed by Iain Sandoe Contributed by Iain Sandoe
This file is part of GCC. This file is part of GCC.
......
...@@ -64,7 +64,7 @@ DEFTREECODE (CLASS_REFERENCE_EXPR, "class_reference_expr", tcc_expression, 1) ...@@ -64,7 +64,7 @@ DEFTREECODE (CLASS_REFERENCE_EXPR, "class_reference_expr", tcc_expression, 1)
it and we just need to swap Operand 2 in, and emit the deprecation it and we just need to swap Operand 2 in, and emit the deprecation
warnings from Operand 3 if needed. warnings from Operand 3 if needed.
Please note that when the Objective-C 2.0 "dot-syntax" 'object.component' Please note that when the Objective-C 2.0 "dot-syntax" 'object.component'
is encountered, where 'component' is not a property but there are valid is encountered, where 'component' is not a property but there are valid
setter/getter methods for it, an artificial PROPERTY_DECL is generated setter/getter methods for it, an artificial PROPERTY_DECL is generated
and used in the PROPERTY_REF. */ and used in the PROPERTY_REF. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment