changes requested by reviewers

Signed-off-by: Chris Perkins <[email protected]>

Author: cperkinsintel

clang/include/clang/Sema/Sema.h

@@ -370,7 +370,7 @@ class SYCLIntegrationHeader {
     KernelParamDesc() = default;
   };
 
-  // there are four free function the kernel may call (this_id, this_item,
+  // there are four free functions the kernel may call (this_id, this_item,
   // this_nd_item, this_group)
   struct KernelCallsSYCLFreeFunction {
     bool CallsThisId;

clang/lib/Sema/SemaSYCL.cpp

@@ -2721,7 +2721,7 @@ class SyclKernelIntHeaderCreator : public SyclKernelFieldHandler {
       if (!Visited.insert(FD).second)
         continue; // We've already seen this Decl
 
-      // Check whether this call is to free functions (  sycl::this_item(),
+      // Check whether this call is to free functions (sycl::this_item(),
       // this_id, etc.).
       if (Util::isSyclFunction(FD, "this_id")) {
         Header.setCallsThisId(true);
@@ -4001,25 +4001,25 @@ void SYCLIntegrationHeader::addSpecConstant(StringRef IDName, QualType IDType) {
 
 void SYCLIntegrationHeader::setCallsThisId(bool B) {
   KernelDesc *K = getCurKernelDesc();
-  assert(K && "no kernels");
+  assert(K && "no kernel");
   K->FreeFunctionCalls.CallsThisId = B;
 }
 
 void SYCLIntegrationHeader::setCallsThisItem(bool B) {
   KernelDesc *K = getCurKernelDesc();
-  assert(K && "no kernels");
+  assert(K && "no kernel");
   K->FreeFunctionCalls.CallsThisItem = B;
 }
 
 void SYCLIntegrationHeader::setCallsThisNDItem(bool B) {
   KernelDesc *K = getCurKernelDesc();
-  assert(K && "no kernels");
+  assert(K && "no kernel");
   K->FreeFunctionCalls.CallsThisNDItem = B;
 }
 
 void SYCLIntegrationHeader::setCallsThisGroup(bool B) {
   KernelDesc *K = getCurKernelDesc();
-  assert(K && "no kernels");
+  assert(K && "no kernel");
   K->FreeFunctionCalls.CallsThisGroup = B;
 }
 

sycl/include/CL/sycl/detail/cg_types.hpp

@@ -11,7 +11,6 @@
 #include <CL/sycl/detail/host_profiling_info.hpp>
 #include <CL/sycl/detail/kernel_desc.hpp>
 #include <CL/sycl/group.hpp>
-//#include <CL/sycl/handler.hpp>
 #include <CL/sycl/id.hpp>
 #include <CL/sycl/interop_handle.hpp>
 #include <CL/sycl/interop_handler.hpp>