X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;ds=sidebyside;f=gcc%2Fcp%2Frtti.c;h=898db00f3110554460e43afd99ebd7dcd8e46b7b;hb=074ab442f459e8d6fa5cb8f36e98b20468f7a35a;hp=8283acb7f4601a00f3607c6c103a30bd740ab91d;hpb=46518bf201fac97504ef5c9aae880d908f89ff79;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/cp/rtti.c b/gcc/cp/rtti.c index 8283acb7f46..898db00f311 100644 --- a/gcc/cp/rtti.c +++ b/gcc/cp/rtti.c @@ -1,5 +1,6 @@ /* RunTime Type Identification - Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation, Inc. Mostly written by Jason Merrill (jason@cygnus.com). @@ -17,9 +18,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ #include "config.h" #include "system.h" @@ -31,6 +31,7 @@ Boston, MA 02111-1307, USA. */ #include "output.h" #include "assert.h" #include "toplev.h" +#include "convert.h" /* C++ returns type information to the user in struct type_info objects. We also use type information to implement dynamic_cast and @@ -61,46 +62,66 @@ Boston, MA 02111-1307, USA. */ corresponding to type_info. That will only happen at the end of translation, when we are emitting the type info objects. */ -/* Accessors for the type_info objects. We need to remember several things - about each of the type_info types. The global tree nodes such as - bltn_desc_type_node are TREE_LISTs, and these macros are used to access - the required information. */ -/* The RECORD_TYPE of a type_info derived class. */ -#define TINFO_PSEUDO_TYPE(NODE) TREE_TYPE (NODE) -/* The VAR_DECL of the vtable for the type_info derived class. - This is only filled in at the end of the translation. */ -#define TINFO_VTABLE_DECL(NODE) TREE_VALUE (NODE) -/* The IDENTIFIER_NODE naming the real class. */ -#define TINFO_REAL_NAME(NODE) TREE_PURPOSE (NODE) - -/* A varray of all tinfo decls that haven't yet been emitted. */ -varray_type unemitted_tinfo_decls; - -static tree build_headof PARAMS((tree)); -static tree ifnonnull PARAMS((tree, tree)); -static tree tinfo_name PARAMS((tree)); -static tree build_dynamic_cast_1 PARAMS((tree, tree)); -static tree throw_bad_cast PARAMS((void)); -static tree throw_bad_typeid PARAMS((void)); -static tree get_tinfo_decl_dynamic PARAMS((tree)); -static tree get_tinfo_ptr PARAMS((tree)); -static bool typeid_ok_p PARAMS((void)); -static int qualifier_flags PARAMS((tree)); +/* Auxiliary data we hold for each type_info derived object we need. */ +typedef struct tinfo_s GTY (()) +{ + tree type; /* The RECORD_TYPE for this type_info object */ + + tree vtable; /* The VAR_DECL of the vtable. Only filled at end of + translation. */ + + tree name; /* IDENTIFIER_NODE for the ABI specified name of + the type_info derived type. */ +} tinfo_s; + +DEF_VEC_O(tinfo_s); +DEF_VEC_ALLOC_O(tinfo_s,gc); + +typedef enum tinfo_kind +{ + TK_TYPE_INFO_TYPE, /* std::type_info */ + TK_BASE_TYPE, /* abi::__base_class_type_info */ + TK_BUILTIN_TYPE, /* abi::__fundamental_type_info */ + TK_ARRAY_TYPE, /* abi::__array_type_info */ + TK_FUNCTION_TYPE, /* abi::__function_type_info */ + TK_ENUMERAL_TYPE, /* abi::__enum_type_info */ + TK_POINTER_TYPE, /* abi::__pointer_type_info */ + TK_POINTER_MEMBER_TYPE, /* abi::__pointer_to_member_type_info */ + TK_CLASS_TYPE, /* abi::__class_type_info */ + TK_SI_CLASS_TYPE, /* abi::__si_class_type_info */ + TK_FIXED /* end of fixed descriptors. */ + /* ... abi::__vmi_type_info */ +} tinfo_kind; + +/* A vector of all tinfo decls that haven't yet been emitted. */ +VEC(tree,gc) *unemitted_tinfo_decls; + +/* A vector of all type_info derived types we need. The first few are + fixed and created early. The remainder are for multiple inheritance + and are generated as needed. */ +static GTY (()) VEC(tinfo_s,gc) *tinfo_descs; + +static tree build_headof (tree); +static tree ifnonnull (tree, tree); +static tree tinfo_name (tree); +static tree build_dynamic_cast_1 (tree, tree); +static tree throw_bad_cast (void); +static tree throw_bad_typeid (void); +static tree get_tinfo_decl_dynamic (tree); +static tree get_tinfo_ptr (tree); +static bool typeid_ok_p (void); +static int qualifier_flags (tree); static bool target_incomplete_p (tree); -static tree tinfo_base_init PARAMS((tree, tree)); -static tree generic_initializer PARAMS((tree, tree)); -static tree ptr_initializer (tree, tree, bool *); -static tree ptm_initializer (tree, tree, bool *); -static tree dfs_class_hint_mark PARAMS ((tree, void *)); -static tree dfs_class_hint_unmark PARAMS ((tree, void *)); -static int class_hint_flags PARAMS((tree)); -static tree class_initializer PARAMS((tree, tree, tree)); -static tree create_pseudo_type_info PARAMS((const char *, int, ...)); -static tree get_pseudo_ti_init PARAMS ((tree, tree, bool *)); -static tree get_pseudo_ti_desc PARAMS((tree)); -static void create_tinfo_types PARAMS((void)); +static tree tinfo_base_init (tinfo_s *, tree); +static tree generic_initializer (tinfo_s *, tree); +static tree ptr_initializer (tinfo_s *, tree); +static tree ptm_initializer (tinfo_s *, tree); +static tree class_initializer (tinfo_s *, tree, tree); +static void create_pseudo_type_info (int, const char *, ...); +static tree get_pseudo_ti_init (tree, unsigned); +static unsigned get_pseudo_ti_index (tree); +static void create_tinfo_types (void); static bool typeinfo_in_lib_p (tree); -static bool unemitted_tinfo_decl_p PARAMS((tree)); static int doing_runtime = 0; @@ -114,19 +135,17 @@ static int doing_runtime = 0; void init_rtti_processing (void) { - tree const_type_info_type; + tree type_info_type; push_namespace (std_identifier); - type_info_type_node - = xref_tag (class_type, get_identifier ("type_info"), - /*attributes=*/NULL_TREE, 1); + type_info_type = xref_tag (class_type, get_identifier ("type_info"), + /*tag_scope=*/ts_current, false); pop_namespace (); - const_type_info_type = build_qualified_type (type_info_type_node, - TYPE_QUAL_CONST); - type_info_ptr_type = build_pointer_type (const_type_info_type); - type_info_ref_type = build_reference_type (const_type_info_type); + const_type_info_type_node + = build_qualified_type (type_info_type, TYPE_QUAL_CONST); + type_info_ptr_type = build_pointer_type (const_type_info_type_node); - VARRAY_TREE_INIT (unemitted_tinfo_decls, 10, "RTTI decls"); + unemitted_tinfo_decls = VEC_alloc (tree, gc, 124); create_tinfo_types (); } @@ -143,7 +162,7 @@ build_headof (tree exp) tree offset; tree index; - my_friendly_assert (TREE_CODE (type) == POINTER_TYPE, 20000112); + gcc_assert (TREE_CODE (type) == POINTER_TYPE); type = TREE_TYPE (type); if (!TYPE_POLYMORPHIC_P (type)) @@ -153,14 +172,15 @@ build_headof (tree exp) exp = save_expr (exp); /* The offset-to-top field is at index -2 from the vptr. */ - index = build_int_2 (-2 * TARGET_VTABLE_DATA_ENTRY_DISTANCE, -1); + index = build_int_cst (NULL_TREE, + -2 * TARGET_VTABLE_DATA_ENTRY_DISTANCE); offset = build_vtbl_ref (build_indirect_ref (exp, NULL), index); - type = build_qualified_type (ptr_type_node, + type = build_qualified_type (ptr_type_node, cp_type_quals (TREE_TYPE (exp))); - return build (PLUS_EXPR, type, exp, - cp_convert (ptrdiff_type_node, offset)); + return build2 (PLUS_EXPR, type, exp, + convert_to_integer (ptrdiff_type_node, offset)); } /* Get a bad_cast node for the program to throw... @@ -171,13 +191,11 @@ static tree throw_bad_cast (void) { tree fn = get_identifier ("__cxa_bad_cast"); - if (IDENTIFIER_GLOBAL_VALUE (fn)) - fn = IDENTIFIER_GLOBAL_VALUE (fn); - else + if (!get_global_value_if_present (fn, &fn)) fn = push_throw_library_fn (fn, build_function_type (ptr_type_node, void_list_node)); - - return build_call (fn, NULL_TREE); + + return build_cxx_call (fn, NULL_TREE); } /* Return an expression for "__cxa_bad_typeid()". The expression @@ -187,16 +205,16 @@ static tree throw_bad_typeid (void) { tree fn = get_identifier ("__cxa_bad_typeid"); - if (IDENTIFIER_GLOBAL_VALUE (fn)) - fn = IDENTIFIER_GLOBAL_VALUE (fn); - else + if (!get_global_value_if_present (fn, &fn)) { - tree t = build_qualified_type (type_info_type_node, TYPE_QUAL_CONST); - t = build_function_type (build_reference_type (t), void_list_node); + tree t; + + t = build_reference_type (const_type_info_type_node); + t = build_function_type (t, void_list_node); fn = push_throw_library_fn (fn, t); } - return convert_from_reference (build_call (fn, NULL_TREE)); + return build_cxx_call (fn, NULL_TREE); } /* Return an lvalue expression whose type is "const std::type_info" @@ -209,22 +227,19 @@ get_tinfo_decl_dynamic (tree exp) { tree type; tree t; - + if (exp == error_mark_node) return error_mark_node; - type = TREE_TYPE (exp); - /* peel back references, so they match. */ - if (TREE_CODE (type) == REFERENCE_TYPE) - type = TREE_TYPE (type); + type = non_reference (TREE_TYPE (exp)); /* Peel off cv qualifiers. */ type = TYPE_MAIN_VARIANT (type); - + if (!VOID_TYPE_P (type)) type = complete_type_or_else (type, exp); - + if (!type) return error_mark_node; @@ -235,9 +250,10 @@ get_tinfo_decl_dynamic (tree exp) tree index; /* The RTTI information is at index -1. */ - index = build_int_2 (-1 * TARGET_VTABLE_DATA_ENTRY_DISTANCE, -1); + index = build_int_cst (NULL_TREE, + -1 * TARGET_VTABLE_DATA_ENTRY_DISTANCE); t = build_vtbl_ref (exp, index); - TREE_TYPE (t) = type_info_ptr_type; + t = convert (type_info_ptr_type, t); } else /* Otherwise return the type_info for the static type of the expr. */ @@ -254,13 +270,13 @@ typeid_ok_p (void) error ("cannot use typeid with -fno-rtti"); return false; } - - if (!COMPLETE_TYPE_P (type_info_type_node)) + + if (!COMPLETE_TYPE_P (const_type_info_type_node)) { error ("must #include before using typeid"); return false; } - + return true; } @@ -277,7 +293,7 @@ build_typeid (tree exp) return error_mark_node; if (processing_template_decl) - return build_min (TYPEID_EXPR, type_info_ref_type, exp); + return build_min (TYPEID_EXPR, const_type_info_type_node, exp); if (TREE_CODE (exp) == INDIRECT_REF && TREE_CODE (TREE_TYPE (TREE_OPERAND (exp, 0))) == POINTER_TYPE @@ -298,7 +314,7 @@ build_typeid (tree exp) { tree bad = throw_bad_typeid (); - exp = build (COND_EXPR, TREE_TYPE (exp), cond, exp, bad); + exp = build3 (COND_EXPR, TREE_TYPE (exp), cond, exp, bad); } return exp; @@ -318,7 +334,7 @@ tinfo_name (tree type) /* Return a VAR_DECL for the internal ABI defined type_info object for TYPE. You must arrange that the decl is mark_used, if actually use - it --- decls in vtables are only used if the vtable is output. */ + it --- decls in vtables are only used if the vtable is output. */ tree get_tinfo_decl (tree type) @@ -326,16 +342,15 @@ get_tinfo_decl (tree type) tree name; tree d; - if (COMPLETE_TYPE_P (type) + if (COMPLETE_TYPE_P (type) && TREE_CODE (TYPE_SIZE (type)) != INTEGER_CST) { - error ("cannot create type information for type `%T' because its size is variable", + error ("cannot create type information for type %qT because " + "its size is variable", type); return error_mark_node; } - if (TREE_CODE (type) == OFFSET_TYPE) - type = TREE_TYPE (type); if (TREE_CODE (type) == METHOD_TYPE) type = build_function_type (TREE_TYPE (type), TREE_CHAIN (TYPE_ARG_TYPES (type))); @@ -348,35 +363,35 @@ get_tinfo_decl (tree type) if (d) return d; } - + name = mangle_typeinfo_for_type (type); d = IDENTIFIER_GLOBAL_VALUE (name); if (!d) { - tree var_desc = get_pseudo_ti_desc (type); + int ix = get_pseudo_ti_index (type); + tinfo_s *ti = VEC_index (tinfo_s, tinfo_descs, ix); - d = build_lang_decl (VAR_DECL, name, TINFO_PSEUDO_TYPE (var_desc)); - + d = build_lang_decl (VAR_DECL, name, ti->type); + SET_DECL_ASSEMBLER_NAME (d, name); + /* Remember the type it is for. */ + TREE_TYPE (name) = type; + DECL_TINFO_P (d) = 1; DECL_ARTIFICIAL (d) = 1; + DECL_IGNORED_P (d) = 1; TREE_READONLY (d) = 1; TREE_STATIC (d) = 1; + /* Mark the variable as undefined -- but remember that we can + define it later if we need to do so. */ DECL_EXTERNAL (d) = 1; - SET_DECL_ASSEMBLER_NAME (d, name); - DECL_COMDAT (d) = 1; - cp_finish_decl (d, NULL_TREE, NULL_TREE, 0); - - pushdecl_top_level (d); - + DECL_NOT_REALLY_EXTERN (d) = 1; if (CLASS_TYPE_P (type)) CLASSTYPE_TYPEINFO_VAR (TYPE_MAIN_VARIANT (type)) = d; + set_linkage_according_to_type (type, d); + pushdecl_top_level_and_finish (d, NULL_TREE); - /* Remember the type it is for. */ - TREE_TYPE (name) = type; - - /* Add decl to the global array of tinfo decls. */ - my_friendly_assert (unemitted_tinfo_decls != 0, 20030312); - VARRAY_PUSH_TREE (unemitted_tinfo_decls, d); + /* Add decl to the global array of tinfo decls. */ + VEC_safe_push (tree, gc, unemitted_tinfo_decls, d); } return d; @@ -388,8 +403,11 @@ get_tinfo_decl (tree type) static tree get_tinfo_ptr (tree type) { - return build_nop (type_info_ptr_type, - build_address (get_tinfo_decl (type))); + tree decl = get_tinfo_decl (type); + + mark_used (decl); + return build_nop (type_info_ptr_type, + build_address (decl)); } /* Return the type_info object for TYPE. */ @@ -399,15 +417,14 @@ get_typeid (tree type) { if (type == error_mark_node || !typeid_ok_p ()) return error_mark_node; - + if (processing_template_decl) - return build_min (TYPEID_EXPR, type_info_ref_type, type); + return build_min (TYPEID_EXPR, const_type_info_type_node, type); /* If the type of the type-id is a reference type, the result of the typeid expression refers to a type_info object representing the referenced type. */ - if (TREE_CODE (type) == REFERENCE_TYPE) - type = TREE_TYPE (type); + type = non_reference (type); /* The top-level cv-qualifiers of the lvalue expression or the type-id that is the operand of typeid are always ignored. */ @@ -415,7 +432,7 @@ get_typeid (tree type) if (!VOID_TYPE_P (type)) type = complete_type_or_else (type, NULL_TREE); - + if (!type) return error_mark_node; @@ -428,10 +445,11 @@ get_typeid (tree type) static tree ifnonnull (tree test, tree result) { - return build (COND_EXPR, TREE_TYPE (result), - build (EQ_EXPR, boolean_type_node, test, integer_zero_node), - cp_convert (TREE_TYPE (result), integer_zero_node), - result); + return build3 (COND_EXPR, TREE_TYPE (result), + build2 (EQ_EXPR, boolean_type_node, test, + cp_convert (TREE_TYPE (test), integer_zero_node)), + cp_convert (TREE_TYPE (result), integer_zero_node), + result); } /* Execute a dynamic cast, as described in section 5.2.6 of the 9/93 working @@ -446,6 +464,9 @@ build_dynamic_cast_1 (tree type, tree expr) tree old_expr = expr; const char *errstr = NULL; + /* Save casted types in the function's used types hash table. */ + used_types_insert (type); + /* T shall be a pointer or reference to a complete class type, or `pointer to cv void''. */ switch (tc) @@ -453,6 +474,7 @@ build_dynamic_cast_1 (tree type, tree expr) case POINTER_TYPE: if (TREE_CODE (TREE_TYPE (type)) == VOID_TYPE) break; + /* Fall through. */ case REFERENCE_TYPE: if (! IS_AGGR_TYPE (TREE_TYPE (type))) { @@ -471,24 +493,6 @@ build_dynamic_cast_1 (tree type, tree expr) goto fail; } - if (TREE_CODE (expr) == OFFSET_REF) - { - expr = resolve_offset_ref (expr); - exprtype = TREE_TYPE (expr); - } - - if (tc == POINTER_TYPE) - expr = convert_from_reference (expr); - else if (TREE_CODE (exprtype) != REFERENCE_TYPE) - { - /* Apply trivial conversion T -> T& for dereferenced ptrs. */ - exprtype = build_reference_type (exprtype); - expr = convert_to_reference (exprtype, expr, CONV_IMPLICIT, - LOOKUP_NORMAL, NULL_TREE); - } - - exprtype = TREE_TYPE (expr); - if (tc == POINTER_TYPE) { /* If T is a pointer type, v shall be an rvalue of a pointer to @@ -512,6 +516,8 @@ build_dynamic_cast_1 (tree type, tree expr) } else { + exprtype = build_reference_type (exprtype); + /* T is a reference type, v shall be an lvalue of a complete class type, and the result is an lvalue of the type referred to by T. */ @@ -525,7 +531,10 @@ build_dynamic_cast_1 (tree type, tree expr) errstr = "source is of incomplete class type"; goto fail; } - + + /* Apply trivial conversion T -> T& for dereferenced ptrs. */ + expr = convert_to_reference (exprtype, expr, CONV_IMPLICIT, + LOOKUP_NORMAL, NULL_TREE); } /* The dynamic_cast operator shall not cast away constness. */ @@ -542,14 +551,14 @@ build_dynamic_cast_1 (tree type, tree expr) tree binfo; binfo = lookup_base (TREE_TYPE (exprtype), TREE_TYPE (type), - ba_not_special, NULL); + ba_check, NULL); if (binfo) { expr = build_base_path (PLUS_EXPR, convert_from_reference (expr), binfo, 0); if (TREE_CODE (exprtype) == POINTER_TYPE) - expr = non_lvalue (expr); + expr = rvalue (expr); return expr; } } @@ -578,21 +587,21 @@ build_dynamic_cast_1 (tree type, tree expr) else { tree retval; - tree result, td2, td3, elems; - tree static_type, target_type, boff; + tree result, td2, td3, elems; + tree static_type, target_type, boff; - /* If we got here, we can't convert statically. Therefore, + /* If we got here, we can't convert statically. Therefore, dynamic_cast(b) (b an object) cannot succeed. */ if (tc == REFERENCE_TYPE) { if (TREE_CODE (old_expr) == VAR_DECL && TREE_CODE (TREE_TYPE (old_expr)) == RECORD_TYPE) { - tree expr = throw_bad_cast (); - warning ("dynamic_cast of `%#D' to `%#T' can never succeed", - old_expr, type); - /* Bash it to the expected type. */ - TREE_TYPE (expr) = type; + tree expr = throw_bad_cast (); + warning (0, "dynamic_cast of %q#D to %q#T can never succeed", + old_expr, type); + /* Bash it to the expected type. */ + TREE_TYPE (expr) = type; return expr; } } @@ -603,22 +612,25 @@ build_dynamic_cast_1 (tree type, tree expr) if (TREE_CODE (op) == VAR_DECL && TREE_CODE (TREE_TYPE (op)) == RECORD_TYPE) { - warning ("dynamic_cast of `%#D' to `%#T' can never succeed", - op, type); - retval = build_int_2 (0, 0); - TREE_TYPE (retval) = type; + warning (0, "dynamic_cast of %q#D to %q#T can never succeed", + op, type); + retval = build_int_cst (type, 0); return retval; } } target_type = TYPE_MAIN_VARIANT (TREE_TYPE (type)); static_type = TYPE_MAIN_VARIANT (TREE_TYPE (exprtype)); - td2 = build_unary_op (ADDR_EXPR, get_tinfo_decl (target_type), 0); - td3 = build_unary_op (ADDR_EXPR, get_tinfo_decl (static_type), 0); + td2 = get_tinfo_decl (target_type); + mark_used (td2); + td2 = build_unary_op (ADDR_EXPR, td2, 0); + td3 = get_tinfo_decl (static_type); + mark_used (td3); + td3 = build_unary_op (ADDR_EXPR, td3, 0); + + /* Determine how T and V are related. */ + boff = dcast_base_hint (static_type, target_type); - /* Determine how T and V are related. */ - boff = get_dynamic_cast_base_type (static_type, target_type); - /* Since expr is used twice below, save it. */ expr = save_expr (expr); @@ -639,13 +651,12 @@ build_dynamic_cast_1 (tree type, tree expr) tree tinfo_ptr; tree ns = abi_node; const char *name; - + push_nested_namespace (ns); tinfo_ptr = xref_tag (class_type, get_identifier ("__class_type_info"), - /*attributes=*/NULL_TREE, - 1); - + /*tag_scope=*/ts_current, false); + tinfo_ptr = build_pointer_type (build_qualified_type (tinfo_ptr, TYPE_QUAL_CONST)); @@ -657,30 +668,33 @@ build_dynamic_cast_1 (tree type, tree expr) (NULL_TREE, ptrdiff_type_node, void_list_node)))); tmp = build_function_type (ptr_type_node, tmp); dcast_fn = build_library_fn_ptr (name, tmp); - pop_nested_namespace (ns); - dynamic_cast_node = dcast_fn; + DECL_IS_PURE (dcast_fn) = 1; + pop_nested_namespace (ns); + dynamic_cast_node = dcast_fn; } - result = build_call (dcast_fn, elems); + result = build_cxx_call (dcast_fn, elems); if (tc == REFERENCE_TYPE) { tree bad = throw_bad_cast (); - + tree neq; + result = save_expr (result); - return build (COND_EXPR, type, result, result, bad); + neq = c_common_truthvalue_conversion (result); + return build3 (COND_EXPR, type, neq, result, bad); } /* Now back to the type we want from a void*. */ result = cp_convert (type, result); - return ifnonnull (expr, result); + return ifnonnull (expr, result); } } else errstr = "source type is not polymorphic"; fail: - error ("cannot dynamic_cast `%E' (of type `%#T') to type `%#T' (%s)", - expr, exprtype, type, errstr); + error ("cannot dynamic_cast %qE (of type %q#T) to type %q#T (%s)", + expr, exprtype, type, errstr); return error_mark_node; } @@ -689,9 +703,21 @@ build_dynamic_cast (tree type, tree expr) { if (type == error_mark_node || expr == error_mark_node) return error_mark_node; - + + /* Use of dynamic_cast when -fno-rtti is prohibited. */ + if (!flag_rtti) + { + error ("% not permitted with -fno-rtti"); + return error_mark_node; + } + if (processing_template_decl) - return build_min (DYNAMIC_CAST_EXPR, type, expr); + { + expr = build_min (DYNAMIC_CAST_EXPR, type, expr); + TREE_SIDE_EFFECTS (expr) = 1; + + return expr; + } return convert_from_reference (build_dynamic_cast_1 (type, expr)); } @@ -703,7 +729,7 @@ qualifier_flags (tree type) { int flags = 0; int quals = cp_type_quals (type); - + if (quals & TYPE_QUAL_CONST) flags |= 1; if (quals & TYPE_QUAL_VOLATILE) @@ -719,19 +745,49 @@ qualifier_flags (tree type) static bool target_incomplete_p (tree type) { - while (TREE_CODE (type) == POINTER_TYPE) + while (true) if (TYPE_PTRMEM_P (type)) { - if (!COMPLETE_TYPE_P (TYPE_PTRMEM_CLASS_TYPE (type))) - return true; - type = TYPE_PTRMEM_POINTED_TO_TYPE (type); + if (!COMPLETE_TYPE_P (TYPE_PTRMEM_CLASS_TYPE (type))) + return true; + type = TYPE_PTRMEM_POINTED_TO_TYPE (type); } - else + else if (TREE_CODE (type) == POINTER_TYPE) type = TREE_TYPE (type); - if (!COMPLETE_OR_VOID_TYPE_P (type)) - return true; - - return false; + else + return !COMPLETE_OR_VOID_TYPE_P (type); +} + +/* Returns true if TYPE involves an incomplete class type; in that + case, typeinfo variables for TYPE should be emitted with internal + linkage. */ + +static bool +involves_incomplete_p (tree type) +{ + switch (TREE_CODE (type)) + { + case POINTER_TYPE: + return target_incomplete_p (TREE_TYPE (type)); + + case OFFSET_TYPE: + ptrmem: + return + (target_incomplete_p (TYPE_PTRMEM_POINTED_TO_TYPE (type)) + || !COMPLETE_TYPE_P (TYPE_PTRMEM_CLASS_TYPE (type))); + + case RECORD_TYPE: + if (TYPE_PTRMEMFUNC_P (type)) + goto ptrmem; + /* Fall through. */ + case UNION_TYPE: + if (!COMPLETE_TYPE_P (type)) + return true; + + default: + /* All other types do not involve incomplete class types. */ + return false; + } } /* Return a CONSTRUCTOR for the common part of the type_info objects. This @@ -741,52 +797,59 @@ target_incomplete_p (tree type) as comdat, because of pointers to incomplete.) */ static tree -tinfo_base_init (tree desc, tree target) +tinfo_base_init (tinfo_s *ti, tree target) { tree init = NULL_TREE; tree name_decl; tree vtable_ptr; - + { tree name_name; - + /* Generate the NTBS array variable. */ tree name_type = build_cplus_array_type - (build_qualified_type (char_type_node, TYPE_QUAL_CONST), - NULL_TREE); + (build_qualified_type (char_type_node, TYPE_QUAL_CONST), + NULL_TREE); tree name_string = tinfo_name (target); + /* Determine the name of the variable -- and remember with which + type it is associated. */ name_name = mangle_typeinfo_string_for_type (target); + TREE_TYPE (name_name) = target; + name_decl = build_lang_decl (VAR_DECL, name_name, name_type); - + SET_DECL_ASSEMBLER_NAME (name_decl, name_name); DECL_ARTIFICIAL (name_decl) = 1; + DECL_IGNORED_P (name_decl) = 1; TREE_READONLY (name_decl) = 1; TREE_STATIC (name_decl) = 1; DECL_EXTERNAL (name_decl) = 0; - TREE_PUBLIC (name_decl) = 1; - comdat_linkage (name_decl); - /* External name of the string containing the type's name has a - special name. */ - SET_DECL_ASSEMBLER_NAME (name_decl, - mangle_typeinfo_string_for_type (target)); + DECL_TINFO_P (name_decl) = 1; + if (involves_incomplete_p (target)) + { + TREE_PUBLIC (name_decl) = 0; + DECL_INTERFACE_KNOWN (name_decl) = 1; + } + else + set_linkage_according_to_type (target, name_decl); + import_export_decl (name_decl); DECL_INITIAL (name_decl) = name_string; - cp_finish_decl (name_decl, name_string, NULL_TREE, 0); - pushdecl_top_level (name_decl); + mark_used (name_decl); + pushdecl_top_level_and_finish (name_decl, name_string); } - vtable_ptr = TINFO_VTABLE_DECL (desc); + vtable_ptr = ti->vtable; if (!vtable_ptr) { tree real_type; - push_nested_namespace (abi_node); - real_type = xref_tag (class_type, TINFO_REAL_NAME (desc), - /*attributes=*/NULL_TREE, 1); + real_type = xref_tag (class_type, ti->name, + /*tag_scope=*/ts_current, false); pop_nested_namespace (abi_node); - + if (!COMPLETE_TYPE_P (real_type)) { - /* We never saw a definition of this type, so we need to + /* We never saw a definition of this type, so we need to tell the compiler that this is an exported class, as indeed all of the __*_type_info classes are. */ SET_CLASSTYPE_INTERFACE_KNOWN (real_type); @@ -797,171 +860,118 @@ tinfo_base_init (tree desc, tree target) vtable_ptr = build_unary_op (ADDR_EXPR, vtable_ptr, 0); /* We need to point into the middle of the vtable. */ - vtable_ptr = build + vtable_ptr = build2 (PLUS_EXPR, TREE_TYPE (vtable_ptr), vtable_ptr, size_binop (MULT_EXPR, size_int (2 * TARGET_VTABLE_DATA_ENTRY_DISTANCE), TYPE_SIZE_UNIT (vtable_entry_type))); - TREE_CONSTANT (vtable_ptr) = 1; - TINFO_VTABLE_DECL (desc) = vtable_ptr; + ti->vtable = vtable_ptr; } init = tree_cons (NULL_TREE, vtable_ptr, init); - + init = tree_cons (NULL_TREE, decay_conversion (name_decl), init); - - init = build_constructor (NULL_TREE, nreverse (init)); - TREE_HAS_CONSTRUCTOR (init) = TREE_CONSTANT (init) = TREE_STATIC (init) = 1; + + init = build_constructor_from_list (NULL_TREE, nreverse (init)); + TREE_CONSTANT (init) = 1; + TREE_INVARIANT (init) = 1; + TREE_STATIC (init) = 1; init = tree_cons (NULL_TREE, init, NULL_TREE); - + return init; } -/* Return the CONSTRUCTOR expr for a type_info of TYPE. DESC provides the +/* Return the CONSTRUCTOR expr for a type_info of TYPE. TI provides the information about the particular type_info derivation, which adds no additional fields to the type_info base. */ static tree -generic_initializer (tree desc, tree target) +generic_initializer (tinfo_s *ti, tree target) { - tree init = tinfo_base_init (desc, target); - - init = build_constructor (NULL_TREE, init); - TREE_HAS_CONSTRUCTOR (init) = TREE_CONSTANT (init) = TREE_STATIC (init) = 1; + tree init = tinfo_base_init (ti, target); + + init = build_constructor_from_list (NULL_TREE, init); + TREE_CONSTANT (init) = 1; + TREE_INVARIANT (init) = 1; + TREE_STATIC (init) = 1; return init; } /* Return the CONSTRUCTOR expr for a type_info of pointer TYPE. - DESC provides information about the particular type_info derivation, + TI provides information about the particular type_info derivation, which adds target type and qualifier flags members to the type_info base. */ static tree -ptr_initializer (tree desc, tree target, bool *non_public_ptr) +ptr_initializer (tinfo_s *ti, tree target) { - tree init = tinfo_base_init (desc, target); + tree init = tinfo_base_init (ti, target); tree to = TREE_TYPE (target); int flags = qualifier_flags (to); bool incomplete = target_incomplete_p (to); - + if (incomplete) - { - flags |= 8; - *non_public_ptr = true; - } - init = tree_cons (NULL_TREE, build_int_2 (flags, 0), init); + flags |= 8; + init = tree_cons (NULL_TREE, build_int_cst (NULL_TREE, flags), init); init = tree_cons (NULL_TREE, - get_tinfo_ptr (TYPE_MAIN_VARIANT (to)), - init); - - init = build_constructor (NULL_TREE, nreverse (init)); - TREE_HAS_CONSTRUCTOR (init) = TREE_CONSTANT (init) = TREE_STATIC (init) = 1; + get_tinfo_ptr (TYPE_MAIN_VARIANT (to)), + init); + + init = build_constructor_from_list (NULL_TREE, nreverse (init)); + TREE_CONSTANT (init) = 1; + TREE_INVARIANT (init) = 1; + TREE_STATIC (init) = 1; return init; } /* Return the CONSTRUCTOR expr for a type_info of pointer to member data TYPE. - DESC provides information about the particular type_info derivation, + TI provides information about the particular type_info derivation, which adds class, target type and qualifier flags members to the type_info base. */ static tree -ptm_initializer (tree desc, tree target, bool *non_public_ptr) +ptm_initializer (tinfo_s *ti, tree target) { - tree init = tinfo_base_init (desc, target); + tree init = tinfo_base_init (ti, target); tree to = TYPE_PTRMEM_POINTED_TO_TYPE (target); tree klass = TYPE_PTRMEM_CLASS_TYPE (target); int flags = qualifier_flags (to); bool incomplete = target_incomplete_p (to); - + if (incomplete) - { - flags |= 0x8; - *non_public_ptr = true; - } + flags |= 0x8; if (!COMPLETE_TYPE_P (klass)) - { - flags |= 0x10; - *non_public_ptr = true; - } - init = tree_cons (NULL_TREE, build_int_2 (flags, 0), init); + flags |= 0x10; + init = tree_cons (NULL_TREE, build_int_cst (NULL_TREE, flags), init); init = tree_cons (NULL_TREE, get_tinfo_ptr (TYPE_MAIN_VARIANT (to)), - init); + init); init = tree_cons (NULL_TREE, get_tinfo_ptr (klass), - init); - - init = build_constructor (NULL_TREE, nreverse (init)); - TREE_HAS_CONSTRUCTOR (init) = TREE_CONSTANT (init) = TREE_STATIC (init) = 1; - return init; -} - -/* Check base BINFO to set hint flags in *DATA, which is really an int. - We use CLASSTYPE_MARKED to tag types we've found as non-virtual bases and - CLASSTYPE_MARKED2 to tag those which are virtual bases. Remember it is - possible for a type to be both a virtual and non-virtual base. */ - -static tree -dfs_class_hint_mark (tree binfo, void *data) -{ - tree basetype = BINFO_TYPE (binfo); - int *hint = (int *) data; - - if (TREE_VIA_VIRTUAL (binfo)) - { - if (CLASSTYPE_MARKED (basetype)) - *hint |= 1; - if (CLASSTYPE_MARKED2 (basetype)) - *hint |= 2; - SET_CLASSTYPE_MARKED2 (basetype); - } - else - { - if (CLASSTYPE_MARKED (basetype) || CLASSTYPE_MARKED2 (basetype)) - *hint |= 1; - SET_CLASSTYPE_MARKED (basetype); - } - return NULL_TREE; -} + init); -/* Clear the base's dfs marks, after searching for duplicate bases. */ - -static tree -dfs_class_hint_unmark (tree binfo, void *data ATTRIBUTE_UNUSED) -{ - tree basetype = BINFO_TYPE (binfo); - - CLEAR_CLASSTYPE_MARKED (basetype); - CLEAR_CLASSTYPE_MARKED2 (basetype); - return NULL_TREE; + init = build_constructor_from_list (NULL_TREE, nreverse (init)); + TREE_CONSTANT (init) = 1; + TREE_INVARIANT (init) = 1; + TREE_STATIC (init) = 1; + return init; } -/* Determine the hint flags describing the features of a class's hierarchy. */ - -static int -class_hint_flags (tree type) -{ - int hint_flags = 0; - - dfs_walk (TYPE_BINFO (type), dfs_class_hint_mark, NULL, &hint_flags); - dfs_walk (TYPE_BINFO (type), dfs_class_hint_unmark, NULL, NULL); - - return hint_flags; -} - /* Return the CONSTRUCTOR expr for a type_info of class TYPE. - DESC provides information about the particular __class_type_info derivation, + TI provides information about the particular __class_type_info derivation, which adds hint flags and TRAIL initializers to the type_info base. */ static tree -class_initializer (tree desc, tree target, tree trail) +class_initializer (tinfo_s *ti, tree target, tree trail) { - tree init = tinfo_base_init (desc, target); - + tree init = tinfo_base_init (ti, target); + TREE_CHAIN (init) = trail; - init = build_constructor (NULL_TREE, init); - TREE_HAS_CONSTRUCTOR (init) = TREE_CONSTANT (init) = TREE_STATIC (init) = 1; - return init; + init = build_constructor_from_list (NULL_TREE, init); + TREE_CONSTANT (init) = 1; + TREE_INVARIANT (init) = 1; + TREE_STATIC (init) = 1; + return init; } /* Returns true if the typeinfo for type should be placed in @@ -981,123 +991,112 @@ typeinfo_in_lib_p (tree type) { case INTEGER_TYPE: case BOOLEAN_TYPE: - case CHAR_TYPE: case REAL_TYPE: case VOID_TYPE: return true; - + default: return false; } } -/* Generate the initializer for the type info describing - TYPE. VAR_DESC is a . NON_PUBLIC_P is set nonzero, if the VAR_DECL - should not be exported from this object file. This should only be - called at the end of translation, when we know that no further - types will be completed. */ +/* Generate the initializer for the type info describing TYPE. TK_INDEX is + the index of the descriptor in the tinfo_desc vector. */ static tree -get_pseudo_ti_init (tree type, tree var_desc, bool *non_public_p) +get_pseudo_ti_init (tree type, unsigned tk_index) { - my_friendly_assert (at_eof, 20021120); - switch (TREE_CODE (type)) + tinfo_s *ti = VEC_index (tinfo_s, tinfo_descs, tk_index); + + gcc_assert (at_eof); + switch (tk_index) { - case POINTER_TYPE: - if (TYPE_PTRMEM_P (type)) - return ptm_initializer (var_desc, type, non_public_p); - else - return ptr_initializer (var_desc, type, non_public_p); - break; - case ENUMERAL_TYPE: - return generic_initializer (var_desc, type); - break; - case FUNCTION_TYPE: - return generic_initializer (var_desc, type); - break; - case ARRAY_TYPE: - return generic_initializer (var_desc, type); - break; - case UNION_TYPE: - case RECORD_TYPE: - if (TYPE_PTRMEMFUNC_P (type)) - return ptm_initializer (var_desc, type, non_public_p); - else if (var_desc == class_desc_type_node) - { - if (!COMPLETE_TYPE_P (type)) - /* Emit a non-public class_type_info. */ - *non_public_p = true; - return class_initializer (var_desc, type, NULL_TREE); - } - else if (var_desc == si_class_desc_type_node) - { - tree base_binfos = BINFO_BASETYPES (TYPE_BINFO (type)); - tree base_binfo = TREE_VEC_ELT (base_binfos, 0); - tree tinfo = get_tinfo_ptr (BINFO_TYPE (base_binfo)); - tree base_inits = tree_cons (NULL_TREE, tinfo, NULL_TREE); - - return class_initializer (var_desc, type, base_inits); - } - else - { - int hint = class_hint_flags (type); - tree binfo = TYPE_BINFO (type); - int nbases = BINFO_N_BASETYPES (binfo); - tree base_binfos = BINFO_BASETYPES (binfo); - tree base_accesses = BINFO_BASEACCESSES (binfo); - tree base_inits = NULL_TREE; - int ix; - - /* Generate the base information initializer. */ - for (ix = nbases; ix--;) - { - tree base_binfo = TREE_VEC_ELT (base_binfos, ix); - tree base_init = NULL_TREE; - int flags = 0; - tree tinfo; - tree offset; - - if (TREE_VEC_ELT (base_accesses, ix) == access_public_node) - flags |= 2; - tinfo = get_tinfo_ptr (BINFO_TYPE (base_binfo)); - if (TREE_VIA_VIRTUAL (base_binfo)) - { - /* We store the vtable offset at which the virtual - base offset can be found. */ - offset = BINFO_VPTR_FIELD (base_binfo); - offset = convert (sizetype, offset); - flags |= 1; - } - else - offset = BINFO_OFFSET (base_binfo); - - /* combine offset and flags into one field */ - offset = cp_build_binary_op (LSHIFT_EXPR, offset, - build_int_2 (8, 0)); - offset = cp_build_binary_op (BIT_IOR_EXPR, offset, - build_int_2 (flags, 0)); - base_init = tree_cons (NULL_TREE, offset, base_init); - base_init = tree_cons (NULL_TREE, tinfo, base_init); - base_init = build_constructor (NULL_TREE, base_init); - TREE_HAS_CONSTRUCTOR (base_init) = 1; - base_inits = tree_cons (NULL_TREE, base_init, base_inits); - } - base_inits = build_constructor (NULL_TREE, base_inits); - TREE_HAS_CONSTRUCTOR (base_inits) = 1; - base_inits = tree_cons (NULL_TREE, base_inits, NULL_TREE); - /* Prepend the number of bases. */ - base_inits = tree_cons (NULL_TREE, - build_int_2 (nbases, 0), base_inits); - /* Prepend the hint flags. */ - base_inits = tree_cons (NULL_TREE, - build_int_2 (hint, 0), base_inits); - - return class_initializer (var_desc, type, base_inits); - } - break; + case TK_POINTER_MEMBER_TYPE: + return ptm_initializer (ti, type); + + case TK_POINTER_TYPE: + return ptr_initializer (ti, type); + + case TK_BUILTIN_TYPE: + case TK_ENUMERAL_TYPE: + case TK_FUNCTION_TYPE: + case TK_ARRAY_TYPE: + return generic_initializer (ti, type); + + case TK_CLASS_TYPE: + return class_initializer (ti, type, NULL_TREE); + + case TK_SI_CLASS_TYPE: + { + tree base_binfo = BINFO_BASE_BINFO (TYPE_BINFO (type), 0); + tree tinfo = get_tinfo_ptr (BINFO_TYPE (base_binfo)); + tree base_inits = tree_cons (NULL_TREE, tinfo, NULL_TREE); + + /* get_tinfo_ptr might have reallocated the tinfo_descs vector. */ + ti = VEC_index (tinfo_s, tinfo_descs, tk_index); + return class_initializer (ti, type, base_inits); + } default: - return generic_initializer (var_desc, type); + { + int hint = ((CLASSTYPE_REPEATED_BASE_P (type) << 0) + | (CLASSTYPE_DIAMOND_SHAPED_P (type) << 1)); + tree binfo = TYPE_BINFO (type); + int nbases = BINFO_N_BASE_BINFOS (binfo); + VEC(tree,gc) *base_accesses = BINFO_BASE_ACCESSES (binfo); + tree base_inits = NULL_TREE; + int ix; + + gcc_assert (tk_index >= TK_FIXED); + + /* Generate the base information initializer. */ + for (ix = nbases; ix--;) + { + tree base_binfo = BINFO_BASE_BINFO (binfo, ix); + tree base_init = NULL_TREE; + int flags = 0; + tree tinfo; + tree offset; + + if (VEC_index (tree, base_accesses, ix) == access_public_node) + flags |= 2; + tinfo = get_tinfo_ptr (BINFO_TYPE (base_binfo)); + if (BINFO_VIRTUAL_P (base_binfo)) + { + /* We store the vtable offset at which the virtual + base offset can be found. */ + offset = BINFO_VPTR_FIELD (base_binfo); + offset = convert (sizetype, offset); + flags |= 1; + } + else + offset = BINFO_OFFSET (base_binfo); + + /* Combine offset and flags into one field. */ + offset = cp_build_binary_op (LSHIFT_EXPR, offset, + build_int_cst (NULL_TREE, 8)); + offset = cp_build_binary_op (BIT_IOR_EXPR, offset, + build_int_cst (NULL_TREE, flags)); + base_init = tree_cons (NULL_TREE, offset, base_init); + base_init = tree_cons (NULL_TREE, tinfo, base_init); + base_init = build_constructor_from_list (NULL_TREE, base_init); + base_inits = tree_cons (NULL_TREE, base_init, base_inits); + } + base_inits = build_constructor_from_list (NULL_TREE, base_inits); + base_inits = tree_cons (NULL_TREE, base_inits, NULL_TREE); + /* Prepend the number of bases. */ + base_inits = tree_cons (NULL_TREE, + build_int_cst (NULL_TREE, nbases), + base_inits); + /* Prepend the hint flags. */ + base_inits = tree_cons (NULL_TREE, + build_int_cst (NULL_TREE, hint), + base_inits); + + /* get_tinfo_ptr might have reallocated the tinfo_descs vector. */ + ti = VEC_index (tinfo_s, tinfo_descs, tk_index); + return class_initializer (ti, type, base_inits); + } } } @@ -1111,117 +1110,140 @@ get_pseudo_ti_init (tree type, tree var_desc, bool *non_public_p) vtable. We have to delay generating the VAR_DECL of the vtable until the end of the translation, when we'll have seen the library definition, if there was one. - + REAL_NAME is the runtime's name of the type. Trailing arguments are additional FIELD_DECL's for the structure. The final argument must be NULL. */ -static tree -create_pseudo_type_info (const char *real_name, int ident, ...) +static void +create_pseudo_type_info (int tk, const char *real_name, ...) { + tinfo_s *ti; tree pseudo_type; char *pseudo_name; tree fields; tree field_decl; - tree result; + va_list ap; - VA_OPEN (ap, ident); - VA_FIXEDARG (ap, const char *, real_name); - VA_FIXEDARG (ap, int, ident); + va_start (ap, real_name); /* Generate the pseudo type name. */ - pseudo_name = (char *)alloca (strlen (real_name) + 30); + pseudo_name = (char *) alloca (strlen (real_name) + 30); strcpy (pseudo_name, real_name); strcat (pseudo_name, "_pseudo"); - if (ident) - sprintf (pseudo_name + strlen (pseudo_name), "%d", ident); - + if (tk >= TK_FIXED) + sprintf (pseudo_name + strlen (pseudo_name), "%d", tk - TK_FIXED); + /* First field is the pseudo type_info base class. */ - fields = build_decl (FIELD_DECL, NULL_TREE, ti_desc_type_node); - + fields = build_decl (FIELD_DECL, NULL_TREE, + VEC_index (tinfo_s, tinfo_descs, + TK_TYPE_INFO_TYPE)->type); + /* Now add the derived fields. */ while ((field_decl = va_arg (ap, tree))) { TREE_CHAIN (field_decl) = fields; fields = field_decl; } - + /* Create the pseudo type. */ pseudo_type = make_aggr_type (RECORD_TYPE); finish_builtin_struct (pseudo_type, pseudo_name, fields, NULL_TREE); CLASSTYPE_AS_BASE (pseudo_type) = pseudo_type; - result = tree_cons (NULL_TREE, NULL_TREE, NULL_TREE); - TINFO_REAL_NAME (result) = get_identifier (real_name); - TINFO_PSEUDO_TYPE (result) = - cp_build_qualified_type (pseudo_type, TYPE_QUAL_CONST); - - VA_CLOSE (ap); - return result; + ti = VEC_index (tinfo_s, tinfo_descs, tk); + ti->type = cp_build_qualified_type (pseudo_type, TYPE_QUAL_CONST); + ti->name = get_identifier (real_name); + ti->vtable = NULL_TREE; + + va_end (ap); } -/* Return a pseudo type info type node used to describe TYPE. TYPE - must be a complete type (or cv void), except at the end of the - translation unit. */ +/* Return the index of a pseudo type info type node used to describe + TYPE. TYPE must be a complete type (or cv void), except at the end + of the translation unit. */ -static tree -get_pseudo_ti_desc (tree type) +static unsigned +get_pseudo_ti_index (tree type) { + unsigned ix; + switch (TREE_CODE (type)) { + case OFFSET_TYPE: + ix = TK_POINTER_MEMBER_TYPE; + break; + case POINTER_TYPE: - return TYPE_PTRMEM_P (type) ? ptm_desc_type_node : ptr_desc_type_node; + ix = TK_POINTER_TYPE; + break; + case ENUMERAL_TYPE: - return enum_desc_type_node; + ix = TK_ENUMERAL_TYPE; + break; + case FUNCTION_TYPE: - return func_desc_type_node; + ix = TK_FUNCTION_TYPE; + break; + case ARRAY_TYPE: - return ary_desc_type_node; + ix = TK_ARRAY_TYPE; + break; + case UNION_TYPE: case RECORD_TYPE: if (TYPE_PTRMEMFUNC_P (type)) - return ptm_desc_type_node; + { + ix = TK_POINTER_MEMBER_TYPE; + break; + } else if (!COMPLETE_TYPE_P (type)) { if (!at_eof) cxx_incomplete_type_error (NULL_TREE, type); - return class_desc_type_node; + ix = TK_CLASS_TYPE; + break; + } + else if (!BINFO_N_BASE_BINFOS (TYPE_BINFO (type))) + { + ix = TK_CLASS_TYPE; + break; } - else if (!CLASSTYPE_N_BASECLASSES (type)) - return class_desc_type_node; else { tree binfo = TYPE_BINFO (type); - tree base_binfos = BINFO_BASETYPES (binfo); - tree base_accesses = BINFO_BASEACCESSES (binfo); - tree base_binfo = TREE_VEC_ELT (base_binfos, 0); - int num_bases = TREE_VEC_LENGTH (base_binfos); - + VEC(tree,gc) *base_accesses = BINFO_BASE_ACCESSES (binfo); + tree base_binfo = BINFO_BASE_BINFO (binfo, 0); + int num_bases = BINFO_N_BASE_BINFOS (binfo); + if (num_bases == 1 - && TREE_VEC_ELT (base_accesses, 0) == access_public_node - && !TREE_VIA_VIRTUAL (base_binfo) + && VEC_index (tree, base_accesses, 0) == access_public_node + && !BINFO_VIRTUAL_P (base_binfo) && integer_zerop (BINFO_OFFSET (base_binfo))) - /* single non-virtual public. */ - return si_class_desc_type_node; + { + /* single non-virtual public. */ + ix = TK_SI_CLASS_TYPE; + break; + } else { - tree var_desc; + tinfo_s *ti; tree array_domain, base_array; - - if (TREE_VEC_LENGTH (vmi_class_desc_type_node) <= num_bases) + + ix = TK_FIXED + num_bases; + if (VEC_length (tinfo_s, tinfo_descs) <= ix) { - int ix; - tree extend = make_tree_vec (num_bases + 5); - - for (ix = TREE_VEC_LENGTH (vmi_class_desc_type_node); ix--;) - TREE_VEC_ELT (extend, ix) - = TREE_VEC_ELT (vmi_class_desc_type_node, ix); - vmi_class_desc_type_node = extend; + /* too short, extend. */ + unsigned len = VEC_length (tinfo_s, tinfo_descs); + + VEC_safe_grow (tinfo_s, gc, tinfo_descs, ix + 1); + while (VEC_iterate (tinfo_s, tinfo_descs, len++, ti)) + ti->type = ti->vtable = ti->name = NULL_TREE; } - var_desc = TREE_VEC_ELT (vmi_class_desc_type_node, num_bases); - if (var_desc) - return var_desc; - + else if (VEC_index (tinfo_s, tinfo_descs, ix)->type) + /* already created. */ + break; + /* Create the array of __base_class_type_info entries. G++ 3.2 allocated an array that had one too many entries, and then filled that extra entries with @@ -1231,108 +1253,106 @@ get_pseudo_ti_desc (tree type) else array_domain = build_index_type (size_int (num_bases)); base_array = - build_array_type (base_desc_type_node, array_domain); + build_array_type (VEC_index (tinfo_s, tinfo_descs, + TK_BASE_TYPE)->type, + array_domain); push_nested_namespace (abi_node); - var_desc = create_pseudo_type_info - ("__vmi_class_type_info", num_bases, + create_pseudo_type_info + (ix, "__vmi_class_type_info", build_decl (FIELD_DECL, NULL_TREE, integer_type_node), build_decl (FIELD_DECL, NULL_TREE, integer_type_node), build_decl (FIELD_DECL, NULL_TREE, base_array), NULL); pop_nested_namespace (abi_node); - - TREE_VEC_ELT (vmi_class_desc_type_node, num_bases) = var_desc; - return var_desc; + break; } } default: - return bltn_desc_type_node; + ix = TK_BUILTIN_TYPE; + break; } + return ix; } /* Make sure the required builtin types exist for generating the type_info - varable definitions. */ + variable definitions. */ static void create_tinfo_types (void) { - my_friendly_assert (!ti_desc_type_node, 20020609); + tinfo_s *ti; + + gcc_assert (!tinfo_descs); + + VEC_safe_grow (tinfo_s, gc, tinfo_descs, TK_FIXED); push_nested_namespace (abi_node); - + /* Create the internal type_info structure. This is used as a base for the other structures. */ { tree field, fields; - ti_desc_type_node = make_aggr_type (RECORD_TYPE); field = build_decl (FIELD_DECL, NULL_TREE, const_ptr_type_node); fields = field; - + field = build_decl (FIELD_DECL, NULL_TREE, const_string_type_node); TREE_CHAIN (field) = fields; fields = field; - - finish_builtin_struct (ti_desc_type_node, "__type_info_pseudo", + + ti = VEC_index (tinfo_s, tinfo_descs, TK_TYPE_INFO_TYPE); + ti->type = make_aggr_type (RECORD_TYPE); + ti->vtable = NULL_TREE; + ti->name = NULL_TREE; + finish_builtin_struct (ti->type, "__type_info_pseudo", fields, NULL_TREE); - TYPE_HAS_CONSTRUCTOR (ti_desc_type_node) = 1; + TYPE_HAS_CONSTRUCTOR (ti->type) = 1; } - + /* Fundamental type_info */ - bltn_desc_type_node = create_pseudo_type_info - ("__fundamental_type_info", 0, - NULL); + create_pseudo_type_info (TK_BUILTIN_TYPE, "__fundamental_type_info", NULL); /* Array, function and enum type_info. No additional fields. */ - ary_desc_type_node = create_pseudo_type_info - ("__array_type_info", 0, - NULL); - func_desc_type_node = create_pseudo_type_info - ("__function_type_info", 0, - NULL); - enum_desc_type_node = create_pseudo_type_info - ("__enum_type_info", 0, - NULL); - - /* Class type_info. Add a flags field. */ - class_desc_type_node = create_pseudo_type_info - ("__class_type_info", 0, - NULL); - - /* Single public non-virtual base class. Add pointer to base class. + create_pseudo_type_info (TK_ARRAY_TYPE, "__array_type_info", NULL); + create_pseudo_type_info (TK_FUNCTION_TYPE, "__function_type_info", NULL); + create_pseudo_type_info (TK_ENUMERAL_TYPE, "__enum_type_info", NULL); + + /* Class type_info. No additional fields. */ + create_pseudo_type_info (TK_CLASS_TYPE, "__class_type_info", NULL); + + /* Single public non-virtual base class. Add pointer to base class. This is really a descendant of __class_type_info. */ - si_class_desc_type_node = create_pseudo_type_info - ("__si_class_type_info", 0, - build_decl (FIELD_DECL, NULL_TREE, type_info_ptr_type), - NULL); - + create_pseudo_type_info (TK_SI_CLASS_TYPE, "__si_class_type_info", + build_decl (FIELD_DECL, NULL_TREE, type_info_ptr_type), + NULL); + /* Base class internal helper. Pointer to base type, offset to base, flags. */ { tree field, fields; - + field = build_decl (FIELD_DECL, NULL_TREE, type_info_ptr_type); fields = field; - + field = build_decl (FIELD_DECL, NULL_TREE, integer_types[itk_long]); TREE_CHAIN (field) = fields; fields = field; - - base_desc_type_node = make_aggr_type (RECORD_TYPE); - finish_builtin_struct (base_desc_type_node, "__base_class_type_info_pseudo", + + ti = VEC_index (tinfo_s, tinfo_descs, TK_BASE_TYPE); + + ti->type = make_aggr_type (RECORD_TYPE); + ti->vtable = NULL_TREE; + ti->name = NULL_TREE; + finish_builtin_struct (ti->type, "__base_class_type_info_pseudo", fields, NULL_TREE); - TYPE_HAS_CONSTRUCTOR (base_desc_type_node) = 1; + TYPE_HAS_CONSTRUCTOR (ti->type) = 1; } - - /* General hierarchy is created as necessary in this vector. */ - vmi_class_desc_type_node = make_tree_vec (10); - + /* Pointer type_info. Adds two fields, qualification mask and pointer to the pointed to type. This is really a descendant of __pbase_type_info. */ - ptr_desc_type_node = create_pseudo_type_info - ("__pointer_type_info", 0, + create_pseudo_type_info (TK_POINTER_TYPE, "__pointer_type_info", build_decl (FIELD_DECL, NULL_TREE, integer_type_node), build_decl (FIELD_DECL, NULL_TREE, type_info_ptr_type), NULL); @@ -1340,12 +1360,12 @@ create_tinfo_types (void) /* Pointer to member data type_info. Add qualifications flags, pointer to the member's type info and pointer to the class. This is really a descendant of __pbase_type_info. */ - ptm_desc_type_node = create_pseudo_type_info - ("__pointer_to_member_type_info", 0, - build_decl (FIELD_DECL, NULL_TREE, integer_type_node), - build_decl (FIELD_DECL, NULL_TREE, type_info_ptr_type), - build_decl (FIELD_DECL, NULL_TREE, type_info_ptr_type), - NULL); + create_pseudo_type_info (TK_POINTER_MEMBER_TYPE, + "__pointer_to_member_type_info", + build_decl (FIELD_DECL, NULL_TREE, integer_type_node), + build_decl (FIELD_DECL, NULL_TREE, type_info_ptr_type), + build_decl (FIELD_DECL, NULL_TREE, type_info_ptr_type), + NULL); pop_nested_namespace (abi_node); } @@ -1374,63 +1394,50 @@ emit_support_tinfos (void) }; int ix; tree bltn_type, dtor; - + push_nested_namespace (abi_node); bltn_type = xref_tag (class_type, - get_identifier ("__fundamental_type_info"), - /*attributes=*/NULL_TREE, - 1); + get_identifier ("__fundamental_type_info"), + /*tag_scope=*/ts_current, false); pop_nested_namespace (abi_node); if (!COMPLETE_TYPE_P (bltn_type)) return; - dtor = TREE_VEC_ELT (CLASSTYPE_METHOD_VEC (bltn_type), 1); - if (DECL_EXTERNAL (dtor)) + dtor = CLASSTYPE_DESTRUCTORS (bltn_type); + if (!dtor || DECL_EXTERNAL (dtor)) return; doing_runtime = 1; for (ix = 0; fundamentals[ix]; ix++) { tree bltn = *fundamentals[ix]; - tree bltn_ptr = build_pointer_type (bltn); - tree bltn_const_ptr = build_pointer_type - (build_qualified_type (bltn, TYPE_QUAL_CONST)); - tree tinfo; - - tinfo = get_tinfo_decl (bltn); - TREE_USED (tinfo) = 1; - TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (tinfo)) = 1; - - tinfo = get_tinfo_decl (bltn_ptr); - TREE_USED (tinfo) = 1; - TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (tinfo)) = 1; - - tinfo = get_tinfo_decl (bltn_const_ptr); - TREE_USED (tinfo) = 1; - TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (tinfo)) = 1; - } -} + tree types[3]; + int i; -/* Return true, iff T is a type_info variable which has not had a - definition emitted for it. */ + types[0] = bltn; + types[1] = build_pointer_type (bltn); + types[2] = build_pointer_type (build_qualified_type (bltn, + TYPE_QUAL_CONST)); -static bool -unemitted_tinfo_decl_p (tree t) -{ - if (/* It's a var decl */ - TREE_CODE (t) == VAR_DECL - /* which has a name */ - && DECL_NAME (t) - /* whose name points back to itself */ - && IDENTIFIER_GLOBAL_VALUE (DECL_NAME (t)) == t - /* whose name's type is non-null */ - && TREE_TYPE (DECL_NAME (t)) - /* and whose type is a struct */ - && TREE_CODE (TREE_TYPE (t)) == RECORD_TYPE - /* with a field */ - && TYPE_FIELDS (TREE_TYPE (t)) - /* which is our pseudo type info */ - && TREE_TYPE (TYPE_FIELDS (TREE_TYPE (t))) == ti_desc_type_node) - return true; - return false; + for (i = 0; i < 3; ++i) + { + tree tinfo; + + tinfo = get_tinfo_decl (types[i]); + TREE_USED (tinfo) = 1; + mark_needed (tinfo); + /* The C++ ABI requires that these objects be COMDAT. But, + On systems without weak symbols, initialized COMDAT + objects are emitted with internal linkage. (See + comdat_linkage for details.) Since we want these objects + to have external linkage so that copies do not have to be + emitted in code outside the runtime library, we make them + non-COMDAT here. */ + if (!flag_weak) + { + gcc_assert (TREE_PUBLIC (tinfo) && !DECL_COMDAT (tinfo)); + DECL_INTERFACE_KNOWN (tinfo) = 1; + } + } + } } /* Finish a type info decl. DECL_PTR is a pointer to an unemitted @@ -1441,34 +1448,50 @@ bool emit_tinfo_decl (tree decl) { tree type = TREE_TYPE (DECL_NAME (decl)); - bool non_public; int in_library = typeinfo_in_lib_p (type); - tree var_desc, var_init; - my_friendly_assert (unemitted_tinfo_decl_p (decl), 20030307); - - import_export_tinfo (decl, type, in_library); - if (DECL_REALLY_EXTERN (decl) || !DECL_NEEDED_P (decl)) - return false; + gcc_assert (DECL_TINFO_P (decl)); - if (!doing_runtime && in_library) - return false; + if (in_library) + { + if (doing_runtime) + DECL_EXTERNAL (decl) = 0; + else + { + /* If we're not in the runtime, then DECL (which is already + DECL_EXTERNAL) will not be defined here. */ + DECL_INTERFACE_KNOWN (decl) = 1; + return false; + } + } + else if (involves_incomplete_p (type)) + { + if (!decl_needed_p (decl)) + return false; + /* If TYPE involves an incomplete class type, then the typeinfo + object will be emitted with internal linkage. There is no + way to know whether or not types are incomplete until the end + of the compilation, so this determination must be deferred + until this point. */ + TREE_PUBLIC (decl) = 0; + DECL_EXTERNAL (decl) = 0; + DECL_INTERFACE_KNOWN (decl) = 1; + } - non_public = false; - var_desc = get_pseudo_ti_desc (type); - var_init = get_pseudo_ti_init (type, var_desc, &non_public); - - DECL_EXTERNAL (decl) = 0; - TREE_PUBLIC (decl) = !non_public; - if (non_public) - DECL_COMDAT (decl) = 0; - - DECL_INITIAL (decl) = var_init; - cp_finish_decl (decl, var_init, NULL_TREE, 0); - /* cp_finish_decl will have dealt with linkage. */ - - /* Say we've dealt with it. */ - TREE_TYPE (DECL_NAME (decl)) = NULL_TREE; + import_export_decl (decl); + if (DECL_NOT_REALLY_EXTERN (decl) && decl_needed_p (decl)) + { + tree init; - return true; + DECL_EXTERNAL (decl) = 0; + init = get_pseudo_ti_init (type, get_pseudo_ti_index (type)); + DECL_INITIAL (decl) = init; + mark_used (decl); + finish_decl (decl, init, NULL_TREE); + return true; + } + else + return false; } + +#include "gt-cp-rtti.h"