Dealias clauses correctly, which should eliminate failures after tablegen. Also, sort the clause kind list so that diagnostics are alphabetical

Author: erichkeane

clang/include/clang/Basic/OpenACCKinds.h

@@ -202,131 +202,132 @@ inline llvm::raw_ostream &operator<<(llvm::raw_ostream &Out,
   return printOpenACCAtomicKind(Out, AK);
 }
 
-/// Represents the kind of an OpenACC clause.
+/// Represents the kind of an OpenACC clause. Sorted alphabetically, since this
+/// order ends up influencing the sorting of the list diagnostic.
 enum class OpenACCClauseKind : uint8_t {
-  /// 'finalize' clause, allowed on 'exit data' directive.
-  Finalize,
-  /// 'if_present' clause, allowed on 'host_data' and 'update' directives.
-  IfPresent,
-  /// 'seq' clause, allowed on 'loop' and 'routine' directives.
-  Seq,
-  /// 'independent' clause, allowed on 'loop' directives.
-  Independent,
+  /// 'async' clause, allowed on Compute, Data, 'update', 'wait', and Combined
+  /// constructs.
+  Async,
+  /// 'attach' clause, allowed on Compute and Combined constructs, plus 'data'
+  /// and 'enter data'.
+  Attach,
   /// 'auto' clause, allowed on 'loop' directives.
   Auto,
-  /// 'worker' clause, allowed on 'loop', Combined, and 'routine' directives.
-  Worker,
-  /// 'vector' clause, allowed on 'loop', Combined, and 'routine' directives.
-  Vector,
-  /// 'nohost' clause, allowed on 'routine' directives.
-  NoHost,
-  /// 'default' clause, allowed on parallel, serial, kernel (and compound)
-  /// constructs.
-  Default,
-  /// 'if' clause, allowed on all the Compute Constructs, Data Constructs,
-  /// Executable Constructs, and Combined Constructs.
-  If,
-  /// 'self' clause, allowed on Compute and Combined Constructs, plus 'update'.
-  Self,
+  /// 'bind' clause, allowed on routine constructs.
+  Bind,
+  /// 'collapse' clause, allowed on 'loop' and Combined constructs.
+  Collapse,
   /// 'copy' clause, allowed on Compute and Combined Constructs, plus 'data' and
   /// 'declare'.
   Copy,
   /// 'copy' clause alias 'pcopy'.  Preserved for diagnostic purposes.
   PCopy,
   /// 'copy' clause alias 'present_or_copy'.  Preserved for diagnostic purposes.
   PresentOrCopy,
-  /// 'use_device' clause, allowed on 'host_data' construct.
-  UseDevice,
-  /// 'attach' clause, allowed on Compute and Combined constructs, plus 'data'
-  /// and 'enter data'.
-  Attach,
+  /// 'copyin' clause, allowed on Compute and Combined constructs, plus 'data',
+  /// 'enter data', and 'declare'.
+  CopyIn,
+  /// 'copyin' clause alias 'pcopyin'.  Preserved for diagnostic purposes.
+  PCopyIn,
+  /// 'copyin' clause alias 'present_or_copyin'.  Preserved for diagnostic
+  /// purposes.
+  PresentOrCopyIn,
+  /// 'copyout' clause, allowed on Compute and Combined constructs, plus 'data',
+  /// 'exit data', and 'declare'.
+  CopyOut,
+  /// 'copyout' clause alias 'pcopyout'.  Preserved for diagnostic purposes.
+  PCopyOut,
+  /// 'copyout' clause alias 'present_or_copyout'.  Preserved for diagnostic
+  /// purposes.
+  PresentOrCopyOut,
+  /// 'create' clause, allowed on Compute and Combined constructs, plus 'data',
+  /// 'enter data', and 'declare'.
+  Create,
+  /// 'create' clause alias 'pcreate'.  Preserved for diagnostic purposes.
+  PCreate,
+  /// 'create' clause alias 'present_or_create'.  Preserved for diagnostic
+  /// purposes.
+  PresentOrCreate,
+  /// 'default' clause, allowed on parallel, serial, kernel (and compound)
+  /// constructs.
+  Default,
+  /// 'default_async' clause, allowed on 'set' construct.
+  DefaultAsync,
   /// 'delete' clause, allowed on the 'exit data' construct.
   Delete,
   /// 'detach' clause, allowed on the 'exit data' construct.
   Detach,
   /// 'device' clause, allowed on the 'update' construct.
   Device,
+  /// 'device_num' clause, allowed on 'init', 'shutdown', and 'set' constructs.
+  DeviceNum,
   /// 'deviceptr' clause, allowed on Compute and Combined Constructs, plus
   /// 'data' and 'declare'.
   DevicePtr,
   /// 'device_resident' clause, allowed on the 'declare' construct.
   DeviceResident,
+  /// 'device_type' clause, allowed on Compute, 'data', 'init', 'shutdown',
+  /// 'set', update', 'loop', 'routine', and Combined constructs.
+  DeviceType,
+  /// 'dtype' clause, an alias for 'device_type', stored separately for
+  /// diagnostic purposes.
+  DType,
+  /// 'finalize' clause, allowed on 'exit data' directive.
+  Finalize,
   /// 'firstprivate' clause, allowed on 'parallel', 'serial', 'parallel loop',
   /// and 'serial loop' constructs.
   FirstPrivate,
+  /// 'gang' clause, allowed on 'loop' and Combined constructs.
+  Gang,
   /// 'host' clause, allowed on 'update' construct.
   Host,
+  /// 'if' clause, allowed on all the Compute Constructs, Data Constructs,
+  /// Executable Constructs, and Combined Constructs.
+  If,
+  /// 'if_present' clause, allowed on 'host_data' and 'update' directives.
+  IfPresent,
+  /// 'independent' clause, allowed on 'loop' directives.
+  Independent,
   /// 'link' clause, allowed on 'declare' construct.
   Link,
   /// 'no_create' clause, allowed on allowed on Compute and Combined constructs,
   /// plus 'data'.
   NoCreate,
+  /// 'nohost' clause, allowed on 'routine' directives.
+  NoHost,
+  /// 'num_gangs' clause, allowed on 'parallel', 'kernels', parallel loop', and
+  /// 'kernels loop' constructs.
+  NumGangs,
+  /// 'num_workers' clause, allowed on 'parallel', 'kernels', parallel loop',
+  /// and 'kernels loop' constructs.
+  NumWorkers,
   /// 'present' clause, allowed on Compute and Combined constructs, plus 'data'
   /// and 'declare'.
   Present,
   /// 'private' clause, allowed on 'parallel', 'serial', 'loop', 'parallel
   /// loop', and 'serial loop' constructs.
   Private,
-  /// 'copyout' clause, allowed on Compute and Combined constructs, plus 'data',
-  /// 'exit data', and 'declare'.
-  CopyOut,
-  /// 'copyout' clause alias 'pcopyout'.  Preserved for diagnostic purposes.
-  PCopyOut,
-  /// 'copyout' clause alias 'present_or_copyout'.  Preserved for diagnostic
-  /// purposes.
-  PresentOrCopyOut,
-  /// 'copyin' clause, allowed on Compute and Combined constructs, plus 'data',
-  /// 'enter data', and 'declare'.
-  CopyIn,
-  /// 'copyin' clause alias 'pcopyin'.  Preserved for diagnostic purposes.
-  PCopyIn,
-  /// 'copyin' clause alias 'present_or_copyin'.  Preserved for diagnostic
-  /// purposes.
-  PresentOrCopyIn,
-  /// 'create' clause, allowed on Compute and Combined constructs, plus 'data',
-  /// 'enter data', and 'declare'.
-  Create,
-  /// 'create' clause alias 'pcreate'.  Preserved for diagnostic purposes.
-  PCreate,
-  /// 'create' clause alias 'present_or_create'.  Preserved for diagnostic
-  /// purposes.
-  PresentOrCreate,
   /// 'reduction' clause, allowed on Parallel, Serial, Loop, and the combined
   /// constructs.
   Reduction,
-  /// 'collapse' clause, allowed on 'loop' and Combined constructs.
-  Collapse,
-  /// 'bind' clause, allowed on routine constructs.
-  Bind,
+  /// 'self' clause, allowed on Compute and Combined Constructs, plus 'update'.
+  Self,
+  /// 'seq' clause, allowed on 'loop' and 'routine' directives.
+  Seq,
+  /// 'tile' clause, allowed on 'loop' and Combined constructs.
+  Tile,
+  /// 'use_device' clause, allowed on 'host_data' construct.
+  UseDevice,
+  /// 'vector' clause, allowed on 'loop', Combined, and 'routine' directives.
+  Vector,
   /// 'vector_length' clause, allowed on 'parallel', 'kernels', 'parallel loop',
   /// and 'kernels loop' constructs.
   VectorLength,
-  /// 'num_gangs' clause, allowed on 'parallel', 'kernels', parallel loop', and
-  /// 'kernels loop' constructs.
-  NumGangs,
-  /// 'num_workers' clause, allowed on 'parallel', 'kernels', parallel loop',
-  /// and 'kernels loop' constructs.
-  NumWorkers,
-  /// 'device_num' clause, allowed on 'init', 'shutdown', and 'set' constructs.
-  DeviceNum,
-  /// 'default_async' clause, allowed on 'set' construct.
-  DefaultAsync,
-  /// 'device_type' clause, allowed on Compute, 'data', 'init', 'shutdown',
-  /// 'set', update', 'loop', 'routine', and Combined constructs.
-  DeviceType,
-  /// 'dtype' clause, an alias for 'device_type', stored separately for
-  /// diagnostic purposes.
-  DType,
-  /// 'async' clause, allowed on Compute, Data, 'update', 'wait', and Combined
-  /// constructs.
-  Async,
-  /// 'tile' clause, allowed on 'loop' and Combined constructs.
-  Tile,
-  /// 'gang' clause, allowed on 'loop' and Combined constructs.
-  Gang,
   /// 'wait' clause, allowed on Compute, Data, 'update', and Combined
   /// constructs.
   Wait,
+  /// 'worker' clause, allowed on 'loop', Combined, and 'routine' directives.
+  Worker,
 
   /// 'shortloop' is represented in the ACC.td file, but isn't present in the
   /// standard. This appears to be an old extension for the nvidia fortran

clang/lib/Sema/SemaOpenACCClauseAppertainment.cpp

@@ -73,8 +73,6 @@ struct LLVMDirectiveClauseRelationships {
 #include "llvm/Frontend/OpenACC/ACC.inc"
 
 namespace {
-
-// TODO: ERIHC: WOULD NEED ON DIRECTIVE_CLAUSE_MAP
 LLVMDirectiveClauseRelationships Relations[] =
 #define GEN_CLANG_DIRECTIVE_CLAUSE_MAP
 #include "llvm/Frontend/OpenACC/ACC.inc"
@@ -120,6 +118,20 @@ std::string getListOfClauses(AccClauseSet Set) {
   OS.flush();
   return OS.str();
 }
+
+OpenACCClauseKind dealiasClauseKind(OpenACCClauseKind CK) {
+  switch (CK) {
+    default:
+      return CK;
+#define VISIT_CLAUSE(NAME)
+#define CLAUSE_ALIAS(ALIAS, NAME, DEPRECATED)                                  \
+  case OpenACCClauseKind::ALIAS:                                             \
+    return OpenACCClauseKind::NAME;
+#include "clang/Basic/OpenACCClauses.def"
+  }
+
+  return CK;
+}
 } // namespace
 
 // Diagnoses if `Clauses` list doesn't have at least one of the required
@@ -136,7 +148,7 @@ bool SemaOpenACC::DiagnoseRequiredClauses(
     return false;
 
   for (auto *C : Clauses) {
-    if (Lists.Required.isSet(C->getClauseKind()))
+    if (Lists.Required.isSet(dealiasClauseKind(C->getClauseKind())))
       return false;
   }
 
@@ -153,12 +165,14 @@ bool SemaOpenACC::DiagnoseAllowedOnceClauses(
   if (DK == OpenACCDirectiveKind::Invalid || CK == OpenACCClauseKind::Invalid)
     return false;
 
+  OpenACCClauseKind Dealiased = dealiasClauseKind(CK);
+
   const LLVMClauseLists &Lists = getListsForDirective(DK);
   if (!Lists.AllowedOnce.isSet(CK))
     return false;
 
   auto Res = llvm::find_if(Clauses, [=](const OpenACCClause *C) {
-    return C->getClauseKind() == CK;
+    return dealiasClauseKind(C->getClauseKind()) == Dealiased;
   });
 
   if (Res == Clauses.end())
@@ -178,13 +192,14 @@ bool SemaOpenACC::DiagnoseExclusiveClauses(
     return false;
 
   const LLVMClauseLists &Lists = getListsForDirective(DK);
+  OpenACCClauseKind Dealiased = dealiasClauseKind(CK);
 
   // If this isn't on the list, this is fine.
-  if (!Lists.AllowedExclusive.isSet(CK))
+  if (!Lists.AllowedExclusive.isSet(Dealiased))
     return false;
 
   for (const OpenACCClause *C : Clauses) {
-    if (Lists.AllowedExclusive.isSet(C->getClauseKind())) {
+    if (Lists.AllowedExclusive.isSet(dealiasClauseKind(C->getClauseKind()))) {
       Diag(ClauseLoc, diag::err_acc_clause_cannot_combine)
           << CK << C->getClauseKind() << DK;
       Diag(C->getBeginLoc(), diag::note_acc_previous_clause_here);
@@ -203,9 +218,11 @@ bool SemaOpenACC::DiagnoseAllowedClauses(OpenACCDirectiveKind DK,
   if (DK == OpenACCDirectiveKind::Invalid || CK == OpenACCClauseKind::Invalid)
     return false;
   const LLVMClauseLists &Lists = getListsForDirective(DK);
+  OpenACCClauseKind Dealiased = dealiasClauseKind(CK);
 
-  if (!Lists.Allowed.isSet(CK) && !Lists.AllowedOnce.isSet(CK) &&
-      !Lists.AllowedExclusive.isSet(CK) && !Lists.Required.isSet(CK))
+  if (!Lists.Allowed.isSet(Dealiased) && !Lists.AllowedOnce.isSet(Dealiased) &&
+      !Lists.AllowedExclusive.isSet(Dealiased) &&
+      !Lists.Required.isSet(Dealiased))
     return Diag(ClauseLoc, diag::err_acc_clause_appertainment) << DK << CK;
 
   return false;