Resolve diagnostic concerns

Author: Fznamznon

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -12434,12 +12434,10 @@ def err_sycl_kernel_incorrectly_named : Error<
   "}0">;
 
 // SYCL free function kernels extension.
-def err_bad_free_function_kernel_param_type : Error<
-  "%0 cannot be used as the type of a free function kernel parameter">;
 def note_free_function_kernel_param_type_not_fwd_declarable : Note<
   "%0 is not forward declarable">;
 def note_free_function_kernel_param_type_not_supported : Note<
-  "%0 is not yet supported as free function kernel parameter">;
+  "%0 is not yet supported as a free function kernel parameter">;
 
 def err_sycl_kernel_not_function_object
     : Error<"kernel parameter must be a lambda or function object">;

clang/lib/Sema/SemaSYCL.cpp

@@ -2049,7 +2049,7 @@ class SyclKernelFieldChecker : public SyclKernelFieldHandler {
         isForwardDeclarable(RD, SemaSYCLRef, /*DiagForFreeFunction=*/true);
     if (NFDR != NotForwardDeclarableReason::None) {
       Diag.Report(PD->getLocation(),
-                  diag::err_bad_free_function_kernel_param_type)
+                  diag::err_bad_kernel_param_type)
           << ParamTy;
       Diag.Report(PD->getLocation(),
                   diag::note_free_function_kernel_param_type_not_fwd_declarable)
@@ -2151,7 +2151,7 @@ class SyclKernelFieldChecker : public SyclKernelFieldHandler {
     CXXRecordDecl *RD = ParamTy->getAsCXXRecordDecl();
     if (RD->hasAttr<SYCLRequiresDecompositionAttr>()) {
       Diag.Report(PD->getLocation(),
-                  diag::err_bad_free_function_kernel_param_type)
+                  diag::err_bad_kernel_param_type)
           << ParamTy;
       Diag.Report(PD->getLocation(),
                   diag::note_free_function_kernel_param_type_not_supported)

clang/test/SemaSYCL/free_function_kernel_params_restrictions.cpp

@@ -13,14 +13,14 @@ class Outer {
 
 __attribute__((sycl_device))
 [[__sycl_detail__::add_ir_attributes_function("sycl-single-task-kernel", 0)]]
-void ff_4(Outer::DefinedWithinAClass S1) { // expected-error {{'Outer::DefinedWithinAClass' cannot be used as the type of a free function kernel parameter}}
+void ff_4(Outer::DefinedWithinAClass S1) { // expected-error {{'Outer::DefinedWithinAClass' cannot be used as the type of a kernel parameter}}
                                            // expected-note@-1 {{'Outer::DefinedWithinAClass' is not forward declarable}}
 }
 
 template <typename T1>
 __attribute__((sycl_device))
 [[__sycl_detail__::add_ir_attributes_function("sycl-single-task-kernel", 0)]]
-  void ff_6(T1 S1) { // expected-error 2{{cannot be used as the type of a free function kernel parameter}}
+  void ff_6(T1 S1) { // expected-error 2{{cannot be used as the type of a kernel parameter}}
                      // expected-note@-1 2{{is not forward declarable}}
 }
 
@@ -56,6 +56,6 @@ struct Wrapper {
 };
 
 [[__sycl_detail__::add_ir_attributes_function("sycl-single-task-kernel", 0)]]
-void ff_6(Wrapper S1) { // expected-error {{cannot be used as the type of a free function kernel parameter}}
-                        // expected-note@-1 {{'Wrapper' is not yet supported as free function kernel parameter}}
+void ff_6(Wrapper S1) { // expected-error {{cannot be used as the type of a kernel parameter}}
+                        // expected-note@-1 {{'Wrapper' is not yet supported as a free function kernel parameter}}
 }