[libcxx] Consolidate new/delete replacement in tests and disable it when using sanitizers.
Summary: MSAN and ASAN also replace new/delete which leads to a link error in these tests. Currently they are unsupported but I think it would be useful if these tests could run with sanitizers. This patch creates a support header that consolidates the new/delete replacement functionality and checking. When we are using sanitizers new and delete are no longer replaced and the checks always return true. Reviewers: mclow.lists, danalbert, jroelofs, EricWF Reviewed By: EricWF Subscribers: cfe-commits Differential Revision: http://reviews.llvm.org/D6562 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@224741 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -16,26 +16,10 @@
|
||||
// && Convertible<Callable<F, ArgTypes...>::result_type
|
||||
// operator=(F f);
|
||||
|
||||
// UNSUPPORTED: asan, msan
|
||||
|
||||
#include <functional>
|
||||
#include <new>
|
||||
#include <cstdlib>
|
||||
#include <cassert>
|
||||
|
||||
int new_called = 0;
|
||||
|
||||
void* operator new(std::size_t s) throw(std::bad_alloc)
|
||||
{
|
||||
++new_called;
|
||||
return std::malloc(s);
|
||||
}
|
||||
|
||||
void operator delete(void* p) throw()
|
||||
{
|
||||
--new_called;
|
||||
std::free(p);
|
||||
}
|
||||
#include "count_new.hpp"
|
||||
|
||||
class A
|
||||
{
|
||||
@@ -70,30 +54,30 @@ int g(int) {return 0;}
|
||||
|
||||
int main()
|
||||
{
|
||||
assert(new_called == 0);
|
||||
assert(globalMemCounter.checkOutstandingNewEq(0));
|
||||
{
|
||||
std::function<int(int)> f;
|
||||
f = A();
|
||||
assert(A::count == 1);
|
||||
assert(new_called == 1);
|
||||
assert(globalMemCounter.checkOutstandingNewEq(1));
|
||||
assert(f.target<A>());
|
||||
assert(f.target<int(*)(int)>() == 0);
|
||||
}
|
||||
assert(A::count == 0);
|
||||
assert(new_called == 0);
|
||||
assert(globalMemCounter.checkOutstandingNewEq(0));
|
||||
{
|
||||
std::function<int(int)> f;
|
||||
f = g;
|
||||
assert(new_called == 0);
|
||||
assert(globalMemCounter.checkOutstandingNewEq(0));
|
||||
assert(f.target<int(*)(int)>());
|
||||
assert(f.target<A>() == 0);
|
||||
}
|
||||
assert(new_called == 0);
|
||||
assert(globalMemCounter.checkOutstandingNewEq(0));
|
||||
{
|
||||
std::function<int(int)> f;
|
||||
f = (int (*)(int))0;
|
||||
assert(!f);
|
||||
assert(new_called == 0);
|
||||
assert(globalMemCounter.checkOutstandingNewEq(0));
|
||||
assert(f.target<int(*)(int)>() == 0);
|
||||
assert(f.target<A>() == 0);
|
||||
}
|
||||
@@ -101,7 +85,7 @@ int main()
|
||||
std::function<int(const A*, int)> f;
|
||||
f = &A::foo;
|
||||
assert(f);
|
||||
assert(new_called == 0);
|
||||
assert(globalMemCounter.checkOutstandingNewEq(0));
|
||||
assert(f.target<int (A::*)(int) const>() != 0);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user