From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 40E353858D39; Tue, 28 Mar 2023 23:18:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 40E353858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680045529; bh=s5iSNUh7Pj+opicKZX+p6GSAZojcM5m54W95CXY0fH0=; h=From:To:Subject:Date:From; b=LQpF2wV/UJqVou5DrGmZu/Scl3AkMdOnLXctS4e9gOiFBKyIG8pNQArG2qmX6Amzm MDwIbQjXr2K58QM1AvRfGDqdbazCQwbPiBMzESw0EjL1BeYz9LvpDxNY3dTPy5y/25 bmdQbpenLLvxrgJgqJ2o3jyWzmwGH7YWqB04gKs4= 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 r13-6918] libstdc++: Do not use facets cached in ios for ATL128 build [PR103387] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: b3c5933ee726004e4e47291d422dfe7ac3345062 X-Git-Newrev: ec12639c82e944d37200a744156e183ea19add00 Message-Id: <20230328231849.40E353858D39@sourceware.org> Date: Tue, 28 Mar 2023 23:18:49 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ec12639c82e944d37200a744156e183ea19add00 commit r13-6918-gec12639c82e944d37200a744156e183ea19add00 Author: Jonathan Wakely Date: Tue Mar 28 21:07:21 2023 +0100 libstdc++: Do not use facets cached in ios for ATL128 build [PR103387] For the powerpc64le build with two different long double representations, we cannot use the ios_base::_M_num_put and ios_base::_M_num_get pointers, because they might have been initialized in a translation unit using the other long double type. With the changes to add __try_use_facet to GCC 13 the cache isn't really needed now, we can just access the right facet in the locale directly, without needing RTTI checks. libstdc++-v3/ChangeLog: PR libstdc++/103387 * include/bits/istream.tcc (istream::_M_extract(ValueT&)): Use std::use_facet instead of cached _M_num_get facet. (istream::operator>>(short&)): Likewise. (istream::operator>>(int&)): Likewise. * include/bits/ostream.tcc (ostream::_M_insert(ValueT)): Use std::use_facet instead of cached _M_num_put facet. Diff: --- libstdc++-v3/include/bits/istream.tcc | 15 +++++++++++++++ libstdc++-v3/include/bits/ostream.tcc | 5 +++++ 2 files changed, 20 insertions(+) diff --git a/libstdc++-v3/include/bits/istream.tcc b/libstdc++-v3/include/bits/istream.tcc index 733a8359902..334a91755aa 100644 --- a/libstdc++-v3/include/bits/istream.tcc +++ b/libstdc++-v3/include/bits/istream.tcc @@ -102,7 +102,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ios_base::iostate __err = ios_base::goodbit; __try { +#ifndef _GLIBCXX_LONG_DOUBLE_ALT128_COMPAT const __num_get_type& __ng = __check_facet(this->_M_num_get); +#else + const __num_get_type& __ng + = use_facet<__num_get_type>(this->_M_ios_locale); +#endif __ng.get(*this, 0, *this, __err, __v); } __catch(__cxxabiv1::__forced_unwind&) @@ -132,7 +137,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __try { long __l; +#ifndef _GLIBCXX_LONG_DOUBLE_ALT128_COMPAT const __num_get_type& __ng = __check_facet(this->_M_num_get); +#else + const __num_get_type& __ng + = use_facet<__num_get_type>(this->_M_ios_locale); +#endif __ng.get(*this, 0, *this, __err, __l); // _GLIBCXX_RESOLVE_LIB_DEFECTS @@ -177,7 +187,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __try { long __l; +#ifndef _GLIBCXX_LONG_DOUBLE_ALT128_COMPAT const __num_get_type& __ng = __check_facet(this->_M_num_get); +#else + const __num_get_type& __ng + = use_facet<__num_get_type>(this->_M_ios_locale); +#endif __ng.get(*this, 0, *this, __err, __l); // _GLIBCXX_RESOLVE_LIB_DEFECTS diff --git a/libstdc++-v3/include/bits/ostream.tcc b/libstdc++-v3/include/bits/ostream.tcc index e20012d2dc6..bb8584276f5 100644 --- a/libstdc++-v3/include/bits/ostream.tcc +++ b/libstdc++-v3/include/bits/ostream.tcc @@ -69,7 +69,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ios_base::iostate __err = ios_base::goodbit; __try { +#ifndef _GLIBCXX_LONG_DOUBLE_ALT128_COMPAT const __num_put_type& __np = __check_facet(this->_M_num_put); +#else + const __num_put_type& __np + = use_facet<__num_put_type>(this->_M_ios_locale); +#endif if (__np.put(*this, *this, this->fill(), __v).failed()) __err |= ios_base::badbit; }