[committed] d: Fix line lengths after mechanical field renames.
Iain Buclaw
ibuclaw@gdcproject.org
Sun Jun 14 09:52:10 GMT 2020
Hi,
This patch adjusts a few overflowed lines after the recent refactorings
done in the upstream front-end that caused renames of many fields - in
this case, dim -> length.
Bootstrapped and regression tested on x86_64-linux-gnu, and committed to
mainline.
Regards
Iain.
gcc/d/ChangeLog:
* expr.cc (ExprVisitor::visit (AssocArrayLiteralExp *)): Fix line
lengths, no functional change.
* typeinfo.cc (TypeInfoVisitor::layout_interfaces): Likewise.
(layout_classinfo_interfaces): Likewise.
---
gcc/d/expr.cc | 3 ++-
gcc/d/typeinfo.cc | 9 ++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/gcc/d/expr.cc b/gcc/d/expr.cc
index 41d97964dd3..1940480f9c4 100644
--- a/gcc/d/expr.cc
+++ b/gcc/d/expr.cc
@@ -2820,7 +2820,8 @@ public:
/* Generate: _d_assocarrayliteralTX (ti, keys, vals); */
tree keys = d_array_value (build_ctype (ta->index->arrayOf ()),
- size_int (e->keys->length), build_address (akeys));
+ size_int (e->keys->length),
+ build_address (akeys));
tree vals = d_array_value (build_ctype (ta->next->arrayOf ()),
size_int (e->values->length),
build_address (avals));
diff --git a/gcc/d/typeinfo.cc b/gcc/d/typeinfo.cc
index 1c5d669abf8..8249fa7c2e8 100644
--- a/gcc/d/typeinfo.cc
+++ b/gcc/d/typeinfo.cc
@@ -451,7 +451,8 @@ class TypeInfoVisitor : public Visitor
gcc_assert (voffset != 0u);
value = build_offset (csym, size_int (voffset));
- CONSTRUCTOR_APPEND_ELT (v, size_int (1), size_int (id->vtbl.length));
+ CONSTRUCTOR_APPEND_ELT (v, size_int (1),
+ size_int (id->vtbl.length));
CONSTRUCTOR_APPEND_ELT (v, size_int (2), value);
}
@@ -1218,7 +1219,8 @@ layout_classinfo_interfaces (ClassDeclaration *decl)
if (id->vtbl.length && offset != ~0u)
{
- tree vtbldomain = build_index_type (size_int (id->vtbl.length - 1));
+ tree vtbldomain
+ = build_index_type (size_int (id->vtbl.length - 1));
tree vtbltype = build_array_type (vtable_entry_type, vtbldomain);
field = create_field_decl (vtbltype, NULL, 1, 1);
@@ -1242,7 +1244,8 @@ layout_classinfo_interfaces (ClassDeclaration *decl)
if (type == tinfo_types[TK_CLASSINFO_TYPE])
type = copy_aggregate_type (type);
- tree vtbldomain = build_index_type (size_int (id->vtbl.length - 1));
+ tree vtbldomain
+ = build_index_type (size_int (id->vtbl.length - 1));
tree vtbltype = build_array_type (vtable_entry_type, vtbldomain);
tree field = create_field_decl (vtbltype, NULL, 1, 1);
--
2.20.1
More information about the Gcc-patches
mailing list