llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-22 16:37:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix PR31489 - std::function self-swap segfaults

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@290721 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-12-29 20:03:55 +00:00
parent 7d0000f737
commit 152e5e61a1
4 changed files with 205 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,92 +19,120 @@
#include "test_macros.h"
#include "count_new.hpp"
class A
{
int data_[10];
class A {
int data_[10];
public:
static int count;
static int count;
A()
{
++count;
for (int i = 0; i < 10; ++i)
data_[i] = i;
}
A() {
++count;
for (int i = 0; i < 10; ++i)
data_[i] = i;
}
A(const A&) {++count;}
A(const A &) { ++count; }
~A() {--count;}
~A() { --count; }
int operator()(int i) const
{
for (int j = 0; j < 10; ++j)
i += data_[j];
return i;
}
int operator()(int i) const {
for (int j = 0; j < 10; ++j)
i += data_[j];
return i;
}
};
int A::count = 0;
int g(int) {return 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()
{
assert(globalMemCounter.checkOutstandingNewEq(0));
{
int main() {
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f = A();
assert(A::count == 1);
assert(globalMemCounter.checkOutstandingNewEq(1));
assert(f.target<A>());
assert(f.target<int(*)(int)>() == 0);
assert(f.target<int (*)(int)>() == 0);
std::function<int(int)> f2;
f2 = f;
assert(A::count == 2);
assert(globalMemCounter.checkOutstandingNewEq(2));
assert(f2.target<A>());
assert(f2.target<int(*)(int)>() == 0);
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
{
assert(f2.target<int (*)(int)>() == 0);
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f = g;
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(f.target<int(*)(int)>());
assert(f.target<int (*)(int)>());
assert(f.target<A>() == 0);
std::function<int(int)> f2;
f2 = f;
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(f2.target<int(*)(int)>());
assert(f2.target<int (*)(int)>());
assert(f2.target<A>() == 0);
}
assert(globalMemCounter.checkOutstandingNewEq(0));
{
}
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f;
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(f.target<int(*)(int)>() == 0);
assert(f.target<int (*)(int)>() == 0);
assert(f.target<A>() == 0);
std::function<int(int)> f2;
f2 = f;
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(f2.target<int(*)(int)>() == 0);
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));
{
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f = A();
assert(A::count == 1);
assert(globalMemCounter.checkOutstandingNewEq(1));
assert(f.target<A>());
assert(f.target<int(*)(int)>() == 0);
assert(f.target<int (*)(int)>() == 0);
std::function<int(int)> f2;
f2 = std::move(f);
assert(A::count == 1);
assert(globalMemCounter.checkOutstandingNewEq(1));
assert(f2.target<A>());
assert(f2.target<int(*)(int)>() == 0);
assert(f2.target<int (*)(int)>() == 0);
assert(f.target<A>() == 0);
assert(f.target<int(*)(int)>() == 0);
}
assert(f.target<int (*)(int)>() == 0);
}
#endif
}

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

@@ -18,46 +18,49 @@
#include "count_new.hpp"
class A
{
int data_[10];
class A {
int data_[10];
public:
static int count;
static int count;
explicit A(int j)
{
++count;
data_[0] = j;
}
explicit A(int j) {
++count;
data_[0] = j;
}
A(const A& a)
{
++count;
for (int i = 0; i < 10; ++i)
data_[i] = a.data_[i];
}
A(const A &a) {
++count;
for (int i = 0; i < 10; ++i)
data_[i] = a.data_[i];
}
~A() {--count;}
~A() { --count; }
int operator()(int i) const
{
for (int j = 0; j < 10; ++j)
i += data_[j];
return i;
}
int operator()(int i) const {
for (int j = 0; j < 10; ++j)
i += data_[j];
return i;
}
int id() const {return data_[0];}
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 g(int) {return 0;}
int h(int) {return 1;}
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()
{
assert(globalMemCounter.checkOutstandingNewEq(0));
{
int main() {
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f1 = A(1);
std::function<int(int)> f2 = A(2);
assert(A::count == 2);
@@ -69,52 +72,122 @@ int main()
assert(globalMemCounter.checkOutstandingNewEq(2));
assert(f1.target<A>()->id() == 2);
assert(f2.target<A>()->id() == 1);
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
{
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f1 = A(1);
std::function<int(int)> f2 = g;
assert(A::count == 1);
assert(globalMemCounter.checkOutstandingNewEq(1));
assert(f1.target<A>()->id() == 1);
assert(*f2.target<int(*)(int)>() == g);
assert(*f2.target<int (*)(int)>() == g);
f1.swap(f2);
assert(A::count == 1);
assert(globalMemCounter.checkOutstandingNewEq(1));
assert(*f1.target<int(*)(int)>() == g);
assert(*f1.target<int (*)(int)>() == g);
assert(f2.target<A>()->id() == 1);
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
{
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f1 = g;
std::function<int(int)> f2 = A(1);
assert(A::count == 1);
assert(globalMemCounter.checkOutstandingNewEq(1));
assert(*f1.target<int(*)(int)>() == g);
assert(*f1.target<int (*)(int)>() == g);
assert(f2.target<A>()->id() == 1);
f1.swap(f2);
assert(A::count == 1);
assert(globalMemCounter.checkOutstandingNewEq(1));
assert(f1.target<A>()->id() == 1);
assert(*f2.target<int(*)(int)>() == g);
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
{
assert(*f2.target<int (*)(int)>() == g);
}
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
{
std::function<int(int)> f1 = g;
std::function<int(int)> f2 = h;
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(*f1.target<int(*)(int)>() == g);
assert(*f2.target<int(*)(int)>() == h);
assert(*f1.target<int (*)(int)>() == g);
assert(*f2.target<int (*)(int)>() == h);
f1.swap(f2);
assert(A::count == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
assert(*f1.target<int(*)(int)>() == h);
assert(*f2.target<int(*)(int)>() == g);
assert(*f1.target<int (*)(int)>() == h);
assert(*f2.target<int (*)(int)>() == g);
}
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 == 0);
assert(globalMemCounter.checkOutstandingNewEq(0));
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);
}