aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2014-08-15 12:23:13 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2014-08-15 12:23:13 +0200
commit7258a2576581f90c5ba8399e6f6ba6c36a16ff86 (patch)
tree9b4e0aa1f7dec4be8ba7da062efc4bd34dccd18b /gcc/fortran
parent2c274197e9fb0fdc9c1aa4c6bfa089c72cca3658 (diff)
downloadgcc-7258a2576581f90c5ba8399e6f6ba6c36a16ff86.zip
gcc-7258a2576581f90c5ba8399e6f6ba6c36a16ff86.tar.gz
gcc-7258a2576581f90c5ba8399e6f6ba6c36a16ff86.tar.bz2
re PR fortran/62131 (OpenMP: Subobject of an allocatable array not allowed in OMP ATOMIC)
PR fortran/62131 * openmp.c (resolve_omp_atomic): Only complain if code->expr1's attr is allocatable, rather than whenever var->attr.allocatable. * gfortran.dg/gomp/pr62131.f90: New test. Co-Authored-By: Tobias Burnus <burnus@net-b.de> From-SVN: r214010
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog7
-rw-r--r--gcc/fortran/openmp.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index f6e3082..411fe4c 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,4 +1,11 @@
2014-08-15 Jakub Jelinek <jakub@redhat.com>
+ Tobias Burnus <burnus@net-b.de>
+
+ PR fortran/62131
+ * openmp.c (resolve_omp_atomic): Only complain if code->expr1's attr
+ is allocatable, rather than whenever var->attr.allocatable.
+
+2014-08-15 Jakub Jelinek <jakub@redhat.com>
PR fortran/62107
* trans-openmp.c (gfc_omp_finish_clause): Handle scalar pointer
diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c
index 49c3b9e..217fce7 100644
--- a/gcc/fortran/openmp.c
+++ b/gcc/fortran/openmp.c
@@ -2744,7 +2744,7 @@ resolve_omp_atomic (gfc_code *code)
break;
}
- if (var->attr.allocatable)
+ if (gfc_expr_attr (code->expr1).allocatable)
{
gfc_error ("!$OMP ATOMIC with ALLOCATABLE variable at %L",
&code->loc);