From patchwork Wed Oct 2 17:21:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Georg-Johann Lay X-Patchwork-Id: 1992118 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gjlay.de header.i=@gjlay.de header.a=rsa-sha256 header.s=strato-dkim-0002 header.b=eXgYDTkr; dkim=fail reason="signature verification failed" header.d=gjlay.de header.i=@gjlay.de header.a=ed25519-sha256 header.s=strato-dkim-0003 header.b=5T3UBw1u; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XJhSR0SVlz1xt1 for ; Thu, 3 Oct 2024 03:21:58 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B65B6385840A for ; Wed, 2 Oct 2024 17:21:56 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.22]) by sourceware.org (Postfix) with ESMTPS id 968EA3858D35 for ; Wed, 2 Oct 2024 17:21:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 968EA3858D35 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gjlay.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=gjlay.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 968EA3858D35 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=85.215.255.22 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1727889696; cv=pass; b=Y8QbYwpYuPvaPFjU7DGkx+OuT9zuRSYaBf4AgA1FX+070dpYDK6Cr25FWoAENW0xOIp46XvObJzpJI2XY0DjCFQkLcKR11BIgL4O+OiZc2nwQZ5EY/yaeiPsufu3oZWwuN/0//wqu2QaXmlxQmwX69JNSn+WF08S344NyCc3PkM= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1727889696; c=relaxed/simple; bh=TOCMIAHVE6uJ5Tn2YolU08j7uN5BLfBtkDtLyY8lllg=; h=DKIM-Signature:DKIM-Signature:Message-ID:Date:MIME-Version:From: To:Subject; b=gmXomcZjlA8DwJ0BukD1r32P6efXhZGTAnEGkk89aic7f3Miy8AEzyzXOy0W0ikEAkoAt+YiU/zG9jQ9TVMuzPciRgZq5812QMEu9iK8KRzAYiKKv5zvpc0dgi71D1ObXlpUHkptN6m4XQIsqufWYiOhfEURFT79efLZbi+qJb4= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; t=1727889693; cv=none; d=strato.com; s=strato-dkim-0002; b=rkqba4PNNKm4J099FPSroEJrrvZZS/ZD7r0E6jv2oaPl8qNVnJlkdmftJ8O/JplWfV khECkNmoJxoo3sUhnNWrUY79MFrZmx73/rCG1hKJ9oGvUlguExuv6UhDt+1kkKzpiLs9 2Lo6lo+cPKzvF6UiStOJmQGIjX2Cz9tLrajvUUmXR5gP3d5JDVr1HE8W9kCJ4FRQ8wOA MRfhu1KTd56xeMP6PvM5tfmfuxJO7CQuWTlUjrQNINfgLDlApJzag8nVO4kdMuXP2Hro izkECXZ7/LgdmxUj7yUx9AOnFRLzbIi1CnHMVm7/w8tGKssoYto4fe1vQ5N0UTx0U7i3 XIJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1727889693; s=strato-dkim-0002; d=strato.com; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=hZJ3beHdCfhjG/Wz9TPc6Uyj3GAW1HR0vsLpLjQ9NyU=; b=BoqxXPStRZK5HvDhtyJrJiETxPcYb4AGQ3CnBuf0qdd4vjgXKj3gGrEn4BwUFLCePO 8CywwKshwDGueIWJBp54f4c6207j8XnVl9pBKE3f8ZeUYjO1k3wAHMu+j9U5+BSzMUf3 JKpGpokzMSadW4rUwA2YM3+bAYKFpKKksWjd00VJ3D/JyouR6S8d13rhyuJFPTroWILs xSxtUko2fIstuKHfqKZt+3x30ST6ZsPyokLJ9ZdwRuHaKu2a9tA7rm679g4B/DsD/sDC 31TKs9V9lpx1F6iLwzqixn3AlQKXL7GcNTE+H/q9KGzS1rm1KP/PQP3hXX5CQjT3JdRi 1mng== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo00 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1727889693; s=strato-dkim-0002; d=gjlay.de; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=hZJ3beHdCfhjG/Wz9TPc6Uyj3GAW1HR0vsLpLjQ9NyU=; b=eXgYDTkrZlm/Cr9xt/WHas6/VIPcOUwp3XEAXdm64l29VNRbJcKTrEnaOLykqA+tHR OxbDC1lexMK/MwClzw3KcyFfBrjWsOx4QoqGMXjGA0kH8cIYgqKv7TiAQXBDvzDLk0M/ ItWP27OQxgm/lrOcH7Q0ns5WFzslYy3mVOIDcflstdCdUvUgDZ4rGKxuViV0vfM13rFO y3982X8CCBfxTz87pxbbPSPh6tnM67t10PAlT2xGBxohMVH6tmvOX5uB0alEc+jm2bww 8zBryLbQpjpN1mnPtzbuBliZS7NtjnnmX5qgvipnHAVvWNalFb+pACULwRSRC/yhybTa mhYA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1727889693; s=strato-dkim-0003; d=gjlay.de; h=Subject:To:From:Date:Message-ID:Cc:Date:From:Subject:Sender; bh=hZJ3beHdCfhjG/Wz9TPc6Uyj3GAW1HR0vsLpLjQ9NyU=; b=5T3UBw1ux/2PJJAA261+ttSTyN6TuoURWcmUywKb7vUVqKrvrdO6uAX5eAdiYUasLy gnC4q56ff/hXIGtdwIDQ== X-RZG-AUTH: ":LXoWVUeid/7A29J/hMvvT3koxZnKXKoq0dKoR0vVqyQb0R7G22gRW+Qr5Q==" Received: from [192.168.2.102] by smtp.strato.de (RZmta 51.2.8 AUTH) with ESMTPSA id x2e25d092HLXwyg (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for ; Wed, 2 Oct 2024 19:21:33 +0200 (CEST) Message-ID: <02bd2e25-e1d3-4bb9-93df-640d82b28830@gjlay.de> Date: Wed, 2 Oct 2024 19:21:32 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Georg-Johann Lay Content-Language: en-US To: "gcc-patches@gcc.gnu.org" Subject: [patch, testsuite, applied] ad PR52641: Make strict-flex-array-3.c work on int != 32-bit targets X-Spam-Status: No, score=-11.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NONE, 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.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org gcc.dg/strict-flex-array-3.c used hard-coded values instead of __SIZEOF_INT__ or equivalent expressions. Fixed as obvious. Plus, on AVR, printf doesn't support %zd, so that expect() is now special-cased. Johann --- testsuite/52641 - Make gcc.dg/strict-flex-array-3.c work on int != 32 bits. PR testsuite/52641 gcc/testsuite/ * gcc.dg/strict-flex-array-3.c (expect) [AVR]: Use custom version due to AVR-LibC limitations. (stuff): Use __SIZEOF_INT__ instead of hard-coded values. testsuite/52641 - Make gcc.dg/strict-flex-array-3.c work on int != 32 bits. PR testsuite/52641 gcc/testsuite/ * gcc.dg/strict-flex-array-3.c (expect) [AVR]: Use custom version due to AVR-LibC limitations. (stuff): Use __SIZEOF_INT__ instead of hard-coded values. diff --git a/gcc/testsuite/gcc.dg/strict-flex-array-3.c b/gcc/testsuite/gcc.dg/strict-flex-array-3.c index f74ed96c751..064f779501a 100644 --- a/gcc/testsuite/gcc.dg/strict-flex-array-3.c +++ b/gcc/testsuite/gcc.dg/strict-flex-array-3.c @@ -17,6 +17,21 @@ } \ } while (0); +#ifdef __AVR__ +/* AVR-Libc doesn't support %zd, thus use %d for size_t. */ +#undef expect +#define expect(p, _v) do { \ + size_t v = _v; \ + if (p == v) \ + __builtin_printf ("ok: %s == %d\n", #p, p); \ + else \ + { \ + __builtin_printf ("WAT: %s == %d (expected %d)\n", #p, p, v); \ + FAIL (); \ + } \ +} while (0); +#endif /* AVR */ + struct trailing_array_1 { int a; int b; @@ -46,8 +61,8 @@ void __attribute__((__noinline__)) stuff( struct trailing_array_3 *trailing_0, struct trailing_array_4 *trailing_flex) { - expect(__builtin_object_size(normal->c, 1), 16); - expect(__builtin_object_size(trailing_1->c, 1), 4); + expect(__builtin_object_size(normal->c, 1), 4 * __SIZEOF_INT__); + expect(__builtin_object_size(trailing_1->c, 1), __SIZEOF_INT__); expect(__builtin_object_size(trailing_0->c, 1), 0); expect(__builtin_object_size(trailing_flex->c, 1), -1); }