diff mbox

[Fortran] Fix ATOMIC checks

Message ID 54F3944A.5000800@net-b.de
State New
Headers show

Commit Message

Tobias Burnus March 1, 2015, 10:35 p.m. UTC 
This patch changes the coarray/coindexed check to match what the error 
message already claimed.

OK for the trunk?

Tobias

Comments

Paul Richard Thomas March 2, 2015, 9:31 a.m. UTC | #1 
Dear Tobias,

This looks kind of 'obvious' to me! OK for trunk.

Thanks for the patch.

Paul

On 1 March 2015 at 23:35, Tobias Burnus <burnus@net-b.de> wrote:
> This patch changes the coarray/coindexed check to match what the error
> message already claimed.
>
> OK for the trunk?
>
> Tobias
diff mbox

Patch

diff --git a/gcc/fortran/check.c b/gcc/fortran/check.c
index 3be4fb1..cdb5ff1 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);
diff --git a/gcc/testsuite/gfortran.dg/coarray_atomic_6.f90 b/gcc/testsuite/gfortran.dg/coarray_atomic_6.f90
new file mode 100644
index 0000000..ae155ec
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/coarray_atomic_6.f90
@@ -0,0 +1,36 @@ 
+! { dg-do compile }
+! { dg-options "-fcoarray=single" }
+!
+! Contributed by Reinhold Bader
+!
+!
+program def_and_ref
+! compile only
+  use, intrinsic :: iso_fortran_env
+  implicit none
+  type :: e
+    integer(kind=atomic_int_kind) :: ia = 0
+    logical(kind=atomic_logical_kind) :: la = .false.
+  end type 
+
+  type(e) :: a[*]
+  
+  integer :: ival = 0
+  logical :: lval = .false.
+
+  if (this_image() == 1) then
+    call atomic_define(a[num_images()]%ia, 4)
+    call atomic_define(a[num_images()]%la, .true.)
+  end if
+  if (this_image() == num_images()) then
+    do while (ival == 0 .and. .not. lval)
+       call atomic_ref(ival, a%ia)
+       call atomic_ref(lval, a%la)
+    end do
+    if (ival == 4 .and. lval) then
+      write(*,*) 'OK'
+    else
+      write(*,*) 'FAIL: ival,lval =', ival, lval
+    end if
+  end if
+end program