Fix unnamed-kenel.cpp

Author: srividya-sundaram

clang/lib/Sema/SemaSYCL.cpp

@@ -2523,7 +2523,8 @@ class SYCLTypeVisitor : public TypeVisitor<SYCLTypeVisitor>,
   void VisitTagDecl(const TagDecl *Tag) {
     bool UnnamedLambdaEnabled =
         S.getASTContext().getLangOpts().SYCLUnnamedLambda;
-    if (Tag && !UnnamedLambdaEnabled) {
+    if (Tag && !Tag->getDeclContext()->isTranslationUnit() &&
+        !UnnamedLambdaEnabled) {
       const bool KernelNameIsMissing = Tag->getName().empty();
       if (KernelNameIsMissing) {
         S.Diag(Loc, diag::err_sycl_kernel_incorrectly_named)

clang/test/SemaSYCL/unnamed-kernel.cpp

@@ -10,7 +10,7 @@ namespace namespace1 {
 template <typename T>
 class KernelName;
 }
-// expected-note@14 {{MyWrapper declared here}}
+
 struct MyWrapper {
 private:
   class InvalidKernelName0 {};
@@ -23,65 +23,65 @@ struct MyWrapper {
     cl::sycl::queue q;
 #ifndef __SYCL_UNNAMED_LAMBDA__
     // expected-error@Inputs/sycl.hpp:220 {{kernel needs to have a globally-visible name}}
-    // expected-note@+2 {{InvalidKernelName1 declared here}}
+    // expected-note@+3 {{InvalidKernelName1 declared here}}
+    // expected-note@+4{{in instantiation of function template specialization}}
 #endif
     class InvalidKernelName1 {};
     q.submit([&](cl::sycl::handler &h) {
-      // expected-note@+1{{in instantiation of function template specialization}}
       h.single_task<InvalidKernelName1>([] {});
     });
 
 #ifndef __SYCL_UNNAMED_LAMBDA__
     // expected-error@Inputs/sycl.hpp:220 {{kernel needs to have a globally-visible name}}
-    // expected-note@+2 {{InvalidKernelName2 declared here}}
+    // expected-note@+3 {{InvalidKernelName2 declared here}}
+    // expected-note@+4{{in instantiation of function template specialization}}
 #endif
     class InvalidKernelName2 {};
     q.submit([&](cl::sycl::handler &h) {
-      // expected-note@+1{{in instantiation of function template specialization}}
       h.single_task<namespace1::KernelName<InvalidKernelName2>>([] {});
     });
 
 #ifndef __SYCL_UNNAMED_LAMBDA__
     // expected-error@Inputs/sycl.hpp:220 {{kernel needs to have a globally-visible name}}
     // expected-note@16 {{InvalidKernelName0 declared here}}
+    // expected-note@+3{{in instantiation of function template specialization}}
 #endif
     q.submit([&](cl::sycl::handler &h) {
-      // expected-note@+1{{in instantiation of function template specialization}}
       h.single_task<InvalidKernelName0>([] {});
     });
 
 #ifndef __SYCL_UNNAMED_LAMBDA__
     // expected-error@Inputs/sycl.hpp:220 {{kernel needs to have a globally-visible name}}
     // expected-note@17 {{InvalidKernelName3 declared here}}
+    // expected-note@+3{{in instantiation of function template specialization}}
 #endif
     q.submit([&](cl::sycl::handler &h) {
-      // expected-note@+1{{in instantiation of function template specialization}}
       h.single_task<namespace1::KernelName<InvalidKernelName3>>([] {});
     });
 
-    /*    using ValidAlias = MyWrapper;
+    using ValidAlias = MyWrapper;
     q.submit([&](cl::sycl::handler &h) {
 
       h.single_task<ValidAlias>([] {});
-    }); */
+    });
 
     using InvalidAlias = InvalidKernelName4;
 #ifndef __SYCL_UNNAMED_LAMBDA__
     // expected-error@Inputs/sycl.hpp:220 {{kernel needs to have a globally-visible name}}
     // expected-note@18 {{InvalidKernelName4 declared here}}
+    // expected-note@+3{{in instantiation of function template specialization}}
 #endif
     q.submit([&](cl::sycl::handler &h) {
-      // expected-note@+1{{in instantiation of function template specialization}}
       h.single_task<InvalidAlias>([] {});
     });
 
     using InvalidAlias1 = InvalidKernelName5;
 #ifndef __SYCL_UNNAMED_LAMBDA__
     // expected-error@Inputs/sycl.hpp:220 {{kernel needs to have a globally-visible name}}
     // expected-note@19 {{InvalidKernelName5 declared here}}
+    // expected-note@+3{{in instantiation of function template specialization}}
 #endif
     q.submit([&](cl::sycl::handler &h) {
-      // expected-note@+1{{in instantiation of function template specialization}}
       h.single_task<namespace1::KernelName<InvalidAlias1>>([] {});
     });
   }
@@ -91,8 +91,8 @@ int main() {
   cl::sycl::queue q;
 #ifndef __SYCL_UNNAMED_LAMBDA__
 // expected-error@Inputs/sycl.hpp:220 {{kernel name is missing}}
+// expected-note@+2{{in instantiation of function template specialization}}
 #endif
-  // expected-note@+1{{in instantiation of function template specialization}}
   q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); });
 
   return 0;