replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove undefined behavior from some tests. Same pattern as the unitialized_copy tests 

llvm-svn: 251804
This commit is contained in:
Marshall Clow 2015-11-02 15:29:13 +00:00
parent dc39f313e2
commit 79dfd99d30
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.fill.n/uninitialized_fill_n.pass.cpp
View File

@ -19,13 +19,15 @@
struct B
{
static int count_;
static int population_;
int data_;
explicit B() : data_(1) {}
B(const B& b) {if (++count_ == 3) throw 1; data_ = b.data_;}
~B() {data_ = 0;}
explicit B() : data_(1) { ++population_; }
B(const B& b) {if (++count_ == 3) throw 1; data_ = b.data_; ++population_; }
~B() {data_ = 0; --population_; }
};
int B::count_ = 0;
int B::population_ = 0;
struct Nasty
{
@ -43,6 +45,7 @@ int main()
const int N = 5;
char pool[sizeof(B)*N] = {0};
B* bp = (B*)pool;
assert(B::population_ == 0);
try
{
std::uninitialized_fill_n(bp, 5, B());
@ -50,14 +53,14 @@ int main()
}
catch (...)
{
for (int i = 0; i < N; ++i)
assert(bp[i].data_ == 0);
assert(B::population_ == 0);
}
B::count_ = 0;
B* r = std::uninitialized_fill_n(bp, 2, B());
assert(r == bp + 2);
for (int i = 0; i < 2; ++i)
assert(bp[i].data_ == 1);
assert(B::population_ == 2);
}
{
{

13
libcxx/test/std/utilities/memory/specialized.algorithms/uninitialized.fill/uninitialized_fill.pass.cpp
View File

@ -20,13 +20,15 @@
struct B
{
static int count_;
static int population_;
int data_;
explicit B() : data_(1) {}
B(const B& b) {if (++count_ == 3) throw 1; data_ = b.data_;}
~B() {data_ = 0;}
explicit B() : data_(1) { ++population_; }
B(const B& b) {if (++count_ == 3) throw 1; data_ = b.data_; ++population_; }
~B() {data_ = 0; --population_; }
};
int B::count_ = 0;
int B::population_ = 0;
struct Nasty
{
@ -44,6 +46,7 @@ int main()
const int N = 5;
char pool[sizeof(B)*N] = {0};
B* bp = (B*)pool;
assert(B::population_ == 0);
try
{
std::uninitialized_fill(bp, bp+N, B());
@ -51,13 +54,13 @@ int main()
}
catch (...)
{
for (int i = 0; i < N; ++i)
assert(bp[i].data_ == 0);
assert(B::population_ == 0);
}
B::count_ = 0;
std::uninitialized_fill(bp, bp+2, B());
for (int i = 0; i < 2; ++i)
assert(bp[i].data_ == 1);
assert(B::population_ == 2);
}
{
const int N = 5;