[flang-commits] [flang] cc2e8e5 - [flang] Add atomic_and to list of intrinsics

[Katherine Rasmussen via flang-commits]

Author: Katherine Rasmussen
Date: 2022-10-31T10:18:55-07:00
New Revision: cc2e8e5075615ccad7d050a52937acec8c9ef93a

URL: https://github.com/llvm/llvm-project/commit/cc2e8e5075615ccad7d050a52937acec8c9ef93a
DIFF: https://github.com/llvm/llvm-project/commit/cc2e8e5075615ccad7d050a52937acec8c9ef93a.diff

LOG: [flang] Add atomic_and to list of intrinsics

Add the atomic subroutine, atomic_and, to the list of
intrinsic subroutines, add its last dummy argument to a check
for coindexed-object, and update test.

Reviewed By: PeteSteinfeld

Differential Revision: https://reviews.llvm.org/D136907

Added: 
    

Modified: 
    flang/lib/Evaluate/intrinsics.cpp
    flang/test/Semantics/atomic02.f90

Removed: 
    


################################################################################
diff  --git a/flang/lib/Evaluate/intrinsics.cpp b/flang/lib/Evaluate/intrinsics.cpp
index 012bf003c54f5..9aaaee47876ca 100644
--- a/flang/lib/Evaluate/intrinsics.cpp
+++ b/flang/lib/Evaluate/intrinsics.cpp
@@ -1143,6 +1143,14 @@ static const SpecificIntrinsicInterface specificIntrinsicFunction[]{
 
 static const IntrinsicInterface intrinsicSubroutine[]{
     {"abort", {}, {}, Rank::elemental, IntrinsicClass::impureSubroutine},
+    {"atomic_and",
+        {{"atom", AtomicInt, Rank::atom, Optionality::required,
+             common::Intent::InOut},
+            {"value", AnyInt, Rank::scalar, Optionality::required,
+                common::Intent::In},
+            {"stat", AnyInt, Rank::scalar, Optionality::optional,
+                common::Intent::Out}},
+        {}, Rank::elemental, IntrinsicClass::atomicSubroutine},
     {"atomic_cas",
         {{"atom", SameAtom, Rank::atom, Optionality::required,
              common::Intent::InOut},
@@ -2734,6 +2742,8 @@ static bool ApplySpecificChecks(SpecificCall &call, FoldingContext &context) {
     }
   } else if (name == "associated") {
     return CheckAssociated(call, context);
+  } else if (name == "atomic_and") {
+    return CheckForCoindexedObject(context, call.arguments[2], name, "stat");
   } else if (name == "atomic_cas") {
     return CheckForCoindexedObject(context, call.arguments[4], name, "stat");
   } else if (name == "atomic_define") {

diff  --git a/flang/test/Semantics/atomic02.f90 b/flang/test/Semantics/atomic02.f90
index d80f6412db905..4c3a59dda250a 100644
--- a/flang/test/Semantics/atomic02.f90
+++ b/flang/test/Semantics/atomic02.f90
@@ -1,10 +1,9 @@
 ! RUN: %python %S/test_errors.py %s %flang_fc1
-! XFAIL: *
 ! This test checks for semantic errors in atomic_and subroutine calls based on
 ! the interface defined in section 16.9.21 of the Fortran 2018 standard.
 
 program test_atomic_and
-  use iso_fortran_env, only: atomic_int_kind
+  use iso_fortran_env, only: atomic_int_kind, atomic_logical_kind
   implicit none
 
   integer(kind=atomic_int_kind) :: scalar_coarray[*], non_scalar_coarray(10)[*], val, non_coarray
@@ -13,6 +12,7 @@ program test_atomic_and
   integer(kind=1) :: kind1_coarray[*]
   real :: non_integer_coarray[*]
   logical :: non_integer
+  logical(atomic_logical_kind) :: atomic_logical[*]
 
   !___ standard-conforming calls ___
   call atomic_and(scalar_coarray, val)
@@ -27,13 +27,16 @@ program test_atomic_and
 
   !___ non-standard-conforming calls ___
 
-  !ERROR: 'atom=' argument must be a scalar coarray for intrinsic 'atomic_and'
+  !ERROR: 'atom=' argument must be a scalar coarray or coindexed object for intrinsic 'atomic_and'
   call atomic_and(non_scalar_coarray, val)
 
-  !ERROR: 'atom=' argument must be a coarray or a coindexed object for intrinsic 'atomic_and'
+  !ERROR: 'atom=' argument must be a scalar coarray or coindexed object for intrinsic 'atomic_and'
+  call atomic_and(non_scalar_coarray[1], val)
+
+  !ERROR: 'atom=' argument must be a scalar coarray or coindexed object for intrinsic 'atomic_and'
   call atomic_and(non_coarray, val)
 
-  !ERROR: 'atom=' argument must be a coarray or a coindexed object for intrinsic 'atomic_and'
+  !ERROR: 'atom=' argument must be a scalar coarray or coindexed object for intrinsic 'atomic_and'
   call atomic_and(array, val)
 
   !ERROR: Actual argument for 'atom=' must have kind=atomic_int_kind, but is 'INTEGER(4)'
@@ -45,6 +48,9 @@ program test_atomic_and
   !ERROR: Actual argument for 'atom=' has bad type 'REAL(4)'
   call atomic_and(non_integer_coarray, val)
 
+  !ERROR: Actual argument for 'atom=' has bad type 'LOGICAL(8)'
+  call atomic_and(atomic_logical, val)
+
   !ERROR: 'value=' argument has unacceptable rank 1
   call atomic_and(scalar_coarray, array)
 
@@ -57,6 +63,7 @@ program test_atomic_and
   !ERROR: 'stat=' argument has unacceptable rank 1
   call atomic_and(scalar_coarray, val, status_array)
 
+  !ERROR: 'stat' argument to 'atomic_and' may not be a coindexed object
   call atomic_and(scalar_coarray, val, coindexed_status[1])
 
   !ERROR: Actual argument associated with INTENT(OUT) dummy argument 'stat=' must be definable