Prohibited use of the sycl_kernel_entry_point attribute with a non-static member function with an explicit object parameter.

Author: tahonermann

clang/include/clang/Basic/AttrDocs.td

@@ -551,6 +551,7 @@ following requirements.
 
 * Has a non-deduced ``void`` return type.
 * Is not a constructor or destructor.
+* Is not a non-static member function with an explicit object parameter.
 * Is not a C variadic function.
 * Is not a coroutine.
 * Is not defined as deleted or as defaulted.

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -13066,7 +13066,8 @@ def err_sycl_entry_point_invalid : Error<
            "constructor|destructor|coroutine|"
            "constexpr function|consteval function|"
            "function declared with the 'noreturn' attribute|"
-           "function defined with a function try block}1">;
+           "function defined with a function try block|"
+           "function with an explicit object parameter}1">;
 def err_sycl_entry_point_invalid_redeclaration : Error<
   "the %0 kernel name argument does not match prior"
   " declaration%diff{: $ vs $|}1,2">;

clang/lib/Sema/SemaSYCL.cpp

@@ -325,6 +325,13 @@ void SemaSYCL::CheckSYCLEntryPointFunctionDecl(FunctionDecl *FD) {
         << SKEPAttr << /*destructor*/ 4;
     SKEPAttr->setInvalidAttr();
   }
+  if (const auto *MD = dyn_cast<CXXMethodDecl>(FD)) {
+    if (MD->isExplicitObjectMemberFunction()) {
+      Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
+          << SKEPAttr << /*function with an explicit object parameter*/ 10;
+      SKEPAttr->setInvalidAttr();
+    }
+  }
 
   if (FD->isVariadic()) {
     Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)

clang/test/SemaSYCL/sycl-kernel-entry-point-attr-appertainment.cpp

@@ -377,3 +377,29 @@ struct B42 {
   // expected-warning@+1 {{declaration does not declare anything}}
   [[clang::sycl_kernel_entry_point(BADKN<42>)]];
 };
+
+#if __cplusplus >= 202302L
+struct B43 {
+  // expected-error@+2 {{the 'clang::sycl_kernel_entry_point' attribute cannot be applied to a function with an explicit object parameter}}
+  template<typename KNT>
+  [[clang::sycl_kernel_entry_point(KNT)]]
+  void bad43(this B43) {}
+};
+#endif
+
+#if __cplusplus >= 202302L
+struct B44 {
+  // expected-error@+1 {{the 'clang::sycl_kernel_entry_point' attribute cannot be applied to a function with an explicit object parameter}}
+  [[clang::sycl_kernel_entry_point(BADKN<44>)]]
+  void bad44(this B44);
+};
+#endif
+
+#if __cplusplus >= 202302L
+template<typename KNT>
+struct B45 {
+  // expected-error@+1 {{the 'clang::sycl_kernel_entry_point' attribute cannot be applied to a function with an explicit object parameter}}
+  [[clang::sycl_kernel_entry_point(KNT)]]
+  void bad45(this B45);
+};
+#endif

clang/test/SemaSYCL/sycl-kernel-entry-point-attr-this.cpp

@@ -1,9 +1,9 @@
 // RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -std=c++17 -fsycl-is-host -verify %s
 // RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -std=c++17 -fsycl-is-device -verify %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -std=c++20 -fsycl-is-host -verify -DCXX20 %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -std=c++20 -fsycl-is-device -verify -DCXX20 %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -std=c++23 -fsycl-is-host -verify -DCXX23 %s
-// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -std=c++23 -fsycl-is-device -verify -DCXX23 %s
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -std=c++20 -fsycl-is-host -verify %s
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -std=c++20 -fsycl-is-device -verify %s
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -std=c++23 -fsycl-is-host -verify %s
+// RUN: %clang_cc1 -triple x86_64-linux-gnu -fsyntax-only -std=c++23 -fsycl-is-device -verify %s
 
 // These tests validate diagnostics for invalid use of 'this' in the body of
 // a function declared with the sycl_kernel_entry_point attribute.
@@ -82,7 +82,7 @@ struct S7 {
 template void S7<KN<7,0>, false>::ok7();
 template void S7<KN<7,1>, true>::ok7();
 
-#if defined(CXX20)
+#if __cplusplus >= 202002L
 template<typename KN, typename T>
 struct S8 {
   void mf(T);
@@ -98,14 +98,6 @@ struct S9 {
 template void S9<KN<9>, int>::ok9();
 #endif
 
-#if defined(CXX23)
-struct S10 {
-  [[clang::sycl_kernel_entry_point(KN<10>)]] void ok10(this S10 self) {
-    (void)self;
-  }
-};
-#endif
-
 
 ////////////////////////////////////////////////////////////////////////////////
 // Invalid declarations.
@@ -185,3 +177,12 @@ struct B8 {
 };
 // expected-note@+1 {{in instantiation of member function 'B8<BADKN<8>>::bad8' requested here}}
 template void B8<BADKN<8>>::bad8();
+
+#if __cplusplus >= 202302L
+struct B9 {
+  // expected-error@+1 {{the 'clang::sycl_kernel_entry_point' attribute cannot be applied to a function with an explicit object parameter}}
+  [[clang::sycl_kernel_entry_point(BADKN<9>)]] void bad9(this B9 self) {
+    (void)self;
+  }
+};
+#endif