diff options
Diffstat (limited to 'gcc/cp/typeck2.c')
| -rw-r--r-- | gcc/cp/typeck2.c | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 5ed7818732f..e66842733a0 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -586,7 +586,7 @@ split_nonconstant_init (tree dest, tree init) for static variable. In that case, caller must emit the code. */ tree -store_init_value (tree decl, tree init) +store_init_value (tree decl, tree init, int flags) { tree value, type; @@ -628,7 +628,7 @@ store_init_value (tree decl, tree init) /* End of special C++ code. */ /* Digest the specified initializer into an expression. */ - value = digest_init (type, init); + value = digest_init_flags (type, init, flags); /* If the initializer is not a constant, fill in DECL_INITIAL with the bits that are constant, and then return an expression that will perform the dynamic initialization. */ @@ -717,7 +717,7 @@ check_narrowing (tree type, tree init) NESTED is true iff we are being called for an element of a CONSTRUCTOR. */ static tree -digest_init_r (tree type, tree init, bool nested) +digest_init_r (tree type, tree init, bool nested, int flags) { enum tree_code code = TREE_CODE (type); @@ -796,9 +796,9 @@ digest_init_r (tree type, tree init, bool nested) if (cxx_dialect != cxx98 && nested) check_narrowing (type, init); - init = convert_for_initialization (0, type, init, LOOKUP_NORMAL, + init = convert_for_initialization (0, type, init, flags, "initialization", NULL_TREE, 0, - tf_warning_or_error); + tf_warning_or_error); exp = &init; /* Skip any conversions since we'll be outputting the underlying @@ -842,7 +842,7 @@ digest_init_r (tree type, tree init, bool nested) } return convert_for_initialization (NULL_TREE, type, init, - LOOKUP_NORMAL | LOOKUP_ONLYCONVERTING, + flags, "initialization", NULL_TREE, 0, tf_warning_or_error); } @@ -851,7 +851,13 @@ digest_init_r (tree type, tree init, bool nested) tree digest_init (tree type, tree init) { - return digest_init_r (type, init, false); + return digest_init_r (type, init, false, LOOKUP_IMPLICIT); +} + +tree +digest_init_flags (tree type, tree init, int flags) +{ + return digest_init_r (type, init, false, flags); } /* Set of flags used within process_init_constructor to describe the @@ -924,7 +930,7 @@ process_init_constructor_array (tree type, tree init) else ce->index = size_int (i); gcc_assert (ce->value); - ce->value = digest_init_r (TREE_TYPE (type), ce->value, true); + ce->value = digest_init_r (TREE_TYPE (type), ce->value, true, LOOKUP_IMPLICIT); if (ce->value != error_mark_node) gcc_assert (same_type_ignoring_top_level_qualifiers_p @@ -1031,7 +1037,7 @@ process_init_constructor_record (tree type, tree init) } gcc_assert (ce->value); - next = digest_init_r (type, ce->value, true); + next = digest_init_r (type, ce->value, true, LOOKUP_IMPLICIT); ++idx; } else if (TYPE_NEEDS_CONSTRUCTING (TREE_TYPE (field))) @@ -1046,7 +1052,7 @@ process_init_constructor_record (tree type, tree init) else next = build_constructor (init_list_type_node, NULL); - next = digest_init_r (TREE_TYPE (field), next, true); + next = digest_init_r (TREE_TYPE (field), next, true, LOOKUP_IMPLICIT); /* Warn when some struct elements are implicitly initialized. */ warning (OPT_Wmissing_field_initializers, @@ -1156,7 +1162,7 @@ process_init_constructor_union (tree type, tree init) } if (ce->value && ce->value != error_mark_node) - ce->value = digest_init_r (TREE_TYPE (ce->index), ce->value, true); + ce->value = digest_init_r (TREE_TYPE (ce->index), ce->value, true, LOOKUP_IMPLICIT); return picflag_from_initializer (ce->value); } @@ -1436,6 +1442,7 @@ build_functional_cast (tree exp, tree parms, tsubst_flags_t complain) /* The type to which we are casting. */ tree type; + VEC(tree,gc) *parmvec; if (exp == error_mark_node || parms == error_mark_node) return error_mark_node; @@ -1506,8 +1513,12 @@ build_functional_cast (tree exp, tree parms, tsubst_flags_t complain) } /* Call the constructor. */ - exp = build_special_member_call (NULL_TREE, complete_ctor_identifier, parms, - type, LOOKUP_NORMAL, complain); + parmvec = make_tree_vector (); + for (; parms != NULL_TREE; parms = TREE_CHAIN (parms)) + VEC_safe_push (tree, gc, parmvec, TREE_VALUE (parms)); + exp = build_special_member_call (NULL_TREE, complete_ctor_identifier, + &parmvec, type, LOOKUP_NORMAL, complain); + release_tree_vector (parmvec); if (exp == error_mark_node) return error_mark_node; |