From patchwork Wed Jul 19 10:05:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 122506 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2328426vqt; Wed, 19 Jul 2023 03:09:38 -0700 (PDT) X-Google-Smtp-Source: APBJJlEif+wr32iAYLm4qAUqzeI0Nqx/m2XHVi6IqVoGd5Eo1XTeVOVhcq0n6EjP2AmJ5o3KkOW7 X-Received: by 2002:a17:906:1096:b0:993:d9bb:748b with SMTP id u22-20020a170906109600b00993d9bb748bmr1679521eju.1.1689761378585; Wed, 19 Jul 2023 03:09:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689761378; cv=none; d=google.com; s=arc-20160816; b=Dmiu26DaXQcSt2RBKH3DFgiPQ4cT85WbAgQnQcvqnAZXZBu/RgbqVZ+TpAUS2vM8Gc 7t3mbt13Chp+b2dYJCC55B+Qdad5T2bMnUMfDagL/M4OAAdZY4SSKZSE5GWJVDUkYT8G 6CqQJiA1NbZ3CU92FPbx+K/t4uiWxhBcsjzf4UfsWnO0aDWQin+ypCzqCssXIieEEN3M rE0l5kyrjKu2kpHjdY+w3yPVs4FQp9RNHJoeQmpYQT5v8Lrln/SQmcrdd/9IednT/iGg zIt5pfs4t352xLy+7t7yaJLoSeNlB4XRuecVRbgAofEbHIe+bLK7Bi8p6EjZJ1pKFcFE uamw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:dmarc-filter:delivered-to:dkim-signature :dkim-filter; bh=bJ+1zO7mNiI9gbL6PziVcE/EAM3VGK9pfw69jCWf54w=; fh=sC8lnOfyH6gL5FYlMbZ1VDz6qVPMj/3ViLJWKNUCUgQ=; b=vTjWR/TMi0okH5E8oQh5WmJSKQ1PMrT4gVxuogPerQ1cFVLlXPSx21DEF3cB6JwyVI pRolmrkfUV+5aVjOCzzV3d5Pnb/HxY+XEuozBBhkSG59tFZHMITgTfvctKsLzRF33zfJ 5/MXd9KwqMwD62XmxvmUTcpZ95beCS4hs+NFxpgBlk7LZr6WgqI6FuQxYGiFvbVDpaAq 829BJ0u+F4cdkn6quFz9rrVa//7XKcu1iS+HGinq13uzk7E0lOiJr521FXf0cxm6U/q+ EkHiIMomksPyDfNPJbblCjQqekFGDK6bHEgjHfMimmLaGxSI5j/uEz7wW+sPSRPIRV3j f6cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=StJTNUDx; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id lm13-20020a170906980d00b00997b9e99196si2706185ejb.52.2023.07.19.03.09.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 03:09:38 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=StJTNUDx; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9F3F03853D2C for ; Wed, 19 Jul 2023 10:07:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9F3F03853D2C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689761266; bh=bJ+1zO7mNiI9gbL6PziVcE/EAM3VGK9pfw69jCWf54w=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=StJTNUDx56azMNETRveQ7kPiID3GCf6gRLlAjRHpkf2sUoU9ZwSe8R7FApfnqwPkM jOFXW3+gLEyz+p5e9rdLPtGn7vOOy/+jj5v6kvis9gIT684lR8dHcuMcVjsq0IwyvC JNk0S9SHq9eJt1sOAtRALwlwX1WjFQnTAvHXVs2E= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 BCC4D3858000 for ; Wed, 19 Jul 2023 10:06:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org BCC4D3858000 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-164-CHhrFyllMgKYDad_dIP_kQ-1; Wed, 19 Jul 2023 06:06:28 -0400 X-MC-Unique: CHhrFyllMgKYDad_dIP_kQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 929EE873203; Wed, 19 Jul 2023 10:06:28 +0000 (UTC) Received: from localhost (unknown [10.42.28.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B04840C206F; Wed, 19 Jul 2023 10:06:28 +0000 (UTC) To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed 3/3] libstdc++: Enable tests for std::stoi etc. unconditionally [PR110653] Date: Wed, 19 Jul 2023 11:05:12 +0100 Message-ID: <20230719100625.2494437-3-jwakely@redhat.com> In-Reply-To: <20230719100625.2494437-1-jwakely@redhat.com> References: <20230719100625.2494437-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, 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_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable 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: , X-Patchwork-Original-From: Jonathan Wakely via Gcc-patches From: Jonathan Wakely Reply-To: Jonathan Wakely Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771843227079594372 X-GMAIL-MSGID: 1771843227079594372 Tested x86_64-linux. Pushed to trunk. -- >8 -- Since the narrow string versions of std::stoi, std::stol, std::stoul, std::stof and std::stod are now always defined, we don't need to check dg-require-string-conversions in the relevant tests. libstdc++-v3/ChangeLog: PR libstdc++/110653 * testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc: Remove dg-require-string-conversions. * testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc: Likewise. * testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc: Likewise. --- .../21_strings/basic_string/numeric_conversions/char/stod.cc | 1 - .../21_strings/basic_string/numeric_conversions/char/stof.cc | 1 - .../21_strings/basic_string/numeric_conversions/char/stoi.cc | 1 - .../21_strings/basic_string/numeric_conversions/char/stol.cc | 1 - .../21_strings/basic_string/numeric_conversions/char/stoul.cc | 1 - 5 files changed, 5 deletions(-) diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc index 062a0203c7c..c899a69ec17 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stod.cc @@ -1,5 +1,4 @@ // { dg-do run { target c++11 } } -// { dg-require-string-conversions "" } // { dg-xfail-run-if "broken long double IO" { newlib_broken_long_double_io } } // 2008-06-15 Paolo Carlini diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc index 584af6d072e..a06cd7e48c7 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stof.cc @@ -1,5 +1,4 @@ // { dg-do run { target c++11 } } -// { dg-require-string-conversions "" } // 2008-06-15 Paolo Carlini diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc index 1ef89728caf..f7d88065d94 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoi.cc @@ -1,5 +1,4 @@ // { dg-do run { target c++11 } } -// { dg-require-string-conversions "" } // 2008-06-15 Paolo Carlini diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc index 4617e38c2a9..a3e4e9cdd76 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stol.cc @@ -1,5 +1,4 @@ // { dg-do run { target c++11 } } -// { dg-require-string-conversions "" } // 2008-06-15 Paolo Carlini diff --git a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc index 1562d5d9fbe..705feaa5e84 100644 --- a/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc +++ b/libstdc++-v3/testsuite/21_strings/basic_string/numeric_conversions/char/stoul.cc @@ -1,5 +1,4 @@ // { dg-do run { target c++11 } } -// { dg-require-string-conversions "" } // 2008-06-15 Paolo Carlini