aboutsummaryrefslogtreecommitdiff
path: root/gcc/d/dmd/optimize.c
diff options
context:
space:
mode:
authorIain Buclaw <ibuclaw@gdcproject.org>2020-06-04 22:36:26 +0200
committerIain Buclaw <ibuclaw@gdcproject.org>2020-06-04 23:27:12 +0200
commit2cbc99d18dc411ac3fdef94e22ce86859806e63c (patch)
tree82939940413c5e726889ccd97fa2afd33e0b06be /gcc/d/dmd/optimize.c
parent4e05c918d28e3fa66f5baaf556f6886447c68c9a (diff)
downloadgcc-2cbc99d18dc411ac3fdef94e22ce86859806e63c.zip
gcc-2cbc99d18dc411ac3fdef94e22ce86859806e63c.tar.gz
gcc-2cbc99d18dc411ac3fdef94e22ce86859806e63c.tar.bz2
d: Merge upstream dmd 48d704f08
Updates the Array interface in dmd/root/array.h to use a DArray<TYPE> internally. Splits out BitArray into a separate header. Reviewed-on: https://github.com/dlang/dmd/pull/11219 gcc/d/ChangeLog: * dmd/MERGE: Merge upstream dmd 48d704f08. * d-attribs.cc (build_attributes): Use new field name. * d-builtins.cc (build_frontend_type): Likewise. (maybe_set_builtin_1): Likewise. (d_maybe_set_builtin): Likewise. * d-codegen.cc (build_interface_binfo): Likewise. (identity_compare_p): Likewise. (lower_struct_comparison): Likewise. (build_struct_comparison): Likewise. (d_build_call): Likewise. (build_frame_type): Likewise. (build_closure): Likewise. * d-compiler.cc (Compiler::paintAsType): Likewise. (Compiler::loadModule): Likewise. * d-incpath.cc (add_globalpaths): Likewise. (add_filepaths): Likewise. (add_import_paths): Likewise. * d-lang.cc (deps_write): Likewise. (d_parse_file): Likewise. * decl.cc (gcc_attribute_p): Likewise. (base_vtable_offset): Likewise. (get_vtable_decl): Likewise. (build_class_instance): Likewise. * expr.cc (class ExprVisitor): Likewise. * modules.cc (layout_moduleinfo_fields): Likewise. (layout_moduleinfo): Likewise. (build_module_tree): Likewise. * toir.cc (class IRVisitor): Likewise. * typeinfo.cc (class TypeInfoVisitor): Likewise. (layout_classinfo_interfaces): Likewise. * types.cc (layout_aggregate_members): Likewise. (layout_aggregate_type): Likewise.
Diffstat (limited to 'gcc/d/dmd/optimize.c')
-rw-r--r--gcc/d/dmd/optimize.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/d/dmd/optimize.c b/gcc/d/dmd/optimize.c
index a79cbf8..fa736dc 100644
--- a/gcc/d/dmd/optimize.c
+++ b/gcc/d/dmd/optimize.c
@@ -242,7 +242,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
void visit(TupleExp *e)
{
expOptimize(e->e0, WANTvalue);
- for (size_t i = 0; i < e->exps->dim; i++)
+ for (size_t i = 0; i < e->exps->length; i++)
{
expOptimize((*e->exps)[i], WANTvalue);
}
@@ -253,7 +253,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
if (e->elements)
{
expOptimize(e->basis, result & WANTexpand);
- for (size_t i = 0; i < e->elements->dim; i++)
+ for (size_t i = 0; i < e->elements->length; i++)
{
expOptimize((*e->elements)[i], result & WANTexpand);
}
@@ -262,8 +262,8 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
void visit(AssocArrayLiteralExp *e)
{
- assert(e->keys->dim == e->values->dim);
- for (size_t i = 0; i < e->keys->dim; i++)
+ assert(e->keys->length == e->values->length);
+ for (size_t i = 0; i < e->keys->length; i++)
{
expOptimize((*e->keys)[i], result & WANTexpand);
expOptimize((*e->values)[i], result & WANTexpand);
@@ -277,7 +277,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
e->stageflags |= stageOptimize;
if (e->elements)
{
- for (size_t i = 0; i < e->elements->dim; i++)
+ for (size_t i = 0; i < e->elements->length; i++)
{
expOptimize((*e->elements)[i], result & WANTexpand);
}
@@ -501,7 +501,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
// Optimize parameters
if (e->newargs)
{
- for (size_t i = 0; i < e->newargs->dim; i++)
+ for (size_t i = 0; i < e->newargs->length; i++)
{
expOptimize((*e->newargs)[i], WANTvalue);
}
@@ -509,7 +509,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
if (e->arguments)
{
- for (size_t i = 0; i < e->arguments->dim; i++)
+ for (size_t i = 0; i < e->arguments->length; i++)
{
expOptimize((*e->arguments)[i], WANTvalue);
}
@@ -529,7 +529,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
if (t1->ty == Tdelegate) t1 = t1->nextOf();
assert(t1->ty == Tfunction);
TypeFunction *tf = (TypeFunction *)t1;
- for (size_t i = 0; i < e->arguments->dim; i++)
+ for (size_t i = 0; i < e->arguments->length; i++)
{
Parameter *p = Parameter::getNth(tf->parameters, i);
bool keep = p && (p->storageClass & (STCref | STCout)) != 0;
@@ -1017,7 +1017,7 @@ Expression *Expression_optimize(Expression *e, int result, bool keepLvalue)
if (arr->op == TOKstring)
len = ((StringExp *)arr)->len;
else if (arr->op == TOKarrayliteral)
- len = ((ArrayLiteralExp *)arr)->elements->dim;
+ len = ((ArrayLiteralExp *)arr)->elements->length;
else
{
Type *t = arr->type->toBasetype();