From 900c0ca22673ec4d382ce588057de240f887be3a Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Thu, 1 Oct 2020 10:58:58 +0100 Subject: [PATCH] Objective-C: Addess a FIXME (NFC). This removes references to the next runtime from the gnu runtime implementation. gcc/objc/ChangeLog: * objc-gnu-runtime-abi-01.c (build_shared_structure_initializer): Remove references to the NeXT runtime. (generate_static_references): Likewise. --- gcc/objc/objc-gnu-runtime-abi-01.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/gcc/objc/objc-gnu-runtime-abi-01.c b/gcc/objc/objc-gnu-runtime-abi-01.c index c9959a7..25c0e01 100644 --- a/gcc/objc/objc-gnu-runtime-abi-01.c +++ b/gcc/objc/objc-gnu-runtime-abi-01.c @@ -1540,25 +1540,14 @@ build_shared_structure_initializer (tree type, tree isa, tree super, CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, expr); } - /* FIXME: Remove NeXT runtime code. */ - if (flag_next_runtime) - { - ltyp = build_pointer_type (xref_tag (RECORD_TYPE, - get_identifier ("objc_cache"))); - /* method_cache = */ - CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, convert (ltyp, null_pointer_node)); - } - else - { - /* dtable = */ - CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0)); + /* dtable = */ + CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0)); - /* subclass_list = */ - CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0)); + /* subclass_list = */ + CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0)); - /* sibling_class = */ - CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0)); - } + /* sibling_class = */ + CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0)); /* protocol_list = */ ltyp = build_pointer_type (build_pointer_type (objc_protocol_template)); @@ -1572,11 +1561,6 @@ build_shared_structure_initializer (tree type, tree isa, tree super, CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, expr); } - /* FIXME: Remove NeXT runtime code. */ - if (flag_next_runtime) - /* sel_id = NULL */ - CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0)); - /* gc_object_type = NULL */ CONSTRUCTOR_APPEND_ELT (v, NULL_TREE, build_int_cst (NULL_TREE, 0)); @@ -1864,10 +1848,6 @@ generate_static_references (void) char buf[BUFSIZE]; vec *decls = NULL; - /* FIXME: Remove NeXT runtime code. */ - if (flag_next_runtime) - gcc_unreachable (); - for (cl_chain = objc_static_instances, num_class = 0; cl_chain; cl_chain = TREE_CHAIN (cl_chain), num_class++) { -- 2.7.4