Update syntax for fallback complex modifier

Author: kevinsala

clang/include/clang/AST/OpenMPClause.h

@@ -9781,8 +9781,8 @@ class OMPDynGroupprivateClause : public OMPClause, public OMPClauseWithPreInit {
   SourceLocation LParenLoc;
 
   /// Modifiers for 'dyn_groupprivate' clause.
-  enum { FIRST, SECOND, NUM_MODIFIERS };
-  OpenMPDynGroupprivateClauseModifier Modifiers[NUM_MODIFIERS];
+  enum { SIMPLE, FALLBACK, NUM_MODIFIERS };
+  unsigned Modifiers[NUM_MODIFIERS];
 
   /// Locations of modifiers.
   SourceLocation ModifiersLoc[NUM_MODIFIERS];
@@ -9793,37 +9793,26 @@ class OMPDynGroupprivateClause : public OMPClause, public OMPClauseWithPreInit {
   /// Set the first dyn_groupprivate modifier.
   ///
   /// \param M The modifier.
-  void setFirstDynGroupprivateModifier(OpenMPDynGroupprivateClauseModifier M) {
-    Modifiers[FIRST] = M;
+  void setDynGroupprivateModifier(OpenMPDynGroupprivateClauseModifier M) {
+    Modifiers[SIMPLE] = M;
   }
 
   /// Set the second dyn_groupprivate modifier.
   ///
   /// \param M The modifier.
-  void setSecondDynGroupprivateModifier(OpenMPDynGroupprivateClauseModifier M) {
-    Modifiers[SECOND] = M;
+  void setDynGroupprivateFallbackModifier(
+      OpenMPDynGroupprivateClauseFallbackModifier M) {
+    Modifiers[FALLBACK] = M;
   }
 
   /// Set location of the first dyn_groupprivate modifier.
-  void setFirstDynGroupprivateModifierLoc(SourceLocation Loc) {
-    ModifiersLoc[FIRST] = Loc;
+  void setDynGroupprivateModifierLoc(SourceLocation Loc) {
+    ModifiersLoc[SIMPLE] = Loc;
   }
 
   /// Set location of the second dyn_groupprivate modifier.
-  void setSecondDynGroupprivateModifierLoc(SourceLocation Loc) {
-    ModifiersLoc[SECOND] = Loc;
-  }
-
-  /// Set dyn_groupprivate modifier location.
-  ///
-  /// \param M The modifier location.
-  void setDynGroupprivateModifer(OpenMPDynGroupprivateClauseModifier M) {
-    if (Modifiers[FIRST] == OMPC_DYN_GROUPPRIVATE_unknown)
-      Modifiers[FIRST] = M;
-    else {
-      assert(Modifiers[SECOND] == OMPC_DYN_GROUPPRIVATE_unknown);
-      Modifiers[SECOND] = M;
-    }
+  void setDynGroupprivateFallbackModifierLoc(SourceLocation Loc) {
+    ModifiersLoc[FALLBACK] = Loc;
   }
 
   /// Sets the location of '('.
@@ -9852,47 +9841,49 @@ class OMPDynGroupprivateClause : public OMPClause, public OMPClauseWithPreInit {
                            OpenMPDirectiveKind CaptureRegion,
                            OpenMPDynGroupprivateClauseModifier M1,
                            SourceLocation M1Loc,
-                           OpenMPDynGroupprivateClauseModifier M2,
+                           OpenMPDynGroupprivateClauseFallbackModifier M2,
                            SourceLocation M2Loc)
       : OMPClause(llvm::omp::OMPC_dyn_groupprivate, StartLoc, EndLoc),
         OMPClauseWithPreInit(this), LParenLoc(LParenLoc), Size(Size) {
     setPreInitStmt(HelperSize, CaptureRegion);
-    Modifiers[FIRST] = M1;
-    Modifiers[SECOND] = M2;
-    ModifiersLoc[FIRST] = M1Loc;
-    ModifiersLoc[SECOND] = M2Loc;
+    Modifiers[SIMPLE] = M1;
+    Modifiers[FALLBACK] = M2;
+    ModifiersLoc[SIMPLE] = M1Loc;
+    ModifiersLoc[FALLBACK] = M2Loc;
   }
 
   /// Build an empty clause.
   explicit OMPDynGroupprivateClause()
       : OMPClause(llvm::omp::OMPC_dyn_groupprivate, SourceLocation(),
                   SourceLocation()),
         OMPClauseWithPreInit(this) {
-    Modifiers[FIRST] = OMPC_DYN_GROUPPRIVATE_unknown;
-    Modifiers[SECOND] = OMPC_DYN_GROUPPRIVATE_unknown;
+    Modifiers[SIMPLE] = OMPC_DYN_GROUPPRIVATE_unknown;
+    Modifiers[FALLBACK] = OMPC_DYN_GROUPPRIVATE_FALLBACK_unknown;
   }
 
   /// Get the first modifier of the clause.
-  OpenMPDynGroupprivateClauseModifier getFirstDynGroupprivateModifier() const {
-    return Modifiers[FIRST];
+  OpenMPDynGroupprivateClauseModifier getDynGroupprivateModifier() const {
+    return static_cast<OpenMPDynGroupprivateClauseModifier>(Modifiers[SIMPLE]);
   }
 
   /// Get the second modifier of the clause.
-  OpenMPDynGroupprivateClauseModifier getSecondDynGroupprivateModifier() const {
-    return Modifiers[SECOND];
+  OpenMPDynGroupprivateClauseFallbackModifier
+  getDynGroupprivateFallbackModifier() const {
+    return static_cast<OpenMPDynGroupprivateClauseFallbackModifier>(
+        Modifiers[FALLBACK]);
   }
 
   /// Get location of '('.
   SourceLocation getLParenLoc() { return LParenLoc; }
 
   /// Get the first modifier location.
-  SourceLocation getFirstDynGroupprivateModifierLoc() const {
-    return ModifiersLoc[FIRST];
+  SourceLocation getDynGroupprivateModifierLoc() const {
+    return ModifiersLoc[SIMPLE];
   }
 
   /// Get the second modifier location.
-  SourceLocation getSecondDynGroupprivateModifierLoc() const {
-    return ModifiersLoc[SECOND];
+  SourceLocation getDynGroupprivateFallbackModifierLoc() const {
+    return ModifiersLoc[FALLBACK];
   }
 
   /// Get size.

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -12058,7 +12058,7 @@ def err_omp_unexpected_schedule_modifier : Error<
   "modifier '%0' cannot be used along with modifier '%1'">;
 def err_omp_schedule_nonmonotonic_static : Error<
   "'nonmonotonic' modifier can only be specified with 'dynamic' or 'guided' schedule kind">;
-def err_omp_unexpected_dyn_groupprivate_modifier
+def err_omp_incompatible_dyn_groupprivate_modifier
     : Error<"modifier '%0' cannot be used along with modifier '%1' in "
             "dyn_groupprivate">;
 def err_omp_simple_clause_incompatible_with_ordered : Error<

clang/include/clang/Basic/OpenMPKinds.def

@@ -86,6 +86,9 @@
 #ifndef OPENMP_DYN_GROUPPRIVATE_MODIFIER
 #define OPENMP_DYN_GROUPPRIVATE_MODIFIER(Name)
 #endif
+#ifndef OPENMP_DYN_GROUPPRIVATE_FALLBACK_MODIFIER
+#define OPENMP_DYN_GROUPPRIVATE_FALLBACK_MODIFIER(Name)
+#endif
 #ifndef OPENMP_NUMTASKS_MODIFIER
 #define OPENMP_NUMTASKS_MODIFIER(Name)
 #endif
@@ -232,8 +235,11 @@ OPENMP_GRAINSIZE_MODIFIER(strict)
 
 // Modifiers for the 'dyn_groupprivate' clause.
 OPENMP_DYN_GROUPPRIVATE_MODIFIER(cgroup)
-OPENMP_DYN_GROUPPRIVATE_MODIFIER(strict)
-OPENMP_DYN_GROUPPRIVATE_MODIFIER(fallback)
+
+// Fallback modifiers for the 'dyn_groupprivate' clause.
+OPENMP_DYN_GROUPPRIVATE_FALLBACK_MODIFIER(abort)
+OPENMP_DYN_GROUPPRIVATE_FALLBACK_MODIFIER(null)
+OPENMP_DYN_GROUPPRIVATE_FALLBACK_MODIFIER(default_mem)
 
 // Modifiers for the 'num_tasks' clause.
 OPENMP_NUMTASKS_MODIFIER(strict)
@@ -254,6 +260,7 @@ OPENMP_DOACROSS_MODIFIER(source_omp_cur_iteration)
 #undef OPENMP_NUMTASKS_MODIFIER
 #undef OPENMP_NUMTHREADS_MODIFIER
 #undef OPENMP_DYN_GROUPPRIVATE_MODIFIER
+#undef OPENMP_DYN_GROUPPRIVATE_FALLBACK_MODIFIER
 #undef OPENMP_GRAINSIZE_MODIFIER
 #undef OPENMP_BIND_KIND
 #undef OPENMP_ADJUST_ARGS_KIND

clang/include/clang/Basic/OpenMPKinds.h

@@ -223,9 +223,13 @@ enum OpenMPDynGroupprivateClauseModifier {
   OMPC_DYN_GROUPPRIVATE_unknown
 };
 
-/// Number of allowed dyn_groupprivate-modifiers.
-static constexpr unsigned NumberOfOMPDynGroupprivateClauseModifiers =
-    OMPC_DYN_GROUPPRIVATE_unknown;
+enum OpenMPDynGroupprivateClauseFallbackModifier {
+  OMPC_DYN_GROUPPRIVATE_FALLBACK_unknown = OMPC_DYN_GROUPPRIVATE_unknown,
+#define OPENMP_DYN_GROUPPRIVATE_FALLBACK_MODIFIER(Name)                        \
+  OMPC_DYN_GROUPPRIVATE_FALLBACK_##Name,
+#include "clang/Basic/OpenMPKinds.def"
+  OMPC_DYN_GROUPPRIVATE_FALLBACK_last
+};
 
 enum OpenMPNumTasksClauseModifier {
 #define OPENMP_NUMTASKS_MODIFIER(Name) OMPC_NUMTASKS_##Name,

clang/include/clang/Sema/SemaOpenMP.h

@@ -1388,7 +1388,7 @@ class SemaOpenMP : public SemaBase {
   /// Called on a well-formed 'dyn_groupprivate' clause.
   OMPClause *ActOnOpenMPDynGroupprivateClause(
       OpenMPDynGroupprivateClauseModifier M1,
-      OpenMPDynGroupprivateClauseModifier M2, Expr *Size,
+      OpenMPDynGroupprivateClauseFallbackModifier M2, Expr *Size,
       SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation M1Loc,
       SourceLocation M2Loc, SourceLocation EndLoc);
 

clang/lib/AST/OpenMPClause.cpp

@@ -2726,15 +2726,14 @@ void OMPClausePrinter::VisitOMPXDynCGroupMemClause(
 void OMPClausePrinter::VisitOMPDynGroupprivateClause(
     OMPDynGroupprivateClause *Node) {
   OS << "dyn_groupprivate(";
-  if (Node->getFirstDynGroupprivateModifier() !=
-      OMPC_DYN_GROUPPRIVATE_unknown) {
-    OS << getOpenMPSimpleClauseTypeName(
-        OMPC_dyn_groupprivate, Node->getFirstDynGroupprivateModifier());
-    if (Node->getSecondDynGroupprivateModifier() !=
-        OMPC_DYN_GROUPPRIVATE_unknown) {
+  if (Node->getDynGroupprivateModifier() != OMPC_DYN_GROUPPRIVATE_unknown) {
+    OS << getOpenMPSimpleClauseTypeName(OMPC_dyn_groupprivate,
+                                        Node->getDynGroupprivateModifier());
+    if (Node->getDynGroupprivateFallbackModifier() !=
+        OMPC_DYN_GROUPPRIVATE_FALLBACK_unknown) {
       OS << ", ";
       OS << getOpenMPSimpleClauseTypeName(
-          OMPC_dyn_groupprivate, Node->getSecondDynGroupprivateModifier());
+          OMPC_dyn_groupprivate, Node->getDynGroupprivateFallbackModifier());
     }
     OS << ": ";
   }

clang/lib/Basic/OpenMPKinds.cpp

@@ -175,6 +175,9 @@ unsigned clang::getOpenMPSimpleClauseType(OpenMPClauseKind Kind, StringRef Str,
     return llvm::StringSwitch<unsigned>(Str)
 #define OPENMP_DYN_GROUPPRIVATE_MODIFIER(Name)                                 \
   .Case(#Name, OMPC_DYN_GROUPPRIVATE_##Name)
+#define OPENMP_DYN_GROUPPRIVATE_FALLBACK_MODIFIER(Name)                        \
+  .Case(#Name, OMPC_DYN_GROUPPRIVATE_FALLBACK_##Name)                          \
+      .Case("fallback(" #Name ")", OMPC_DYN_GROUPPRIVATE_FALLBACK_##Name)
 #include "clang/Basic/OpenMPKinds.def"
         .Default(OMPC_DYN_GROUPPRIVATE_unknown);
   }
@@ -518,10 +521,14 @@ const char *clang::getOpenMPSimpleClauseTypeName(OpenMPClauseKind Kind,
   case OMPC_dyn_groupprivate:
     switch (Type) {
     case OMPC_DYN_GROUPPRIVATE_unknown:
+    case OMPC_DYN_GROUPPRIVATE_FALLBACK_last:
       return "unknown";
 #define OPENMP_DYN_GROUPPRIVATE_MODIFIER(Name)                                 \
   case OMPC_DYN_GROUPPRIVATE_##Name:                                           \
     return #Name;
+#define OPENMP_DYN_GROUPPRIVATE_FALLBACK_MODIFIER(Name)                        \
+  case OMPC_DYN_GROUPPRIVATE_FALLBACK_##Name:                                  \
+    return "fallback(" #Name ")";
 #include "clang/Basic/OpenMPKinds.def"
     }
     llvm_unreachable("Invalid OpenMP 'dyn_groupprivate' clause modifier");

clang/lib/Parse/ParseOpenMP.cpp

@@ -3837,31 +3837,72 @@ OMPClause *Parser::ParseOpenMPSingleExprWithArgClause(OpenMPDirectiveKind DKind,
       KLoc.emplace_back();
     }
   } else if (Kind == OMPC_dyn_groupprivate) {
-    enum { Modifier1, Modifier2, NumberOfElements };
-    Arg.resize(NumberOfElements);
-    KLoc.resize(NumberOfElements);
-    Arg[Modifier1] = OMPC_DYN_GROUPPRIVATE_unknown;
-    Arg[Modifier2] = OMPC_DYN_GROUPPRIVATE_unknown;
-    unsigned Modifier = getOpenMPSimpleClauseType(
-        Kind, Tok.isAnnotation() ? "" : PP.getSpelling(Tok), getLangOpts());
+    enum { SimpleModifier, ComplexModifier, NumberOfModifiers };
+    Arg.resize(NumberOfModifiers);
+    KLoc.resize(NumberOfModifiers);
+    Arg[SimpleModifier] = OMPC_DYN_GROUPPRIVATE_unknown;
+    Arg[ComplexModifier] = OMPC_DYN_GROUPPRIVATE_FALLBACK_unknown;
+
+    auto consumeModifier = [&]() {
+      unsigned Type = NumberOfModifiers;
+      unsigned Modifier;
+      SourceLocation Loc;
+      if (PP.getSpelling(Tok) == "fallback" && NextToken().is(tok::l_paren)) {
+        ConsumeToken();
+        BalancedDelimiterTracker ParenT(*this, tok::l_paren, tok::r_paren);
+        ParenT.consumeOpen();
 
-    if (Modifier < OMPC_DYN_GROUPPRIVATE_unknown) {
-      // Parse 'modifier'
-      Arg[Modifier1] = Modifier;
-      KLoc[Modifier1] = Tok.getLocation();
-      if (Tok.isNot(tok::r_paren) && Tok.isNot(tok::comma) &&
-          Tok.isNot(tok::annot_pragma_openmp_end))
-        ConsumeAnyToken();
-      if (Tok.is(tok::comma)) {
-        // Parse ',' 'modifier'
-        ConsumeAnyToken();
         Modifier = getOpenMPSimpleClauseType(
             Kind, Tok.isAnnotation() ? "" : PP.getSpelling(Tok), getLangOpts());
-        Arg[Modifier2] = Modifier;
-        KLoc[Modifier2] = Tok.getLocation();
+        if (Modifier <= OMPC_DYN_GROUPPRIVATE_FALLBACK_unknown ||
+            Modifier >= OMPC_DYN_GROUPPRIVATE_FALLBACK_last) {
+          Diag(Tok.getLocation(), diag::err_expected)
+              << "'abort', 'null' or 'default_mem' in fallback modifier";
+          SkipUntil(tok::r_paren);
+          return std::make_tuple(Type, Modifier, Loc);
+        }
+        Type = ComplexModifier;
+        Loc = Tok.getLocation();
         if (Tok.isNot(tok::r_paren) && Tok.isNot(tok::comma) &&
             Tok.isNot(tok::annot_pragma_openmp_end))
           ConsumeAnyToken();
+        ParenT.consumeClose();
+      } else {
+        Modifier = getOpenMPSimpleClauseType(
+            Kind, Tok.isAnnotation() ? "" : PP.getSpelling(Tok), getLangOpts());
+        if (Modifier < OMPC_DYN_GROUPPRIVATE_unknown) {
+          Type = SimpleModifier;
+          Loc = Tok.getLocation();
+          if (Tok.isNot(tok::r_paren) && Tok.isNot(tok::comma) &&
+              Tok.isNot(tok::annot_pragma_openmp_end))
+            ConsumeAnyToken();
+        }
+      }
+      return std::make_tuple(Type, Modifier, Loc);
+    };
+
+    auto saveModifier = [&](unsigned Type, unsigned Modifier,
+                            SourceLocation Loc) {
+      assert(Type < NumberOfModifiers);
+      if (!KLoc[Type].isValid()) {
+        Arg[Type] = Modifier;
+        KLoc[Type] = Loc;
+      } else
+        Diag(Loc, diag::err_omp_incompatible_dyn_groupprivate_modifier)
+            << getOpenMPSimpleClauseTypeName(OMPC_dyn_groupprivate, Modifier)
+            << getOpenMPSimpleClauseTypeName(OMPC_dyn_groupprivate, Arg[Type]);
+    };
+
+    // Parse 'modifier'
+    auto [Type1, Mod1, Loc1] = consumeModifier();
+    if (Type1 < NumberOfModifiers) {
+      saveModifier(Type1, Mod1, Loc1);
+      if (Tok.is(tok::comma)) {
+        // Parse ',' 'modifier'
+        ConsumeAnyToken();
+        auto [Type2, Mod2, Loc2] = consumeModifier();
+        if (Type2 < NumberOfModifiers)
+          saveModifier(Type2, Mod2, Loc2);
       }
       // Parse ':'
       if (Tok.is(tok::colon))

clang/lib/Sema/SemaOpenMP.cpp

@@ -16731,7 +16731,8 @@ OMPClause *SemaOpenMP::ActOnOpenMPSingleExprWithArgClause(
            ArgumentLoc.size() == NumberOfElements);
     Res = ActOnOpenMPDynGroupprivateClause(
         static_cast<OpenMPDynGroupprivateClauseModifier>(Argument[Modifier1]),
-        static_cast<OpenMPDynGroupprivateClauseModifier>(Argument[Modifier2]),
+        static_cast<OpenMPDynGroupprivateClauseFallbackModifier>(
+            Argument[Modifier2]),
         Expr, StartLoc, LParenLoc, ArgumentLoc[Modifier1],
         ArgumentLoc[Modifier2], EndLoc);
   } break;
@@ -24179,12 +24180,12 @@ OMPClause *SemaOpenMP::ActOnOpenMPXDynCGroupMemClause(Expr *Size,
 
 OMPClause *SemaOpenMP::ActOnOpenMPDynGroupprivateClause(
     OpenMPDynGroupprivateClauseModifier M1,
-    OpenMPDynGroupprivateClauseModifier M2, Expr *Size, SourceLocation StartLoc,
-    SourceLocation LParenLoc, SourceLocation M1Loc, SourceLocation M2Loc,
-    SourceLocation EndLoc) {
+    OpenMPDynGroupprivateClauseFallbackModifier M2, Expr *Size,
+    SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation M1Loc,
+    SourceLocation M2Loc, SourceLocation EndLoc) {
 
   if ((M1Loc.isValid() && M1 == OMPC_DYN_GROUPPRIVATE_unknown) ||
-      (M2Loc.isValid() && M2 == OMPC_DYN_GROUPPRIVATE_unknown)) {
+      (M2Loc.isValid() && M2 == OMPC_DYN_GROUPPRIVATE_FALLBACK_unknown)) {
     std::string Values = getListOfPossibleValues(
         OMPC_dyn_groupprivate, /*First=*/0, OMPC_DYN_GROUPPRIVATE_unknown);
     Diag((M1Loc.isValid() && M1 == OMPC_DYN_GROUPPRIVATE_unknown) ? M1Loc
@@ -24194,18 +24195,6 @@ OMPClause *SemaOpenMP::ActOnOpenMPDynGroupprivateClause(
     return nullptr;
   }
 
-  if ((M1Loc.isValid() && M2Loc.isValid() && M1 == M2) ||
-      (M1 == OMPC_DYN_GROUPPRIVATE_strict &&
-       M2 == OMPC_DYN_GROUPPRIVATE_fallback) ||
-      (M1 == OMPC_DYN_GROUPPRIVATE_fallback &&
-       M2 == OMPC_DYN_GROUPPRIVATE_strict)) {
-
-    Diag(M2Loc, diag::err_omp_unexpected_dyn_groupprivate_modifier)
-        << getOpenMPSimpleClauseTypeName(OMPC_dyn_groupprivate, M2)
-        << getOpenMPSimpleClauseTypeName(OMPC_dyn_groupprivate, M1);
-    return nullptr;
-  }
-
   Expr *ValExpr = Size;
   Stmt *HelperValStmt = nullptr;
 

clang/lib/Sema/TreeTransform.h

@@ -2465,7 +2465,7 @@ class TreeTransform {
   /// Subclasses may override this routine to provide different behavior.
   OMPClause *RebuildOMPDynGroupprivateClause(
       OpenMPDynGroupprivateClauseModifier M1,
-      OpenMPDynGroupprivateClauseModifier M2, Expr *Size,
+      OpenMPDynGroupprivateClauseFallbackModifier M2, Expr *Size,
       SourceLocation StartLoc, SourceLocation LParenLoc, SourceLocation M1Loc,
       SourceLocation M2Loc, SourceLocation EndLoc) {
     return getSema().OpenMP().ActOnOpenMPDynGroupprivateClause(
@@ -11727,10 +11727,10 @@ OMPClause *TreeTransform<Derived>::TransformOMPDynGroupprivateClause(
   if (Size.isInvalid())
     return nullptr;
   return getDerived().RebuildOMPDynGroupprivateClause(
-      C->getFirstDynGroupprivateModifier(),
-      C->getSecondDynGroupprivateModifier(), Size.get(), C->getBeginLoc(),
-      C->getLParenLoc(), C->getFirstDynGroupprivateModifierLoc(),
-      C->getSecondDynGroupprivateModifierLoc(), C->getEndLoc());
+      C->getDynGroupprivateModifier(), C->getDynGroupprivateFallbackModifier(),
+      Size.get(), C->getBeginLoc(), C->getLParenLoc(),
+      C->getDynGroupprivateModifierLoc(),
+      C->getDynGroupprivateFallbackModifierLoc(), C->getEndLoc());
 }
 
 template <typename Derived>