[flang] Add atomic_or to list of intrinsics

[ktras]

Summary

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

[PeteSteinfeld]

I'm seeing a diff in the test atomic09 for the error message associated with line 70. I suspect you need to integrate the latest changes.

[ktras]

Update test based on recent changes in flang.

[ktras]

@PeteSteinfeld Thanks for noticing that change that affected my patch! I have integrated the latest changes and updated the test accordingly.

[PeteSteinfeld]

Thanks, @ktras. All looks good now.

flang/lib/Evaluate/intrinsics.cpp

static const IntrinsicInterface intrinsicSubroutine[]{
              common::Intent::InOut},
             {"value", AnyInt, Rank::scalar, Optionality::required,
                 common::Intent::In},
             {"old", AtomicInt, Rank::scalar, Optionality::required,
                 common::Intent::Out},
             {"stat", AnyInt, Rank::scalar, Optionality::optional,
                 common::Intent::Out}},
         {}, Rank::elemental, IntrinsicClass::atomicSubroutine},
+    {"atomic_or",
+        {{"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_ref",
         {{"value", AnyIntOrLogical, Rank::scalar, Optionality::required,
              common::Intent::Out},
             {"atom", AtomicIntOrLogical, Rank::atom, Optionality::required,
                 common::Intent::In},
             {"stat", AnyInt, Rank::scalar, Optionality::optional,
                 common::Intent::Out}},
         {}, Rank::elemental, IntrinsicClass::atomicSubroutine},
if (name == "allocated") {
     }
     if (!ok) {
       context.messages().Say(
           arg ? arg->sourceLocation() : context.messages().at(),
           "Argument of ALLOCATED() must be an ALLOCATABLE object or component"_err_en_US);
     }
   } else if (name == "associated") {
     return CheckAssociated(call, context);
-  } else if (name == "atomic_and") {
+  } else if (name == "atomic_and" || name == "atomic_or") {
     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") {
     return CheckAtomicDefineAndRef(
         context, call.arguments[0], call.arguments[1], call.arguments[2], name);
   } else if (name == "atomic_fetch_add" || name == "atomic_fetch_and" ||
       name == "atomic_fetch_or" || name == "atomic_fetch_xor") {

flang/test/Semantics/atomic09.f90

 ! RUN: %python %S/test_errors.py %s %flang_fc1
-! XFAIL: *
 ! This test checks for semantic errors in atomic_or subroutine calls based on
 ! the interface defined in section 16.9.28 of the Fortran 2018 standard.
 
 program test_atomic_or
-  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
   integer(kind=atomic_int_kind) :: repeated_atom[*], repeated_val, array(10)
   integer :: status, default_kind_coarray[*], coindexed_status[*], extra_arg, repeated_status, status_array(10)
   integer(kind=1) :: kind1_coarray[*]
   real :: non_integer_coarray[*]
   logical :: non_integer
+  logical(atomic_logical_kind) :: atomic_logical[*]
 
   !___ standard-conforming calls ___
   call atomic_or(scalar_coarray, val)
   call atomic_or(scalar_coarray[1], val)
   call atomic_or(scalar_coarray, val, status)
   call atomic_or(scalar_coarray[1], val, status)
   call atomic_or(scalar_coarray, val, stat=status)
   call atomic_or(scalar_coarray, value=val, stat=status)
   call atomic_or(atom=scalar_coarray, value=val)
   call atomic_or(atom=scalar_coarray, value=val, stat=status)
   call atomic_or(stat=status, value=val, atom=scalar_coarray)
 
   !___ non-standard-conforming calls ___
 
-  !ERROR: 'atom=' argument must be a scalar coarray for intrinsic 'atomic_or'
+  !ERROR: 'atom=' argument must be a scalar coarray or coindexed object for intrinsic 'atomic_or'
   call atomic_or(non_scalar_coarray, val)
 
-  !ERROR: 'atom=' argument must be a coarray or a coindexed object for intrinsic 'atomic_or'
+  !ERROR: 'atom=' argument must be a scalar coarray or coindexed object for intrinsic 'atomic_or'
+  call atomic_or(non_scalar_coarray[1], val)
+
+  !ERROR: 'atom=' argument must be a scalar coarray or coindexed object for intrinsic 'atomic_or'
   call atomic_or(non_coarray, val)
 
-  !ERROR: 'atom=' argument must be a coarray or a coindexed object for intrinsic 'atomic_or'
+  !ERROR: 'atom=' argument must be a scalar coarray or coindexed object for intrinsic 'atomic_or'
   call atomic_or(array, val)
 
   !ERROR: Actual argument for 'atom=' must have kind=atomic_int_kind, but is 'INTEGER(4)'
   call atomic_or(default_kind_coarray, val)
 
   !ERROR: Actual argument for 'atom=' must have kind=atomic_int_kind, but is 'INTEGER(1)'
   call atomic_or(kind1_coarray, val)
 
   !ERROR: Actual argument for 'atom=' has bad type 'REAL(4)'
   call atomic_or(non_integer_coarray, val)
 
+  !ERROR: Actual argument for 'atom=' has bad type 'LOGICAL(8)'
+  call atomic_or(atomic_logical, val)
+
   !ERROR: 'value=' argument has unacceptable rank 1
   call atomic_or(scalar_coarray, array)
 
   !ERROR: Actual argument for 'value=' has bad type 'LOGICAL(4)'
   call atomic_or(scalar_coarray, non_integer)
 
   !ERROR: Actual argument for 'stat=' has bad type 'LOGICAL(4)'
   call atomic_or(scalar_coarray, val, non_integer)
 
   !ERROR: 'stat=' argument has unacceptable rank 1
   call atomic_or(scalar_coarray, val, status_array)
 
+  !ERROR: 'stat' argument to 'atomic_or' may not be a coindexed object
   call atomic_or(scalar_coarray, val, coindexed_status[1])
 
-  !ERROR: Actual argument associated with INTENT(OUT) dummy argument 'stat=' must be definable
+  !ERROR: Actual argument associated with INTENT(OUT) dummy argument 'stat=' is not definable
+  !BECAUSE: '1_4' is not a variable or pointer
   call atomic_or(scalar_coarray, val, 1)
 
   !ERROR: missing mandatory 'atom=' argument
   call atomic_or()
 
   !ERROR: missing mandatory 'atom=' argument
   call atomic_or(value=val, stat=status)