From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by sourceware.org (Postfix) with ESMTPS id 8168C3858D37; Tue, 5 Apr 2022 18:48:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8168C3858D37 Received: by mail-wr1-x432.google.com with SMTP id j12so13107547wrb.5; Tue, 05 Apr 2022 11:48:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=U4paqoyszSJoMZ6GJSVC2A11Tesr/oNnKPvMqbiw4H8=; b=iK690UU1z33RiGBrEoeFDrOs6El3a8yvXyLHSCbm9GQSPQus6uilOhojFblZ3p+vZ6 1bs3s2t2fnOFVvpP2VyMqXRHRRWiGNoo19sdI1djDkeSYwabkwdggkkGuS4GHzBgK+jX 0B2+WzVJV0jcYl6slk9EtZhLP4gmBMRehcCUjYmOstM9xUXhxTRaDp04XWJomiGaTTpY 0SdIhBZ0eUGTFITSthqE1hnCAnLDMOTNp3p7nnUYnZBvZYkmX+ImrNMbZkpUL7dMuW2w rawwx3s7dzWyoWgWTi3x+Ja1K+f1Uea3B94sJ0vjFcxP6oc1ui2fR6HmsdBmEW5dilJa WTYQ== X-Gm-Message-State: AOAM5303Ea/Zb4UZzB6IRkgv+ZUrtVuE1XYaCK5Eb9bIjh5/SPOfn4ih JfHpJ6DRcD1OnE65I1BHjBKzTMsoqj67PnOnpKg= X-Google-Smtp-Source: ABdhPJxEWsNPq/wIMoi1lXDo/1I76fMD3qn3zV3HTT8wIt2blgErBe28imTa4T8j/fkt/NxMNn72sfpQcKM2hSym1LU= X-Received: by 2002:adf:eb48:0:b0:203:f854:86cc with SMTP id u8-20020adfeb48000000b00203f85486ccmr3766025wrn.102.1649184490829; Tue, 05 Apr 2022 11:48:10 -0700 (PDT) MIME-Version: 1.0 References: <20220405164329.99C9F20426@pchp3.se.axis.com> In-Reply-To: <20220405164329.99C9F20426@pchp3.se.axis.com> From: Jonathan Wakely Date: Tue, 5 Apr 2022 19:47:58 +0100 Message-ID: Subject: Re: [PATCH] libstdc++-v3 expected: Don't test ABI-variant properties in requirements.cc To: Hans-Peter Nilsson Cc: gcc-patches , "libstdc++" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, HTML_MESSAGE, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Apr 2022 18:48:14 -0000 On Tue, 5 Apr 2022, 17:44 Hans-Peter Nilsson via Libstdc++, < libstdc++@gcc.gnu.org> wrote: > Ok to commit? > -------------- 8< -------------- > > Without this, for a target where alignment and structure-sizes are by > default byte-aligned, such as cris-elf, you'll see, in libstdc++.log: > > /X/gcc/libstdc++-v3/testsuite/20_util/expected/requirements.cc:127: error: > static assertion failed > /X/gcc/libstdc++-v3/testsuite/20_util/expected/requirements.cc:127: note: > the comparison reduces to '(5 == 2)' > compiler exited with status 1 > FAIL: 20_util/expected/requirements.cc (test for excess errors) > Excess errors: > /X/gcc/libstdc++-v3/testsuite/20_util/expected/requirements.cc:127: error: > static assertion failed > > It seems the intent is a smoke-test and that conditionals for ABI > properties are out of scope, so best to just delete this particular > line. > The idea is to ensure the object is no larger than necessary. I think we could use == sizeof(void*)+alignof(void*) which would be correct everywhere. Does that work for cris-elf? > libstdc++-v3/: > * testsuite/20_util/expected/requirements.cc: Don't test > ABI-variant properties of expected<>. > --- > libstdc++-v3/testsuite/20_util/expected/requirements.cc | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/libstdc++-v3/testsuite/20_util/expected/requirements.cc > b/libstdc++-v3/testsuite/20_util/expected/requirements.cc > index 485aa338679c..a51a007a4fc3 100644 > --- a/libstdc++-v3/testsuite/20_util/expected/requirements.cc > +++ b/libstdc++-v3/testsuite/20_util/expected/requirements.cc > @@ -124,6 +124,5 @@ static_assert( move_assignable< void, G > ); > // QoI properties > static_assert( sizeof(std::expected) == 2 ); > static_assert( sizeof(std::expected) == 2 ); > -static_assert( sizeof(std::expected) == 2 * __alignof(void*) > ); > static_assert( alignof(std::expected) == 1 ); > static_assert( alignof(std::expected) == alignof(void*) ); > -- > 2.30.2 > >