From patchwork Sun Jun 14 09:52:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 1308927 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gcc.gnu.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=m4OPQ8xe; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49l8rm5hMkz9sQx for ; Sun, 14 Jun 2020 19:52:23 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CD126383F843; Sun, 14 Jun 2020 09:52:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CD126383F843 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1592128340; bh=ccRJMQsXQONIlegsbVzAnTbGXIshV3MM2IQG35BjJ2g=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=m4OPQ8xecTe65sCtQX3LvpeedrygwFuSz+zNnkZSTO548KQRVqBWkGqxnow68IuD2 BeDqBwQvNY+PP2a9OzeI2oGVbQkd/HHF8a1SDduR2cnTFOE6SNeV6OnDKzuPzfXiKk dY4tyWIRFpssQ279AmuI89aubuckCN1NG8PphNh8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-202.mailbox.org (mout-p-202.mailbox.org [IPv6:2001:67c:2050::465:202]) by sourceware.org (Postfix) with ESMTPS id 5F3C2385DC00 for ; Sun, 14 Jun 2020 09:52:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5F3C2385DC00 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 49l8rc6L5GzQlD7; Sun, 14 Jun 2020 11:52:16 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id wUYjG8cxcDnl; Sun, 14 Jun 2020 11:52:12 +0200 (CEST) To: gcc-patches@gcc.gnu.org Subject: [committed] d: Fix line lengths after mechanical field renames. Date: Sun, 14 Jun 2020 11:52:10 +0200 Message-Id: <20200614095210.32077-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: CC666176F X-Rspamd-Score: 1.28 / 15.00 / 15.00 X-Spam-Status: No, score=-17.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_ABUSE_SURBL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Buclaw via Gcc-patches From: Iain Buclaw Reply-To: Iain Buclaw Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" 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);