summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons
diff options
context:
space:
mode:
authorMikhail Maltsev <mikhail.maltsev@arm.com>2018-02-08 11:33:48 +0000
committerMikhail Maltsev <mikhail.maltsev@arm.com>2018-02-08 11:33:48 +0000
commit2b20304def44a0e3c4ab4ae90f50d4c4449ce03d (patch)
treefca74d6f819afec7856cb5e37500974845b37d5d /libcxx/test/std/numerics/numarray/template.valarray/valarray.cons
parent25dc3d27ea816aeff1d30929845efb0db934f0b3 (diff)
downloadbcm5719-llvm-2b20304def44a0e3c4ab4ae90f50d4c4449ce03d.tar.gz
bcm5719-llvm-2b20304def44a0e3c4ab4ae90f50d4c4449ce03d.zip
[libcxx] Avoid spurious construction of valarray elements
Summary: Currently libc++ implements some operations on valarray by using the resize method. This method has a parameter with a default value. Because of this, valarray may spuriously construct and destruct objects of valarray's element type. This patch fixes this issue and adds corresponding test cases. Reviewers: EricWF, mclow.lists Reviewed By: mclow.lists Subscribers: rogfer01, cfe-commits Differential Revision: https://reviews.llvm.org/D41992 llvm-svn: 324596
Diffstat (limited to 'libcxx/test/std/numerics/numarray/template.valarray/valarray.cons')
-rw-r--r--libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp12
-rw-r--r--libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp16
2 files changed, 28 insertions, 0 deletions
diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp
index f46e0bf28cf..9933322de96 100644
--- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp
+++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/default.pass.cpp
@@ -16,6 +16,13 @@
#include <valarray>
#include <cassert>
+struct S {
+ S() { ctor_called = true; }
+ static bool ctor_called;
+};
+
+bool S::ctor_called = false;
+
int main()
{
{
@@ -34,4 +41,9 @@ int main()
std::valarray<std::valarray<double> > v;
assert(v.size() == 0);
}
+ {
+ std::valarray<S> v;
+ assert(v.size() == 0);
+ assert(!S::ctor_called);
+ }
}
diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp
index 359073eb3ae..221187c4e12 100644
--- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp
+++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.cons/size.pass.cpp
@@ -16,6 +16,15 @@
#include <valarray>
#include <cassert>
+struct S {
+ S() : x(1) {}
+ ~S() { ++cnt_dtor; }
+ int x;
+ static size_t cnt_dtor;
+};
+
+size_t S::cnt_dtor = 0;
+
int main()
{
{
@@ -36,4 +45,11 @@ int main()
for (int i = 0; i < 100; ++i)
assert(v[i].size() == 0);
}
+ {
+ std::valarray<S> v(100);
+ assert(v.size() == 100);
+ for (int i = 0; i < 100; ++i)
+ assert(v[i].x == 1);
+ }
+ assert(S::cnt_dtor == 100);
}
OpenPOWER on IntegriCloud