Skip to content

R
riscv-gcc-1
Commit 88a19424 by Zack Weinberg Committed by Zack Weinberg
Options

objc-act.c (generate_method_descriptors): Register objc_method_prototype_template as a GC root. 

	* objc/objc-act.c (generate_method_descriptors): Register
	objc_method_prototype_template as a GC root.
	(comp_method_with_proto): Register function_type as a GC root.
	(comp_proto_with_proto): Replace function_type1 and
	function_type2 with a two-element array; register it as a GC root.

	(generate_protocols, build_protocol_initializer,
	generate_protocol_list, build_category_initializer,
	build_shared_structure_initializer): Do not cache cast_type
	and/or cast_type2.

From-SVN: r34405
parent a696c1d6
Showing with 65 additions and 57 deletions
gcc/ChangeLog
2000-06-05 Zack Weinberg <zack@wolery.cumb.org>
* objc/objc-act.c (generate_method_descriptors): Register
objc_method_prototype_template as a GC root.
(comp_method_with_proto): Register function_type as a GC root.
(comp_proto_with_proto): Replace function_type1 and
function_type2 with a two-element array; register it as a GC root.
(generate_protocols, build_protocol_initializer,
generate_protocol_list, build_category_initializer,
build_shared_structure_initializer): Do not cache cast_type
and/or cast_type2.
2000-06-05 J. David Anglin <dave@hiauly1.hia.nrc.ca> 2000-06-05 J. David Anglin <dave@hiauly1.hia.nrc.ca>
* function.c (assign_parms): Add missing argument to set_mem_attributes * function.c (assign_parms): Add missing argument to set_mem_attributes
......
gcc/objc/objc-act.c
...@@ -3017,7 +3017,10 @@ generate_method_descriptors (protocol) /* generate_dispatch_tables */ ...@@ -3017,7 +3017,10 @@ generate_method_descriptors (protocol) /* generate_dispatch_tables */
int size; int size;
if (!objc_method_prototype_template) if (!objc_method_prototype_template)
objc_method_prototype_template = build_method_prototype_template (); {
objc_method_prototype_template = build_method_prototype_template ();
ggc_add_tree_root (&objc_method_prototype_template, 1);
}
cast = build_tree_list (build_tree_list (NULL_TREE, xref_tag (RECORD_TYPE, cast = build_tree_list (build_tree_list (NULL_TREE, xref_tag (RECORD_TYPE,
get_identifier (UTAG_METHOD_PROTOTYPE_LIST))), get_identifier (UTAG_METHOD_PROTOTYPE_LIST))),
...@@ -3178,7 +3181,7 @@ generate_protocols () ...@@ -3178,7 +3181,7 @@ generate_protocols ()
tree p, tmp_decl, encoding; tree p, tmp_decl, encoding;
tree sc_spec, decl_specs, decl; tree sc_spec, decl_specs, decl;
tree initlist, protocol_name_expr, refs_decl, refs_expr; tree initlist, protocol_name_expr, refs_decl, refs_expr;
tree cast_type2 = 0; tree cast_type2;
tmp_decl = build_tmp_function_decl (); tmp_decl = build_tmp_function_decl ();
...@@ -3244,9 +3247,8 @@ generate_protocols () ...@@ -3244,9 +3247,8 @@ generate_protocols ()
if (refs_decl) if (refs_decl)
{ {
if (!cast_type2) cast_type2
cast_type2 = groktypename
= groktypename
(build_tree_list (build_tree_list (NULL_TREE, (build_tree_list (build_tree_list (NULL_TREE,
objc_protocol_template), objc_protocol_template),
build1 (INDIRECT_REF, NULL_TREE, build1 (INDIRECT_REF, NULL_TREE,
...@@ -3282,16 +3284,14 @@ build_protocol_initializer (type, protocol_name, protocol_list, ...@@ -3282,16 +3284,14 @@ build_protocol_initializer (type, protocol_name, protocol_list,
tree class_methods; tree class_methods;
{ {
tree initlist = NULL_TREE, expr; tree initlist = NULL_TREE, expr;
static tree cast_type = 0; tree cast_type;
if (!cast_type) cast_type = groktypename
cast_type (build_tree_list
= groktypename (build_tree_list (NULL_TREE,
(build_tree_list xref_tag (RECORD_TYPE,
(build_tree_list (NULL_TREE, get_identifier (UTAG_CLASS))),
xref_tag (RECORD_TYPE, build1 (INDIRECT_REF, NULL_TREE, NULL_TREE)));
get_identifier (UTAG_CLASS))),
build1 (INDIRECT_REF, NULL_TREE, NULL_TREE)));
/* Filling the "isa" in with one allows the runtime system to /* Filling the "isa" in with one allows the runtime system to
detect that the version change...should remove before final release. */ detect that the version change...should remove before final release. */
...@@ -4202,9 +4202,9 @@ static tree ...@@ -4202,9 +4202,9 @@ static tree
generate_protocol_list (i_or_p) generate_protocol_list (i_or_p)
tree i_or_p; tree i_or_p;
{ {
static tree cast_type = 0;
tree initlist, decl_specs, sc_spec; tree initlist, decl_specs, sc_spec;
tree refs_decl, expr_decl, lproto, e, plist; tree refs_decl, expr_decl, lproto, e, plist;
tree cast_type;
int size = 0; int size = 0;
if (TREE_CODE (i_or_p) == CLASS_INTERFACE_TYPE if (TREE_CODE (i_or_p) == CLASS_INTERFACE_TYPE
...@@ -4215,14 +4215,12 @@ generate_protocol_list (i_or_p) ...@@ -4215,14 +4215,12 @@ generate_protocol_list (i_or_p)
else else
abort (); abort ();
if (!cast_type) cast_type = groktypename
cast_type (build_tree_list
= groktypename (build_tree_list (NULL_TREE,
(build_tree_list xref_tag (RECORD_TYPE,
(build_tree_list (NULL_TREE, get_identifier (UTAG_PROTOCOL))),
xref_tag (RECORD_TYPE, build1 (INDIRECT_REF, NULL_TREE, NULL_TREE)));
get_identifier (UTAG_PROTOCOL))),
build1 (INDIRECT_REF, NULL_TREE, NULL_TREE)));
/* Compute size. */ /* Compute size. */
for (lproto = plist; lproto; lproto = TREE_CHAIN (lproto)) for (lproto = plist; lproto; lproto = TREE_CHAIN (lproto))
...@@ -4321,17 +4319,13 @@ build_category_initializer (type, cat_name, class_name, ...@@ -4321,17 +4319,13 @@ build_category_initializer (type, cat_name, class_name,
initlist = tree_cons (NULL_TREE, build_int_2 (0, 0), initlist); initlist = tree_cons (NULL_TREE, build_int_2 (0, 0), initlist);
else else
{ {
static tree cast_type2; tree cast_type2 = groktypename
(build_tree_list
if (!cast_type2) (build_tree_list (NULL_TREE,
cast_type2 xref_tag (RECORD_TYPE,
= groktypename get_identifier (UTAG_PROTOCOL))),
(build_tree_list build1 (INDIRECT_REF, NULL_TREE,
(build_tree_list (NULL_TREE, build1 (INDIRECT_REF, NULL_TREE, NULL_TREE))));
xref_tag (RECORD_TYPE,
get_identifier (UTAG_PROTOCOL))),
build1 (INDIRECT_REF, NULL_TREE,
build1 (INDIRECT_REF, NULL_TREE, NULL_TREE))));
expr = build_unary_op (ADDR_EXPR, protocol_list, 0); expr = build_unary_op (ADDR_EXPR, protocol_list, 0);
TREE_TYPE (expr) = cast_type2; TREE_TYPE (expr) = cast_type2;
...@@ -4432,17 +4426,14 @@ build_shared_structure_initializer (type, isa, super, name, size, status, ...@@ -4432,17 +4426,14 @@ build_shared_structure_initializer (type, isa, super, name, size, status,
initlist = tree_cons (NULL_TREE, build_int_2 (0, 0), initlist); initlist = tree_cons (NULL_TREE, build_int_2 (0, 0), initlist);
else else
{ {
static tree cast_type2; tree cast_type2
= groktypename
if (!cast_type2) (build_tree_list
cast_type2 (build_tree_list (NULL_TREE,
= groktypename xref_tag (RECORD_TYPE,
(build_tree_list get_identifier (UTAG_PROTOCOL))),
(build_tree_list (NULL_TREE, build1 (INDIRECT_REF, NULL_TREE,
xref_tag (RECORD_TYPE, build1 (INDIRECT_REF, NULL_TREE, NULL_TREE))));
get_identifier (UTAG_PROTOCOL))),
build1 (INDIRECT_REF, NULL_TREE,
build1 (INDIRECT_REF, NULL_TREE, NULL_TREE))));
expr = build_unary_op (ADDR_EXPR, protocol_list, 0); expr = build_unary_op (ADDR_EXPR, protocol_list, 0);
TREE_TYPE (expr) = cast_type2; TREE_TYPE (expr) = cast_type2;
...@@ -7116,7 +7107,10 @@ comp_method_with_proto (method, proto) ...@@ -7116,7 +7107,10 @@ comp_method_with_proto (method, proto)
/* Create a function_type node once. */ /* Create a function_type node once. */
if (!function_type) if (!function_type)
function_type = make_node (FUNCTION_TYPE); {
function_type = make_node (FUNCTION_TYPE);
ggc_add_tree_root (&function_type, 1);
}
/* Install argument types - normally set by build_function_type. */ /* Install argument types - normally set by build_function_type. */
TYPE_ARG_TYPES (function_type) = get_arg_type_list (proto, METHOD_DEF, 0); TYPE_ARG_TYPES (function_type) = get_arg_type_list (proto, METHOD_DEF, 0);
...@@ -7130,27 +7124,28 @@ comp_method_with_proto (method, proto) ...@@ -7130,27 +7124,28 @@ comp_method_with_proto (method, proto)
/* Return 1 if PROTO1 is consistent with PROTO2. */ /* Return 1 if PROTO1 is consistent with PROTO2. */
static int static int
comp_proto_with_proto (proto1, proto2) comp_proto_with_proto (proto0, proto1)
tree proto1, proto2; tree proto0, proto1;
{ {
static tree function_type1 = 0, function_type2 = 0; static tree function_type[2];
/* Create a couple function_type node's once. */ /* Create a couple function_type node's once. */
if (!function_type1) if (!function_type[0])
{ {
function_type1 = make_node (FUNCTION_TYPE); function_type[0] = make_node (FUNCTION_TYPE);
function_type2 = make_node (FUNCTION_TYPE); function_type[1] = make_node (FUNCTION_TYPE);
ggc_add_tree_root (function_type, 2);
} }
/* Install argument types; normally set by build_function_type. */ /* Install argument types; normally set by build_function_type. */
TYPE_ARG_TYPES (function_type1) = get_arg_type_list (proto1, METHOD_REF, 0); TYPE_ARG_TYPES (function_type[0]) = get_arg_type_list (proto0, METHOD_REF, 0);
TYPE_ARG_TYPES (function_type2) = get_arg_type_list (proto2, METHOD_REF, 0); TYPE_ARG_TYPES (function_type[1]) = get_arg_type_list (proto1, METHOD_REF, 0);
/* Install return type. */ /* Install return type. */
TREE_TYPE (function_type1) = groktypename (TREE_TYPE (proto1)); TREE_TYPE (function_type[0]) = groktypename (TREE_TYPE (proto0));
TREE_TYPE (function_type2) = groktypename (TREE_TYPE (proto2)); TREE_TYPE (function_type[1]) = groktypename (TREE_TYPE (proto1));
return comptypes (function_type1, function_type2); return comptypes (function_type[0], function_type[1]);
} }
/* - Generate an identifier for the function. the format is "_n_cls", /* - Generate an identifier for the function. the format is "_n_cls",
......
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