commit c5f0241831d08b1125c115932ff6266bf31ade9a
author Arnamoy Bhattacharyya <arnamoy.bhattacharyya@huawei.com> Tue Apr 13 13:56:43 2021 -0400
committer Copybara-Service <copybara-worker@google.com> Tue Apr 13 16:57:30 2021 -0700
tree 23cf3bda9fb9cbfffc00fd0d8593b26663dbda8a
parent 11b578eb04035cf10e134e1d272712c97d16da8a

[flang][OpenMP] Modify semantic check for nesting of `ordered` regions to include `close` nesting check.

Reviewed By: kiranchandramohan

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

GitOrigin-RevId: 162b463d85d3b6d253479b2b3b87fca786e61258

lib/Semantics/check-omp-structure.cpp

diff --git a/lib/Semantics/check-omp-structure.cpp b/lib/Semantics/check-omp-structure.cpp
index dcb7001..d05d663 100644
--- a/lib/Semantics/check-omp-structure.cpp
+++ b/lib/Semantics/check-omp-structure.cpp
@@ -394,8 +394,7 @@
     }
     // Other disallowed nestings, these directives do not support
     // ordered clause in them, so no need to check
-    else if (llvm::omp::nestedOrderedErrSet.test(
-                 GetContextParent().directive)) {
+    else if (IsCloselyNestedRegion(llvm::omp::nestedOrderedErrSet)) {
       context_.Say(blkDirective.source,
           "`ORDERED` region may not be closely nested inside of "
           "`CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region."_err_en_US);

test/Semantics/omp-ordered-simd.f90

diff --git a/test/Semantics/omp-ordered-simd.f90 b/test/Semantics/omp-ordered-simd.f90
index d597191..5a3760e 100644
--- a/test/Semantics/omp-ordered-simd.f90
+++ b/test/Semantics/omp-ordered-simd.f90
@@ -92,4 +92,54 @@
   END DO
   !$OMP END TASKLOOP
 
+  !$OMP CRITICAL  
+    C =  C - A * B
+    !$OMP MASTER
+    DO I = 1,N
+      !ERROR: `ORDERED` region may not be closely nested inside of `CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region.
+      !$OMP ORDERED 
+      CALL WORK(I)
+      !$OMP END ORDERED
+    END DO
+    !$OMP END MASTER
+  !$OMP END CRITICAL
+
+  !$OMP ORDERED  
+    C =  C - A * B
+    !$OMP MASTER
+    DO I = 1,N
+      !ERROR: `ORDERED` region may not be closely nested inside of `CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region.
+      !$OMP ORDERED 
+      CALL WORK(I)
+      !$OMP END ORDERED
+    END DO
+    !$OMP END MASTER
+  !$OMP END ORDERED
+
+  !$OMP TASK  
+    C =  C - A * B
+    !$OMP MASTER
+    DO I = 1,N
+      !ERROR: `ORDERED` region may not be closely nested inside of `CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region.
+      !$OMP ORDERED 
+      CALL WORK(I)
+      !$OMP END ORDERED
+    END DO
+    !$OMP END MASTER
+  !$OMP END TASK
+
+  !$OMP TASKLOOP
+  DO J= 1,N  
+    C =  C - A * B
+    !$OMP MASTER
+    DO I = 1,N
+      !ERROR: `ORDERED` region may not be closely nested inside of `CRITICAL`, `ORDERED`, explicit `TASK` or `TASKLOOP` region.
+      !$OMP ORDERED 
+      CALL WORK(I)
+      !$OMP END ORDERED
+    END DO
+    !$OMP END MASTER
+  END DO
+  !$OMP END TASKLOOP
+
 END SUBROUTINE ORDERED_BAD