From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 4F52B3858425 for ; Wed, 21 Dec 2022 00:51:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4F52B3858425 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671583909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nH6mLtiigrlEIKyS5M1NGHkAG9MCfJDa/kr5Kb4mox0=; b=OKC0jXLBbCa2T8cjU8pZdkend/0IJkF8VFFLMrUe/p/KcCzFLGAnivUFlUzjlnewjadavk q58zC47Pf6UyCgndQlfUet1XA8hTgh2ITzgZqkYEIjZiTzhBidrlkYFNSDuQcv20HNl+Yc fE47nzsvn82/ogVF34b7ZqybLkbeUw4= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-662-Wfm4Ab9zPIat1b3eF0AnxA-1; Tue, 20 Dec 2022 19:51:48 -0500 X-MC-Unique: Wfm4Ab9zPIat1b3eF0AnxA-1 Received: by mail-lf1-f69.google.com with SMTP id be20-20020a056512251400b004aa9aadf60cso5736334lfb.20 for ; Tue, 20 Dec 2022 16:51:48 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nH6mLtiigrlEIKyS5M1NGHkAG9MCfJDa/kr5Kb4mox0=; b=WVbOC7RhDMyuz9HVifUDEmOac/nRW8r1ude1B4MPdfpJf2OmXz0IiHXwrdQeXrkkXK ggcl+QlZwrdnLfyhLrl7csEErwPHACBBttdvgfOev7zYJ844OkDuIk1SX9lpNaRiTt5A gY/BiJrgDt2WGFrCEmh1kiWozmZiUP8Hj9DDIAEMcTW10RR1EY4JB8zmJfvgvaQRoo4G VtH9sPFZLSMeOlP5m+09+AczDBKFtdVKB9sneU8F+d5L8bF5lv9+1WtGjldaC5vbvBIG AbqEjFoAXWNV0nzD4TIX5cXdowwu+BVAR0PWW616NqRqK9zgk2hqMGy3EHPb1FtTsEFM 4Shg== X-Gm-Message-State: AFqh2krwO6m6j2ZQVrmfmCUBvIA1yt+2/z0Ya8/Yp4yJR4pHJjOFKt1n eXbSGwCA9dkgmj3ROWB0tTqkRq4ZoB7ullTts2IoOiO/W191VK1/d5/7qDDrKSSJyTqlI7TZ+J9 uwqKygJy/Ii63CuUSlU0GH+2ZxNdHOiY= X-Received: by 2002:a05:6512:614:b0:4b0:65b0:7f30 with SMTP id b20-20020a056512061400b004b065b07f30mr4295lfe.385.1671583907325; Tue, 20 Dec 2022 16:51:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXuTREqLz9KzP02r8T5qyI6gCjTjKJY0wdGpJH2l9adXagsvcirhNQJd0BcaY6sm8qF3oUqhVrAGsD9t6fbNu1s= X-Received: by 2002:a05:6512:614:b0:4b0:65b0:7f30 with SMTP id b20-20020a056512061400b004b065b07f30mr4292lfe.385.1671583906963; Tue, 20 Dec 2022 16:51:46 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Jonathan Wakely Date: Wed, 21 Dec 2022 00:51:35 +0000 Message-ID: Subject: Re: [PATCH] libstdc++: Don't call 4-5 argument to_chars with chars_format{} To: Jakub Jelinek Cc: gcc-patches@gcc.gnu.org, libstdc++@gcc.gnu.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-6.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,KAM_SHORT,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,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 List-Id: On Tue, 20 Dec 2022 at 08:47, Jakub Jelinek wrote: > > Hi! > > In Fedora build libstdc++.so is built with assertions enabled and > FAIL: 20_util/to_chars/float128_c++23.cc execution test > was failing on all arches. The problem is that it called 5 argument version > of to_chars with chars_format{}, which C++ says is invalid: > http://eel.is/c++draft/charconv.to.chars#12 > Preconditions: fmt has the value of one of the enumerators of chars_format. > > The following patch fixes it by skipping the second part of the test > which needs the 5 argument to_chars for chars_format{}, but because > it is strictly speaking invalid also for 4 argument to_chars, it uses > 3 argument to_chars instead of 4 argument to_chars with last argument > chars_format{}. > > Bootstrapped/regtested on {x86_64,i686,aarch64,powerpc64le,s390x}-linux, ok > for trunk? OK, thanks. > > 2022-12-20 Jakub Jelinek > > * testsuite/20_util/to_chars/float16_c++23.cc (test): Use 3 argument > std::to_chars if fmt is std::chars_format{}, rather than 4 argument. > * testsuite/20_util/to_chars/float128_c++23.cc (test): Likewise, and > skip second part of testing that requires 5 argument std::to_chars. > > --- libstdc++-v3/testsuite/20_util/to_chars/float16_c++23.cc.jj 2022-11-01 22:45:50.653626818 +0100 > +++ libstdc++-v3/testsuite/20_util/to_chars/float16_c++23.cc 2022-12-19 16:23:28.989733811 +0100 > @@ -36,9 +36,16 @@ test(std::chars_format fmt = std::chars_ > for (int i = 0; i <= (unsigned short) ~0; ++i) > { > u.s = i; > - auto [ptr1, ec1] = std::to_chars(str1, str1 + sizeof(str1), u.f, fmt); > - auto [ptr2, ec2] = std::to_chars(str2, str2 + sizeof(str2), std::float32_t(u.f), fmt); > - VERIFY( ec1 == std::errc() && ec2 == std::errc()); > + auto [ptr1, ec1] = (fmt == std::chars_format{} > + ? std::to_chars(str1, str1 + sizeof(str1), u.f) > + : std::to_chars(str1, str1 + sizeof(str1), u.f, > + fmt)); > + auto [ptr2, ec2] = (fmt == std::chars_format{} > + ? std::to_chars(str2, str2 + sizeof(str2), > + std::float32_t(u.f)) > + : std::to_chars(str2, str2 + sizeof(str2), > + std::float32_t(u.f), fmt)); > + VERIFY( ec1 == std::errc() && ec2 == std::errc() ); > // std::cout << i << ' ' << std::string_view (str1, ptr1) > // << '\t' << std::string_view (str2, ptr2) << '\n'; > if (fmt == std::chars_format::fixed) > --- libstdc++-v3/testsuite/20_util/to_chars/float128_c++23.cc.jj 2022-11-25 22:23:44.540104246 +0100 > +++ libstdc++-v3/testsuite/20_util/to_chars/float128_c++23.cc 2022-12-19 16:24:49.142571475 +0100 > @@ -60,7 +60,9 @@ test(std::chars_format fmt = std::chars_ > char str1[10000], str2[10000]; > for (auto u : tests) > { > - auto [ptr1, ec1] = std::to_chars(str1, str1 + sizeof(str1), u, fmt); > + auto [ptr1, ec1] = (fmt == std::chars_format{} > + ? std::to_chars(str1, str1 + sizeof(str1), u) > + : std::to_chars(str1, str1 + sizeof(str1), u, fmt)); > VERIFY( ec1 == std::errc() ); > // std::cout << u << ' ' << std::string_view (str1, ptr1) << '\n'; > if (fmt == std::chars_format::fixed) > @@ -77,13 +79,14 @@ test(std::chars_format fmt = std::chars_ > VERIFY( ec4 == std::errc() && ptr4 == ptr1 ); > VERIFY( u == v ); > > + if (fmt == std::chars_format{}) > + continue; > + > auto [ptr5, ec5] = std::to_chars(str1, str1 + sizeof(str1), u, fmt, 90); > VERIFY( ec5 == std::errc() ); > // std::cout << u << ' ' << std::string_view (str1, ptr5) << '\n'; > v = 4.0f128; > - auto [ptr6, ec6] = std::from_chars(str1, ptr5, v, > - fmt == std::chars_format{} > - ? std::chars_format::general : fmt); > + auto [ptr6, ec6] = std::from_chars(str1, ptr5, v, fmt); > VERIFY( ec6 == std::errc() && ptr6 == ptr5 ); > if (fmt == std::chars_format::fixed && u > 0.0f128 && u < 0.000001f128) > VERIFY( v == 0.0 ); > > Jakub >