Merge branch 'users/kevinsala/omp-dyn-groupprivate-pr' into users/kevinsala/omp-dyn-groupprivate-codegen-pr

Author: kevinsala

clang/lib/Parse/ParseOpenMP.cpp

@@ -4016,7 +4016,7 @@ OMPClause *Parser::ParseOpenMPSingleExprWithArgClause(OpenMPDirectiveKind DKind,
     Arg[SimpleModifier] = OMPC_DYN_GROUPPRIVATE_unknown;
     Arg[ComplexModifier] = OMPC_DYN_GROUPPRIVATE_FALLBACK_unknown;
 
-    auto consumeModifier = [&]() {
+    auto ConsumeModifier = [&]() {
       unsigned Type = NumberOfModifiers;
       unsigned Modifier;
       SourceLocation Loc;
@@ -4055,28 +4055,29 @@ OMPClause *Parser::ParseOpenMPSingleExprWithArgClause(OpenMPDirectiveKind DKind,
       return std::make_tuple(Type, Modifier, Loc);
     };
 
-    auto saveModifier = [&](unsigned Type, unsigned Modifier,
+    auto SaveModifier = [&](unsigned Type, unsigned Modifier,
                             SourceLocation Loc) {
-      assert(Type < NumberOfModifiers);
+      assert(Type < NumberOfModifiers && "Unexpected modifier type");
       if (!KLoc[Type].isValid()) {
         Arg[Type] = Modifier;
         KLoc[Type] = Loc;
-      } else
+      } 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();
+    auto [Type1, Mod1, Loc1] = ConsumeModifier();
     if (Type1 < NumberOfModifiers) {
-      saveModifier(Type1, Mod1, Loc1);
+      SaveModifier(Type1, Mod1, Loc1);
       if (Tok.is(tok::comma)) {
         // Parse ',' 'modifier'
         ConsumeAnyToken();
-        auto [Type2, Mod2, Loc2] = consumeModifier();
+        auto [Type2, Mod2, Loc2] = ConsumeModifier();
         if (Type2 < NumberOfModifiers)
-          saveModifier(Type2, Mod2, Loc2);
+          SaveModifier(Type2, Mod2, Loc2);
       }
       // Parse ':'
       if (Tok.is(tok::colon))

clang/lib/Sema/SemaOpenMP.cpp

@@ -17697,7 +17697,8 @@ OMPClause *SemaOpenMP::ActOnOpenMPSingleExprWithArgClause(
         static_cast<OpenMPScheduleClauseKind>(Argument[ScheduleKind]), Expr,
         StartLoc, LParenLoc, ArgumentLoc[Modifier1], ArgumentLoc[Modifier2],
         ArgumentLoc[ScheduleKind], DelimLoc, EndLoc);
-  } break;
+    break;
+  }
   case OMPC_if:
     assert(Argument.size() == 1 && ArgumentLoc.size() == 1);
     Res = ActOnOpenMPIfClause(static_cast<OpenMPDirectiveKind>(Argument.back()),
@@ -17756,14 +17757,17 @@ OMPClause *SemaOpenMP::ActOnOpenMPSingleExprWithArgClause(
   case OMPC_dyn_groupprivate: {
     enum { Modifier1, Modifier2, NumberOfElements };
     assert(Argument.size() == NumberOfElements &&
-           ArgumentLoc.size() == NumberOfElements);
+           ArgumentLoc.size() == NumberOfElements &&
+           "Modifiers for dyn_groupprivate clause and their locations are "
+           "expected.");
     Res = ActOnOpenMPDynGroupprivateClause(
         static_cast<OpenMPDynGroupprivateClauseModifier>(Argument[Modifier1]),
         static_cast<OpenMPDynGroupprivateClauseFallbackModifier>(
             Argument[Modifier2]),
         Expr, StartLoc, LParenLoc, ArgumentLoc[Modifier1],
         ArgumentLoc[Modifier2], EndLoc);
-  } break;
+    break;
+  }
   case OMPC_num_threads:
     assert(Argument.size() == 1 && ArgumentLoc.size() == 1 &&
            "Modifier for num_threads clause and its location are expected.");

clang/lib/Serialization/ASTReader.cpp

@@ -12729,10 +12729,9 @@ void OMPClauseReader::VisitOMPDynGroupprivateClause(
     OMPDynGroupprivateClause *C) {
   VisitOMPClauseWithPreInit(C);
   C->setDynGroupprivateModifier(
-      static_cast<OpenMPDynGroupprivateClauseModifier>(Record.readInt()));
+      Record.readEnum<OpenMPDynGroupprivateClauseModifier>());
   C->setDynGroupprivateFallbackModifier(
-      static_cast<OpenMPDynGroupprivateClauseFallbackModifier>(
-          Record.readInt()));
+      Record.readEnum<OpenMPDynGroupprivateClauseFallbackModifier>());
   C->setSize(Record.readSubExpr());
   C->setLParenLoc(Record.readSourceLocation());
   C->setDynGroupprivateModifierLoc(Record.readSourceLocation());