maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix PR31489 - std::function self-swap segfaults 

llvm-svn: 290721
This commit is contained in:
Eric Fiselier 2016-12-29 20:03:55 +00:00
parent 7cc6059058
commit d566c34526
4 changed files with 205 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcxx/include/__functional_03
View File

@ -642,6 +642,8 @@ template<class _Rp>
void
function<_Rp()>::swap(function& __f)
{
if (_VSTD::addressof(__f) == this)
return;
if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
{
typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
@ -916,6 +918,8 @@ template<class _Rp, class _A0>
void
function<_Rp(_A0)>::swap(function& __f)
{
if (_VSTD::addressof(__f) == this)
return;
if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
{
typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
@ -1190,6 +1194,8 @@ template<class _Rp, class _A0, class _A1>
void
function<_Rp(_A0, _A1)>::swap(function& __f)
{
if (_VSTD::addressof(__f) == this)
return;
if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
{
typename aligned_storage<sizeof(__buf_)>::type __tempbuf;
@ -1464,6 +1470,8 @@ template<class _Rp, class _A0, class _A1, class _A2>
void
function<_Rp(_A0, _A1, _A2)>::swap(function& __f)
{
if (_VSTD::addressof(__f) == this)
return;
if (__f_ == (__base*)&__buf_ && __f.__f_ == (__base*)&__f.__buf_)
{
typename aligned_storage<sizeof(__buf_)>::type __tempbuf;

2
libcxx/include/functional
View File

@ -1870,6 +1870,8 @@ template<class _Rp, class ..._ArgTypes>
void
function<_Rp(_ArgTypes...)>::swap(function& __f) _NOEXCEPT
{
if (_VSTD::addressof(__f) == this)
return;
if ((void *)__f_ == &__buf_ && (void *)__f.__f_ == &__f.__buf_)
{
typename aligned_storage<sizeof(__buf_)>::type __tempbuf;

44
libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/copy_assign.pass.cpp
View File

@ -19,14 +19,13 @@
#include "test_macros.h"
#include "count_new.hpp"
class A
{
class A {
int data_[10];
public:
static int count;
A()
{
A() {
++count;
for (int i = 0; i < 10; ++i)
data_[i] = i;
@ -36,8 +35,7 @@ public:
~A() { --count; }
int operator()(int i) const
{
int operator()(int i) const {
for (int j = 0; j < 10; ++j)
i += data_[j];
return i;
@ -46,10 +44,12 @@ public:
int A::count = 0;
int g0() { return 0; }
int g(int) { return 0; }
int g2(int, int) { return 2; }
int g3(int, int, int) { return 3; }
int main()
{
int main() {
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f = A();
@ -89,6 +89,34 @@ int main()
assert(f2.target<int (*)(int)>() == 0);
assert(f2.target<A>() == 0);
}
{
typedef std::function<int()> Func;
Func f = g0;
Func& fr = (f = f);
assert(&fr == &f);
assert(*f.target<int(*)()>() == g0);
}
{
typedef std::function<int(int)> Func;
Func f = g;
Func& fr = (f = f);
assert(&fr == &f);
assert(*f.target<int(*)(int)>() == g);
}
{
typedef std::function<int(int, int)> Func;
Func f = g2;
Func& fr = (f = f);
assert(&fr == &f);
assert(*f.target<int(*)(int, int)>() == g2);
}
{
typedef std::function<int(int, int, int)> Func;
Func f = g3;
Func& fr = (f = f);
assert(&fr == &f);
assert(*f.target<int(*)(int, int, int)>() == g3);
}
#if TEST_STD_VER >= 11
assert(globalMemCounter.checkOutstandingNewEq(0));
{

93
libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.mod/swap.pass.cpp
View File

@ -18,20 +18,18 @@
#include "count_new.hpp"
class A
{
class A {
int data_[10];
public:
static int count;
explicit A(int j)
{
explicit A(int j) {
++count;
data_[0] = j;
}
A(const A& a)
{
A(const A &a) {
++count;
for (int i = 0; i < 10; ++i)
data_[i] = a.data_[i];
@ -39,23 +37,28 @@ public:
~A() { --count; }
int operator()(int i) const
{
int operator()(int i) const {
for (int j = 0; j < 10; ++j)
i += data_[j];
return i;
}
int operator()() const { return -1; }
int operator()(int, int) const { return -2; }
int operator()(int, int, int) const { return -3; }
int id() const { return data_[0]; }
};
int A::count = 0;
int g0() { return 0; }
int g(int) { return 0; }
int h(int) { return 1; }
int g2(int, int) { return 2; }
int g3(int, int, int) { return 3; }
int main()
{
int main() {
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f1 = A(1);
@ -117,4 +120,74 @@ int main()
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f1 = A(1);
assert(A::count == 1);
{
DisableAllocationGuard guard;
((void)guard);
f1.swap(f1);
}
assert(A::count == 1);
assert(f1.target<A>()->id() == 1);
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int()> f1 = g0;
DisableAllocationGuard guard;
((void)guard);
f1.swap(f1);
assert(*f1.target<int (*)()>() == g0);
}
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int, int)> f1 = g2;
DisableAllocationGuard guard;
((void)guard);
f1.swap(f1);
assert(*f1.target<int (*)(int, int)>() == g2);
}
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int, int, int)> f1 = g3;
DisableAllocationGuard guard;
((void)guard);
f1.swap(f1);
assert(*f1.target<int (*)(int, int, int)>() == g3);
}
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int()> f1 = A(1);
assert(A::count == 1);
DisableAllocationGuard guard;
((void)guard);
f1.swap(f1);
assert(A::count == 1);
assert(f1.target<A>()->id() == 1);
}
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(A::count == 0);
{
std::function<int(int, int)> f1 = A(2);
assert(A::count == 1);
DisableAllocationGuard guard;
((void)guard);
f1.swap(f1);
assert(A::count == 1);
assert(f1.target<A>()->id() == 2);
}
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(A::count == 0);
{
std::function<int(int, int, int)> f1 = A(3);
assert(A::count == 1);
DisableAllocationGuard guard;
((void)guard);
f1.swap(f1);
assert(A::count == 1);
assert(f1.target<A>()->id() == 3);
}
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(A::count == 0);
}