diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-04 22:36:26 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-06-04 23:27:12 +0200 |
| commit | 2cbc99d18dc411ac3fdef94e22ce86859806e63c (patch) | |
| tree | 82939940413c5e726889ccd97fa2afd33e0b06be /gcc/d/d-compiler.cc | |
| parent | 4e05c918d28e3fa66f5baaf556f6886447c68c9a (diff) | |
| download | gcc-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/d-compiler.cc')
| -rw-r--r-- | gcc/d/d-compiler.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/d/d-compiler.cc b/gcc/d/d-compiler.cc index a27261f..a8adb98 100644 --- a/gcc/d/d-compiler.cc +++ b/gcc/d/d-compiler.cc @@ -91,8 +91,8 @@ Compiler::paintAsType (UnionExp *, Expression *expr, Type *type) Expressions *elements = ((ArrayLiteralExp *) expr)->elements; vec<constructor_elt, va_gc> *elms = NULL; - vec_safe_reserve (elms, elements->dim); - for (size_t i = 0; i < elements->dim; i++) + vec_safe_reserve (elms, elements->length); + for (size_t i = 0; i < elements->length; i++) { Expression *e = (*elements)[i]; if (e->type->isintegral ()) @@ -167,13 +167,13 @@ Compiler::loadModule (Module *m) if (!strcmp (id->toChars (), "object")) create_tinfo_types (m); } - else if (md->packages->dim == 1) + else if (md->packages->length == 1) { if (!strcmp ((*md->packages)[0]->toChars (), "gcc") && !strcmp (md->id->toChars (), "builtins")) d_build_builtins_module (m); } - else if (md->packages->dim == 2) + else if (md->packages->length == 2) { if (!strcmp ((*md->packages)[0]->toChars (), "core") && !strcmp ((*md->packages)[1]->toChars (), "stdc")) |