diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-09-16 18:37:09 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2017-09-16 18:37:09 +0000 |
| commit | d93762bb324e0758c1e41f015154a00313e3aae9 (patch) | |
| tree | 10be6a72d9f8515e5e4514d767da644bdd7ff806 | |
| parent | ac698be087af6efcf4559392030c05160e65e6e5 (diff) | |
Backported from mainline
2017-08-03 Jakub Jelinek <jakub@redhat.com>
PR middle-end/81052
* omp-low.c (diagnose_sb_0): Handle flag_openmp_simd like flag_openmp.
(pass_diagnose_omp_blocks::gate): Enable also for flag_openmp_simd.
* c-c++-common/pr81052.c: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@252883 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/omp-low.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/c-c++-common/pr81052.c | 28 |
4 files changed, 41 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e10cd11b771..292907cabf2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -8,6 +8,12 @@ behavior of always calling find_many_sub_basic_blocks on the inserted prologue. + 2017-08-03 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/81052 + * omp-low.c (diagnose_sb_0): Handle flag_openmp_simd like flag_openmp. + (pass_diagnose_omp_blocks::gate): Enable also for flag_openmp_simd. + 2017-08-02 Jakub Jelinek <jakub@redhat.com> PR middle-end/79499 diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 907a728417b..c1147c63d11 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -12059,7 +12059,7 @@ diagnose_sb_0 (gimple_stmt_iterator *gsi_p, } if (kind == NULL) { - gcc_checking_assert (flag_openmp); + gcc_checking_assert (flag_openmp || flag_openmp_simd); kind = "OpenMP"; } @@ -12465,7 +12465,7 @@ public: /* opt_pass methods: */ virtual bool gate (function *) { - return flag_cilkplus || flag_openacc || flag_openmp; + return flag_cilkplus || flag_openacc || flag_openmp || flag_openmp_simd; } virtual unsigned int execute (function *) { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1485d418557..40093277202 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -6,6 +6,11 @@ PR middle-end/81766 * gcc.target/i386/pr81766.c: New testcase. + 2017-08-03 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/81052 + * c-c++-common/pr81052.c: New test. + 2017-08-02 Jakub Jelinek <jakub@redhat.com> PR middle-end/79499 diff --git a/gcc/testsuite/c-c++-common/pr81052.c b/gcc/testsuite/c-c++-common/pr81052.c new file mode 100644 index 00000000000..6bc2879951e --- /dev/null +++ b/gcc/testsuite/c-c++-common/pr81052.c @@ -0,0 +1,28 @@ +/* PR middle-end/81052 */ +/* { dg-do compile } */ +/* { dg-options "-fopenmp-simd -O2" } */ + +int +foo (int x, int y) +{ + int i; +#pragma omp simd + for (i = x; i < y; ++i) + return 0; /* { dg-error "invalid branch to/from OpenMP structured block" } */ + return 1; +} + +#ifdef __cplusplus +template <typename T> +T +bar (T x, T y) +{ + T i; +#pragma omp simd + for (i = x; i < y; ++i) + return 0; /* { dg-error "invalid branch to/from OpenMP structured block" "" { target c++ } } */ + return 1; +} + +int x = bar (1, 7); +#endif |