diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-09-21 23:43:25 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-09-21 23:43:25 +0100 |
| commit | 7db5967f1050eb2b45e920b13d495d92ba4f16f4 (patch) | |
| tree | 900f738d28b4bce44d6cdbae4799fadee0123778 | |
| parent | aecea4158f4e547af349657a3d16cb031a30ec3b (diff) | |
| download | gcc-7db5967f1050eb2b45e920b13d495d92ba4f16f4.zip gcc-7db5967f1050eb2b45e920b13d495d92ba4f16f4.tar.gz gcc-7db5967f1050eb2b45e920b13d495d92ba4f16f4.tar.bz2 | |
libstdc++: Use __builtin_expect in __glibcxx_assert
libstdc++-v3/ChangeLog:
* include/bits/c++config (__replacement_assert): Add noreturn
attribute.
(__glibcxx_assert_impl): Use __builtin_expect to hint that the
assertion is expected to pass.
| -rw-r--r-- | libstdc++-v3/include/bits/c++config | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index badf9d0..860bf6d 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -468,7 +468,8 @@ namespace std { // Avoid the use of assert, because we're trying to keep the <cassert> // include out of the mix. - extern "C++" inline void + extern "C++" _GLIBCXX_NORETURN + inline void __replacement_assert(const char* __file, int __line, const char* __function, const char* __condition) { @@ -478,7 +479,7 @@ namespace std } } #define __glibcxx_assert_impl(_Condition) \ - if (!bool(_Condition)) \ + if (__builtin_expect(!bool(_Condition), false)) \ std::__replacement_assert(__FILE__, __LINE__, __PRETTY_FUNCTION__, \ #_Condition) #endif |