diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-04-04 19:48:45 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2008-04-04 19:48:45 +0200 |
| commit | 3088d40408d9c26ace497e6a01badc53cde9ffb7 (patch) | |
| tree | d83c3a40ff3f297f492f2150280bf1b12d2741ce | |
| parent | c9a22ea10dedc186d37ef00958d0049e5b324082 (diff) | |
| download | gcc-3088d40408d9c26ace497e6a01badc53cde9ffb7.zip gcc-3088d40408d9c26ace497e6a01badc53cde9ffb7.tar.gz gcc-3088d40408d9c26ace497e6a01badc53cde9ffb7.tar.bz2 | |
re PR target/35364 (ICE on ia64 with vector declaration inside #pragma omp parallel)
PR target/35364
* tree-cfg.c (remove_useless_stmts_1): Handle OMP_* containers.
* g++.dg/gomp/pr35364.C: New test.
From-SVN: r133905
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/gomp/pr35364.C | 50 | ||||
| -rw-r--r-- | gcc/tree-cfg.c | 27 |
4 files changed, 87 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f52f12b..79fb7738 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2008-04-04 Jakub Jelinek <jakub@redhat.com> + + PR target/35364 + * tree-cfg.c (remove_useless_stmts_1): Handle OMP_* containers. + 2008-04-04 H.J. Lu <hongjiu.lu@intel.com> * config.gcc (extra_headers): Add wmmintrin.h for x86 and x86-64. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1ec1c2d..5a203d1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-04-04 Jakub Jelinek <jakub@redhat.com> + + PR target/35364 + * g++.dg/gomp/pr35364.C: New test. + 2008-04-04 H.J. Lu <hongjiu.lu@intel.com> * g++.dg/other/i386-2.C: Include <wmmintrin.h>. diff --git a/gcc/testsuite/g++.dg/gomp/pr35364.C b/gcc/testsuite/g++.dg/gomp/pr35364.C new file mode 100644 index 0000000..da60d5d --- /dev/null +++ b/gcc/testsuite/g++.dg/gomp/pr35364.C @@ -0,0 +1,50 @@ +// PR target/35364 +// { dg-do compile } +// { dg-options "-O2 -fopenmp" } + +template <typename T> +struct E +{ + E (); + ~E (); +}; + +template <typename T, typename U> +struct C +{ + C (const U &y) : u (y) {} + ~C () {} + const U &u; +}; + +template <typename T, typename U = E<T> > +struct B : public C<T, U> +{ + B (int x, const T &z = T (), const U &y = U ()) : C<T, U> (y) {} + ~B () {} +}; + +void +foo () +{ +#pragma omp parallel + { + B<double> x (1); + } +#pragma omp for + for (int i = 0; i < 10; i++) + { + B<int> x (i); + } +#pragma omp sections + { +#pragma omp section + { + B<int> x (6); + } + } +#pragma omp single + { + B<int> x (16); + } +} diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c index cea11b8..7eea2e1 100644 --- a/gcc/tree-cfg.c +++ b/gcc/tree-cfg.c @@ -1917,6 +1917,33 @@ remove_useless_stmts_1 (tree *tp, struct rus_data *data) data->last_goto = NULL; break; + case OMP_PARALLEL: + /* Make sure the outermost BIND_EXPR in OMP_BODY isn't removed + as useless. */ + remove_useless_stmts_1 (&BIND_EXPR_BODY (OMP_BODY (*tp)), data); + data->last_goto = NULL; + break; + + case OMP_SECTIONS: + case OMP_SINGLE: + case OMP_SECTION: + case OMP_MASTER : + case OMP_ORDERED: + case OMP_CRITICAL: + remove_useless_stmts_1 (&OMP_BODY (*tp), data); + data->last_goto = NULL; + break; + + case OMP_FOR: + remove_useless_stmts_1 (&OMP_FOR_BODY (*tp), data); + data->last_goto = NULL; + if (OMP_FOR_PRE_BODY (*tp)) + { + remove_useless_stmts_1 (&OMP_FOR_PRE_BODY (*tp), data); + data->last_goto = NULL; + } + break; + default: data->last_goto = NULL; break; |