Address review comments

Author: srividya-sundaram

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -14,6 +14,7 @@ let Component = "Sema" in {
 let CategoryName = "Semantic Issue" in {
 def note_previous_decl : Note<"%0 declared here">;
 def note_entity_declared_at : Note<"%0 declared here">;
+def note_nullptr_used : Note<"nullptr is a prvalue of type std::nullptr_t">;
 def note_callee_decl : Note<"%0 declared here">;
 def note_defined_here : Note<"%0 defined here">;
 

clang/lib/Sema/SemaSYCL.cpp

@@ -2834,13 +2834,13 @@ class SYCLKernelNameTypeVisitor
   Sema &S;
   SourceLocation KernelInvocationFuncLoc;
   using InnerTypeVisitor = TypeVisitor<SYCLKernelNameTypeVisitor>;
-  using InnerTAVisitor =
+  using InnerTemplArgVisitor =
       ConstTemplateArgumentVisitor<SYCLKernelNameTypeVisitor>;
   bool IsInvalid = false;
 
   void VisitTemplateArgs(ArrayRef<TemplateArgument> Args) {
-    for (size_t I = 0, E = Args.size(); I < E; ++I)
-      Visit(Args[I]);
+    for (auto &A : Args)
+      Visit(A);
   }
 
 public:
@@ -2857,6 +2857,7 @@ class SYCLKernelNameTypeVisitor
       if (T->isNullPtrType()) {
         S.Diag(KernelInvocationFuncLoc, diag::err_sycl_kernel_incorrectly_named)
             << /* kernel name cannot be a type in the std namespace */ 3;
+        S.Diag(KernelInvocationFuncLoc, diag::note_nullptr_used);
         IsInvalid = true;
       }
       return;
@@ -2874,7 +2875,7 @@ class SYCLKernelNameTypeVisitor
   void Visit(const TemplateArgument &TA) {
     if (TA.isNull())
       return;
-    InnerTAVisitor::Visit(TA);
+    InnerTemplArgVisitor::Visit(TA);
   }
 
   void VisitEnumType(const EnumType *T) {
@@ -2903,7 +2904,7 @@ class SYCLKernelNameTypeVisitor
             << /* kernel name cannot be a type in the std namespace */ 3;
         IsInvalid = true;
         return;
-      } else {
+      }
         if (!DeclCtx->isTranslationUnit() && !isa<NamespaceDecl>(DeclCtx)) {
           const bool KernelNameIsMissing = Tag->getName().empty();
           if (KernelNameIsMissing) {
@@ -2912,7 +2913,7 @@ class SYCLKernelNameTypeVisitor
                 << /* kernel name is missing */ 0;
             IsInvalid = true;
             return;
-          } else {
+          }
             if (Tag->isCompleteDefinition()) {
               S.Diag(KernelInvocationFuncLoc,
                      diag::err_sycl_kernel_incorrectly_named)
@@ -2923,9 +2924,7 @@ class SYCLKernelNameTypeVisitor
 
             S.Diag(Tag->getSourceRange().getBegin(), diag::note_previous_decl)
                 << Tag->getName();
-          }
         }
-      }
     }
   }
 

clang/test/CodeGenSYCL/stdtypes_kernel_type.cpp

@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -fsycl -fsycl-is-device -internal-isystem %S/Inputs -sycl-std=2020 -DCHECK_ERROR -verify %s
+// RUN: %clang_cc1 -fsycl -fsycl-is-device -sycl-std=2020 -DCHECK_ERROR -verify %s
 
-#include "sycl.hpp"
+#include "Inputs/sycl.hpp"
 
 namespace std {
 typedef long unsigned int size_t;
@@ -21,6 +21,7 @@ queue q;
 int main() {
 #ifdef CHECK_ERROR
   // expected-error@Inputs/sycl.hpp:328 5 {{kernel name cannot be a type in the "std" namespace}}
+  // expected-note@Inputs/sycl.hpp:328 3 {{nullptr is a prvalue of type std::nullptr_t}}
   q.submit([&](handler &h) {
     // expected-note@+1{{in instantiation of function template specialization}}
     h.single_task<std::nullptr_t>([=] {});