Implemented review comments:

Changed 'check' function to return true on error.
Changed diagnostic message.

Signed-off-by: Elizabeth Andrews <[email protected]>

Author: elizabethandrews

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -10762,7 +10762,7 @@ def err_builtin_launder_invalid_arg : Error<
 def err_sycl_kernel_incorrectly_named : Error<
   "kernel %select{name is missing"
   "|needs to have a globally-visible name"
-  "|name cannot be templated using unscoped enum without fixed underlying type"
+  "|name is invalid. Unscoped enum requires fixed underlying type"
   "}0">;
 def err_sycl_restrict : Error<
   "SYCL kernel cannot "

clang/lib/Sema/SemaSYCL.cpp

@@ -1644,9 +1644,9 @@ static bool checkEnumTemplateParameter(const EnumDecl *ED,
     Diag.Report(KernelLocation, diag::err_sycl_kernel_incorrectly_named) << 2;
     Diag.Report(ED->getSourceRange().getBegin(), diag::note_entity_declared_at)
         << ED;
-    return false;
+    return true;
   }
-  return true;
+  return false;
 }
 
 // Emits a forward declaration
@@ -1794,7 +1794,7 @@ void SYCLIntegrationHeader::emitForwardClassDecls(
         // Handle Kernel Name Type templated using enum type and value.
         if (const auto *ET = T->getAs<EnumType>()) {
           const EnumDecl *ED = ET->getDecl();
-          if (checkEnumTemplateParameter(ED, Diag, KernelLocation))
+          if (!checkEnumTemplateParameter(ED, Diag, KernelLocation))
             emitFwdDecl(O, ED, KernelLocation);
         } else if (Arg.getKind() == TemplateArgument::ArgKind::Type)
           emitForwardClassDecls(O, T, KernelLocation, Printed);

clang/test/SemaSYCL/kernelname-enum.cpp

@@ -31,7 +31,7 @@ class dummy_functor_1 {
   void operator()() {}
 };
 
-// expected-error@+2 {{kernel name cannot be templated using unscoped enum without fixed underlying type}}
+// expected-error@+2 {{kernel name is invalid. Unscoped enum requires fixed underlying type}}
 template <unscoped_enum_no_type_set EnumType>
 class dummy_functor_2 {
 public: