diff options
author | Jakub Jelinek <jakub@redhat.com> | 2008-05-23 13:52:44 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-05-23 13:52:44 +0200 |
commit | 7a0112e7a42a5a3891d93fa449348df6446fc8bb (patch) | |
tree | 3a38cb4eac5c303a4914f7d2e4ec296b47965633 /libgomp | |
parent | 3fda325236b11bff7210616f03247012d393a95f (diff) | |
download | gcc-7a0112e7a42a5a3891d93fa449348df6446fc8bb.zip gcc-7a0112e7a42a5a3891d93fa449348df6446fc8bb.tar.gz gcc-7a0112e7a42a5a3891d93fa449348df6446fc8bb.tar.bz2 |
re PR c++/36308 (OpenMP privatized vars don't get dtors called if they are virtual)
PR c++/36308
* semantics.c (omp_clause_info_fndecl): New function.
(finish_omp_clauses): Use it.
* testsuite/libgomp.c++/ctor-11.C: New test.
* testsuite/libgomp.c++/ctor-12.C: New test.
From-SVN: r135798
Diffstat (limited to 'libgomp')
-rw-r--r-- | libgomp/ChangeLog | 6 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.c++/ctor-11.C | 100 | ||||
-rw-r--r-- | libgomp/testsuite/libgomp.c++/ctor-12.C | 65 |
3 files changed, 171 insertions, 0 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index f1f5a8e..f673758 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,9 @@ +2008-05-23 Jakub Jelinek <jakub@redhat.com> + + PR c++/36308 + * testsuite/libgomp.c++/ctor-11.C: New test. + * testsuite/libgomp.c++/ctor-12.C: New test. + 2008-05-15 Janis Johnson <janis187@us.ibm.com> * testsuite/lib/libgomp.exp: Load torture-options.exp from gcc lib. diff --git a/libgomp/testsuite/libgomp.c++/ctor-11.C b/libgomp/testsuite/libgomp.c++/ctor-11.C new file mode 100644 index 0000000..8f501e8 --- /dev/null +++ b/libgomp/testsuite/libgomp.c++/ctor-11.C @@ -0,0 +1,100 @@ +// PR c++/36308 +// { dg-do run } + +#include <omp.h> +#include <assert.h> + +#define N 10 + +struct B +{ + static int icount; + static int ccount; + static int dcount; + static int xcount; + + B (); + B (const B &); + virtual ~B (); + B& operator= (const B &); + void doit (); + static void clear () { icount = ccount = dcount = xcount = 0; } +}; + +int B::icount; +int B::ccount; +int B::dcount; +int B::xcount; + +B::B () +{ + #pragma omp atomic + icount++; +} + +B::B (const B &) +{ + #pragma omp atomic + ccount++; +} + +B::~B () +{ + #pragma omp atomic + dcount++; +} + +void +B::doit () +{ + #pragma omp atomic + xcount++; +} + +static int nthreads; + +void +test1 () +{ + B b[N]; + #pragma omp parallel private (b) + { + #pragma omp master + nthreads = omp_get_num_threads (); + b[0].doit (); + } +} + +void +test2 () +{ + B b; + #pragma omp parallel firstprivate (b) + { + #pragma omp single + nthreads = omp_get_num_threads (); + b.doit (); + } +} + +int +main () +{ + omp_set_dynamic (0); + omp_set_num_threads (4); + + B::clear (); + test1 (); + assert (B::xcount == nthreads); + assert (B::ccount == 0); + assert (B::icount == (nthreads + 1) * N); + assert (B::dcount == (nthreads + 1) * N); + + B::clear (); + test2 (); + assert (B::xcount == nthreads); + assert (B::ccount == nthreads); + assert (B::icount == 1); + assert (B::dcount == nthreads + 1); + return 0; +} diff --git a/libgomp/testsuite/libgomp.c++/ctor-12.C b/libgomp/testsuite/libgomp.c++/ctor-12.C new file mode 100644 index 0000000..762cbd9 --- /dev/null +++ b/libgomp/testsuite/libgomp.c++/ctor-12.C @@ -0,0 +1,65 @@ +// PR c++/36308 +// { dg-do run } + +extern "C" void abort (); + +static int ctors, dtors, copyctors, n, m; + +struct A +{ + A () + { + l = 0; + #pragma omp atomic + ctors++; + } + A (const A &x) + { + l = x.l; + #pragma omp atomic + copyctors++; + } + virtual A& operator= (const A &x) + { + l = x.l; + #pragma omp atomic + assignops++; + return *this; + } + virtual ~A () + { + #pragma omp atomic + dtors++; + } + int l; + static int ctors, dtors, copyctors, assignops; +}; + +int A::ctors; +int A::dtors; +int A::copyctors; +int A::assignops; + +int +main () +{ + A a; +#pragma omp parallel private (a) + { + a.l = 6; + #pragma omp single copyprivate (a) + { + a.l = 3; + } + if (a.l != 3) + abort (); + #pragma omp atomic + n++; + } + if (A::ctors != n + 1 + || A::copyctors != 0 + || A::dtors != n + || A::assignops != n - 1) + abort (); + return 0; +} |