aboutsummaryrefslogtreecommitdiff
path: root/gcc/fortran
diff options
context:
space:
mode:
authorburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2015-03-02 18:56:51 +0000
committerburnus <burnus@138bc75d-0d04-0410-961f-82ee72b054a4>2015-03-02 18:56:51 +0000
commit4ed3f3fd63e8b9f325ebfb2fe0d4626f19fcf349 (patch)
tree430ad9093a901be4e63fd18520d2810c008df5fa /gcc/fortran
parentaa3393f79a33677a051c6f8ba0931c1b7a3fb7a4 (diff)
2015-03-02 Tobias Burnus <burnus@net-b.de>
* check.c (gfc_check_atomic): Properly check for coarrayness and for being coindexed. 2015-03-02 Tobias Burnus <burnus@net-b.de> * gfortran.dg/coarray_atomic_6.f90: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221122 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/fortran')
-rw-r--r--gcc/fortran/ChangeLog5
-rw-r--r--gcc/fortran/check.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a693db89fa1..e61ad02e897 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-02 Tobias Burnus <burnus@net-b.de>
+
+ * check.c (gfc_check_atomic): Properly check for coarrayness
+ and for being coindexed.
+
2015-02-26 Martin Liska <mliska@suse.cz>
* resolve.c: Rename enum 'comparison' to 'compare_result' as
diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 3be4fb11e24..cdb5ff1cba6 100644
--- a/gcc/fortran/check.c
+++ b/gcc/fortran/check.c
@@ -1022,7 +1022,7 @@ gfc_check_atomic (gfc_expr *atom, int atom_no, gfc_expr *value, int val_no,
return false;
}
- if (!gfc_expr_attr (atom).codimension)
+ if (!gfc_is_coarray (atom) && !gfc_is_coindexed (atom))
{
gfc_error ("ATOM argument at %L of the %s intrinsic function shall be a "
"coarray or coindexed", &atom->where, gfc_current_intrinsic);