Skip to content

Commit 1428bfc

Browse files
author
Erich Keane
committed
Fix error message + a code format issue
1 parent 852f2e0 commit 1428bfc

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

clang/include/clang/Basic/DiagnosticSemaKinds.td

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10938,7 +10938,7 @@ def err_sycl_kernel_incorrectly_named : Error<
1093810938
"|name is invalid. Unscoped enum requires fixed underlying type"
1093910939
"}0">;
1094010940
def err_sycl_kernel_not_function_object
10941-
: Error<"kernel parameter is required to be a lambda or function object">;
10941+
: Error<"kernel parameter must be a lambda or function object">;
1094210942
def err_sycl_restrict : Error<
1094310943
"SYCL kernel cannot "
1094410944
"%select{use a non-const global variable"

clang/lib/Sema/SemaSYCL.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2034,14 +2034,14 @@ void Sema::CheckSYCLKernelCall(FunctionDecl *KernelFunc, SourceRange CallLoc,
20342034
}
20352035
}
20362036

2037-
SyclKernelFieldChecker checker(*this);
2037+
SyclKernelFieldChecker Checker(*this);
20382038

20392039
KernelObjVisitor Visitor{*this};
20402040
DiagnosingSYCLKernel = true;
2041-
Visitor.VisitRecordBases(KernelObj, checker);
2042-
Visitor.VisitRecordFields(KernelObj, checker);
2041+
Visitor.VisitRecordBases(KernelObj, Checker);
2042+
Visitor.VisitRecordFields(KernelObj, Checker);
20432043
DiagnosingSYCLKernel = false;
2044-
if (!checker.isValid())
2044+
if (!Checker.isValid())
20452045
KernelFunc->setInvalidDecl();
20462046
}
20472047

clang/test/SemaSYCL/kernel-not-functor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ __attribute__((sycl_kernel)) void kernel(F kernelFunc) {
77

88
template <typename Name, typename F>
99
void uses_kernel(F kernelFunc) {
10-
// expected-error@+1{{kernel parameter is required to be a lambda or function object}}
10+
// expected-error@+1{{kernel parameter must be a lambda or function object}}
1111
kernel<Name>(kernelFunc);
1212
}
1313

0 commit comments

Comments
 (0)