[ser] Fold barrier_invalid_semantics_flags[_legacy] diags into one

Author: simoll

tools/clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -7974,12 +7974,9 @@ def err_hlsl_controlpoints_size: Error<
 def err_hlsl_barrier_invalid_memory_flags: Error<
   "invalid MemoryTypeFlags for Barrier operation; expected 0, ALL_MEMORY, or some combination of "
   "UAV_MEMORY, GROUP_SHARED_MEMORY, NODE_INPUT_MEMORY, NODE_OUTPUT_MEMORY flags">;
-def err_hlsl_barrier_invalid_semantic_flags_legacy: Error<
-  "invalid SemanticFlags for Barrier operation; expected 0 or some combination of "
-  "GROUP_SYNC, GROUP_SCOPE, DEVICE_SCOPE flags">;
 def err_hlsl_barrier_invalid_semantic_flags: Error<
   "invalid SemanticFlags for Barrier operation; expected 0 or some combination of "
-  "GROUP_SYNC, GROUP_SCOPE, DEVICE_SCOPE, REORDER_SCOPE flags">;
+  "GROUP_SYNC, GROUP_SCOPE, DEVICE_SCOPE%select{|, REORDER_SCOPE}0 flags">;
 def warn_hlsl_barrier_group_memory_requires_group: Warning<
   "GROUP_SHARED_MEMORY specified for Barrier operation when context has no visible group">,
   InGroup<HLSLBarrier>, DefaultError;

tools/clang/lib/Sema/SemaHLSL.cpp

@@ -11593,18 +11593,17 @@ static bool CheckBarrierCall(Sema &S, FunctionDecl *FD, CallExpr *CE,
   if (SemanticFlagsExpr->isIntegerConstantExpr(SemanticFlagsVal, S.Context)) {
     SemanticFlags = SemanticFlagsVal.getLimitedValue();
     uint32_t ValidMask = 0U;
-    unsigned DiagID = 0;
     if (SM->IsSM69Plus()) {
-      DiagID = diag::err_hlsl_barrier_invalid_semantic_flags;
       ValidMask =
           static_cast<unsigned>(hlsl::DXIL::BarrierSemanticFlag::ValidMask);
     } else {
-      DiagID = diag::err_hlsl_barrier_invalid_semantic_flags_legacy;
       ValidMask =
           static_cast<unsigned>(hlsl::DXIL::BarrierSemanticFlag::LegacyFlags);
     }
     if ((uint32_t)SemanticFlags & ~ValidMask) {
-      S.Diags.Report(SemanticFlagsExpr->getExprLoc(), DiagID);
+      S.Diags.Report(SemanticFlagsExpr->getExprLoc(),
+                     diag::err_hlsl_barrier_invalid_semantic_flags)
+          << SM->IsSM69Plus();
       return true;
     }
   }