diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2018-08-14 13:09:57 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2018-08-14 13:09:57 +0100 |
| commit | 484e936e88e52d9e4e013bbc1b8264f556ff7cb4 (patch) | |
| tree | 1227bb8ea48c20af0f5bac310dfeecfce9a1e3ac /libstdc++-v3/src | |
| parent | 3ffa55de6061011361d13d0ecb032c694556ebf7 (diff) | |
| download | gcc-484e936e88e52d9e4e013bbc1b8264f556ff7cb4.zip gcc-484e936e88e52d9e4e013bbc1b8264f556ff7cb4.tar.gz gcc-484e936e88e52d9e4e013bbc1b8264f556ff7cb4.tar.bz2 | |
PR libstdc++/85343 overload __throw_ios_failure to take errno
[ios::failure] p2: "When throwing ios_base::failure exceptions,
implementations should provide values of ec that identify the specific
reason for the failure."
This adds a new overload of __throw_ios_failure that can be passed
errno, to store error_code(errno, system_category()) in the exception
object.
PR libstdc++/85343
* acinclude.m4 (libtool_VERSION): Bump version.
* config/abi/pre/gnu.ver (GLIBCXX_3.4.26): Add new symbol version.
Export new symbol.
* configure: Regenerate.
* doc/xml/manual/abi.xml: Document new versions.
* include/bits/fstream.tcc (basic_filebuf<C, T>::underflow)
(basic_filebuf<C, T>::xsgetn): Pass errno to __throw_ios_failure.
* include/bits/functexcept.h (__throw_ios_failure(const char*, int)):
Declare new overload.
* src/c++11/cxx11-ios_failure.cc (__ios_failure): Add new constructor
and static member function.
(__throw_ios_failure(const char*, int)): Define.
* src/c++98/ios_failure.cc [!_GLIBCXX_USE_DUAL_ABI]
(__throw_ios_failure(const char*, int)): Define.
* testsuite/util/testsuite_abi.cc: Update known and latest versions.
From-SVN: r263535
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/c++11/cxx11-ios_failure.cc | 12 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++98/ios_failure.cc | 6 |
2 files changed, 17 insertions, 1 deletions
diff --git a/libstdc++-v3/src/c++11/cxx11-ios_failure.cc b/libstdc++-v3/src/c++11/cxx11-ios_failure.cc index b1e4bfb..26816fa 100644 --- a/libstdc++-v3/src/c++11/cxx11-ios_failure.cc +++ b/libstdc++-v3/src/c++11/cxx11-ios_failure.cc @@ -114,6 +114,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __ios_failure(const char* s) : failure(s) { __construct_ios_failure(buf, runtime_error::what()); } + __ios_failure(const char* s, int e) : failure(s, to_error_code(e)) + { __construct_ios_failure(buf, runtime_error::what()); } + ~__ios_failure() { __destroy_ios_failure(buf); } @@ -122,6 +125,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // There are assertions in src/c++98/ios_failure.cc to ensure the size // and alignment assumptions are valid. alignas(runtime_error) unsigned char buf[sizeof(runtime_error)]; + + static error_code + to_error_code(int e) + { return e ? error_code(e, system_category()) : io_errc::stream; } }; // Custom type info for __ios_failure. @@ -161,5 +168,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __throw_ios_failure(const char* __s __attribute__((unused))) { _GLIBCXX_THROW_OR_ABORT(__ios_failure(_(__s))); } + void + __throw_ios_failure(const char* str __attribute__((unused)), + int err __attribute__((unused))) + { _GLIBCXX_THROW_OR_ABORT(__ios_failure(_(str), err)); } + _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/src/c++98/ios_failure.cc b/libstdc++-v3/src/c++98/ios_failure.cc index 49d24f4..794124b 100644 --- a/libstdc++-v3/src/c++98/ios_failure.cc +++ b/libstdc++-v3/src/c++98/ios_failure.cc @@ -88,7 +88,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __throw_ios_failure(const char* __s __attribute__((unused))) { _GLIBCXX_THROW_OR_ABORT(ios::failure(_(__s))); } -#endif + void + __throw_ios_failure(const char* str, int) + { __throw_ios_failure(str); } + +#endif // _GLIBCXX_USE_DUAL_ABI _GLIBCXX_END_NAMESPACE_VERSION } // namespace |