Skip to content

[Clang][SYCL] Modify err_sycl_entry_point_invalid to use %enum_select. #173122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tahonermann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Clang][SYCL] Modify err_sycl_entry_point_invalid to use %enum_select. #173122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions clang/include/clang/Basic/DiagnosticSemaKinds.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13170,11 +13170,17 @@ def warn_sycl_external_missing_on_first_decl : Warning<

// SYCL kernel entry point diagnostics
def err_sycl_entry_point_invalid : Error<
"the %0 attribute cannot be applied to a"
" %select{non-static member function|variadic function|deleted function|"
"defaulted function|constexpr function|consteval function|"
"function declared with the 'noreturn' attribute|coroutine|"
"function defined with a function try block}1">;
"the %0 attribute cannot be applied to a %enum_select<InvalidSKEPReason>{"
"%NonStaticMemberFn{non-static member function}|"
"%VariadicFn{variadic function}|"
"%DeletedFn{deleted function}|"
"%DefaultedFn{defaulted function}|"
"%ConstexprFn{constexpr function}|"
"%ConstevalFn{consteval function}|"
"%NoreturnFn{function declared with the 'noreturn' attribute}|"
"%Coroutine{coroutine}|"
"%FunctionTryBlock{function defined with a function try block}"
"}1">;
def err_sycl_entry_point_invalid_redeclaration : Error<
"the %0 kernel name argument does not match prior"
" declaration%diff{: $ vs $|}1,2">;
Expand Down
8 changes: 4 additions & 4 deletions clang/lib/Sema/SemaDecl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16468,19 +16468,19 @@ Decl *Sema::ActOnFinishFunctionBody(Decl *dcl, Stmt *Body, bool IsInstantiation,
FD->getAttr<SYCLKernelEntryPointAttr>();
if (FD->isDefaulted()) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*defaulted function*/ 3;
<< SKEPAttr << diag::InvalidSKEPReason::DefaultedFn;
SKEPAttr->setInvalidAttr();
} else if (FD->isDeleted()) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*deleted function*/ 2;
<< SKEPAttr << diag::InvalidSKEPReason::DeletedFn;
SKEPAttr->setInvalidAttr();
} else if (FSI->isCoroutine()) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*coroutine*/ 7;
<< SKEPAttr << diag::InvalidSKEPReason::Coroutine;
SKEPAttr->setInvalidAttr();
} else if (Body && isa<CXXTryStmt>(Body)) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*function defined with a function try block*/ 8;
<< SKEPAttr << diag::InvalidSKEPReason::FunctionTryBlock;
SKEPAttr->setInvalidAttr();
}

Expand Down
14 changes: 7 additions & 7 deletions clang/lib/Sema/SemaSYCL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,40 +318,40 @@ void SemaSYCL::CheckSYCLEntryPointFunctionDecl(FunctionDecl *FD) {
if (const auto *MD = dyn_cast<CXXMethodDecl>(FD)) {
if (!MD->isStatic()) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*non-static member function*/ 0;
<< SKEPAttr << diag::InvalidSKEPReason::NonStaticMemberFn;
SKEPAttr->setInvalidAttr();
}
}

if (FD->isVariadic()) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*variadic function*/ 1;
<< SKEPAttr << diag::InvalidSKEPReason::VariadicFn;
SKEPAttr->setInvalidAttr();
}

if (FD->isDefaulted()) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*defaulted function*/ 3;
<< SKEPAttr << diag::InvalidSKEPReason::DefaultedFn;
SKEPAttr->setInvalidAttr();
} else if (FD->isDeleted()) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*deleted function*/ 2;
<< SKEPAttr << diag::InvalidSKEPReason::DeletedFn;
SKEPAttr->setInvalidAttr();
}

if (FD->isConsteval()) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*consteval function*/ 5;
<< SKEPAttr << diag::InvalidSKEPReason::ConstevalFn;
SKEPAttr->setInvalidAttr();
} else if (FD->isConstexpr()) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*constexpr function*/ 4;
<< SKEPAttr << diag::InvalidSKEPReason::ConstexprFn;
SKEPAttr->setInvalidAttr();
}

if (FD->isNoReturn()) {
Diag(SKEPAttr->getLocation(), diag::err_sycl_entry_point_invalid)
<< SKEPAttr << /*function declared with the 'noreturn' attribute*/ 6;
<< SKEPAttr << diag::InvalidSKEPReason::NoreturnFn;
SKEPAttr->setInvalidAttr();
}

Expand Down