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/dmd/cppmangle.c | |
| 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/dmd/cppmangle.c')
| -rw-r--r-- | gcc/d/dmd/cppmangle.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gcc/d/dmd/cppmangle.c b/gcc/d/dmd/cppmangle.c index e3307af..a508022 100644 --- a/gcc/d/dmd/cppmangle.c +++ b/gcc/d/dmd/cppmangle.c @@ -88,7 +88,7 @@ class CppMangleVisitor : public Visitor int find(RootObject *p) { //printf("find %p %d %s\n", p, p.dyncast(), p ? p.toChars() : NULL); - for (size_t i = 0; i < components.dim; i++) + for (size_t i = 0; i < components.length; i++) { if (p == components[i]) return (int)i; @@ -166,7 +166,7 @@ class CppMangleVisitor : public Visitor if (!ti) // could happen if std::basic_string is not a template return; buf->writeByte('I'); - for (size_t i = 0; i < ti->tiargs->dim; i++) + for (size_t i = 0; i < ti->tiargs->length; i++) { RootObject *o = (*ti->tiargs)[i]; TemplateDeclaration *td = ti->tempdecl->isTemplateDeclaration(); @@ -184,7 +184,7 @@ class CppMangleVisitor : public Visitor buf->writeByte('I'); // argument pack // mangle the rest of the arguments as types - for (size_t j = i; j < ti->tiargs->dim; j++) + for (size_t j = i; j < ti->tiargs->length; j++) { Type *t = isType((*ti->tiargs)[j]); assert(t); @@ -365,7 +365,7 @@ class CppMangleVisitor : public Visitor if (!ti) return false; Dsymbol *q = getQualifier(ti); - return isStd(q) && ti->tiargs->dim == 1 && isChar((*ti->tiargs)[0]); + return isStd(q) && ti->tiargs->length == 1 && isChar((*ti->tiargs)[0]); } /*** @@ -376,7 +376,7 @@ class CppMangleVisitor : public Visitor */ bool char_std_char_traits_char(TemplateInstance *ti, const char *st) { - if (ti->tiargs->dim == 2 && + if (ti->tiargs->length == 2 && isChar((*ti->tiargs)[0]) && isChar_traits_char((*ti->tiargs)[1])) { @@ -411,7 +411,7 @@ class CppMangleVisitor : public Visitor if (s->ident == Id::basic_string) { // ::std::basic_string<char, ::std::char_traits<char>, ::std::allocator<char>> - if (ti->tiargs->dim == 3 && + if (ti->tiargs->length == 3 && isChar((*ti->tiargs)[0]) && isChar_traits_char((*ti->tiargs)[1]) && isAllocator_char((*ti->tiargs)[2])) @@ -491,7 +491,7 @@ class CppMangleVisitor : public Visitor else if (s->ident == Id::basic_string) { // ::std::basic_string<char, ::std::char_traits<char>, ::std::allocator<char>> - if (ti->tiargs->dim == 3 && + if (ti->tiargs->length == 3 && isChar((*ti->tiargs)[0]) && isChar_traits_char((*ti->tiargs)[1]) && isAllocator_char((*ti->tiargs)[2])) |