From patchwork Fri Feb 24 07:28:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vit Kabele X-Patchwork-Id: 65573 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 36384385482E for ; Fri, 24 Feb 2023 07:30:29 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail.sysgo.com (mail.sysgo.com [159.69.174.51]) by sourceware.org (Postfix) with ESMTPS id C2B65385840F for ; Fri, 24 Feb 2023 07:30:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C2B65385840F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sysgo.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=sysgo.com Received: from lantia.sysgo.com ([172.20.1.5]:35932) by mail.sysgo.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pVSWp-0007Ie-1X; Fri, 24 Feb 2023 08:30:03 +0100 From: =?utf-8?q?V=C3=ADt_Kabele?= To: gcc-patches@gcc.gnu.org Cc: vit@kabele.me, =?utf-8?q?V=C3=ADt_Kabele?= Subject: [PATCH v2] Print padding size when aligning struct member Date: Fri, 24 Feb 2023 08:28:36 +0100 Message-Id: <20230224072835.12177-1-vit.kabele@sysgo.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hello, I changed the tested pattern to match even on targets with different alignment. BR, VK -- >8 -- Announce the size of introduced padding when compiling with -Wpadded. gcc/ChangeLog: * stor-layout.cc (place_field): Change warning message format gcc/testsuite/ChangeLog: * c-c++-common/Wpadded.c: Add new testcase * gcc.dg/Wpadded.c: Update the expected warning message Signed-off-by: Vít Kabele --- gcc/stor-layout.cc | 2 +- gcc/testsuite/c-c++-common/Wpadded.c | 1 + gcc/testsuite/gcc.dg/Wpadded.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/stor-layout.cc b/gcc/stor-layout.cc index 45bf2d18639..1d2bd61eeae 100644 --- a/gcc/stor-layout.cc +++ b/gcc/stor-layout.cc @@ -1346,7 +1346,7 @@ place_field (record_layout_info rli, tree field) if (!targetm.ms_bitfield_layout_p (rli->t) && DECL_SOURCE_LOCATION (field) != BUILTINS_LOCATION && !TYPE_ARTIFICIAL (rli->t)) - warning (OPT_Wpadded, "padding struct to align %q+D", field); + warning (OPT_Wpadded, "padding struct with %d bytes to align %q+D", (desired_align - known_align)/8, field); /* If the alignment is still within offset_align, just align the bit position. */ diff --git a/gcc/testsuite/c-c++-common/Wpadded.c b/gcc/testsuite/c-c++-common/Wpadded.c index c5be4686822..0818ea03690 100644 --- a/gcc/testsuite/c-c++-common/Wpadded.c +++ b/gcc/testsuite/c-c++-common/Wpadded.c @@ -11,4 +11,5 @@ * 4 byte fields to 2 byte boundary. */ struct S { __UINT32_TYPE__ i; char c; } __attribute__((aligned(4))); /* { dg-warning "padding struct size to alignment boundary with 3 bytes" } */ +struct R { char c; __UINT32_TYPE__ i; } __attribute__((aligned(4))); /* { dg-warning "padding struct with" } */ diff --git a/gcc/testsuite/gcc.dg/Wpadded.c b/gcc/testsuite/gcc.dg/Wpadded.c index 70fcd79a6d4..218b37d1abc 100644 --- a/gcc/testsuite/gcc.dg/Wpadded.c +++ b/gcc/testsuite/gcc.dg/Wpadded.c @@ -10,5 +10,5 @@ struct foo { char bar; - long baz; /* { dg-warning "padding struct to align" "" { target { ! default_packed } } } */ + long baz; /* { dg-warning "padding struct with" "" { target { ! default_packed } } } */ } futz;