/* Handle initialization things in C++.
Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
Contributed by Michael Tiemann (tiemann@cygnus.com)
This file is part of GCC.
#include "output.h"
#include "except.h"
#include "toplev.h"
+#include "target.h"
static bool begin_init_stmts (tree *, tree *);
static tree finish_init_stmts (bool, tree, tree);
static tree dfs_initialize_vtbl_ptrs (tree, void *);
static tree build_default_init (tree, tree);
static tree build_new_1 (tree);
-static tree get_cookie_size (tree);
static tree build_dtor_call (tree, special_function_kind, int);
static tree build_field_list (tree, tree, int *);
static tree build_vtbl_address (tree);
begin_init_stmts (tree *stmt_expr_p, tree *compound_stmt_p)
{
bool is_global = !building_stmt_tree ();
-
+
*stmt_expr_p = begin_stmt_expr ();
- *compound_stmt_p = begin_compound_stmt (/*has_no_scope=*/true);
+ *compound_stmt_p = begin_compound_stmt (BCS_NO_SCOPE);
return is_global;
}
static tree
finish_init_stmts (bool is_global, tree stmt_expr, tree compound_stmt)
-{
+{
finish_compound_stmt (compound_stmt);
-
+
stmt_expr = finish_stmt_expr (stmt_expr, true);
- my_friendly_assert (!building_stmt_tree () == is_global, 20030726);
-
+ gcc_assert (!building_stmt_tree () == is_global);
+
return stmt_expr;
}
static tree
dfs_initialize_vtbl_ptrs (tree binfo, void *data)
{
- if ((!BINFO_PRIMARY_P (binfo) || TREE_VIA_VIRTUAL (binfo))
- && CLASSTYPE_VFIELDS (BINFO_TYPE (binfo)))
+ if (!TYPE_CONTAINS_VPTR_P (BINFO_TYPE (binfo)))
+ return dfs_skip_bases;
+
+ if (!BINFO_PRIMARY_P (binfo) || BINFO_VIRTUAL_P (binfo))
{
tree base_ptr = TREE_VALUE ((tree) data);
expand_virtual_init (binfo, base_ptr);
}
- BINFO_MARKED (binfo) = 1;
-
return NULL_TREE;
}
class. We do these in pre-order because we can't find the virtual
bases for a class until we've initialized the vtbl for that
class. */
- dfs_walk_real (TYPE_BINFO (type), dfs_initialize_vtbl_ptrs,
- NULL, unmarkedp, list);
- dfs_walk (TYPE_BINFO (type), dfs_unmark, markedp, type);
+ dfs_walk_once (TYPE_BINFO (type), dfs_initialize_vtbl_ptrs, NULL, list);
}
/* Return an expression for the zero-initialization of an object with
To zero-initialization storage for an object of type T means:
-- if T is a scalar type, the storage is set to the value of zero
- converted to T.
+ converted to T.
-- if T is a non-union class type, the storage for each nonstatic
- data member and each base-class subobject is zero-initialized.
+ data member and each base-class subobject is zero-initialized.
-- if T is a union type, the storage for its first data member is
- zero-initialized.
+ zero-initialized.
-- if T is an array type, the storage for each element is
- zero-initialized.
+ zero-initialized.
-- if T is a reference type, no initialization is performed. */
- my_friendly_assert (nelts == NULL_TREE || TREE_CODE (nelts) == INTEGER_CST,
- 20030618);
+ gcc_assert (nelts == NULL_TREE || TREE_CODE (nelts) == INTEGER_CST);
if (type == error_mark_node)
;
over TYPE_FIELDs will result in correct initialization of
all of the subobjects. */
if (static_storage_p && !zero_init_p (TREE_TYPE (field)))
- inits = tree_cons (field,
+ inits = tree_cons (field,
build_zero_init (TREE_TYPE (field),
/*nelts=*/NULL_TREE,
static_storage_p),
}
else if (TREE_CODE (type) == ARRAY_TYPE)
{
- tree index;
tree max_index;
tree inits;
init = build_constructor (type, NULL_TREE);
/* Iterate over the array elements, building initializations. */
inits = NULL_TREE;
- max_index = nelts ? nelts : array_type_nelts (type);
- my_friendly_assert (TREE_CODE (max_index) == INTEGER_CST, 20030618);
-
- for (index = size_zero_node;
- !tree_int_cst_lt (max_index, index);
- index = size_binop (PLUS_EXPR, index, size_one_node))
- inits = tree_cons (index,
- build_zero_init (TREE_TYPE (type),
- /*nelts=*/NULL_TREE,
- static_storage_p),
- inits);
+ if (nelts)
+ max_index = fold_build2 (MINUS_EXPR, TREE_TYPE (nelts),
+ nelts, integer_one_node);
+ else
+ max_index = array_type_nelts (type);
+ gcc_assert (TREE_CODE (max_index) == INTEGER_CST);
+
+ /* A zero-sized array, which is accepted as an extension, will
+ have an upper bound of -1. */
+ if (!tree_int_cst_equal (max_index, integer_minus_one_node))
+ {
+ tree elt_init = build_zero_init (TREE_TYPE (type),
+ /*nelts=*/NULL_TREE,
+ static_storage_p);
+ tree range;
+
+ /* If this is a one element array, we just use a regular init. */
+ if (tree_int_cst_equal (size_zero_node, max_index))
+ range = size_zero_node;
+ else
+ range = build2 (RANGE_EXPR, sizetype, size_zero_node, max_index);
+
+ inits = tree_cons (range, elt_init, inits);
+ }
+
CONSTRUCTOR_ELTS (init) = nreverse (inits);
}
- else if (TREE_CODE (type) == REFERENCE_TYPE)
- ;
else
- abort ();
+ gcc_assert (TREE_CODE (type) == REFERENCE_TYPE);
/* In all cases, the initializer is a constant. */
if (init)
- TREE_CONSTANT (init) = 1;
+ {
+ TREE_CONSTANT (init) = 1;
+ TREE_INVARIANT (init) = 1;
+ }
return init;
}
a class with a pointer-to-data member as a non-static data member
does not have TYPE_NEEDS_CONSTRUCTING set.) Therefore, we end up
passing non-PODs to build_zero_init below, which is contrary to
- the semantics quoted above from [dcl.init].
+ the semantics quoted above from [dcl.init].
It happens, however, that the behavior of the constructor the
standard says we should have generated would be precisely the
if (TYPE_NEEDS_CONSTRUCTING (type)
|| (nelts && TREE_CODE (nelts) != INTEGER_CST))
return NULL_TREE;
-
+
/* At this point, TYPE is either a POD class type, an array of POD
classes, or something even more innocuous. */
return build_zero_init (type, nelts, /*static_storage_p=*/false);
/* Effective C++ rule 12 requires that all data members be
initialized. */
if (warn_ecpp && !explicit && TREE_CODE (type) != ARRAY_TYPE)
- warning ("`%D' should be initialized in the member initialization "
- "list",
- member);
+ warning (0, "%J%qD should be initialized in the member initialization "
+ "list", current_function_decl, member);
if (init == void_type_node)
init = NULL_TREE;
{
if (init)
{
- init = build (INIT_EXPR, type, decl, TREE_VALUE (init));
+ init = build2 (INIT_EXPR, type, decl, TREE_VALUE (init));
finish_expr_stmt (init);
}
}
- else if (TYPE_NEEDS_CONSTRUCTING (type)
- || (init && TYPE_HAS_CONSTRUCTOR (type)))
+ else if (TYPE_NEEDS_CONSTRUCTING (type))
{
if (explicit
&& TREE_CODE (type) == ARRAY_TYPE
{
init = build_default_init (type, /*nelts=*/NULL_TREE);
if (TREE_CODE (type) == REFERENCE_TYPE)
- warning
- ("default-initialization of `%#D', which has reference type",
- member);
+ warning (0, "%Jdefault-initialization of %q#D, "
+ "which has reference type",
+ current_function_decl, member);
}
/* member traversal: note it leaves init NULL */
else if (TREE_CODE (type) == REFERENCE_TYPE)
- pedwarn ("uninitialized reference member `%D'", member);
+ pedwarn ("%Juninitialized reference member %qD",
+ current_function_decl, member);
+ else if (CP_TYPE_CONST_P (type))
+ pedwarn ("%Juninitialized member %qD with %<const%> type %qT",
+ current_function_decl, member, type);
}
else if (TREE_CODE (init) == TREE_LIST)
/* There was an explicit member initialization. Do some work
/* Returns a TREE_LIST containing (as the TREE_PURPOSE of each node) all
the FIELD_DECLs on the TYPE_FIELDS list for T, in reverse order. */
-static tree
+static tree
build_field_list (tree t, tree list, int *uses_unions_p)
{
tree fields;
/* Skip CONST_DECLs for enumeration constants and so forth. */
if (TREE_CODE (fields) != FIELD_DECL || DECL_ARTIFICIAL (fields))
continue;
-
+
/* Keep track of whether or not any fields are unions. */
if (TREE_CODE (TREE_TYPE (fields)) == UNION_TYPE)
*uses_unions_p = 1;
initialize the entire aggregate. */
list = tree_cons (fields, NULL_TREE, list);
/* And now add the fields in the anonymous aggregate. */
- list = build_field_list (TREE_TYPE (fields), list,
+ list = build_field_list (TREE_TYPE (fields), list,
uses_unions_p);
}
/* Add this field. */
sort_mem_initializers (tree t, tree mem_inits)
{
tree init;
- tree base;
+ tree base, binfo, base_binfo;
tree sorted_inits;
tree next_subobject;
+ VEC(tree,gc) *vbases;
int i;
int uses_unions_p;
TREE_VALUE will be the constructor arguments, or NULL if no
explicit initialization was provided. */
sorted_inits = NULL_TREE;
+
/* Process the virtual bases. */
- for (base = CLASSTYPE_VBASECLASSES (t); base; base = TREE_CHAIN (base))
- sorted_inits = tree_cons (TREE_VALUE (base), NULL_TREE, sorted_inits);
+ for (vbases = CLASSTYPE_VBASECLASSES (t), i = 0;
+ VEC_iterate (tree, vbases, i, base); i++)
+ sorted_inits = tree_cons (base, NULL_TREE, sorted_inits);
+
/* Process the direct bases. */
- for (i = 0; i < CLASSTYPE_N_BASECLASSES (t); ++i)
- {
- base = BINFO_BASETYPE (TYPE_BINFO (t), i);
- if (!TREE_VIA_VIRTUAL (base))
- sorted_inits = tree_cons (base, NULL_TREE, sorted_inits);
- }
+ for (binfo = TYPE_BINFO (t), i = 0;
+ BINFO_BASE_ITERATE (binfo, i, base_binfo); ++i)
+ if (!BINFO_VIRTUAL_P (base_binfo))
+ sorted_inits = tree_cons (base_binfo, NULL_TREE, sorted_inits);
+
/* Process the non-static data members. */
sorted_inits = build_field_list (t, sorted_inits, &uses_unions_p);
/* Reverse the entire list of initializations, so that they are in
subobject = TREE_PURPOSE (init);
/* If the explicit initializers are in sorted order, then
- SUBOBJECT will be NEXT_SUBOBJECT, or something following
+ SUBOBJECT will be NEXT_SUBOBJECT, or something following
it. */
- for (subobject_init = next_subobject;
- subobject_init;
+ for (subobject_init = next_subobject;
+ subobject_init;
subobject_init = TREE_CHAIN (subobject_init))
if (TREE_PURPOSE (subobject_init) == subobject)
break;
/* Issue a warning if the explicit initializer order does not
- match that which will actually occur. */
+ match that which will actually occur.
+ ??? Are all these on the correct lines? */
if (warn_reorder && !subobject_init)
{
if (TREE_CODE (TREE_PURPOSE (next_subobject)) == FIELD_DECL)
- cp_warning_at ("`%D' will be initialized after",
+ cp_warning_at ("%qD will be initialized after",
TREE_PURPOSE (next_subobject));
else
- warning ("base `%T' will be initialized after",
+ warning (0, "base %qT will be initialized after",
TREE_PURPOSE (next_subobject));
if (TREE_CODE (subobject) == FIELD_DECL)
- cp_warning_at (" `%#D'", subobject);
+ cp_warning_at (" %q#D", subobject);
else
- warning (" base `%T'", subobject);
+ warning (0, " base %qT", subobject);
+ warning (0, "%J when initialized here", current_function_decl);
}
/* Look again, from the beginning of the list. */
while (TREE_PURPOSE (subobject_init) != subobject)
subobject_init = TREE_CHAIN (subobject_init);
}
-
+
/* It is invalid to initialize the same subobject more than
once. */
if (TREE_VALUE (subobject_init))
{
if (TREE_CODE (subobject) == FIELD_DECL)
- error ("multiple initializations given for `%D'", subobject);
+ error ("%Jmultiple initializations given for %qD",
+ current_function_decl, subobject);
else
- error ("multiple initializations given for base `%T'",
- subobject);
+ error ("%Jmultiple initializations given for base %qT",
+ current_function_decl, subobject);
}
/* Record the initialization. */
int done;
/* Skip uninitialized members and base classes. */
- if (!TREE_VALUE (init)
+ if (!TREE_VALUE (init)
|| TREE_CODE (TREE_PURPOSE (init)) != FIELD_DECL)
continue;
/* See if this field is a member of a union, or a member of a
if (same_type_p (last_field_type, field_type))
{
if (TREE_CODE (field_type) == UNION_TYPE)
- error ("initializations for multiple members of `%T'",
- last_field_type);
+ error ("%Jinitializations for multiple members of %qT",
+ current_function_decl, last_field_type);
done = 1;
break;
}
last_field_type = TYPE_CONTEXT (last_field_type);
}
-
+
/* If we've reached the outermost class, then we're
done. */
if (same_type_p (field_type, t))
void
emit_mem_initializers (tree mem_inits)
{
+ /* We will already have issued an error message about the fact that
+ the type is incomplete. */
+ if (!COMPLETE_TYPE_P (current_class_type))
+ return;
+
/* Sort the mem-initializers into the order in which the
initializations should be performed. */
mem_inits = sort_mem_initializers (current_class_type, mem_inits);
in_base_initializer = 1;
-
+
/* Initialize base classes. */
- while (mem_inits
+ while (mem_inits
&& TREE_CODE (TREE_PURPOSE (mem_inits)) != FIELD_DECL)
{
tree subobject = TREE_PURPOSE (mem_inits);
/* If these initializations are taking place in a copy
constructor, the base class should probably be explicitly
initialized. */
- if (extra_warnings && !arguments
+ if (extra_warnings && !arguments
&& DECL_COPY_CONSTRUCTOR_P (current_function_decl)
&& TYPE_NEEDS_CONSTRUCTING (BINFO_TYPE (subobject)))
- warning ("base class `%#T' should be explicitly initialized in the "
+ warning (0, "%Jbase class %q#T should be explicitly initialized in the "
"copy constructor",
- BINFO_TYPE (subobject));
+ current_function_decl, BINFO_TYPE (subobject));
/* If an explicit -- but empty -- initializer list was present,
treat it just like default initialization at this point. */
arguments = NULL_TREE;
/* Initialize the base. */
- if (TREE_VIA_VIRTUAL (subobject))
+ if (BINFO_VIRTUAL_P (subobject))
construct_virtual_base (subobject, arguments);
else
{
tree base_addr;
-
+
base_addr = build_base_path (PLUS_EXPR, current_class_ptr,
subobject, 1);
expand_aggr_init_1 (subobject, NULL_TREE,
- build_indirect_ref (base_addr, NULL),
+ build_indirect_ref (base_addr, NULL),
arguments,
LOOKUP_NORMAL);
expand_cleanup_for_base (subobject, NULL_TREE);
/* Initialize the vptrs. */
initialize_vtbl_ptrs (current_class_ptr);
-
+
/* Initialize the data members. */
while (mem_inits)
{
tree binfo_for = binfo;
tree vtbl;
- if (BINFO_VPTR_INDEX (binfo) && TREE_VIA_VIRTUAL (binfo)
- && BINFO_PRIMARY_P (binfo))
+ if (BINFO_VPTR_INDEX (binfo) && BINFO_VIRTUAL_P (binfo))
/* If this is a virtual primary base, then the vtable we want to store
is that for the base this is being used as the primary base of. We
can't simply skip the initialization, because we may be expanding the
inits of a subobject constructor where the virtual base layout
can be different. */
- while (BINFO_PRIMARY_BASE_OF (binfo_for))
- binfo_for = BINFO_PRIMARY_BASE_OF (binfo_for);
+ while (BINFO_PRIMARY_P (binfo_for))
+ binfo_for = BINFO_INHERITANCE_CHAIN (binfo_for);
/* Figure out what vtable BINFO's vtable is based on, and mark it as
used. */
TREE_USED (vtbl) = 1;
/* Now compute the address to use when initializing the vptr. */
- vtbl = BINFO_VTABLE (binfo_for);
+ vtbl = unshare_expr (BINFO_VTABLE (binfo_for));
if (TREE_CODE (vtbl) == VAR_DECL)
- {
- vtbl = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (vtbl)), vtbl);
- TREE_CONSTANT (vtbl) = 1;
- }
+ vtbl = build1 (ADDR_EXPR, build_pointer_type (TREE_TYPE (vtbl)), vtbl);
return vtbl;
}
/* Compute the value to use, when there's a VTT. */
vtt_parm = current_vtt_parm;
- vtbl2 = build (PLUS_EXPR,
- TREE_TYPE (vtt_parm),
- vtt_parm,
- vtt_index);
- vtbl2 = build1 (INDIRECT_REF, TREE_TYPE (vtbl), vtbl2);
+ vtbl2 = build2 (PLUS_EXPR,
+ TREE_TYPE (vtt_parm),
+ vtt_parm,
+ vtt_index);
+ vtbl2 = build_indirect_ref (vtbl2, NULL);
+ vtbl2 = convert (TREE_TYPE (vtbl), vtbl2);
/* The actual initializer is the VTT value only in the subobject
constructor. In maybe_clone_body we'll substitute NULL for
the vtt_parm in the case of the non-subobject constructor. */
- vtbl = build (COND_EXPR,
- TREE_TYPE (vtbl),
- build (EQ_EXPR, boolean_type_node,
- current_in_charge_parm, integer_zero_node),
- vtbl2,
- vtbl);
+ vtbl = build3 (COND_EXPR,
+ TREE_TYPE (vtbl),
+ build2 (EQ_EXPR, boolean_type_node,
+ current_in_charge_parm, integer_zero_node),
+ vtbl2,
+ vtbl);
}
/* Compute the location of the vtpr. */
vtbl_ptr = build_vfield_ref (build_indirect_ref (decl, NULL),
TREE_TYPE (binfo));
- my_friendly_assert (vtbl_ptr != error_mark_node, 20010730);
+ gcc_assert (vtbl_ptr != error_mark_node);
/* Assign the vtable to the vptr. */
vtbl = convert_force (TREE_TYPE (vtbl_ptr), vtbl, 0);
return;
/* Call the destructor. */
- expr = build_special_member_call (current_class_ref,
+ expr = build_special_member_call (current_class_ref,
base_dtor_identifier,
NULL_TREE,
binfo,
LOOKUP_NORMAL | LOOKUP_NONVIRTUAL);
if (flag)
- expr = fold (build (COND_EXPR, void_type_node,
+ expr = fold_build3 (COND_EXPR, void_type_node,
c_common_truthvalue_conversion (flag),
- expr, integer_zero_node));
+ expr, integer_zero_node);
finish_eh_cleanup (expr);
}
construct_virtual_base (tree vbase, tree arguments)
{
tree inner_if_stmt;
- tree compound_stmt;
tree exp;
- tree flag;
+ tree flag;
/* If there are virtual base classes with destructors, we need to
emit cleanups to destroy them if an exception is thrown during
flag = TREE_CHAIN (DECL_ARGUMENTS (current_function_decl));
inner_if_stmt = begin_if_stmt ();
finish_if_stmt_cond (flag, inner_if_stmt);
- compound_stmt = begin_compound_stmt (/*has_no_scope=*/true);
/* Compute the location of the virtual base. If we're
constructing virtual bases, then we must be the most derived
we already know where it is. */
exp = convert_to_base_statically (current_class_ref, vbase);
- expand_aggr_init_1 (vbase, current_class_ref, exp, arguments,
+ expand_aggr_init_1 (vbase, current_class_ref, exp, arguments,
LOOKUP_COMPLAIN);
- finish_compound_stmt (compound_stmt);
finish_then_clause (inner_if_stmt);
- finish_if_stmt ();
+ finish_if_stmt (inner_if_stmt);
expand_cleanup_for_base (vbase, flag);
}
is erroneous. FIELD is the member we decided to initialize.
TYPE is the type for which the initialization is being performed.
FIELD must be a member of TYPE.
-
+
MEMBER_NAME is the name of the member. */
static int
return 0;
if (!field)
{
- error ("class `%T' does not have any field named `%D'", type,
+ error ("class %qT does not have any field named %qD", type,
member_name);
return 0;
}
if (TREE_CODE (field) == VAR_DECL)
{
- error ("`%#D' is a static data member; it can only be "
+ error ("%q#D is a static data member; it can only be "
"initialized at its definition",
field);
return 0;
}
if (TREE_CODE (field) != FIELD_DECL)
{
- error ("`%#D' is not a non-static data member of `%T'",
+ error ("%q#D is not a non-static data member of %qT",
field, type);
return 0;
}
if (initializing_context (field) != type)
{
- error ("class `%T' does not have any field named `%D'", type,
+ error ("class %qT does not have any field named %qD", type,
member_name);
return 0;
}
{
/* This is an obsolete unnamed base class initializer. The
parser will already have warned about its use. */
- switch (CLASSTYPE_N_BASECLASSES (current_class_type))
+ switch (BINFO_N_BASE_BINFOS (TYPE_BINFO (current_class_type)))
{
case 0:
- error ("unnamed initializer for `%T', which has no base classes",
+ error ("unnamed initializer for %qT, which has no base classes",
current_class_type);
return NULL_TREE;
case 1:
- basetype = TYPE_BINFO_BASETYPE (current_class_type, 0);
+ basetype = BINFO_TYPE
+ (BINFO_BASE_BINFO (TYPE_BINFO (current_class_type), 0));
break;
default:
- error ("unnamed initializer for `%T', which uses multiple inheritance",
+ error ("unnamed initializer for %qT, which uses multiple inheritance",
current_class_type);
return NULL_TREE;
}
virtual_binfo = NULL_TREE;
/* Look for a direct base. */
- for (i = 0; i < BINFO_N_BASETYPES (class_binfo); ++i)
- if (same_type_p (basetype,
- TYPE_BINFO_BASETYPE (current_class_type, i)))
- {
- direct_binfo = BINFO_BASETYPE (class_binfo, i);
- break;
- }
+ for (i = 0; BINFO_BASE_ITERATE (class_binfo, i, direct_binfo); ++i)
+ if (SAME_BINFO_TYPE_P (BINFO_TYPE (direct_binfo), basetype))
+ break;
+
/* Look for a virtual base -- unless the direct base is itself
virtual. */
- if (!direct_binfo || !TREE_VIA_VIRTUAL (direct_binfo))
- {
- virtual_binfo
- = purpose_member (basetype,
- CLASSTYPE_VBASECLASSES (current_class_type));
- if (virtual_binfo)
- virtual_binfo = TREE_VALUE (virtual_binfo);
- }
+ if (!direct_binfo || !BINFO_VIRTUAL_P (direct_binfo))
+ virtual_binfo = binfo_for_vbase (basetype, current_class_type);
/* [class.base.init]
-
- If a mem-initializer-id is ambiguous because it designates
+
+ If a mem-initializer-id is ambiguous because it designates
both a direct non-virtual base class and an inherited virtual
base class, the mem-initializer is ill-formed. */
if (direct_binfo && virtual_binfo)
{
- error ("'%D' is both a direct base and an indirect virtual base",
+ error ("%qD is both a direct base and an indirect virtual base",
basetype);
return NULL_TREE;
}
if (!direct_binfo && !virtual_binfo)
{
- if (TYPE_USES_VIRTUAL_BASECLASSES (current_class_type))
- error ("type `%D' is not a direct or virtual base of `%T'",
+ if (CLASSTYPE_VBASECLASSES (current_class_type))
+ error ("type %qD is not a direct or virtual base of %qT",
name, current_class_type);
else
- error ("type `%D' is not a direct base of `%T'",
+ error ("type %qD is not a direct base of %qT",
name, current_class_type);
return NULL_TREE;
}
if (TREE_CODE (type) == ARRAY_TYPE)
{
- /* Must arrange to initialize each element of EXP
- from elements of INIT. */
- tree itype = init ? TREE_TYPE (init) : NULL_TREE;
-
- if (init && !itype)
+ tree itype;
+
+ /* An array may not be initialized use the parenthesized
+ initialization form -- unless the initializer is "()". */
+ if (init && TREE_CODE (init) == TREE_LIST)
{
- /* Handle bad initializers like:
- class COMPLEX {
- public:
- double re, im;
- COMPLEX(double r = 0.0, double i = 0.0) {re = r; im = i;};
- ~COMPLEX() {};
- };
-
- int main(int argc, char **argv) {
- COMPLEX zees(1.0, 0.0)[10];
- }
- */
error ("bad array initializer");
return error_mark_node;
}
+ /* Must arrange to initialize each element of EXP
+ from elements of INIT. */
+ itype = init ? TREE_TYPE (init) : NULL_TREE;
if (cp_type_quals (type) != TYPE_UNQUALIFIED)
TREE_TYPE (exp) = TYPE_MAIN_VARIANT (type);
if (itype && cp_type_quals (itype) != TYPE_UNQUALIFIED)
- TREE_TYPE (init) = TYPE_MAIN_VARIANT (itype);
+ itype = TREE_TYPE (init) = TYPE_MAIN_VARIANT (itype);
stmt_expr = build_vec_init (exp, NULL_TREE, init,
- init && same_type_p (TREE_TYPE (init),
- TREE_TYPE (exp)));
+ itype && same_type_p (itype,
+ TREE_TYPE (exp)));
TREE_READONLY (exp) = was_const;
TREE_THIS_VOLATILE (exp) = was_volatile;
TREE_TYPE (exp) = type;
}
if (TREE_CODE (exp) == VAR_DECL || TREE_CODE (exp) == PARM_DECL)
- /* just know that we've seen something for this node */
+ /* Just know that we've seen something for this node. */
TREE_USED (exp) = 1;
TREE_TYPE (exp) = TYPE_MAIN_VARIANT (type);
{
tree expr;
- if (IS_AGGR_TYPE (TREE_TYPE (decl))
- || TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE)
+ if (TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE)
expr = build_aggr_init (decl, init, flags);
+ else if (CLASS_TYPE_P (TREE_TYPE (decl)))
+ expr = build_special_member_call (decl, complete_ctor_identifier,
+ build_tree_list (NULL_TREE, init),
+ TREE_TYPE (decl),
+ LOOKUP_NORMAL|flags);
else
- expr = build (INIT_EXPR, TREE_TYPE (decl), decl, init);
+ expr = build2 (INIT_EXPR, TREE_TYPE (decl), decl, init);
return expr;
}
&& (flags & LOOKUP_ONLYCONVERTING))
{
/* Base subobjects should only get direct-initialization. */
- if (true_exp != exp)
- abort ();
+ gcc_assert (true_exp == exp);
if (flags & DIRECT_BIND)
/* Do nothing. We hit this in two cases: Reference initialization,
to run a new constructor; and catching an exception, where we
have already built up the constructor call so we could wrap it
in an exception region. */;
- else if (TREE_CODE (init) == CONSTRUCTOR
- && TREE_HAS_CONSTRUCTOR (init))
+ else if (BRACE_ENCLOSED_INITIALIZER_P (init))
{
/* A brace-enclosed initializer for an aggregate. */
- my_friendly_assert (CP_AGGREGATE_TYPE_P (type), 20021016);
+ gcc_assert (CP_AGGREGATE_TYPE_P (type));
init = digest_init (type, init, (tree *)NULL);
}
else
around the TARGET_EXPR for the copy constructor. See
initialize_handler_parm. */
{
- TREE_OPERAND (init, 0) = build (INIT_EXPR, TREE_TYPE (exp), exp,
- TREE_OPERAND (init, 0));
+ TREE_OPERAND (init, 0) = build2 (INIT_EXPR, TREE_TYPE (exp), exp,
+ TREE_OPERAND (init, 0));
TREE_TYPE (init) = void_type_node;
}
else
- init = build (INIT_EXPR, TREE_TYPE (exp), exp, init);
+ init = build2 (INIT_EXPR, TREE_TYPE (exp), exp, init);
TREE_SIDE_EFFECTS (init) = 1;
finish_expr_stmt (init);
return;
from TRUE_EXP. In constructors, we don't know anything about
the value being initialized.
- FLAGS is just passes to `build_method_call'. See that function for
- its description. */
+ FLAGS is just passed to `build_new_method_call'. See that function
+ for its description. */
static void
expand_aggr_init_1 (tree binfo, tree true_exp, tree exp, tree init, int flags)
{
tree type = TREE_TYPE (exp);
- my_friendly_assert (init != error_mark_node && type != error_mark_node, 211);
- my_friendly_assert (building_stmt_tree (), 20021010);
+ gcc_assert (init != error_mark_node && type != error_mark_node);
+ gcc_assert (building_stmt_tree ());
/* Use a function returning the desired type to initialize EXP for us.
If the function is a constructor, and its first argument is
/* If store_init_value returns NULL_TREE, the INIT has been
record in the DECL_INITIAL for EXP. That means there's
nothing more we have to do. */
- if (store_init_value (exp, init))
- finish_expr_stmt (build (INIT_EXPR, type, exp, init));
+ init = store_init_value (exp, init);
+ if (init)
+ finish_expr_stmt (init);
return;
}
&& TREE_CODE (type) != BOUND_TEMPLATE_TEMPLATE_PARM)
{
if (or_else)
- error ("`%T' is not an aggregate type", type);
+ error ("%qT is not an aggregate type", type);
return 0;
}
return 1;
}
-/* Like is_aggr_typedef, but returns typedef if successful. */
-
-tree
-get_aggr_from_typedef (tree name, int or_else)
-{
- tree type;
-
- if (name == error_mark_node)
- return NULL_TREE;
-
- if (IDENTIFIER_HAS_TYPE_VALUE (name))
- type = IDENTIFIER_TYPE_VALUE (name);
- else
- {
- if (or_else)
- error ("`%T' fails to be an aggregate typedef", name);
- return NULL_TREE;
- }
-
- if (! IS_AGGR_TYPE (type)
- && TREE_CODE (type) != TEMPLATE_TYPE_PARM
- && TREE_CODE (type) != BOUND_TEMPLATE_TEMPLATE_PARM)
- {
- if (or_else)
- error ("type `%T' is of non-aggregate type", type);
- return NULL_TREE;
- }
- return type;
-}
-
tree
get_type_value (tree name)
{
if (TREE_CODE (name) == TEMPLATE_DECL)
return name;
- if (processing_template_decl || uses_template_parms (type))
+ if (dependent_type_p (type) || type_dependent_expression_p (name))
return build_min_nt (SCOPE_REF, type, name);
if (TREE_CODE (name) == TEMPLATE_ID_EXPR)
name = DECL_NAME (OVL_CURRENT (name));
}
- my_friendly_assert (TREE_CODE (name) == IDENTIFIER_NODE, 0);
+ gcc_assert (TREE_CODE (name) == IDENTIFIER_NODE);
}
if (type == NULL_TREE)
return error_mark_node;
-
+
/* Handle namespace names fully here. */
if (TREE_CODE (type) == NAMESPACE_DECL)
{
tree t = lookup_namespace_name (type, name);
if (t == error_mark_node)
- return t;
+ return t;
if (TREE_CODE (orig_name) == TEMPLATE_ID_EXPR)
- /* Reconstruct the TEMPLATE_ID_EXPR. */
- t = build (TEMPLATE_ID_EXPR, TREE_TYPE (t),
- t, TREE_OPERAND (orig_name, 1));
+ /* Reconstruct the TEMPLATE_ID_EXPR. */
+ t = build2 (TEMPLATE_ID_EXPR, TREE_TYPE (t),
+ t, TREE_OPERAND (orig_name, 1));
if (! type_unknown_p (t))
{
mark_used (t);
if (TREE_CODE (name) == BIT_NOT_EXPR)
{
if (! check_dtor_name (type, name))
- error ("qualified type `%T' does not match destructor name `~%T'",
+ error ("qualified type %qT does not match destructor name %<~%T%>",
type, TREE_OPERAND (name, 0));
name = dtor_identifier;
}
if (!COMPLETE_TYPE_P (complete_type (type))
&& !TYPE_BEING_DEFINED (type))
{
- error ("incomplete type `%T' does not have member `%D'", type,
- name);
+ error ("incomplete type %qT does not have member %qD", type, name);
return error_mark_node;
}
+ /* Set up BASEBINFO for member lookup. */
decl = maybe_dummy_object (type, &basebinfo);
if (BASELINK_P (name) || DECL_P (name))
else
{
member = lookup_member (basebinfo, name, 1, 0);
-
+
if (member == error_mark_node)
return error_mark_node;
}
if (!member)
{
- error ("`%D' is not a member of type `%T'", name, type);
+ error ("%qD is not a member of type %qT", name, type);
return error_mark_node;
}
if (TREE_CODE (member) == FIELD_DECL && DECL_C_BIT_FIELD (member))
{
- error ("invalid pointer to bit-field `%D'", member);
+ error ("invalid pointer to bit-field %qD", member);
return error_mark_node;
}
expects to encounter OVERLOADs, not raw functions. */
t = ovl_cons (t, NULL_TREE);
- t = build (TEMPLATE_ID_EXPR, TREE_TYPE (t), t,
- TREE_OPERAND (orig_name, 1));
- t = build (OFFSET_REF, unknown_type_node, decl, t);
-
- PTRMEM_OK_P (t) = 1;
-
+ t = build2 (TEMPLATE_ID_EXPR, TREE_TYPE (t), t,
+ TREE_OPERAND (orig_name, 1));
+ t = build2 (OFFSET_REF, unknown_type_node, decl, t);
+
+ PTRMEM_OK_P (t) = 1;
+
return t;
}
if (TREE_CODE (t) != TEMPLATE_ID_EXPR && !really_overloaded_fn (t))
{
- /* Get rid of a potential OVERLOAD around it */
+ /* Get rid of a potential OVERLOAD around it. */
t = OVL_CURRENT (t);
/* Unique functions are handled easily. */
a class derived from that class (_class.base.init_). */
if (DECL_NONSTATIC_MEMBER_FUNCTION_P (member))
{
+ /* Build a representation of a the qualified name suitable
+ for use as the operand to "&" -- even though the "&" is
+ not actually present. */
+ member = build2 (OFFSET_REF, TREE_TYPE (member), decl, member);
/* In Microsoft mode, treat a non-static member function as if
it were a pointer-to-member. */
if (flag_ms_extensions)
{
- member = build (OFFSET_REF, TREE_TYPE (member), decl, member);
PTRMEM_OK_P (member) = 1;
return build_unary_op (ADDR_EXPR, member, 0);
}
- error ("invalid use of non-static member function `%D'", member);
- return error_mark_node;
+ error ("invalid use of non-static member function %qD",
+ TREE_OPERAND (member, 1));
+ return member;
}
else if (TREE_CODE (member) == FIELD_DECL)
{
- error ("invalid use of non-static data member `%D'", member);
+ error ("invalid use of non-static data member %qD", member);
return error_mark_node;
}
return member;
}
- /* In member functions, the form `type::name' is no longer
- equivalent to `this->type::name', at least not until
- resolve_offset_ref. */
- member = build (OFFSET_REF, TREE_TYPE (member), decl, member);
+ member = build2 (OFFSET_REF, TREE_TYPE (member), decl, member);
PTRMEM_OK_P (member) = 1;
return member;
}
-/* If DECL is a `const' declaration, and its value is a known
- constant, then return that value. */
+/* If DECL is a CONST_DECL, or a constant VAR_DECL initialized by
+ constant of integral or enumeration type, then return that value.
+ These are those variables permitted in constant expressions by
+ [5.19/1]. FIXME:If we did lazy folding, this could be localized. */
tree
-decl_constant_value (tree decl)
+integral_constant_value (tree decl)
{
- /* When we build a COND_EXPR, we don't know whether it will be used
- as an lvalue or as an rvalue. If it is an lvalue, it's not safe
- to replace the second and third operands with their
- initializers. So, we do that here. */
- if (TREE_CODE (decl) == COND_EXPR)
- {
- tree d1;
- tree d2;
+ while ((TREE_CODE (decl) == CONST_DECL
+ || (TREE_CODE (decl) == VAR_DECL
+ /* And so are variables with a 'const' type -- unless they
+ are also 'volatile'. */
+ && CP_TYPE_CONST_NON_VOLATILE_P (TREE_TYPE (decl))
+ && DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (decl)))
+ && DECL_INITIAL (decl)
+ && DECL_INITIAL (decl) != error_mark_node
+ && TREE_TYPE (DECL_INITIAL (decl))
+ && INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (DECL_INITIAL (decl))))
+ decl = DECL_INITIAL (decl);
+ return decl;
+}
- d1 = decl_constant_value (TREE_OPERAND (decl, 1));
- d2 = decl_constant_value (TREE_OPERAND (decl, 2));
+/* A more relaxed version of integral_constant_value, for which type
+ is not considered. This is used by the common C/C++ code, and not
+ directly by the C++ front end. */
- if (d1 != TREE_OPERAND (decl, 1) || d2 != TREE_OPERAND (decl, 2))
- return build (COND_EXPR,
- TREE_TYPE (decl),
- TREE_OPERAND (decl, 0), d1, d2);
- }
-
- if (TREE_READONLY_DECL_P (decl)
- && ! TREE_THIS_VOLATILE (decl)
+tree
+decl_constant_value (tree decl)
+{
+ if ((TREE_CODE (decl) == CONST_DECL
+ || (TREE_CODE (decl) == VAR_DECL
+ /* And so are variables with a 'const' type -- unless they
+ are also 'volatile'. */
+ && CP_TYPE_CONST_NON_VOLATILE_P (TREE_TYPE (decl))))
&& DECL_INITIAL (decl)
&& DECL_INITIAL (decl) != error_mark_node
- /* This is invalid if initial value is not constant.
- If it has either a function call, a memory reference,
- or a variable, then re-evaluating it could give different results. */
- && TREE_CONSTANT (DECL_INITIAL (decl))
- /* Check for cases where this is sub-optimal, even though valid. */
- && TREE_CODE (DECL_INITIAL (decl)) != CONSTRUCTOR)
+ /* This is invalid if initial value is not constant. If it has
+ either a function call, a memory reference, or a variable,
+ then re-evaluating it could give different results. */
+ && TREE_CONSTANT (DECL_INITIAL (decl)))
return DECL_INITIAL (decl);
+
return decl;
}
\f
return build_call (global_delete_fndecl, build_tree_list (NULL_TREE, addr));
}
\f
-/* Generate a C++ "new" expression. DECL is either a TREE_LIST
- (which needs to go through some sort of groktypename) or it
- is the name of the class we are newing. INIT is an initialization value.
- It is either an EXPRLIST, an EXPR_NO_COMMAS, or something in braces.
- If INIT is void_type_node, it means do *not* call a constructor
- for this instance.
-
- For types with constructors, the data returned is initialized
- by the appropriate constructor.
-
- Whether the type has a constructor or not, if it has a pointer
- to a virtual function table, then that pointer is set up
- here.
-
- Unless I am mistaken, a call to new () will return initialized
- data regardless of whether the constructor itself is private or
- not. NOPE; new fails if the constructor is private (jcm).
-
- Note that build_new does nothing to assure that any special
- alignment requirements of the type are met. Rather, it leaves
- it up to malloc to do the right thing. Otherwise, folding to
- the right alignment cal cause problems if the user tries to later
- free the memory returned by `new'.
-
- PLACEMENT is the `placement' list for user-defined operator new (). */
+/* Generate a representation for a C++ "new" expression. PLACEMENT is
+ a TREE_LIST of placement-new arguments (or NULL_TREE if none). If
+ NELTS is NULL, TYPE is the type of the storage to be allocated. If
+ NELTS is not NULL, then this is an array-new allocation; TYPE is
+ the type of the elements in the array and NELTS is the number of
+ elements in the array. INIT, if non-NULL, is the initializer for
+ the new object. If USE_GLOBAL_NEW is true, then the user
+ explicitly wrote "::new" rather than just "new". */
tree
-build_new (tree placement, tree decl, tree init, int use_global_new)
+build_new (tree placement, tree type, tree nelts, tree init,
+ int use_global_new)
{
- tree type, rval;
- tree nelts = NULL_TREE, t;
- int has_array = 0;
+ tree rval;
- if (decl == error_mark_node)
+ if (type == error_mark_node)
return error_mark_node;
- if (TREE_CODE (decl) == TREE_LIST)
- {
- tree absdcl = TREE_VALUE (decl);
- tree last_absdcl = NULL_TREE;
-
- if (current_function_decl
- && DECL_CONSTRUCTOR_P (current_function_decl))
- my_friendly_assert (immediate_size_expand == 0, 19990926);
-
- nelts = integer_one_node;
-
- if (absdcl && TREE_CODE (absdcl) == CALL_EXPR)
- abort ();
- while (absdcl && TREE_CODE (absdcl) == INDIRECT_REF)
- {
- last_absdcl = absdcl;
- absdcl = TREE_OPERAND (absdcl, 0);
- }
-
- if (absdcl && TREE_CODE (absdcl) == ARRAY_REF)
- {
- /* probably meant to be a vec new */
- tree this_nelts;
-
- while (TREE_OPERAND (absdcl, 0)
- && TREE_CODE (TREE_OPERAND (absdcl, 0)) == ARRAY_REF)
- {
- last_absdcl = absdcl;
- absdcl = TREE_OPERAND (absdcl, 0);
- }
-
- has_array = 1;
- this_nelts = TREE_OPERAND (absdcl, 1);
- if (this_nelts != error_mark_node)
- {
- if (this_nelts == NULL_TREE)
- error ("new of array type fails to specify size");
- else if (processing_template_decl)
- {
- nelts = this_nelts;
- absdcl = TREE_OPERAND (absdcl, 0);
- }
- else
- {
- if (build_expr_type_conversion (WANT_INT | WANT_ENUM,
- this_nelts, false)
- == NULL_TREE)
- pedwarn ("size in array new must have integral type");
-
- this_nelts = save_expr (cp_convert (sizetype, this_nelts));
- absdcl = TREE_OPERAND (absdcl, 0);
- if (this_nelts == integer_zero_node)
- {
- warning ("zero size array reserves no space");
- nelts = integer_zero_node;
- }
- else
- nelts = cp_build_binary_op (MULT_EXPR, nelts, this_nelts);
- }
- }
- else
- nelts = integer_zero_node;
- }
-
- if (last_absdcl)
- TREE_OPERAND (last_absdcl, 0) = absdcl;
- else
- TREE_VALUE (decl) = absdcl;
-
- type = groktypename (decl);
- if (! type || type == error_mark_node)
- return error_mark_node;
- }
- else if (TREE_CODE (decl) == IDENTIFIER_NODE)
- {
- if (IDENTIFIER_HAS_TYPE_VALUE (decl))
- {
- /* An aggregate type. */
- type = IDENTIFIER_TYPE_VALUE (decl);
- decl = TYPE_MAIN_DECL (type);
- }
- else
- {
- /* A builtin type. */
- decl = lookup_name (decl, 1);
- my_friendly_assert (TREE_CODE (decl) == TYPE_DECL, 215);
- type = TREE_TYPE (decl);
- }
- }
- else if (TREE_CODE (decl) == TYPE_DECL)
- {
- type = TREE_TYPE (decl);
- }
- else
- {
- type = decl;
- decl = TYPE_MAIN_DECL (type);
- }
-
if (processing_template_decl)
{
- if (has_array)
- t = tree_cons (tree_cons (NULL_TREE, type, NULL_TREE),
- build_min_nt (ARRAY_REF, NULL_TREE, nelts),
- NULL_TREE);
- else
- t = type;
-
- rval = build_min (NEW_EXPR, build_pointer_type (type),
- placement, t, init);
+ rval = build_min (NEW_EXPR, build_pointer_type (type),
+ placement, type, nelts, init);
NEW_EXPR_USE_GLOBAL (rval) = use_global_new;
+ TREE_SIDE_EFFECTS (rval) = 1;
return rval;
}
+ if (nelts)
+ {
+ if (!build_expr_type_conversion (WANT_INT | WANT_ENUM, nelts, false))
+ pedwarn ("size in array new must have integral type");
+ nelts = save_expr (cp_convert (sizetype, nelts));
+ if (nelts == integer_zero_node)
+ warning (0, "zero size array reserves no space");
+ }
+
/* ``A reference cannot be created by the new operator. A reference
is not an object (8.2.2, 8.4.3), so a pointer to it could not be
returned by new.'' ARM 5.3.3 */
return error_mark_node;
}
- /* When the object being created is an array, the new-expression yields a
- pointer to the initial element (if any) of the array. For example,
- both new int and new int[10] return an int*. 5.3.4. */
- if (TREE_CODE (type) == ARRAY_TYPE && has_array == 0)
- {
- nelts = array_type_nelts_top (type);
- has_array = 1;
- type = TREE_TYPE (type);
- }
-
- if (has_array)
- t = build_nt (ARRAY_REF, type, nelts);
- else
- t = type;
-
- rval = build (NEW_EXPR, build_pointer_type (type), placement, t, init);
+ rval = build4 (NEW_EXPR, build_pointer_type (type), placement, type,
+ nelts, init);
NEW_EXPR_USE_GLOBAL (rval) = use_global_new;
TREE_SIDE_EFFECTS (rval) = 1;
rval = build_new_1 (rval);
/* Wrap it in a NOP_EXPR so warn_if_unused_value doesn't complain. */
rval = build1 (NOP_EXPR, TREE_TYPE (rval), rval);
- TREE_NO_UNUSED_WARNING (rval) = 1;
+ TREE_NO_WARNING (rval) = 1;
return rval;
}
{
jclass_node = IDENTIFIER_GLOBAL_VALUE (get_identifier ("jclass"));
if (jclass_node == NULL_TREE)
- fatal_error ("call to Java constructor, while `jclass' undefined");
+ fatal_error ("call to Java constructor, while %<jclass%> undefined");
jclass_node = TREE_TYPE (jclass_node);
}
- /* Mangle the class$ field */
+ /* Mangle the class$ field. */
{
tree field;
for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field))
DECL_ARTIFICIAL (class_decl) = 1;
DECL_IGNORED_P (class_decl) = 1;
pushdecl_top_level (class_decl);
- make_decl_rtl (class_decl, NULL);
+ make_decl_rtl (class_decl);
}
return class_decl;
}
-/* Returns the size of the cookie to use when allocating an array
- whose elements have the indicated TYPE. Assumes that it is already
- known that a cookie is needed. */
-
-static tree
-get_cookie_size (tree type)
-{
- tree cookie_size;
-
- /* We need to allocate an additional max (sizeof (size_t), alignof
- (true_type)) bytes. */
- tree sizetype_size;
- tree type_align;
-
- sizetype_size = size_in_bytes (sizetype);
- type_align = size_int (TYPE_ALIGN_UNIT (type));
- if (INT_CST_LT_UNSIGNED (type_align, sizetype_size))
- cookie_size = sizetype_size;
- else
- cookie_size = type_align;
-
- return cookie_size;
-}
/* Called from cplus_expand_expr when expanding a NEW_EXPR. The return
value is immediately handed to expand_expr. */
build_new_1 (tree exp)
{
tree placement, init;
- tree true_type, size, rval, t;
+ tree size, rval;
+ /* True iff this is a call to "operator new[]" instead of just
+ "operator new". */
+ bool array_p = false;
+ /* True iff ARRAY_P is true and the bound of the array type is
+ not necessarily a compile time constant. For example, VLA_P is
+ true for "new int[f()]". */
+ bool vla_p = false;
+ /* The type being allocated. If ARRAY_P is true, this will be an
+ ARRAY_TYPE. */
+ tree full_type;
+ /* If ARRAY_P is true, the element type of the array. This is an
+ never ARRAY_TYPE; for something like "new int[3][4]", the
+ ELT_TYPE is "int". If ARRAY_P is false, this is the same type as
+ FULL_TYPE. */
+ tree elt_type;
/* The type of the new-expression. (This type is always a pointer
type.) */
tree pointer_type;
- /* The type pointed to by POINTER_TYPE. */
+ /* The type pointed to by POINTER_TYPE. This type may be different
+ from ELT_TYPE for a multi-dimensional array; ELT_TYPE is never an
+ ARRAY_TYPE, but TYPE may be an ARRAY_TYPE. */
tree type;
- /* The type being allocated. For "new T[...]" this will be an
- ARRAY_TYPE. */
- tree full_type;
- /* A pointer type pointing to to the FULL_TYPE. */
+ /* A pointer type pointing to the FULL_TYPE. */
tree full_pointer_type;
tree outer_nelts = NULL_TREE;
tree nelts = NULL_TREE;
tree alloc_node;
tree alloc_fn;
tree cookie_expr, init_expr;
- int has_array = 0;
- enum tree_code code;
int nothrow, check_new;
/* Nonzero if the user wrote `::new' rather than just `new'. */
int globally_qualified_p;
address of the first array element. This node is a VAR_DECL, and
is therefore reusable. */
tree data_addr;
+ tree init_preeval_expr = NULL_TREE;
placement = TREE_OPERAND (exp, 0);
type = TREE_OPERAND (exp, 1);
- init = TREE_OPERAND (exp, 2);
+ nelts = TREE_OPERAND (exp, 2);
+ init = TREE_OPERAND (exp, 3);
globally_qualified_p = NEW_EXPR_USE_GLOBAL (exp);
- if (TREE_CODE (type) == ARRAY_REF)
+ if (nelts)
{
- has_array = 1;
- nelts = outer_nelts = TREE_OPERAND (type, 1);
- type = TREE_OPERAND (type, 0);
+ tree index;
+
+ outer_nelts = nelts;
+ array_p = true;
- /* Use an incomplete array type to avoid VLA headaches. */
+ /* ??? The middle-end will error on us for building a VLA outside a
+ function context. Methinks that's not it's purvey. So we'll do
+ our own VLA layout later. */
+ vla_p = true;
full_type = build_cplus_array_type (type, NULL_TREE);
+ index = convert (sizetype, nelts);
+ index = size_binop (MINUS_EXPR, index, size_one_node);
+ TYPE_DOMAIN (full_type) = build_index_type (index);
}
else
- full_type = type;
-
- true_type = type;
-
- code = has_array ? VEC_NEW_EXPR : NEW_EXPR;
+ {
+ full_type = type;
+ if (TREE_CODE (type) == ARRAY_TYPE)
+ {
+ array_p = true;
+ nelts = array_type_nelts_top (type);
+ outer_nelts = nelts;
+ type = TREE_TYPE (type);
+ }
+ }
/* If our base type is an array, then make sure we know how many elements
it has. */
- while (TREE_CODE (true_type) == ARRAY_TYPE)
- {
- tree this_nelts = array_type_nelts_top (true_type);
- nelts = cp_build_binary_op (MULT_EXPR, nelts, this_nelts);
- true_type = TREE_TYPE (true_type);
- }
+ for (elt_type = type;
+ TREE_CODE (elt_type) == ARRAY_TYPE;
+ elt_type = TREE_TYPE (elt_type))
+ nelts = cp_build_binary_op (MULT_EXPR, nelts,
+ array_type_nelts_top (elt_type));
- if (!complete_type_or_else (true_type, exp))
+ if (!complete_type_or_else (elt_type, exp))
return error_mark_node;
- if (TREE_CODE (true_type) == VOID_TYPE)
+ if (TREE_CODE (elt_type) == VOID_TYPE)
{
- error ("invalid type `void' for new");
+ error ("invalid type %<void%> for new");
return error_mark_node;
}
- if (abstract_virtuals_error (NULL_TREE, true_type))
+ if (abstract_virtuals_error (NULL_TREE, elt_type))
return error_mark_node;
- is_initialized = (TYPE_NEEDS_CONSTRUCTING (type) || init);
- if (CP_TYPE_CONST_P (true_type) && !is_initialized)
+ is_initialized = (TYPE_NEEDS_CONSTRUCTING (elt_type) || init);
+ if (CP_TYPE_CONST_P (elt_type) && !is_initialized)
{
- error ("uninitialized const in `new' of `%#T'", true_type);
+ error ("uninitialized const in %<new%> of %q#T", elt_type);
return error_mark_node;
}
- size = size_in_bytes (true_type);
- if (has_array)
- size = size_binop (MULT_EXPR, size, convert (sizetype, nelts));
+ size = size_in_bytes (elt_type);
+ if (array_p)
+ {
+ size = size_binop (MULT_EXPR, size, convert (sizetype, nelts));
+ if (vla_p)
+ {
+ tree n, bitsize;
+
+ /* Do our own VLA layout. Setting TYPE_SIZE/_UNIT is
+ necessary in order for the <INIT_EXPR <*foo> <CONSTRUCTOR
+ ...>> to be valid. */
+ TYPE_SIZE_UNIT (full_type) = size;
+ n = convert (bitsizetype, nelts);
+ bitsize = size_binop (MULT_EXPR, TYPE_SIZE (elt_type), n);
+ TYPE_SIZE (full_type) = bitsize;
+ }
+ }
/* Allocate the object. */
- if (! placement && TYPE_FOR_JAVA (true_type))
+ if (! placement && TYPE_FOR_JAVA (elt_type))
{
tree class_addr, alloc_decl;
- tree class_decl = build_java_class_ref (true_type);
- tree class_size = size_in_bytes (true_type);
+ tree class_decl = build_java_class_ref (elt_type);
static const char alloc_name[] = "_Jv_AllocObject";
+
use_java_new = 1;
- if (!get_global_value_if_present (get_identifier (alloc_name),
+ alloc_decl = NULL;
+ if (!get_global_value_if_present (get_identifier (alloc_name),
&alloc_decl))
- {\r
- error ("call to Java constructor with `%s' undefined", alloc_name);
+ {
+ error ("call to Java constructor with %qs undefined", alloc_name);
return error_mark_node;
}
else if (really_overloaded_fn (alloc_decl))
- {\r
- error ("`%D' should never be overloaded", alloc_decl);
+ {
+ error ("%qD should never be overloaded", alloc_decl);
return error_mark_node;
}
alloc_decl = OVL_CURRENT (alloc_decl);
class_addr = build1 (ADDR_EXPR, jclass_node, class_decl);
alloc_call = (build_function_call
(alloc_decl,
- tree_cons (NULL_TREE, class_addr,
- build_tree_list (NULL_TREE, class_size))));
+ build_tree_list (NULL_TREE, class_addr)));
}
else
{
tree fnname;
+ tree fns;
- fnname = ansi_opname (code);
+ fnname = ansi_opname (array_p ? VEC_NEW_EXPR : NEW_EXPR);
- if (!globally_qualified_p
- && CLASS_TYPE_P (true_type)
- && (has_array
- ? TYPE_HAS_ARRAY_NEW_OPERATOR (true_type)
- : TYPE_HAS_NEW_OPERATOR (true_type)))
+ if (!globally_qualified_p
+ && CLASS_TYPE_P (elt_type)
+ && (array_p
+ ? TYPE_HAS_ARRAY_NEW_OPERATOR (elt_type)
+ : TYPE_HAS_NEW_OPERATOR (elt_type)))
{
/* Use a class-specific operator new. */
/* If a cookie is required, add some extra space. */
- if (has_array && TYPE_VEC_NEW_USES_COOKIE (true_type))
+ if (array_p && TYPE_VEC_NEW_USES_COOKIE (elt_type))
{
- cookie_size = get_cookie_size (true_type);
+ cookie_size = targetm.cxx.get_cookie_size (elt_type);
size = size_binop (PLUS_EXPR, size, cookie_size);
}
/* Create the argument list. */
args = tree_cons (NULL_TREE, size, placement);
- /* Call the function. */
- alloc_call = build_method_call (build_dummy_object (true_type),
- fnname, args,
- TYPE_BINFO (true_type),
- LOOKUP_NORMAL);
+ /* Do name-lookup to find the appropriate operator. */
+ fns = lookup_fnfields (elt_type, fnname, /*protect=*/2);
+ if (TREE_CODE (fns) == TREE_LIST)
+ {
+ error ("request for member %qD is ambiguous", fnname);
+ print_candidates (fns);
+ return error_mark_node;
+ }
+ alloc_call = build_new_method_call (build_dummy_object (elt_type),
+ fns, args,
+ /*conversion_path=*/NULL_TREE,
+ LOOKUP_NORMAL);
}
else
{
/* Use a global operator new. */
/* See if a cookie might be required. */
- if (has_array && TYPE_VEC_NEW_USES_COOKIE (true_type))
- cookie_size = get_cookie_size (true_type);
+ if (array_p && TYPE_VEC_NEW_USES_COOKIE (elt_type))
+ cookie_size = targetm.cxx.get_cookie_size (elt_type);
else
cookie_size = NULL_TREE;
- alloc_call = build_operator_new_call (fnname, placement,
+ alloc_call = build_operator_new_call (fnname, placement,
&size, &cookie_size);
}
}
alloc_node = TARGET_EXPR_SLOT (alloc_expr);
/* Strip any COMPOUND_EXPRs from ALLOC_CALL. */
- while (TREE_CODE (alloc_call) == COMPOUND_EXPR)
+ while (TREE_CODE (alloc_call) == COMPOUND_EXPR)
alloc_call = TREE_OPERAND (alloc_call, 1);
alloc_fn = get_callee_fndecl (alloc_call);
- my_friendly_assert (alloc_fn != NULL_TREE, 20020325);
+ gcc_assert (alloc_fn != NULL_TREE);
/* Now, check to see if this function is actually a placement
allocation function. This can happen even when PLACEMENT is NULL
there is no explicit placement argument. If there is more than
one argument, or there are variable arguments, then this is a
placement allocation function. */
- placement_allocation_fn_p
- = (type_num_arguments (TREE_TYPE (alloc_fn)) > 1
+ placement_allocation_fn_p
+ = (type_num_arguments (TREE_TYPE (alloc_fn)) > 1
|| varargs_function_p (alloc_fn));
/* Preevaluate the placement args so that we don't reevaluate them for a
placement delete. */
if (placement_allocation_fn_p)
{
- tree inits = NULL_TREE;
- t = TREE_CHAIN (TREE_OPERAND (alloc_call, 1));
- for (; t; t = TREE_CHAIN (t))
- if (TREE_SIDE_EFFECTS (TREE_VALUE (t)))
- {
- tree init;
- TREE_VALUE (t) = stabilize_expr (TREE_VALUE (t), &init);
- if (inits)
- inits = build (COMPOUND_EXPR, void_type_node, inits, init);
- else
- inits = init;
- }
+ tree inits;
+ stabilize_call (alloc_call, &inits);
if (inits)
- alloc_expr = build (COMPOUND_EXPR, TREE_TYPE (alloc_expr), inits,
- alloc_expr);
+ alloc_expr = build2 (COMPOUND_EXPR, TREE_TYPE (alloc_expr), inits,
+ alloc_expr);
}
/* unless an allocation function is declared with an empty excep-
if (cookie_size)
{
tree cookie;
+ tree cookie_ptr;
/* Adjust so we're pointing to the start of the object. */
- data_addr = get_target_expr (build (PLUS_EXPR, full_pointer_type,
- alloc_node, cookie_size));
+ data_addr = get_target_expr (build2 (PLUS_EXPR, full_pointer_type,
+ alloc_node, cookie_size));
/* Store the number of bytes allocated so that we can know how
many elements to destroy later. We use the last sizeof
(size_t) bytes to store the number of elements. */
- cookie = build (MINUS_EXPR, build_pointer_type (sizetype),
- data_addr, size_in_bytes (sizetype));
- cookie = build_indirect_ref (cookie, NULL);
+ cookie_ptr = build2 (MINUS_EXPR, build_pointer_type (sizetype),
+ data_addr, size_in_bytes (sizetype));
+ cookie = build_indirect_ref (cookie_ptr, NULL);
- cookie_expr = build (MODIFY_EXPR, sizetype, cookie, nelts);
+ cookie_expr = build2 (MODIFY_EXPR, sizetype, cookie, nelts);
+
+ if (targetm.cxx.cookie_has_size ())
+ {
+ /* Also store the element size. */
+ cookie_ptr = build2 (MINUS_EXPR, build_pointer_type (sizetype),
+ cookie_ptr, size_in_bytes (sizetype));
+ cookie = build_indirect_ref (cookie_ptr, NULL);
+ cookie = build2 (MODIFY_EXPR, sizetype, cookie,
+ size_in_bytes(elt_type));
+ cookie_expr = build2 (COMPOUND_EXPR, TREE_TYPE (cookie_expr),
+ cookie, cookie_expr);
+ }
data_addr = TARGET_EXPR_SLOT (data_addr);
}
else
data_addr = alloc_node;
}
- /* Now initialize the allocated object. */
+ /* Now initialize the allocated object. Note that we preevaluate the
+ initialization expression, apart from the actual constructor call or
+ assignment--we do this because we want to delay the allocation as long
+ as possible in order to minimize the size of the exception region for
+ placement delete. */
if (is_initialized)
{
+ bool stable;
+
init_expr = build_indirect_ref (data_addr, NULL);
if (init == void_zero_node)
init = build_default_init (full_type, nelts);
- else if (init && pedantic && has_array)
+ else if (init && array_p)
pedwarn ("ISO C++ forbids initialization in array new");
- if (has_array)
- init_expr
- = build_vec_init (init_expr,
- cp_build_binary_op (MINUS_EXPR, outer_nelts,
- integer_one_node),
- init, /*from_array=*/0);
+ if (array_p)
+ {
+ init_expr
+ = build_vec_init (init_expr,
+ cp_build_binary_op (MINUS_EXPR, outer_nelts,
+ integer_one_node),
+ init, /*from_array=*/0);
+
+ /* An array initialization is stable because the initialization
+ of each element is a full-expression, so the temporaries don't
+ leak out. */
+ stable = true;
+ }
else if (TYPE_NEEDS_CONSTRUCTING (type))
- init_expr = build_special_member_call (init_expr,
- complete_ctor_identifier,
- init, TYPE_BINFO (true_type),
- LOOKUP_NORMAL);
+ {
+ init_expr = build_special_member_call (init_expr,
+ complete_ctor_identifier,
+ init, elt_type,
+ LOOKUP_NORMAL);
+ stable = stabilize_init (init_expr, &init_preeval_expr);
+ }
else
{
/* We are processing something like `new int (10)', which
if (TREE_CODE (init) == TREE_LIST)
init = build_x_compound_expr_from_list (init, "new initializer");
-
- else if (TREE_CODE (init) == CONSTRUCTOR
- && TREE_TYPE (init) == NULL_TREE)
- {
- pedwarn ("ISO C++ forbids aggregate initializer to new");
- init = digest_init (type, init, 0);
- }
+
+ else
+ gcc_assert (TREE_CODE (init) != CONSTRUCTOR
+ || TREE_TYPE (init) != NULL_TREE);
init_expr = build_modify_expr (init_expr, INIT_EXPR, init);
+ stable = stabilize_init (init_expr, &init_preeval_expr);
}
if (init_expr == error_mark_node)
freed. */
if (flag_exceptions && ! use_java_new)
{
- enum tree_code dcode = has_array ? VEC_DELETE_EXPR : DELETE_EXPR;
+ enum tree_code dcode = array_p ? VEC_DELETE_EXPR : DELETE_EXPR;
tree cleanup;
- int flags = (LOOKUP_NORMAL
- | (globally_qualified_p * LOOKUP_GLOBAL));
/* The Standard is unclear here, but the right thing to do
is to use the same method for finding deallocation
functions that we use for finding allocation functions. */
- flags |= LOOKUP_SPECULATIVELY;
-
- cleanup = build_op_delete_call (dcode, alloc_node, size, flags,
- (placement_allocation_fn_p
+ cleanup = build_op_delete_call (dcode, alloc_node, size,
+ globally_qualified_p,
+ (placement_allocation_fn_p
? alloc_call : NULL_TREE));
- /* Ack! First we allocate the memory. Then we set our sentry
- variable to true, and expand a cleanup that deletes the memory
- if sentry is true. Then we run the constructor, and finally
- clear the sentry.
-
- It would be nice to be able to handle this without the sentry
- variable, perhaps with a TRY_CATCH_EXPR, but this doesn't
- work. We allocate the space first, so if there are any
- temporaries with cleanups in the constructor args we need this
- EH region to extend until end of full-expression to preserve
- nesting.
-
- If the backend had some mechanism so that we could force the
- allocation to be expanded after all the other args to the
- constructor, that would fix the nesting problem and we could
- do away with this complexity. But that would complicate other
- things; in particular, it would make it difficult to bail out
- if the allocation function returns null. Er, no, it wouldn't;
- we just don't run the constructor. The standard says it's
- unspecified whether or not the args are evaluated.
-
- FIXME FIXME FIXME inline invisible refs as refs. That way we
- can preevaluate value parameters. */
-
- if (cleanup)
+ if (!cleanup)
+ /* We're done. */;
+ else if (stable)
+ /* This is much simpler if we were able to preevaluate all of
+ the arguments to the constructor call. */
+ init_expr = build2 (TRY_CATCH_EXPR, void_type_node,
+ init_expr, cleanup);
+ else
+ /* Ack! First we allocate the memory. Then we set our sentry
+ variable to true, and expand a cleanup that deletes the
+ memory if sentry is true. Then we run the constructor, and
+ finally clear the sentry.
+
+ We need to do this because we allocate the space first, so
+ if there are any temporaries with cleanups in the
+ constructor args and we weren't able to preevaluate them, we
+ need this EH region to extend until end of full-expression
+ to preserve nesting. */
{
tree end, sentry, begin;
sentry = TARGET_EXPR_SLOT (begin);
TARGET_EXPR_CLEANUP (begin)
- = build (COND_EXPR, void_type_node, sentry,
- cleanup, void_zero_node);
+ = build3 (COND_EXPR, void_type_node, sentry,
+ cleanup, void_zero_node);
- end = build (MODIFY_EXPR, TREE_TYPE (sentry),
- sentry, boolean_false_node);
+ end = build2 (MODIFY_EXPR, TREE_TYPE (sentry),
+ sentry, boolean_false_node);
init_expr
- = build (COMPOUND_EXPR, void_type_node, begin,
- build (COMPOUND_EXPR, void_type_node, init_expr,
- end));
+ = build2 (COMPOUND_EXPR, void_type_node, begin,
+ build2 (COMPOUND_EXPR, void_type_node, init_expr,
+ end));
}
+
}
}
else
rval = data_addr;
if (init_expr)
- rval = build (COMPOUND_EXPR, TREE_TYPE (rval), init_expr, rval);
+ rval = build2 (COMPOUND_EXPR, TREE_TYPE (rval), init_expr, rval);
if (cookie_expr)
- rval = build (COMPOUND_EXPR, TREE_TYPE (rval), cookie_expr, rval);
+ rval = build2 (COMPOUND_EXPR, TREE_TYPE (rval), cookie_expr, rval);
if (rval == alloc_node)
/* If we don't have an initializer or a cookie, strip the TARGET_EXPR
/* Perform the allocation before anything else, so that ALLOC_NODE
has been initialized before we start using it. */
- rval = build (COMPOUND_EXPR, TREE_TYPE (rval), alloc_expr, rval);
+ rval = build2 (COMPOUND_EXPR, TREE_TYPE (rval), alloc_expr, rval);
}
+ if (init_preeval_expr)
+ rval = build2 (COMPOUND_EXPR, TREE_TYPE (rval), init_preeval_expr, rval);
+
/* Convert to the final type. */
rval = build_nop (pointer_type, rval);
tree controller = NULL_TREE;
/* We should only have 1-D arrays here. */
- if (TREE_CODE (type) == ARRAY_TYPE)
- abort ();
+ gcc_assert (TREE_CODE (type) != ARRAY_TYPE);
if (! IS_AGGR_TYPE (type) || TYPE_HAS_TRIVIAL_DESTRUCTOR (type))
goto no_destructor;
tbase = create_temporary_var (ptype);
tbase_init = build_modify_expr (tbase, NOP_EXPR,
- fold (build (PLUS_EXPR, ptype,
+ fold_build2 (PLUS_EXPR, ptype,
base,
- virtual_size)));
+ virtual_size));
DECL_REGISTER (tbase) = 1;
- controller = build (BIND_EXPR, void_type_node, tbase, NULL_TREE, NULL_TREE);
+ controller = build3 (BIND_EXPR, void_type_node, tbase,
+ NULL_TREE, NULL_TREE);
TREE_SIDE_EFFECTS (controller) = 1;
- body = build (EXIT_EXPR, void_type_node,
- build (EQ_EXPR, boolean_type_node, base, tbase));
+ body = build1 (EXIT_EXPR, void_type_node,
+ build2 (EQ_EXPR, boolean_type_node, base, tbase));
body = build_compound_expr
(body, build_modify_expr (tbase, NOP_EXPR,
- build (MINUS_EXPR, ptype, tbase, size_exp)));
+ build2 (MINUS_EXPR, ptype, tbase, size_exp)));
body = build_compound_expr
(body, build_delete (ptype, tbase, sfk_complete_destructor,
LOOKUP_NORMAL|LOOKUP_DESTRUCTOR, 1));
- loop = build (LOOP_EXPR, void_type_node, body);
+ loop = build1 (LOOP_EXPR, void_type_node, body);
loop = build_compound_expr (tbase_init, loop);
no_destructor:
{
tree cookie_size;
- cookie_size = get_cookie_size (type);
- base_tbd
+ cookie_size = targetm.cxx.get_cookie_size (type);
+ base_tbd
= cp_convert (ptype,
cp_build_binary_op (MINUS_EXPR,
- cp_convert (string_type_node,
+ cp_convert (string_type_node,
base),
cookie_size));
/* True size with header. */
body = deallocate_expr;
else
body = build_compound_expr (body, deallocate_expr);
-
+
if (!body)
body = integer_zero_node;
-
+
/* Outermost wrapper: If pointer is null, punt. */
- body = fold (build (COND_EXPR, void_type_node,
- fold (build (NE_EXPR, boolean_type_node, base,
- integer_zero_node)),
- body, integer_zero_node));
+ body = fold_build3 (COND_EXPR, void_type_node,
+ fold_build2 (NE_EXPR, boolean_type_node, base,
+ convert (TREE_TYPE (base),
+ integer_zero_node)),
+ body, integer_zero_node);
body = build1 (NOP_EXPR, void_type_node, body);
if (controller)
if (TREE_CODE (base) == SAVE_EXPR)
/* Pre-evaluate the SAVE_EXPR outside of the BIND_EXPR. */
- body = build (COMPOUND_EXPR, void_type_node, base, body);
+ body = build2 (COMPOUND_EXPR, void_type_node, base, body);
return convert_to_void (body, /*implicit=*/NULL);
}
-/* Create an unnamed variable of the indicated TYPE. */
+/* Create an unnamed variable of the indicated TYPE. */
tree
create_temporary_var (tree type)
{
tree decl;
-
+
decl = build_decl (VAR_DECL, NULL_TREE, type);
TREE_USED (decl) = 1;
DECL_ARTIFICIAL (decl) = 1;
- DECL_SOURCE_LOCATION (decl) = input_location;
DECL_IGNORED_P (decl) = 1;
+ DECL_SOURCE_LOCATION (decl) = input_location;
DECL_CONTEXT (decl) = current_function_decl;
return decl;
tree decl;
decl = create_temporary_var (type);
- add_decl_stmt (decl);
-
+ add_decl_expr (decl);
+
finish_expr_stmt (build_modify_expr (decl, INIT_EXPR, init));
return decl;
tree atype = TREE_TYPE (base);
/* The type of an element in the array. */
tree type = TREE_TYPE (atype);
+ /* The element type reached after removing all outer array
+ types. */
+ tree inner_elt_type;
/* The type of a pointer to an element in the array. */
tree ptype;
tree stmt_expr;
tree compound_stmt;
int destroy_temps;
tree try_block = NULL_TREE;
- tree try_body = NULL_TREE;
int num_initialized_elts = 0;
bool is_global;
-
+
if (TYPE_DOMAIN (atype))
maxindex = array_type_nelts (atype);
if (maxindex == NULL_TREE || maxindex == error_mark_node)
return error_mark_node;
+ inner_elt_type = strip_array_types (atype);
if (init
&& (from_array == 2
- ? (!CLASS_TYPE_P (type) || !TYPE_HAS_COMPLEX_ASSIGN_REF (type))
+ ? (!CLASS_TYPE_P (inner_elt_type)
+ || !TYPE_HAS_COMPLEX_ASSIGN_REF (inner_elt_type))
: !TYPE_NEEDS_CONSTRUCTING (type))
&& ((TREE_CODE (init) == CONSTRUCTOR
/* Don't do this if the CONSTRUCTOR might contain something
that might throw and require us to clean up. */
&& (CONSTRUCTOR_ELTS (init) == NULL_TREE
- || ! TYPE_HAS_NONTRIVIAL_DESTRUCTOR (target_type (type))))
+ || ! TYPE_HAS_NONTRIVIAL_DESTRUCTOR (inner_elt_type)))
|| from_array))
{
/* Do non-default initialization of POD arrays resulting from
brace-enclosed initializers. In this case, digest_init and
store_constructor will handle the semantics for us. */
- stmt_expr = build (INIT_EXPR, atype, base, init);
+ stmt_expr = build2 (INIT_EXPR, atype, base, init);
return stmt_expr;
}
++t1;
}
} catch (...) {
- ... destroy elements that were constructed ...
+ ... destroy elements that were constructed ...
}
rval;
})
-
+
We can omit the try and catch blocks if we know that the
initialization will never throw an exception, or if the array
elements do not have destructors. We can omit the loop completely if
- the elements of the array do not have constructors.
+ the elements of the array do not have constructors.
We actually wrap the entire body of the above in a STMT_EXPR, for
- tidiness.
+ tidiness.
When copying from array to another, when the array elements have
only trivial copy constructors, we should use __builtin_memcpy
&& from_array != 2)
{
try_block = begin_try_block ();
- try_body = begin_compound_stmt (/*has_no_scope=*/true);
}
if (init != NULL_TREE && TREE_CODE (init) == CONSTRUCTOR)
{
/* If initializing one array from another, initialize element by
element. We rely upon the below calls the do argument
- checking. */
+ checking. */
if (init)
{
base2 = decay_conversion (init);
/* If the ITERATOR is equal to -1, then we don't have to loop;
we've already initialized all the elements. */
tree for_stmt;
- tree for_body;
tree elt_init;
for_stmt = begin_for_stmt ();
finish_for_init_stmt (for_stmt);
- finish_for_cond (build (NE_EXPR, boolean_type_node,
- iterator, integer_minus_one_node),
+ finish_for_cond (build2 (NE_EXPR, boolean_type_node,
+ iterator, integer_minus_one_node),
for_stmt);
finish_for_expr (build_unary_op (PREDECREMENT_EXPR, iterator, 0),
for_stmt);
- /* Otherwise, loop through the elements. */
- for_body = begin_compound_stmt (/*has_no_scope=*/true);
-
if (from_array)
{
tree to = build1 (INDIRECT_REF, type, base);
else if (from)
elt_init = build_modify_expr (to, NOP_EXPR, from);
else
- abort ();
+ gcc_unreachable ();
}
else if (TREE_CODE (type) == ARRAY_TYPE)
{
0, 0, 0);
}
else
- elt_init = build_aggr_init (build1 (INDIRECT_REF, type, base),
+ elt_init = build_aggr_init (build1 (INDIRECT_REF, type, base),
init, 0);
-
+
current_stmt_tree ()->stmts_are_full_exprs_p = 1;
finish_expr_stmt (elt_init);
current_stmt_tree ()->stmts_are_full_exprs_p = 0;
if (base2)
finish_expr_stmt (build_unary_op (PREINCREMENT_EXPR, base2, 0));
- finish_compound_stmt (for_body);
finish_for_stmt (for_stmt);
}
/* Flatten multi-dimensional array since build_vec_delete only
expects one-dimensional array. */
if (TREE_CODE (type) == ARRAY_TYPE)
- {
- m = cp_build_binary_op (MULT_EXPR, m,
- array_type_nelts_total (type));
- type = strip_array_types (type);
- }
+ m = cp_build_binary_op (MULT_EXPR, m,
+ array_type_nelts_total (type));
- finish_compound_stmt (try_body);
finish_cleanup_try_block (try_block);
- e = build_vec_delete_1 (rval, m, type, sfk_base_destructor,
+ e = build_vec_delete_1 (rval, m,
+ inner_elt_type, sfk_base_destructor,
/*use_global_delete=*/0);
finish_cleanup (e, try_block);
}
/* The value of the array initialization is the array itself, RVAL
is a pointer to the first element. */
- finish_stmt_expr_expr (rval);
+ finish_stmt_expr_expr (rval, stmt_expr);
stmt_expr = finish_init_stmts (is_global, stmt_expr, compound_stmt);
atype = build_pointer_type (atype);
stmt_expr = build1 (NOP_EXPR, atype, stmt_expr);
stmt_expr = build_indirect_ref (stmt_expr, NULL);
-
+
current_stmt_tree ()->stmts_are_full_exprs_p = destroy_temps;
return stmt_expr;
}
int use_global_delete = which_delete & 1;
int use_vec_delete = !!(which_delete & 2);
enum tree_code code = use_vec_delete ? VEC_DELETE_EXPR : DELETE_EXPR;
- int flags = LOOKUP_NORMAL | (use_global_delete * LOOKUP_GLOBAL);
- return build_op_delete_call (code, addr, virtual_size, flags, NULL_TREE);
+ return build_op_delete_call (code, addr, virtual_size, use_global_delete,
+ NULL_TREE);
}
/* Call the DTOR_KIND destructor for EXP. FLAGS are as for
break;
default:
- abort ();
+ gcc_unreachable ();
}
-
- exp = convert_from_reference (exp);
fn = lookup_fnfields (TREE_TYPE (exp), name, /*protect=*/2);
- return build_new_method_call (exp, fn,
+ return build_new_method_call (exp, fn,
/*args=*/NULL_TREE,
/*conversion_path=*/NULL_TREE,
flags);
if (TREE_CODE (type) == POINTER_TYPE)
{
+ bool complete_p = true;
+
type = TYPE_MAIN_VARIANT (TREE_TYPE (type));
if (TREE_CODE (type) == ARRAY_TYPE)
goto handle_array;
- if (VOID_TYPE_P (type)
- /* We don't want to warn about delete of void*, only other
- incomplete types. Deleting other incomplete types
- invokes undefined behavior, but it is not ill-formed, so
- compile to something that would even do The Right Thing
- (TM) should the type have a trivial dtor and no delete
- operator. */
- || !complete_type_or_diagnostic (type, addr, 1)
- || !IS_AGGR_TYPE (type))
+ /* We don't want to warn about delete of void*, only other
+ incomplete types. Deleting other incomplete types
+ invokes undefined behavior, but it is not ill-formed, so
+ compile to something that would even do The Right Thing
+ (TM) should the type have a trivial dtor and no delete
+ operator. */
+ if (!VOID_TYPE_P (type))
{
- /* Call the builtin operator delete. */
- return build_builtin_delete_call (addr);
+ complete_type (type);
+ if (!COMPLETE_TYPE_P (type))
+ {
+ warning (0, "possible problem detected in invocation of "
+ "delete operator:");
+ cxx_incomplete_type_diagnostic (addr, type, 1);
+ inform ("neither the destructor nor the class-specific "
+ "operator delete will be called, even if they are "
+ "declared when the class is defined.");
+ complete_p = false;
+ }
}
+ if (VOID_TYPE_P (type) || !complete_p || !IS_AGGR_TYPE (type))
+ /* Call the builtin operator delete. */
+ return build_builtin_delete_call (addr);
if (TREE_SIDE_EFFECTS (addr))
addr = save_expr (addr);
- /* throw away const and volatile on target type of addr */
+ /* Throw away const and volatile on target type of addr. */
addr = convert_force (build_pointer_type (type), addr, 0);
}
else if (TREE_CODE (type) == ARRAY_TYPE)
{
handle_array:
-
+
if (TYPE_DOMAIN (type) == NULL_TREE)
{
error ("unknown array size in delete");
addr = convert_force (build_pointer_type (type), addr, 0);
}
- my_friendly_assert (IS_AGGR_TYPE (type), 220);
+ gcc_assert (IS_AGGR_TYPE (type));
if (TYPE_HAS_TRIVIAL_DESTRUCTOR (type))
{
return void_zero_node;
return build_op_delete_call
- (DELETE_EXPR, addr, cxx_sizeof_nowarn (type),
- LOOKUP_NORMAL | (use_global_delete * LOOKUP_GLOBAL),
+ (DELETE_EXPR, addr, cxx_sizeof_nowarn (type), use_global_delete,
NULL_TREE);
}
else
tree do_delete = NULL_TREE;
tree ifexp;
- my_friendly_assert (TYPE_HAS_DESTRUCTOR (type), 20011213);
+ if (CLASSTYPE_LAZY_DESTRUCTOR (type))
+ lazily_declare_fn (sfk_destructor, type);
/* For `::delete x', we must not use the deleting destructor
since then we would not be sure to get the global `operator
do_delete = build_op_delete_call (DELETE_EXPR,
addr,
cxx_sizeof_nowarn (type),
- LOOKUP_NORMAL,
+ /*global_p=*/false,
NULL_TREE);
/* Call the complete object destructor. */
auto_delete = sfk_complete_destructor;
/* Make sure we have access to the member op delete, even though
we'll actually be calling it from the destructor. */
build_op_delete_call (DELETE_EXPR, addr, cxx_sizeof_nowarn (type),
- LOOKUP_NORMAL, NULL_TREE);
+ /*global_p=*/false, NULL_TREE);
}
expr = build_dtor_call (build_indirect_ref (addr, NULL),
auto_delete, flags);
if (do_delete)
- expr = build (COMPOUND_EXPR, void_type_node, expr, do_delete);
+ expr = build2 (COMPOUND_EXPR, void_type_node, expr, do_delete);
if (flags & LOOKUP_DESTRUCTOR)
/* Explicit destructor call; don't check for null pointer. */
ifexp = fold (cp_build_binary_op (NE_EXPR, addr, integer_zero_node));
if (ifexp != integer_one_node)
- expr = build (COND_EXPR, void_type_node,
- ifexp, expr, void_zero_node);
+ expr = build3 (COND_EXPR, void_type_node,
+ ifexp, expr, void_zero_node);
return expr;
}
void
push_base_cleanups (void)
{
- tree binfos;
- int i, n_baseclasses;
+ tree binfo, base_binfo;
+ int i;
tree member;
tree expr;
+ VEC(tree,gc) *vbases;
/* Run destructors for all virtual baseclasses. */
- if (TYPE_USES_VIRTUAL_BASECLASSES (current_class_type))
+ if (CLASSTYPE_VBASECLASSES (current_class_type))
{
- tree vbases;
tree cond = (condition_conversion
- (build (BIT_AND_EXPR, integer_type_node,
- current_in_charge_parm,
- integer_two_node)));
+ (build2 (BIT_AND_EXPR, integer_type_node,
+ current_in_charge_parm,
+ integer_two_node)));
- vbases = CLASSTYPE_VBASECLASSES (current_class_type);
- /* The CLASSTYPE_VBASECLASSES list is in initialization
+ /* The CLASSTYPE_VBASECLASSES vector is in initialization
order, which is also the right order for pushing cleanups. */
- for (; vbases;
- vbases = TREE_CHAIN (vbases))
+ for (vbases = CLASSTYPE_VBASECLASSES (current_class_type), i = 0;
+ VEC_iterate (tree, vbases, i, base_binfo); i++)
{
- tree vbase = TREE_VALUE (vbases);
- tree base_type = BINFO_TYPE (vbase);
-
- if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (base_type))
+ if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (BINFO_TYPE (base_binfo)))
{
- expr = build_special_member_call (current_class_ref,
+ expr = build_special_member_call (current_class_ref,
base_dtor_identifier,
NULL_TREE,
- vbase,
- (LOOKUP_NORMAL
+ base_binfo,
+ (LOOKUP_NORMAL
| LOOKUP_NONVIRTUAL));
- expr = build (COND_EXPR, void_type_node, cond,
- expr, void_zero_node);
+ expr = build3 (COND_EXPR, void_type_node, cond,
+ expr, void_zero_node);
finish_decl_cleanup (NULL_TREE, expr);
}
}
}
- binfos = BINFO_BASETYPES (TYPE_BINFO (current_class_type));
- n_baseclasses = CLASSTYPE_N_BASECLASSES (current_class_type);
-
/* Take care of the remaining baseclasses. */
- for (i = 0; i < n_baseclasses; i++)
+ for (binfo = TYPE_BINFO (current_class_type), i = 0;
+ BINFO_BASE_ITERATE (binfo, i, base_binfo); i++)
{
- tree base_binfo = TREE_VEC_ELT (binfos, i);
if (TYPE_HAS_TRIVIAL_DESTRUCTOR (BINFO_TYPE (base_binfo))
- || TREE_VIA_VIRTUAL (base_binfo))
+ || BINFO_VIRTUAL_P (base_binfo))
continue;
- expr = build_special_member_call (current_class_ref,
+ expr = build_special_member_call (current_class_ref,
base_dtor_identifier,
- NULL_TREE, base_binfo,
+ NULL_TREE, base_binfo,
LOOKUP_NORMAL | LOOKUP_NONVIRTUAL);
finish_decl_cleanup (NULL_TREE, expr);
}
continue;
if (TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (member)))
{
- tree this_member = (build_class_member_access_expr
- (current_class_ref, member,
+ tree this_member = (build_class_member_access_expr
+ (current_class_ref, member,
/*access_path=*/NULL_TREE,
/*preserve_reference=*/false));
tree this_type = TREE_TYPE (member);
}
}
-/* For type TYPE, delete the virtual baseclass objects of DECL. */
-
-tree
-build_vbase_delete (tree type, tree decl)
-{
- tree vbases = CLASSTYPE_VBASECLASSES (type);
- tree result;
- tree addr = build_unary_op (ADDR_EXPR, decl, 0);
-
- my_friendly_assert (addr != error_mark_node, 222);
-
- for (result = convert_to_void (integer_zero_node, NULL);
- vbases; vbases = TREE_CHAIN (vbases))
- {
- tree base_addr = convert_force
- (build_pointer_type (BINFO_TYPE (TREE_VALUE (vbases))), addr, 0);
- tree base_delete = build_delete
- (TREE_TYPE (base_addr), base_addr, sfk_base_destructor,
- LOOKUP_NORMAL|LOOKUP_DESTRUCTOR, 0);
-
- result = build_compound_expr (result, base_delete);
- }
- return result;
-}
-
/* Build a C++ vector delete expression.
MAXINDEX is the number of elements to be deleted.
ELT_SIZE is the nominal size of each element in the vector.
base = TARGET_EXPR_SLOT (base_init);
}
type = strip_array_types (TREE_TYPE (type));
- cookie_addr = build (MINUS_EXPR,
- build_pointer_type (sizetype),
- base,
- TYPE_SIZE_UNIT (sizetype));
+ cookie_addr = build2 (MINUS_EXPR,
+ build_pointer_type (sizetype),
+ base,
+ TYPE_SIZE_UNIT (sizetype));
maxindex = build_indirect_ref (cookie_addr, NULL);
}
else if (TREE_CODE (type) == ARRAY_TYPE)
{
- /* get the total number of things in the array, maxindex is a bad name */
+ /* Get the total number of things in the array, maxindex is a
+ bad name. */
maxindex = array_type_nelts_total (type);
type = strip_array_types (type);
base = build_unary_op (ADDR_EXPR, base, 1);
rval = build_vec_delete_1 (base, maxindex, type, auto_delete_vec,
use_global_delete);
if (base_init)
- rval = build (COMPOUND_EXPR, TREE_TYPE (rval), base_init, rval);
+ rval = build2 (COMPOUND_EXPR, TREE_TYPE (rval), base_init, rval);
return rval;
}
OSDN Git Service
