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

libstdc++: Optimize std::function move constructor [PR101923]

Browse Source 
PR 101923 points out that the unconditional swap in the std::function
move constructor makes it slower than copying an empty std::function.
The copy constructor has to check for the empty case before doing
anything, and that makes it very fast for the empty case.

Adding the same check to the move constructor avoids copying the
_Any_data POD when we don't need to. We can also inline the effects of
swap, by copying each member and then zeroing the pointer members.

This makes moving an empty object at least as fast as copying an empty
object.

Signed-off-by: Jonathan Wakely <jwakely@redhat.com>

libstdc++-v3/ChangeLog:

	PR libstdc++/101923
	* include/bits/std_function.h (function(function&&)): Check for
	non-empty parameter before doing any work.

(cherry picked from commit 0808b0df9c)
This commit is contained in:
Jonathan Wakely 2021-08-17 11:30:56 +01:00
parent da206878f6
commit 73b0f810a1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libstdc++-v3/include/bits/std_function.h
View File

@ -389,8 +389,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* (if it has one).
*/
function(function&& __x) noexcept
: _Function_base()
{ __x.swap(*this); }
: _Function_base(), _M_invoker(__x._M_invoker)
{
if (static_cast<bool>(__x))
{
_M_functor = __x._M_functor;
_M_manager = __x._M_manager;
__x._M_manager = nullptr;
__x._M_invoker = nullptr;
}
}
/**
* @brief Builds a %function that targets a copy of the incoming