From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 8EF473857739; Wed, 19 Jul 2023 10:04:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8EF473857739 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689761066; bh=2CNiSbg3BHpjQHbv7LYYjTGttNsuOg2Ya7TJRKfCjDc=; h=From:To:Subject:Date:From; b=SWczj9siRZEGzofX1OQ1ZpeZsCPYh1q+TgjI13x6QmLINpeIaIQ+aaztH+wZP3I7C tx3KxZ1CKMqZyuMNofaBwaLK0j5sc0iWEh5s9c6TvgPpCIBvcoMUrydRutg2UpYBEN LBhUnffLbsyhRu2qkCMs5uQyJPHG1AS4Zzfx5RqM= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-2636] libstdc++: Define std::stof fallback in terms of std::stod [PR110653] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 58303d42809f0e01f23262f592d37943f7703f71 X-Git-Newrev: f0b0c21152b337bc9a8ef3a72a15c8dcdff1d847 Message-Id: <20230719100426.8EF473857739@sourceware.org> Date: Wed, 19 Jul 2023 10:04:26 +0000 (GMT) List-Id: https://gcc.gnu.org/g:f0b0c21152b337bc9a8ef3a72a15c8dcdff1d847 commit r14-2636-gf0b0c21152b337bc9a8ef3a72a15c8dcdff1d847 Author: Jonathan Wakely Date: Sat Jul 15 20:41:28 2023 +0100 libstdc++: Define std::stof fallback in terms of std::stod [PR110653] For targets without std::strtof we can define std::stof by calling std::stod and then checking if the result is out of range of float. libstdc++-v3/ChangeLog: PR libstdc++/110653 * include/bits/basic_string.h [!_GLIBCXX_HAVE_STRTOF] (stof): Define in terms of std::stod. Diff: --- libstdc++-v3/include/bits/basic_string.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index 32f5d4421f7..e4cb9846025 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -4153,6 +4153,22 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 inline float stof(const string& __str, size_t* __idx = 0) { return __gnu_cxx::__stoa(&std::strtof, "stof", __str.c_str(), __idx); } +#else + inline float + stof(const string& __str, size_t* __idx = 0) + { + double __d = std::stod(__str, __idx); + if (__builtin_isfinite(__d)) + { + double __abs_d = __builtin_fabs(__d); + if (__abs_d < __FLT_MIN__ || __abs_d > __FLT_MAX__) + { + errno = ERANGE; + std::__throw_out_of_range("stof"); + } + } + return __d; + } #endif #if _GLIBCXX_USE_C99_STDLIB || _GLIBCXX_HAVE_STRTOLD