};
static tree add_objc_string (tree, enum string_section);
-static tree build_objc_string_decl (enum string_section);
static void build_selector_table_decl (void);
/* Protocol additions. */
finish_var_decl (tree var, tree initializer)
{
finish_decl (var, input_location, initializer, NULL_TREE, NULL_TREE);
- /* Ensure that the variable actually gets output. */
- mark_decl_referenced (var);
- /* Mark the decl to avoid "defined but not used" warning. */
- TREE_USED (var) = 1;
- DECL_READ_P (var) = 1;
- /* We reserve the right for the runtime to use/modify these variables
- in ways that are opaque to us. */
- DECL_PRESERVE_P (var) = 1;
}
/* Find the decl for the constant string class reference. This is only
expr = build_unary_op (input_location,
ADDR_EXPR, static_instances_decl, 0);
else
- expr = build_int_cst (NULL_TREE, 0);
+ expr = integer_zero_node;
CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, expr);
}
/* refs = { ..., _OBJC_SELECTOR_TABLE, ... } */
if (flag_next_runtime || ! sel_ref_chain)
- CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0));
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, convert (
+ build_pointer_type (objc_selector_type),
+ integer_zero_node));
else
{
tree expr = build_unary_op (input_location, ADDR_EXPR,
/* cls_def_cnt = { ..., 5, ... } */
- CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, imp_count));
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE,
+ build_int_cst (short_integer_type_node, imp_count));
/* cat_def_cnt = { ..., 5, ... } */
- CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, cat_count));
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE,
+ build_int_cst (short_integer_type_node, cat_count));
/* cls_def = { ..., { &Foo, &Bar, ...}, ... } */
static void
generate_objc_symtab_decl (void)
{
- /* forward declare categories */
- if (cat_count)
- forward_declare_categories ();
-
+
build_objc_symtab_template ();
UOBJC_SYMBOLS_decl = start_var_decl (objc_symtab_template, "_OBJC_SYMBOLS");
finish_var_decl (UOBJC_SYMBOLS_decl,
expr = build_unary_op (input_location,
ADDR_EXPR, UOBJC_SYMBOLS_decl, 0);
else
- expr = build_int_cst (NULL_TREE, 0);
+ expr = null_pointer_node;
CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, expr);
return objc_build_constructor (type, v);
/* Create an instance of "_objc_module". */
UOBJC_MODULES_decl = start_var_decl (objc_module_template, "_OBJC_MODULES");
+ /* This is the root of the metadata for defined classes and categories, it
+ is referenced by the runtime and, therefore, needed. */
+ DECL_PRESERVE_P (UOBJC_MODULES_decl) = 1;
finish_var_decl (UOBJC_MODULES_decl,
init_module_descriptor (TREE_TYPE (UOBJC_MODULES_decl)));
VEC(constructor_elt,gc) *decls = NULL;
if (flag_next_runtime)
- abort ();
+ gcc_unreachable ();
for (cl_chain = objc_static_instances, num_class = 0;
cl_chain; cl_chain = TREE_CHAIN (cl_chain), num_class++)
add_objc_string (ident, meth_var_names));
}
+/* Used only by build_*_selector_translation_table (). */
static void
-build_selector_translation_table (void)
+diagnose_missing_method (tree meth, location_t here)
{
- tree chain;
- int offset = 0;
- tree decl = NULL_TREE;
- VEC(constructor_elt,gc) *inits = NULL;
+ tree method_chain;
+ bool found = false;
+ for (method_chain = meth_var_names_chain;
+ method_chain;
+ method_chain = TREE_CHAIN (method_chain))
+ {
+ if (TREE_VALUE (method_chain) == meth)
+ {
+ found = true;
+ break;
+ }
+ }
+ if (!found)
+ warning_at (here, 0, "creating selector for nonexistent method %qE",
+ meth);
+}
+
+static void
+build_next_selector_translation_table (void)
+{
+ tree chain;
for (chain = sel_ref_chain; chain; chain = TREE_CHAIN (chain))
{
tree expr;
-
+ tree decl = TREE_PURPOSE (chain);
if (warn_selector && objc_implementation_context)
- {
- tree method_chain;
- bool found = false;
- for (method_chain = meth_var_names_chain;
- method_chain;
- method_chain = TREE_CHAIN (method_chain))
- {
- if (TREE_VALUE (method_chain) == TREE_VALUE (chain))
- {
- found = true;
- break;
- }
- }
- if (!found)
- {
- location_t loc;
- if (flag_next_runtime && TREE_PURPOSE (chain))
- loc = DECL_SOURCE_LOCATION (TREE_PURPOSE (chain));
- else
- loc = input_location;
- warning_at (loc, 0, "creating selector for nonexistent method %qE",
- TREE_VALUE (chain));
- }
- }
+ {
+ location_t loc;
+ if (decl)
+ loc = DECL_SOURCE_LOCATION (decl);
+ else
+ loc = input_location;
+ diagnose_missing_method (TREE_VALUE (chain), loc);
+ }
expr = build_selector (TREE_VALUE (chain));
- /* add one for the '\0' character */
- offset += IDENTIFIER_LENGTH (TREE_VALUE (chain)) + 1;
- if (flag_next_runtime)
+ if (decl)
{
- decl = TREE_PURPOSE (chain);
+ /* Entries of this form are used for references to methods.
+ The runtime re-writes these on start-up, but the compiler can't see
+ that and optimizes it away unless we force it. */
+ DECL_PRESERVE_P (decl) = 1;
finish_var_decl (decl, expr);
}
- else
+ }
+}
+
+static void
+build_gnu_selector_translation_table (void)
+{
+ tree chain;
+/* int offset = 0;
+ tree decl = NULL_TREE;*/
+ VEC(constructor_elt,gc) *inits = NULL;
+
+ for (chain = sel_ref_chain; chain; chain = TREE_CHAIN (chain))
+ {
+ tree expr;
+
+ if (warn_selector && objc_implementation_context)
+ diagnose_missing_method (TREE_VALUE (chain), input_location);
+
+ expr = build_selector (TREE_VALUE (chain));
+ /* add one for the '\0' character
+ offset += IDENTIFIER_LENGTH (TREE_VALUE (chain)) + 1;*/
+
{
if (flag_typed_selectors)
{
CONSTRUCTOR_APPEND_ELT (inits, NULL_TREE, expr);
}
- }
+ } /* each element in the chain */
- if (! flag_next_runtime)
{
/* Cause the selector table (previously forward-declared)
to be actually output. */
if (flag_typed_selectors)
{
VEC(constructor_elt,gc) *v = NULL;
- CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0));
- CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0));
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, integer_zero_node);
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, integer_zero_node);
expr = objc_build_constructor (objc_selector_template, v);
}
else
- expr = build_int_cst (NULL_TREE, 0);
+ expr = integer_zero_node;
CONSTRUCTOR_APPEND_ELT (inits, NULL_TREE, expr);
expr = objc_build_constructor (TREE_TYPE (UOBJC_SELECTOR_TABLE_decl),
/* For each string section we have a chain which maps identifier nodes
to decls for the strings. */
+static GTY(()) int class_names_idx;
+static GTY(()) int meth_var_names_idx;
+static GTY(()) int meth_var_types_idx;
+
static tree
add_objc_string (tree ident, enum string_section section)
{
tree *chain, decl, type, string_expr;
-
+ char buf[256];
+
+ buf[0] = 0;
if (section == class_names)
- chain = &class_names_chain;
+ {
+ chain = &class_names_chain;
+ sprintf (buf, "_OBJC_CLASS_NAME_%d", class_names_idx++);
+ }
else if (section == meth_var_names)
- chain = &meth_var_names_chain;
+ {
+ chain = &meth_var_names_chain;
+ sprintf (buf, "_OBJC_METH_VAR_NAME_%d", meth_var_names_idx++);
+ }
else if (section == meth_var_types)
- chain = &meth_var_types_chain;
+ {
+ chain = &meth_var_types_chain;
+ sprintf (buf, "_OBJC_METH_VAR_TYPE_%d", meth_var_types_idx++);
+ }
else
- abort ();
+ gcc_unreachable ();
while (*chain)
{
chain = &TREE_CHAIN (*chain);
}
- decl = build_objc_string_decl (section);
-
type = build_sized_array_type (char_type_node, IDENTIFIER_LENGTH (ident) + 1);
- decl = start_var_decl (type, IDENTIFIER_POINTER (DECL_NAME (decl)));
+ decl = start_var_decl (type, buf);
string_expr = my_build_string (IDENTIFIER_LENGTH (ident) + 1,
IDENTIFIER_POINTER (ident));
+ TREE_CONSTANT (decl) = 1;
finish_var_decl (decl, string_expr);
*chain = tree_cons (decl, ident, NULL_TREE);
ADDR_EXPR, decl, 1));
}
-static GTY(()) int class_names_idx;
-static GTY(()) int meth_var_names_idx;
-static GTY(()) int meth_var_types_idx;
-
-static tree
-build_objc_string_decl (enum string_section section)
-{
- tree decl, ident;
- char buf[256];
-
- if (section == class_names)
- sprintf (buf, "_OBJC_CLASS_NAME_%d", class_names_idx++);
- else if (section == meth_var_names)
- sprintf (buf, "_OBJC_METH_VAR_NAME_%d", meth_var_names_idx++);
- else if (section == meth_var_types)
- sprintf (buf, "_OBJC_METH_VAR_TYPE_%d", meth_var_types_idx++);
-
- ident = get_identifier (buf);
-
- decl = build_decl (input_location,
- VAR_DECL, ident, build_array_type (char_type_node, 0));
- DECL_EXTERNAL (decl) = 1;
- TREE_PUBLIC (decl) = 0;
- TREE_USED (decl) = 1;
- TREE_CONSTANT (decl) = 1;
- DECL_CONTEXT (decl) = 0;
- DECL_ARTIFICIAL (decl) = 1;
-#ifdef OBJCPLUS
- DECL_THIS_STATIC (decl) = 1; /* squash redeclaration errors */
-#endif
-
- make_decl_rtl (decl);
- pushdecl_top_level (decl);
-
- return decl;
-}
-
-
void
objc_declare_alias (tree alias_ident, tree class_ident)
{
decl = start_var_decl (type, synth_id_with_class_suffix
(name, objc_implementation_context));
- CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0));
- CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, size));
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, integer_zero_node);
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (integer_type_node, size));
CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, list);
finish_var_decl (decl,
/* static struct objc_category _OBJC_CATEGORY_<name> = { ... }; */
static void
-generate_category (tree cat)
+generate_category (struct imp_entry *impent)
{
- tree decl;
tree initlist, cat_name_expr, class_name_expr;
tree protocol_decl, category;
+ tree cat = impent->imp_context;
+
+ implementation_template = impent->imp_template;
+ UOBJC_CLASS_decl = impent->class_decl;
+ UOBJC_METACLASS_decl = impent->meta_decl;
add_class_reference (CLASS_NAME (cat));
cat_name_expr = add_objc_string (CLASS_SUPER_NAME (cat), class_names);
else
protocol_decl = 0;
- decl = start_var_decl (objc_category_template,
- synth_id_with_class_suffix
- ("_OBJC_CATEGORY", objc_implementation_context));
-
- initlist = build_category_initializer (TREE_TYPE (decl),
+ initlist = build_category_initializer (TREE_TYPE (UOBJC_CLASS_decl),
cat_name_expr, class_name_expr,
UOBJC_INSTANCE_METHODS_decl,
UOBJC_CLASS_METHODS_decl,
protocol_decl);
-
- finish_var_decl (decl, initlist);
+ /* Finish and initialize the forward decl. */
+ finish_var_decl (UOBJC_CLASS_decl, initlist);
}
/* static struct objc_class _OBJC_METACLASS_Foo={ ... };
static struct objc_class _OBJC_CLASS_Foo={ ... }; */
static void
-generate_shared_structures (int cls_flags)
+generate_shared_structures (struct imp_entry *impent)
{
- tree decl;
tree name_expr, super_expr, root_expr;
- tree my_root_id = NULL_TREE, my_super_id = NULL_TREE;
+ tree my_root_id, my_super_id;
tree cast_type, initlist, protocol_decl;
-
+ int cls_flags;
+
+ objc_implementation_context = impent->imp_context;
+ implementation_template = impent->imp_template;
+ UOBJC_CLASS_decl = impent->class_decl;
+ UOBJC_METACLASS_decl = impent->meta_decl;
+ cls_flags = impent->has_cxx_cdtors ? CLS_HAS_CXX_STRUCTORS : 0 ;
+
my_super_id = CLASS_SUPER_NAME (implementation_template);
if (my_super_id)
{
/* Install class `isa' and `super' pointers at runtime. */
if (my_super_id)
- {
- super_expr = add_objc_string (my_super_id, class_names);
- super_expr = build_c_cast (input_location,
- cast_type, super_expr); /* cast! */
- }
+ super_expr = add_objc_string (my_super_id, class_names);
else
- super_expr = build_int_cst (NULL_TREE, 0);
+ super_expr = integer_zero_node;
+
+ super_expr = build_c_cast (input_location,
+ cast_type, super_expr); /* cast! */
root_expr = add_objc_string (my_root_id, class_names);
root_expr = build_c_cast (input_location, cast_type, root_expr); /* cast! */
/* static struct objc_class _OBJC_METACLASS_Foo = { ... }; */
- decl = start_var_decl (objc_class_template,
- IDENTIFIER_POINTER
- (DECL_NAME (UOBJC_METACLASS_decl)));
-
initlist
= build_shared_structure_initializer
- (TREE_TYPE (decl),
+ (TREE_TYPE (UOBJC_METACLASS_decl),
root_expr, super_expr, name_expr,
convert (integer_type_node, TYPE_SIZE_UNIT (objc_class_template)),
2 /*CLS_META*/,
UOBJC_CLASS_VARIABLES_decl,
protocol_decl);
- finish_var_decl (decl, initlist);
+ finish_var_decl (UOBJC_METACLASS_decl, initlist);
/* static struct objc_class _OBJC_CLASS_Foo={ ... }; */
- decl = start_var_decl (objc_class_template,
- IDENTIFIER_POINTER
- (DECL_NAME (UOBJC_CLASS_decl)));
-
initlist
= build_shared_structure_initializer
- (TREE_TYPE (decl),
+ (TREE_TYPE (UOBJC_CLASS_decl),
build_unary_op (input_location, ADDR_EXPR, UOBJC_METACLASS_decl, 0),
super_expr, name_expr,
convert (integer_type_node,
UOBJC_INSTANCE_VARIABLES_decl,
protocol_decl);
- finish_var_decl (decl, initlist);
+ finish_var_decl (UOBJC_CLASS_decl, initlist);
}
if (objc_static_instances)
generate_static_references ();
- if (imp_list || class_names_chain
- || meth_var_names_chain || meth_var_types_chain || sel_ref_chain)
- generate_objc_symtab_decl ();
+ /* forward declare categories */
+ if (cat_count)
+ forward_declare_categories ();
for (impent = imp_list; impent; impent = impent->next)
{
objc_implementation_context = impent->imp_context;
implementation_template = impent->imp_template;
+ /* FIXME: This needs reworking to be more obvious. */
+
UOBJC_CLASS_decl = impent->class_decl;
UOBJC_METACLASS_decl = impent->meta_decl;
/* all of the following reference the string pool... */
generate_ivar_lists ();
generate_dispatch_tables ();
- generate_shared_structures (impent->has_cxx_cdtors
- ? CLS_HAS_CXX_STRUCTORS
- : 0);
+ generate_shared_structures (impent);
}
else
{
generate_dispatch_tables ();
- generate_category (objc_implementation_context);
+ generate_category (impent);
}
+
+ impent->class_decl = UOBJC_CLASS_decl;
+ impent->meta_decl = UOBJC_METACLASS_decl;
}
/* If we are using an array of selectors, we must always
finish up the array decl even if no selectors were used. */
- if (! flag_next_runtime || sel_ref_chain)
- build_selector_translation_table ();
+ if (flag_next_runtime)
+ build_next_selector_translation_table ();
+ else
+ build_gnu_selector_translation_table ();
if (protocol_chain)
generate_protocols ();
- if ((flag_replace_objc_classes && imp_list) || flag_objc_gc)
+ if (flag_next_runtime)
generate_objc_image_info ();
+ if (imp_list || class_names_chain
+ || meth_var_names_chain || meth_var_types_chain || sel_ref_chain)
+ generate_objc_symtab_decl ();
+
/* Arrange for ObjC data structures to be initialized at run time. */
if (objc_implementation_context || class_names_chain || objc_static_instances
|| meth_var_names_chain || meth_var_types_chain || sel_ref_chain)
expr = add_objc_string (TREE_VALUE (chain), class_names);
expr = convert (type, expr); /* cast! */
- /* The decl that is the one that we
- forward declared in build_class_reference. */
+ /* This is a class reference. It is re-written by the runtime,
+ but will be optimized away unless we force it. */
+ DECL_PRESERVE_P (decl) = 1;
finish_var_decl (decl, expr);
return;
}
/* Make a decl for this name, so we can use its address in a tree. */
decl = build_decl (input_location,
- VAR_DECL, get_identifier (string), char_type_node);
+ VAR_DECL, get_identifier (string), TREE_TYPE (integer_zero_node));
DECL_EXTERNAL (decl) = 1;
TREE_PUBLIC (decl) = 1;
-
pushdecl (decl);
- rest_of_decl_compilation (decl, 0, 0);
+ finish_var_decl (decl, 0);
/* Make a decl for the address. */
sprintf (string, "%sobjc_class_ref_%s",
exp = build1 (ADDR_EXPR, string_type_node, decl);
decl = build_decl (input_location,
VAR_DECL, get_identifier (string), string_type_node);
- DECL_INITIAL (decl) = exp;
TREE_STATIC (decl) = 1;
TREE_USED (decl) = 1;
DECL_READ_P (decl) = 1;
- /* Force the output of the decl as this forces the reference of the class. */
- mark_decl_referenced (decl);
+ DECL_ARTIFICIAL (decl) = 1;
+ DECL_INITIAL (decl) = error_mark_node;
+
+ /* We must force the reference. */
+ DECL_PRESERVE_P (decl) = 1;
pushdecl (decl);
- rest_of_decl_compilation (decl, 0, 0);
+ finish_var_decl (decl, exp);
}
static void
{
tree decl, init;
- init = build_int_cst (c_common_type_for_size (BITS_PER_WORD, 1), 0);
+ init = integer_zero_node;
decl = build_decl (input_location,
VAR_DECL, get_identifier (string), TREE_TYPE (init));
TREE_PUBLIC (decl) = 1;
TREE_READONLY (decl) = 1;
TREE_USED (decl) = 1;
TREE_CONSTANT (decl) = 1;
- DECL_CONTEXT (decl) = 0;
+ DECL_CONTEXT (decl) = NULL_TREE;
DECL_ARTIFICIAL (decl) = 1;
- DECL_INITIAL (decl) = init;
- assemble_variable (decl, 1, 0, 0);
+ TREE_STATIC (decl) = 1;
+ DECL_INITIAL (decl) = error_mark_node; /* A real initializer is coming... */
+ /* We must force the reference. */
+ DECL_PRESERVE_P (decl) = 1;
+
+ finish_var_decl(decl, init) ;
}
}
\f
{
tree decl;
int flags
- = ((flag_replace_objc_classes && imp_list ? 1 : 0)
+ = ((flag_replace_objc_classes && imp_count ? 1 : 0)
| (flag_objc_gc ? 2 : 0));
VEC(constructor_elt,gc) *v = NULL;
- tree array_type = build_sized_array_type (integer_type_node, 2);
+ tree array_type;
+
+ if (!flags)
+ return; /* No need for an image_info entry. */
+
+ array_type = build_sized_array_type (integer_type_node, 2);
decl = start_var_decl (array_type, "_OBJC_IMAGE_INFO");
- CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0));
- CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, flags));
-
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, integer_zero_node);
+ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (integer_type_node, flags));
+ /* If we need this (determined above) it is because the runtime wants to
+ refer to it in a manner hidden from the compiler. So we must force the
+ output. */
+ DECL_PRESERVE_P (decl) = 1;
finish_var_decl (decl, objc_build_constructor (TREE_TYPE (decl), v));
}
OSDN Git Service
