[llvm-branch-commits] [flang] f99e90f - Revert "[flang][openacc] Add clause validity tests for the update directive"

[via llvm-branch-commits]

Author: clementval
Date: 2020-12-04T15:06:22-05:00
New Revision: f99e90f2c38bbee679a64dcfc0a892cd549d0a61

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

LOG: Revert "[flang][openacc] Add clause validity tests for the update directive"

This reverts commit e46065433466eec50903fec6f40a09cf26fa801e.

Added: 
    

Modified: 
    flang/lib/Semantics/check-acc-structure.cpp
    flang/test/Semantics/acc-clause-validity.f90

Removed: 
    


################################################################################
diff  --git a/flang/lib/Semantics/check-acc-structure.cpp b/flang/lib/Semantics/check-acc-structure.cpp
index 74b608f9ca6d..edcb41eae0c5 100644
--- a/flang/lib/Semantics/check-acc-structure.cpp
+++ b/flang/lib/Semantics/check-acc-structure.cpp
@@ -201,8 +201,6 @@ void AccStructureChecker::Leave(const parser::OpenACCStandaloneConstruct &x) {
     CheckRequireAtLeastOneOf();
     break;
   case llvm::acc::Directive::ACCD_update:
-    // Restriction - line 2636
-    CheckRequireAtLeastOneOf();
     // Restriction - 2301
     CheckOnlyAllowedAfter(llvm::acc::Clause::ACCC_device_type,
         updateOnlyAllowedAfterDeviceTypeClauses);

diff  --git a/flang/test/Semantics/acc-clause-validity.f90 b/flang/test/Semantics/acc-clause-validity.f90
index 7508aab5eedf..b2fb57796f3f 100644
--- a/flang/test/Semantics/acc-clause-validity.f90
+++ b/flang/test/Semantics/acc-clause-validity.f90
@@ -138,37 +138,9 @@ program openacc_clause_validity
   !ERROR: Unmatched PARALLEL directive
   !$acc end parallel
 
-  !ERROR: At least one of DEVICE, HOST, SELF clause must appear on the UPDATE directive
-  !$acc update
-
   !$acc update self(a, f) host(g) device(h)
 
-  !$acc update host(aa) async(1)
-
-  !$acc update device(bb) async(async1)
-
-  !ERROR: At most one ASYNC clause can appear on the UPDATE directive
-  !$acc update host(aa, bb) async(1) async(2)
-
-  !$acc update self(bb, cc(:)) wait(1)
-
-  !$acc update device(aa, bb, cc) wait(wait1)
-
-  !$acc update host(aa) host(bb) device(cc) wait(1,2)
-
-  !$acc update device(aa, cc) wait(wait1, wait2)
-
-  !$acc update device(aa) device_type(*) async
-
-  !$acc update host(bb) device_type(*) wait
-
-  !$acc update self(cc) device_type(1,2) async device_type(3) wait
-
-  !ERROR: At most one IF clause can appear on the UPDATE directive
-  !$acc update device(aa) if(.true.) if(ifCondition)
-
-  !ERROR: At most one IF_PRESENT clause can appear on the UPDATE directive
-  !$acc update device(bb) if_present if_present
+  !$acc update device(i) device_type(*) async
 
   !ERROR: Clause IF is not allowed after clause DEVICE_TYPE on the UPDATE directive
   !$acc update device(i) device_type(*) if(.TRUE.)