X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Fcp%2Fdecl2.c;h=3e18c4a4c19ba3bf5a37f1a763610ef6bf6ec092;hp=3b23638e71ad1a12d12848b700562075c7b34b8c;hb=34382091d27e41e1f2ff4eafb3ffa434957c7a7a;hpb=d00ca5b2db3115e0b9af6677d6bec85a2755eb14 diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 3b23638e71a..3e18c4a4c19 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -97,11 +97,6 @@ static GTY(()) VEC(tree,gc) *deferred_fns; int at_eof; -/* Functions called along with real static constructors and destructors. */ - -tree static_ctors; -tree static_dtors; - /* Return a member function type (a METHOD_TYPE), given FNTYPE (a @@ -141,6 +136,12 @@ cp_build_parm_decl (tree name, tree type) sees templates. */ if (!processing_template_decl) DECL_ARG_TYPE (parm) = type_passed_as (type); + + /* If the type is a pack expansion, then we have a function + parameter pack. */ + if (type && TREE_CODE (type) == TYPE_PACK_EXPANSION) + FUNCTION_PARAMETER_PACK_P (parm) = 1; + return parm; } @@ -445,13 +446,8 @@ check_member_template (tree tmpl) || (TREE_CODE (decl) == TYPE_DECL && IS_AGGR_TYPE (TREE_TYPE (decl)))) { - if (current_function_decl) - /* 14.5.2.2 [temp.mem] - - A local class shall not have member templates. */ - error ("invalid declaration of member template %q#D in local class", - decl); - + /* The parser rejects template declarations in local classes. */ + gcc_assert (!current_function_decl); /* The parser rejects any use of virtual in a function template. */ gcc_assert (!(TREE_CODE (decl) == FUNCTION_DECL && DECL_VIRTUAL_P (decl))); @@ -1399,7 +1395,7 @@ import_export_class (tree ctype) if (MULTIPLE_SYMBOL_SPACES && import_export == -1) import_export = 0; - /* Allow backends the chance to overrule the decision. */ + /* Allow back ends the chance to overrule the decision. */ if (targetm.cxx.import_export_class) import_export = targetm.cxx.import_export_class (ctype, import_export); @@ -1415,7 +1411,7 @@ import_export_class (tree ctype) static bool var_finalized_p (tree var) { - return cgraph_varpool_node (var)->finalized; + return varpool_node (var)->finalized; } /* DECL is a VAR_DECL or FUNCTION_DECL which, for whatever reason, @@ -1451,7 +1447,7 @@ decl_needed_p (tree decl) emitted; they may be referred to from other object files. */ if (TREE_PUBLIC (decl) && !DECL_COMDAT (decl)) return true; - /* If this entity was used, let the back-end see it; it will decide + /* If this entity was used, let the back end see it; it will decide whether or not to emit it into the object file. */ if (TREE_USED (decl) || (DECL_ASSEMBLER_NAME_SET_P (decl) @@ -1860,13 +1856,17 @@ constrain_class_visibility (tree type) for (t = TYPE_FIELDS (type); t; t = TREE_CHAIN (t)) if (TREE_CODE (t) == FIELD_DECL && TREE_TYPE (t) != error_mark_node) { - tree ftype = strip_array_types (TREE_TYPE (t)); + tree ftype = strip_pointer_or_array_types (TREE_TYPE (t)); int subvis = type_visibility (ftype); if (subvis == VISIBILITY_ANON) - warning (0, "\ + { + if (strcmp (main_input_filename, + DECL_SOURCE_FILE (TYPE_MAIN_DECL (ftype)))) + warning (0, "\ %qT has a field %qD whose type uses the anonymous namespace", - type, t); + type, t); + } else if (IS_AGGR_TYPE (ftype) && vis < VISIBILITY_HIDDEN && subvis >= VISIBILITY_HIDDEN) @@ -1881,9 +1881,13 @@ constrain_class_visibility (tree type) int subvis = type_visibility (TREE_TYPE (t)); if (subvis == VISIBILITY_ANON) - warning (0, "\ + { + if (strcmp (main_input_filename, + DECL_SOURCE_FILE (TYPE_MAIN_DECL (TREE_TYPE (t))))) + warning (0, "\ %qT has a base %qT whose type uses the anonymous namespace", - type, TREE_TYPE (t)); + type, TREE_TYPE (t)); + } else if (vis < VISIBILITY_HIDDEN && subvis >= VISIBILITY_HIDDEN) warning (OPT_Wattributes, "\ @@ -2186,10 +2190,7 @@ build_cleanup (tree decl) if (TREE_CODE (type) == ARRAY_TYPE) temp = decl; else - { - cxx_mark_addressable (decl); - temp = build1 (ADDR_EXPR, build_pointer_type (type), decl); - } + temp = build_address (decl); temp = build_delete (TREE_TYPE (temp), temp, sfk_complete_destructor, LOOKUP_NORMAL|LOOKUP_NONVIRTUAL|LOOKUP_DESTRUCTOR, 0); @@ -2324,14 +2325,12 @@ start_objects (int method_type, int initp) sprintf (type, "%c", method_type); fndecl = build_lang_decl (FUNCTION_DECL, - get_file_function_name_long (type), + get_file_function_name (type), build_function_type (void_type_node, void_list_node)); start_preparsed_function (fndecl, /*attrs=*/NULL_TREE, SF_PRE_PARSED); - /* It can be a static function as long as collect2 does not have - to scan the object file to find its ctor/dtor routine. */ - TREE_PUBLIC (current_function_decl) = ! targetm.have_ctors_dtors; + TREE_PUBLIC (current_function_decl) = 0; /* Mark this declaration as used to avoid spurious warnings. */ TREE_USED (current_function_decl) = 1; @@ -2345,13 +2344,6 @@ start_objects (int method_type, int initp) body = begin_compound_stmt (BCS_FN_BODY); - /* We cannot allow these functions to be elided, even if they do not - have external linkage. And, there's no point in deferring - compilation of these functions; they're all going to have to be - out anyhow. */ - DECL_INLINE (current_function_decl) = 0; - DECL_UNINLINABLE (current_function_decl) = 1; - return body; } @@ -2366,23 +2358,19 @@ finish_objects (int method_type, int initp, tree body) /* Finish up. */ finish_compound_stmt (body); fn = finish_function (0); - expand_or_defer_fn (fn); - /* When only doing semantic analysis, and no RTL generation, we - can't call functions that directly emit assembly code; there is - no assembly file in which to put the code. */ - if (flag_syntax_only) - return; - - if (targetm.have_ctors_dtors) + if (method_type == 'I') { - rtx fnsym = XEXP (DECL_RTL (fn), 0); - cgraph_mark_needed_node (cgraph_node (fn)); - if (method_type == 'I') - (* targetm.asm_out.constructor) (fnsym, initp); - else - (* targetm.asm_out.destructor) (fnsym, initp); + DECL_STATIC_CONSTRUCTOR (fn) = 1; + decl_init_priority_insert (fn, initp); } + else + { + DECL_STATIC_DESTRUCTOR (fn) = 1; + decl_fini_priority_insert (fn, initp); + } + + expand_or_defer_fn (fn); } /* The names of the parameters to the function created to handle @@ -2449,6 +2437,7 @@ start_static_storage_duration_function (unsigned count) type); TREE_PUBLIC (ssdf_decl) = 0; DECL_ARTIFICIAL (ssdf_decl) = 1; + DECL_INLINE (ssdf_decl) = 1; /* Put this function in the list of functions to be called from the static constructors and destructors. */ @@ -2502,11 +2491,6 @@ start_static_storage_duration_function (unsigned count) /* Set up the scope of the outermost block in the function. */ body = begin_compound_stmt (BCS_FN_BODY); - /* This function must not be deferred because we are depending on - its compilation to tell us what is TREE_SYMBOL_REFERENCED. */ - DECL_INLINE (ssdf_decl) = 0; - DECL_UNINLINABLE (ssdf_decl) = 1; - return body; } @@ -2829,7 +2813,7 @@ write_out_vars (tree vars) } /* Generate a static constructor (if CONSTRUCTOR_P) or destructor - (otherwise) that will initialize all gobal objects with static + (otherwise) that will initialize all global objects with static storage duration having the indicated PRIORITY. */ static void @@ -2863,7 +2847,7 @@ generate_ctor_or_dtor_function (bool constructor_p, int priority, && constructor_p && objc_static_init_needed_p ()) { body = start_objects (function_key, priority); - static_ctors = objc_generate_static_init_call (static_ctors); + objc_generate_static_init_call (NULL_TREE); } /* Call the static storage duration function with appropriate @@ -2886,29 +2870,6 @@ generate_ctor_or_dtor_function (bool constructor_p, int priority, } } - /* If we're generating code for the DEFAULT_INIT_PRIORITY, throw in - calls to any functions marked with attributes indicating that - they should be called at initialization- or destruction-time. */ - if (priority == DEFAULT_INIT_PRIORITY) - { - tree fns; - - for (fns = constructor_p ? static_ctors : static_dtors; - fns; - fns = TREE_CHAIN (fns)) - { - fndecl = TREE_VALUE (fns); - - /* Calls to pure/const functions will expand to nothing. */ - if (! (flags_from_decl_or_type (fndecl) & (ECF_CONST | ECF_PURE))) - { - if (! body) - body = start_objects (function_key, priority); - finish_expr_stmt (build_function_call (fndecl, NULL_TREE)); - } - } - } - /* Close out the function. */ if (body) finish_objects (function_key, priority, body); @@ -2926,11 +2887,9 @@ generate_ctor_and_dtor_functions_for_priority (splay_tree_node n, void * data) /* Generate the functions themselves, but only if they are really needed. */ - if (pi->initializations_p - || (priority == DEFAULT_INIT_PRIORITY && static_ctors)) + if (pi->initializations_p) generate_ctor_or_dtor_function (/*constructor_p=*/true, priority, locus); - if (pi->destructions_p - || (priority == DEFAULT_INIT_PRIORITY && static_dtors)) + if (pi->destructions_p) generate_ctor_or_dtor_function (/*constructor_p=*/false, priority, locus); /* Keep iterating. */ @@ -2938,7 +2897,7 @@ generate_ctor_and_dtor_functions_for_priority (splay_tree_node n, void * data) } /* Called via LANGHOOK_CALLGRAPH_ANALYZE_EXPR. It is supposed to mark - decls referenced from frontend specific constructs; it will be called + decls referenced from front-end specific constructs; it will be called only for language-specific tree nodes. Here we must deal with member pointers. */ @@ -3027,13 +2986,13 @@ build_java_method_aliases (void) } } -/* This routine is called from the last rule in yyparse (). +/* This routine is called at the end of compilation. Its job is to create all the code needed to initialize and destroy the global aggregates. We do the destruction first, since that way we only need to reverse the decls once. */ void -cp_finish_file (void) +cp_write_global_declarations (void) { tree vars; bool reconsider; @@ -3151,7 +3110,7 @@ cp_finish_file (void) through the loop. That's because we need to know which vtables have been referenced, and TREE_SYMBOL_REFERENCED isn't computed until a function is finished, and written - out. That's a deficiency in the back-end. When this is + out. That's a deficiency in the back end. When this is fixed, these initialization functions could all become inline, with resulting performance improvements. */ tree ssdf_body; @@ -3226,7 +3185,7 @@ cp_finish_file (void) if (!DECL_SAVED_TREE (decl)) continue; - /* We lie to the back-end, pretending that some functions + /* We lie to the back end, pretending that some functions are not defined when they really are. This keeps these functions from being put out unnecessarily. But, we must stop lying when the functions are referenced, or if they @@ -3325,17 +3284,11 @@ cp_finish_file (void) splay_tree_foreach (priority_info_map, generate_ctor_and_dtor_functions_for_priority, /*data=*/&locus); - else - { - /* If we have a ctor or this is obj-c++ and we need a static init, - call generate_ctor_or_dtor_function. */ - if (static_ctors || (c_dialect_objc () && objc_static_init_needed_p ())) - generate_ctor_or_dtor_function (/*constructor_p=*/true, - DEFAULT_INIT_PRIORITY, &locus); - if (static_dtors) - generate_ctor_or_dtor_function (/*constructor_p=*/false, - DEFAULT_INIT_PRIORITY, &locus); - } + else if (c_dialect_objc () && objc_static_init_needed_p ()) + /* If this is obj-c++ and we need a static init, call + generate_ctor_or_dtor_function. */ + generate_ctor_or_dtor_function (/*constructor_p=*/true, + DEFAULT_INIT_PRIORITY, &locus); /* We're done with the splay-tree now. */ if (priority_info_map) @@ -3417,7 +3370,7 @@ build_offset_ref_call_from_tree (tree fn, tree args) || TREE_CODE (fn) == MEMBER_REF); if (type_dependent_expression_p (fn) || any_type_dependent_arguments_p (args)) - return build_min_nt (CALL_EXPR, fn, args, NULL_TREE); + return build_nt_call_list (fn, args); /* Transform the arguments and add the implicit "this" parameter. That must be done before the FN is transformed @@ -3447,7 +3400,7 @@ build_offset_ref_call_from_tree (tree fn, tree args) expr = build_function_call (fn, args); if (processing_template_decl && expr != error_mark_node) - return build_min_non_dep (CALL_EXPR, expr, orig_fn, orig_args, NULL_TREE); + return build_min_non_dep_call_list (expr, orig_fn, orig_args); return expr; }