[SYCL] Improve diagnostic about invalid kernel name

Signed-off-by: Alexey Sachkov <[email protected]>

Author: AlexeySachkov

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -10654,8 +10654,9 @@ def err_builtin_launder_invalid_arg : Error<
 // SYCL-specific diagnostics
 def err_sycl_attribute_address_space_invalid : Error<
   "address space is outside the valid range of values">;
-def err_sycl_kernel_name_class_not_top_level : Error<
- "kernel needs to have a globally-visible name">;
+def err_sycl_kernel_incorrectly_named : Error<
+  "kernel %select{name is missing"
+  "|needs to have a globally-visible name}0">;
 def err_sycl_restrict : Error<
   "SYCL kernel cannot "
 "%select{use a non-const global variable"

clang/lib/Sema/SemaSYCL.cpp

@@ -1504,12 +1504,18 @@ void SYCLIntegrationHeader::emitFwdDecl(raw_ostream &O, const Decl *D,
         if (TD && TD->isCompleteDefinition() && !UnnamedLambdaSupport) {
           // defined class constituting the kernel name is not globally
           // accessible - contradicts the spec
-          Diag.Report(KernelLocation,
-                      diag::err_sycl_kernel_name_class_not_top_level);
-          if (!TD->getName().empty())
+          const bool KernelNameIsMissing = TD->getName().empty();
+          if (KernelNameIsMissing) {
+            Diag.Report(KernelLocation, diag::err_sycl_kernel_incorrectly_named)
+                << /* kernel name is missing */ 0;
             // Don't emit note if kernel name was completely omitted
+          } else {
+            Diag.Report(KernelLocation, diag::err_sycl_kernel_incorrectly_named)
+                << /* kernel name is not globally-visible */ 1;
             Diag.Report(D->getSourceRange().getBegin(),
-                        diag::note_previous_decl) << TD->getName();
+                        diag::note_previous_decl)
+                << TD->getName();
+          }
         }
       }
       break;

clang/test/SemaSYCL/unnamed-kernel.cpp

@@ -82,7 +82,7 @@ struct MyWrapper {
 int main() {
   cl::sycl::queue q;
 #ifndef __SYCL_UNNAMED_LAMBDA__
-  // expected-error@+2 {{kernel needs to have a globally-visible name}}
+  // expected-error@+2 {{kernel name is missing}}
 #endif
   q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); });