Commit 484e936e by Jonathan Wakely Committed by Jonathan Wakely

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
parent 3ffa55de
2018-08-14 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/85343
* config/abi/pre/gnu.ver: Export new symbol.
* 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.
2018-08-14 Jeremy Sawicki <jeremy-gcc@sawicki.us> 2018-08-14 Jeremy Sawicki <jeremy-gcc@sawicki.us>
* include/ext/rope (_Rope_iterator_base(const _Rope_iterator_base&)) * include/ext/rope (_Rope_iterator_base(const _Rope_iterator_base&))
......
...@@ -2046,6 +2046,9 @@ GLIBCXX_3.4.26 { ...@@ -2046,6 +2046,9 @@ GLIBCXX_3.4.26 {
_ZNSt3pmr25monotonic_buffer_resource13_M_new_bufferE[jmy][jmy]; _ZNSt3pmr25monotonic_buffer_resource13_M_new_bufferE[jmy][jmy];
_ZNSt3pmr25monotonic_buffer_resource18_M_release_buffersEv; _ZNSt3pmr25monotonic_buffer_resource18_M_release_buffersEv;
# std::__throw_ios_failure(const char*, int);
_ZSt19__throw_ios_failurePKci;
} GLIBCXX_3.4.25; } GLIBCXX_3.4.25;
# Symbols in the support library (libsupc++) have their own tag. # Symbols in the support library (libsupc++) have their own tag.
......
...@@ -268,6 +268,7 @@ compatible. ...@@ -268,6 +268,7 @@ compatible.
<listitem><para>GCC 7.1.0: libstdc++.so.6.0.23</para></listitem> <listitem><para>GCC 7.1.0: libstdc++.so.6.0.23</para></listitem>
<listitem><para>GCC 7.2.0: libstdc++.so.6.0.24</para></listitem> <listitem><para>GCC 7.2.0: libstdc++.so.6.0.24</para></listitem>
<listitem><para>GCC 8.0.0: libstdc++.so.6.0.25</para></listitem> <listitem><para>GCC 8.0.0: libstdc++.so.6.0.25</para></listitem>
<listitem><para>GCC 9.0.0: libstdc++.so.6.0.26</para></listitem>
</itemizedlist> </itemizedlist>
<para> <para>
Note 1: Error should be libstdc++.so.3.0.3. Note 1: Error should be libstdc++.so.3.0.3.
...@@ -338,6 +339,7 @@ compatible. ...@@ -338,6 +339,7 @@ compatible.
<listitem><para>GCC 7.1.0: GLIBCXX_3.4.23, CXXABI_1.3.11</para></listitem> <listitem><para>GCC 7.1.0: GLIBCXX_3.4.23, CXXABI_1.3.11</para></listitem>
<listitem><para>GCC 7.2.0: GLIBCXX_3.4.24, CXXABI_1.3.11</para></listitem> <listitem><para>GCC 7.2.0: GLIBCXX_3.4.24, CXXABI_1.3.11</para></listitem>
<listitem><para>GCC 8.0.0: GLIBCXX_3.4.25, CXXABI_1.3.11</para></listitem> <listitem><para>GCC 8.0.0: GLIBCXX_3.4.25, CXXABI_1.3.11</para></listitem>
<listitem><para>GCC 9.0.0: GLIBCXX_3.4.26, CXXABI_1.3.11</para></listitem>
</itemizedlist> </itemizedlist>
</listitem> </listitem>
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <bits/cxxabi_forced.h> #include <bits/cxxabi_forced.h>
#include <bits/move.h> // for swap #include <bits/move.h> // for swap
#include <cerrno>
namespace std _GLIBCXX_VISIBILITY(default) namespace std _GLIBCXX_VISIBILITY(default)
{ {
...@@ -471,7 +472,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -471,7 +472,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
"invalid byte sequence in file")); "invalid byte sequence in file"));
else else
__throw_ios_failure(__N("basic_filebuf::underflow " __throw_ios_failure(__N("basic_filebuf::underflow "
"error reading the file")); "error reading the file"), errno);
} }
return __ret; return __ret;
} }
...@@ -717,7 +718,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -717,7 +718,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__len = _M_file.xsgetn(reinterpret_cast<char*>(__s), __n); __len = _M_file.xsgetn(reinterpret_cast<char*>(__s), __n);
if (__len == -1) if (__len == -1)
__throw_ios_failure(__N("basic_filebuf::xsgetn " __throw_ios_failure(__N("basic_filebuf::xsgetn "
"error reading the file")); "error reading the file"), errno);
if (__len == 0) if (__len == 0)
break; break;
......
...@@ -95,8 +95,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -95,8 +95,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__throw_ios_failure(const char*) __attribute__((__noreturn__)); __throw_ios_failure(const char*) __attribute__((__noreturn__));
void void
__throw_ios_failure(const char*, int) __attribute__((__noreturn__));
// Helpers for exception objects in <system_error>
void
__throw_system_error(int) __attribute__((__noreturn__)); __throw_system_error(int) __attribute__((__noreturn__));
// Helpers for exception objects in <future>
void void
__throw_future_error(int) __attribute__((__noreturn__)); __throw_future_error(int) __attribute__((__noreturn__));
......
...@@ -114,6 +114,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -114,6 +114,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__ios_failure(const char* s) : failure(s) __ios_failure(const char* s) : failure(s)
{ __construct_ios_failure(buf, runtime_error::what()); } { __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() ~__ios_failure()
{ __destroy_ios_failure(buf); } { __destroy_ios_failure(buf); }
...@@ -122,6 +125,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -122,6 +125,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// There are assertions in src/c++98/ios_failure.cc to ensure the size // There are assertions in src/c++98/ios_failure.cc to ensure the size
// and alignment assumptions are valid. // and alignment assumptions are valid.
alignas(runtime_error) unsigned char buf[sizeof(runtime_error)]; 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. // Custom type info for __ios_failure.
...@@ -161,5 +168,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -161,5 +168,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__throw_ios_failure(const char* __s __attribute__((unused))) __throw_ios_failure(const char* __s __attribute__((unused)))
{ _GLIBCXX_THROW_OR_ABORT(__ios_failure(_(__s))); } { _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 _GLIBCXX_END_NAMESPACE_VERSION
} // namespace } // namespace
...@@ -88,7 +88,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -88,7 +88,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__throw_ios_failure(const char* __s __attribute__((unused))) __throw_ios_failure(const char* __s __attribute__((unused)))
{ _GLIBCXX_THROW_OR_ABORT(ios::failure(_(__s))); } { _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 _GLIBCXX_END_NAMESPACE_VERSION
} // namespace } // namespace
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment