diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2019-01-28 23:33:33 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2019-01-28 23:33:33 +0100 |
| commit | be3a87e7b5ff3d284a7663519826f2613dc46f69 (patch) | |
| tree | 7f3f4b05ca6c6131553e48f493f88a3a420f4cad | |
| parent | 62d4a355b7346242fd2242a41662f3b18340f53d (diff) | |
| download | gcc-be3a87e7b5ff3d284a7663519826f2613dc46f69.zip gcc-be3a87e7b5ff3d284a7663519826f2613dc46f69.tar.gz gcc-be3a87e7b5ff3d284a7663519826f2613dc46f69.tar.bz2 | |
re PR middle-end/89002 (ICE in scan_omp_1_op, at omp-low.c:3166)
PR middle-end/89002
* gimplify.c (gimplify_omp_for): When adding OMP_CLAUSE_*_GIMPLE_SEQ
for lastprivate/linear IV, push gimplify context around gimplify_assign
and, if it needed any temporaries, pop it into a gimple bind around the
sequence.
* testsuite/libgomp.c/pr89002.c: New test.
From-SVN: r268345
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/gimplify.c | 11 | ||||
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c/pr89002.c | 86 |
4 files changed, 109 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b447913..f5872db 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2019-01-28 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/89002 + * gimplify.c (gimplify_omp_for): When adding OMP_CLAUSE_*_GIMPLE_SEQ + for lastprivate/linear IV, push gimplify context around gimplify_assign + and, if it needed any temporaries, pop it into a gimple bind around the + sequence. + 2019-01-28 Bernd Edlinger <bernd.edlinger@hotmail.de> * common.opt (-Wattribute-alias): Remove "no-" from name. diff --git a/gcc/gimplify.c b/gcc/gimplify.c index 5916678..7e37e50 100644 --- a/gcc/gimplify.c +++ b/gcc/gimplify.c @@ -11167,8 +11167,17 @@ gimplify_omp_for (tree *expr_p, gimple_seq *pre_p) seq = &OMP_CLAUSE_LASTPRIVATE_GIMPLE_SEQ (c); else seq = &OMP_CLAUSE_LINEAR_GIMPLE_SEQ (c); + push_gimplify_context (); gimplify_assign (decl, t, seq); - } + gimple *bind = NULL; + if (gimplify_ctxp->temps) + { + bind = gimple_build_bind (NULL_TREE, *seq, NULL_TREE); + *seq = NULL; + gimplify_seq_add_stmt (seq, bind); + } + pop_gimplify_context (bind); + } } } diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 5a7d4d8..e774e7f 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2019-01-28 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/89002 + * testsuite/libgomp.c/pr89002.c: New test. + 2019-01-28 Richard Biener <rguenther@suse.de> PR testsuite/89064 diff --git a/libgomp/testsuite/libgomp.c/pr89002.c b/libgomp/testsuite/libgomp.c/pr89002.c new file mode 100644 index 0000000..b66fada --- /dev/null +++ b/libgomp/testsuite/libgomp.c/pr89002.c @@ -0,0 +1,86 @@ +/* PR middle-end/89002 */ + +extern void abort (void); + +int +foo (int x) +{ + int a; + int *p = &a; + +#pragma omp taskloop lastprivate (a) + for (a = 0; a < x; ++a) + ; + return *p; +} + +int +bar (int x) +{ + int a; + int *p = &a; + +#pragma omp parallel +#pragma omp single +#pragma omp taskloop lastprivate (a) + for (a = 0; a < x; ++a) + ; + return *p; +} + +int +main () +{ +#pragma omp parallel +#pragma omp single + { + if (foo (4) != 4) + abort (); + } + if (bar (6) != 6) + abort (); + return 0; +} +/* PR middle-end/89002 */ + +extern void abort (void); + +int +foo (int x) +{ + int a; + int *p = &a; + +#pragma omp taskloop lastprivate (a) + for (a = 0; a < x; ++a) + ; + return *p; +} + +int +bar (int x) +{ + int a; + int *p = &a; + +#pragma omp parallel +#pragma omp single +#pragma omp taskloop lastprivate (a) + for (a = 0; a < x; ++a) + ; + return *p; +} + +int +main () +{ +#pragma omp parallel +#pragma omp single + { + if (foo (4) != 4) + abort (); + } + if (bar (6) != 6) + abort (); + return 0; +} |