diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/omp-expand.c | 19 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/gomp/doacross-4.c | 30 |
2 files changed, 42 insertions, 7 deletions
diff --git a/gcc/omp-expand.c b/gcc/omp-expand.c index 4a6c44d..23a13d8 100644 --- a/gcc/omp-expand.c +++ b/gcc/omp-expand.c @@ -4304,13 +4304,18 @@ expand_omp_for_generic (struct omp_region *region, gsi = gsi_last_bb (l0_bb); expand_omp_build_assign (&gsi, counts[fd->collapse - 1], istart0, true); - gsi = gsi_last_bb (cont_bb); - t = fold_build2 (PLUS_EXPR, fd->iter_type, counts[fd->collapse - 1], - build_int_cst (fd->iter_type, 1)); - expand_omp_build_assign (&gsi, counts[fd->collapse - 1], t); - tree aref = build4 (ARRAY_REF, fd->iter_type, counts[fd->ordered], - size_zero_node, NULL_TREE, NULL_TREE); - expand_omp_build_assign (&gsi, aref, counts[fd->collapse - 1]); + if (cont_bb) + { + gsi = gsi_last_bb (cont_bb); + t = fold_build2 (PLUS_EXPR, fd->iter_type, + counts[fd->collapse - 1], + build_int_cst (fd->iter_type, 1)); + expand_omp_build_assign (&gsi, counts[fd->collapse - 1], t); + tree aref = build4 (ARRAY_REF, fd->iter_type, + counts[fd->ordered], size_zero_node, + NULL_TREE, NULL_TREE); + expand_omp_build_assign (&gsi, aref, counts[fd->collapse - 1]); + } t = counts[fd->collapse - 1]; } else if (fd->collapse > 1) diff --git a/gcc/testsuite/c-c++-common/gomp/doacross-4.c b/gcc/testsuite/c-c++-common/gomp/doacross-4.c new file mode 100644 index 0000000..a1182e3 --- /dev/null +++ b/gcc/testsuite/c-c++-common/gomp/doacross-4.c @@ -0,0 +1,30 @@ +/* PR middle-end/98205 */ + +void baz (int) __attribute__((noreturn)); + +void +foo (int n) +{ + int i; + #pragma omp for ordered(1) + for (i = 0; i < 8; i += n) + { + #pragma omp ordered depend(source) + #pragma omp ordered depend(sink: i - 2) + baz (i); + } +} + +void +bar (int n) +{ + int i, j; + #pragma omp for collapse(2) ordered(2) + for (i = 0; i < 8; i += n) + for (j = 0; j < 8; j += n) + { + #pragma omp ordered depend(source) + #pragma omp ordered depend(sink: i - 2, j + 2) + baz (i); + } +} |