OSDN Git Service

Backported from mainline
authorjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 14 Jun 2012 17:48:38 +0000 (17:48 +0000)
committerjakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 14 Jun 2012 17:48:38 +0000 (17:48 +0000)
commitf4046ef287ebc34ebe9becf8727cddf0fa24b9b8
treed35512bb213148d0fc2fb989c4f5079c588f8957
parent8af3b70e0ff91879ee6c47983fe0eb07cc48018e
Backported from mainline
2012-06-07  Jakub Jelinek  <jakub@redhat.com>

PR middle-end/53580
* omp-low.c (scan_omp_1_stmt): If check_omp_nesting_restrictions
returns false, replace stmt with GIMPLE_NOP.
(check_omp_nesting_restrictions): Instead of issuing warnings,
issue errors and return false if any errors were reported.

* gcc.dg/gomp/nesting-1.c: Expect errors rather than warnings.
* gcc.dg/gomp/critical-4.c: Likewise.
* gfortran.dg/gomp/appendix-a/a.35.1.f90: Likewise.
* gfortran.dg/gomp/appendix-a/a.35.3.f90: Likewise.
* gfortran.dg/gomp/appendix-a/a.35.4.f90: Likewise.
* gfortran.dg/gomp/appendix-a/a.35.6.f90: Likewise.
* c-c++-common/gomp/pr53580.c: New test.

* testsuite/libgomp.c/pr26943-2.c: Remove #pragma omp barrier,
use GOMP_barrier () call instead.
* testsuite/libgomp.c/pr26943-3.c: Likewise.
* testsuite/libgomp.c/pr26943-4.c: Likewise.
* testsuite/libgomp.fortran/vla4.f90: Remove !$omp barrier,
call GOMP_barrier instead.
* testsuite/libgomp.fortran/vla5.f90: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@188625 138bc75d-0d04-0410-961f-82ee72b054a4
16 files changed:
gcc/ChangeLog
gcc/omp-low.c
gcc/testsuite/ChangeLog
gcc/testsuite/c-c++-common/gomp/pr53580.c [new file with mode: 0644]
gcc/testsuite/gcc.dg/gomp/critical-4.c
gcc/testsuite/gcc.dg/gomp/nesting-1.c
gcc/testsuite/gfortran.dg/gomp/appendix-a/a.35.1.f90
gcc/testsuite/gfortran.dg/gomp/appendix-a/a.35.3.f90
gcc/testsuite/gfortran.dg/gomp/appendix-a/a.35.4.f90
gcc/testsuite/gfortran.dg/gomp/appendix-a/a.35.6.f90
libgomp/ChangeLog
libgomp/testsuite/libgomp.c/pr26943-2.c
libgomp/testsuite/libgomp.c/pr26943-3.c
libgomp/testsuite/libgomp.c/pr26943-4.c
libgomp/testsuite/libgomp.fortran/vla4.f90
libgomp/testsuite/libgomp.fortran/vla5.f90