R5: Addressing a few more review comments

flang/include/flang/Semantics/openmp-directive-sets.h

@@ -187,9 +187,6 @@ static const OmpDirectiveSet allTeamsSet{
 // Directive sets for groups of multiple directives
 //===----------------------------------------------------------------------===//
 
-// Directive sets for parent directives that do allow/not allow a construct
-static const OmpDirectiveSet scanAllowedSet{allDoSet | allSimdSet};
-
 // Directive sets that form Composite constructs
 static const OmpDirectiveSet allDistributeParallelDoSet{
     allDistributeSet & allParallelSet & allDoSet};
@@ -293,6 +290,11 @@ static const OmpDirectiveSet workShareSet{
     } | allDoSet,
 };
 
+//===----------------------------------------------------------------------===//
+// Directive sets for parent directives that do allow/not allow a construct
+static const OmpDirectiveSet scanParentAllowedSet{allDoSet | allSimdSet};
+//===----------------------------------------------------------------------===//
+
 //===----------------------------------------------------------------------===//
 // Directive sets for allowed/not allowed nested directives
 //===----------------------------------------------------------------------===//

flang/lib/Semantics/check-omp-structure.cpp

@@ -2990,7 +2990,7 @@ void OmpStructureChecker::CheckReductionModifier(
     // or "simd" directive.
     // The worksharing-loop directives are OMPD_do and OMPD_for. Only the
     // former is allowed in Fortran.
-    if (!llvm::omp::scanAllowedSet.test(dirCtx.directive)) {
+    if (!llvm::omp::scanParentAllowedSet.test(dirCtx.directive)) {
       context_.Say(GetContext().clauseSource,
           "Modifier 'INSCAN' on REDUCTION clause is only allowed with "
           "worksharing-loop, worksharing-loop simd, "

flang/lib/Semantics/resolve-directives.cpp

@@ -1644,7 +1644,7 @@ bool OmpAttributeVisitor::Pre(
           "Exactly one of `exclusive` or `inclusive` clause is expected"_err_en_US);
     }
     if (!parentContext ||
-        !llvm::omp::scanAllowedSet.test(parentContext->directive)) {
+        !llvm::omp::scanParentAllowedSet.test(parentContext->directive)) {
       context_.Say(standaloneDir.source,
           "Orphaned `omp scan` directives are prohibited; perhaps you forgot "
           "to enclose the directive in to a worksharing loop, a worksharing "