mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-10 03:20:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

libstdc++: Fix bootstrap with -fno-rtti [PR 99077]

Browse Source 
When libstdc++ is built without RTTI the __ios_failure type is just an
alias for std::ios_failure, so trying to construct it from an int won't
compile. This changes the RTTI-enabled __ios_failure type to have the
same constructor parameters as std::ios_failure, so that the constructor
takes the same arguments whether RTTI is enabled or not.

The __throw_ios_failure function now constructs the error_code, instead
of the __ios_failure constructor. As a drive-by fix that error_code is
constructed with std::generic_category() not std::system_category(),
because the int comes from errno which corresponds to the generic
category.

libstdc++-v3/ChangeLog:

	PR libstdc++/99077
	* src/c++11/cxx11-ios_failure.cc (__ios_failure(const char*, int)):
	Change int parameter to error_code, to match std::ios_failure.
	(__throw_ios_failure(const char*, int)): Construct error_code
	from int parameter.
This commit is contained in:
Jonathan Wakely 2021-02-12 10:37:56 +00:00
parent 71b8ed7c61
commit 4591f7e532
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libstdc++-v3/src/c++11/cxx11-ios_failure.cc
View File

@ -114,7 +114,7 @@ _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))
__ios_failure(const char* s, const error_code& e) : failure(s, e)
{ __construct_ios_failure(buf, runtime_error::what()); }
~__ios_failure()
@ -125,10 +125,6 @@ _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.
@ -171,7 +167,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
void
__throw_ios_failure(const char* str __attribute__((unused)),
int err __attribute__((unused)))
{ _GLIBCXX_THROW_OR_ABORT(__ios_failure(_(str), err)); }
{
_GLIBCXX_THROW_OR_ABORT(__ios_failure(_(str),
err ? error_code(err, generic_category()) : io_errc::stream));
}
_GLIBCXX_END_NAMESPACE_VERSION
} // namespace