OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

array (at): Do not use builtin_expect.

Browse Source 
* include/tr1_impl/array (at): Do not use builtin_expect.
	* include/ext/throw_allocator.h (allocate): Likewise.
	* include/ext/pool_allocator.h (allocate): Likweise.
	* include/ext/bitmap_allocator.h (allocate): Likewise.
	* include/ext/rc_string_base.h (_S_construct): Likewise.
	* include/ext/malloc_allocator.h (allocate): Likewise.
	* include/ext/mt_allocator.h (allocate): Likewise.
	* include/ext/sso_string_base.h (_M_construct): Likewise.
	* include/bits/basic_string.tcc (_S_construct): Likewise.

From-SVN: r146681
This commit is contained in:
Jan Hubicka 2009-04-24 11:35:19 +02:00 committed by Jan Hubicka
parent aa829fa1ea
commit e762c6f4c6
11 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,15 @@
2009-04-22 Jan Hubicka <jh@suse.cz>
* include/tr1_impl/array (at): Do not use builtin_expect.
* include/ext/throw_allocator.h (allocate): Likewise.
* include/ext/pool_allocator.h (allocate): Likweise.
* include/ext/bitmap_allocator.h (allocate): Likewise.
* include/ext/rc_string_base.h (_S_construct): Likewise.
* include/ext/malloc_allocator.h (allocate): Likewise.
* include/ext/mt_allocator.h (allocate): Likewise.
* include/ext/sso_string_base.h (_M_construct): Likewise.
* include/bits/basic_string.tcc (_S_construct): Likewise.
2009-04-22 Jan Hubicka <jh@suse.cz>
* include/c_std/cstdlib (abort, exit, _Exit): Mark noreturn throw ().

3
libstdc++-v3/include/bits/basic_string.tcc
View File

@ -129,8 +129,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
return _S_empty_rep()._M_refdata();
#endif
// NB: Not required, but considered best practice.
if (__builtin_expect(__gnu_cxx::__is_null_pointer(__beg)
&& __beg != __end, 0))
if (__gnu_cxx::__is_null_pointer(__beg) && __beg != __end)
__throw_logic_error(__N("basic_string::_S_construct NULL not valid"));
const size_type __dnew = static_cast<size_type>(std::distance(__beg,

2
libstdc++-v3/include/ext/bitmap_allocator.h
View File

@ -1049,7 +1049,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
pointer
allocate(size_type __n)
{
if (__builtin_expect(__n > this->max_size(), false))
if (__n > this->max_size())
std::__throw_bad_alloc();
if (__builtin_expect(__n == 1, true))

2
libstdc++-v3/include/ext/malloc_allocator.h
View File

@ -84,7 +84,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
pointer
allocate(size_type __n, const void* = 0)
{
if (__builtin_expect(__n > this->max_size(), false))
if (__n > this->max_size())
std::__throw_bad_alloc();
pointer __ret = static_cast<_Tp*>(std::malloc(__n * sizeof(_Tp)));

2
libstdc++-v3/include/ext/mt_allocator.h
View File

@ -674,7 +674,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
__mt_alloc<_Tp, _Poolp>::
allocate(size_type __n, const void*)
{
if (__builtin_expect(__n > this->max_size(), false))
if (__n > this->max_size())
std::__throw_bad_alloc();
__policy_type::_S_initialize_once();

2
libstdc++-v3/include/ext/new_allocator.h
View File

@ -83,7 +83,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
pointer
allocate(size_type __n, const void* = 0)
{
if (__builtin_expect(__n > this->max_size(), false))
if (__n > this->max_size())
std::__throw_bad_alloc();
return static_cast<_Tp*>(::operator new(__n * sizeof(_Tp)));

4
libstdc++-v3/include/ext/pool_allocator.h
View File

@ -200,7 +200,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
pointer __ret = 0;
if (__builtin_expect(__n != 0, true))
{
if (__builtin_expect(__n > this->max_size(), false))
if (__n > this->max_size())
std::__throw_bad_alloc();
// If there is a race through here, assume answer from getenv
@ -230,7 +230,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
*__free_list = __result->_M_free_list_link;
__ret = reinterpret_cast<_Tp*>(__result);
}
if (__builtin_expect(__ret == 0, 0))
if (__ret == 0)
std::__throw_bad_alloc();
}
}

2
libstdc++-v3/include/ext/rc_string_base.h
View File

@ -546,7 +546,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
return _S_empty_rep._M_refcopy();
// NB: Not required, but considered best practice.
if (__builtin_expect(__is_null_pointer(__beg) && __beg != __end, 0))
if (__is_null_pointer(__beg) && __beg != __end)
std::__throw_logic_error(__N("__rc_string_base::"
"_S_construct NULL not valid"));

2
libstdc++-v3/include/ext/sso_string_base.h
View File

@ -428,7 +428,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
std::forward_iterator_tag)
{
// NB: Not required, but considered best practice.
if (__builtin_expect(__is_null_pointer(__beg) && __beg != __end, 0))
if (__is_null_pointer(__beg) && __beg != __end)
std::__throw_logic_error(__N("__sso_string_base::"
"_M_construct NULL not valid"));

2
libstdc++-v3/include/ext/throw_allocator.h
View File

@ -220,7 +220,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
pointer
allocate(size_type __n, std::allocator<void>::const_pointer hint = 0)
{
if (__builtin_expect(__n > this->max_size(), false))
if (__n > this->max_size())
std::__throw_bad_alloc();
throw_conditionally();

4
libstdc++-v3/include/tr1_impl/array
View File

@ -149,7 +149,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
reference
at(size_type __n)
{
if (__builtin_expect(__n >= _Nm, false))
if (__n >= _Nm)
std::__throw_out_of_range(__N("array::at"));
return _M_instance[__n];
}
@ -157,7 +157,7 @@ _GLIBCXX_BEGIN_NAMESPACE_TR1
const_reference
at(size_type __n) const
{
if (__builtin_expect(__n >= _Nm, false))
if (__n >= _Nm)
std::__throw_out_of_range(__N("array::at"));
return _M_instance[__n];
}