From 2cbc99d18dc411ac3fdef94e22ce86859806e63c Mon Sep 17 00:00:00 2001
From: Iain Buclaw <ibuclaw@gdcproject.org>
Date: Thu, 4 Jun 2020 22:36:26 +0200
Subject: 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.
---
 gcc/d/d-attribs.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gcc/d/d-attribs.cc')

diff --git a/gcc/d/d-attribs.cc b/gcc/d/d-attribs.cc
index 69434c6..b83db95 100644
--- a/gcc/d/d-attribs.cc
+++ b/gcc/d/d-attribs.cc
@@ -245,7 +245,7 @@ build_attributes (Expressions *eattrs)
 
   tree attribs = NULL_TREE;
 
-  for (size_t i = 0; i < eattrs->dim; i++)
+  for (size_t i = 0; i < eattrs->length; i++)
     {
       Expression *attr = (*eattrs)[i];
       Dsymbol *sym = attr->type->toDsymbol (0);
@@ -297,7 +297,7 @@ build_attributes (Expressions *eattrs)
       /* Chain all attribute arguments together.  */
       tree args = NULL_TREE;
 
-      for (size_t j = 1; j < elems->dim; j++)
+      for (size_t j = 1; j < elems->length; j++)
 	{
 	  Expression *e = (*elems)[j];
 	  tree t;
-- 
cgit v1.1