Fix failing tests and clang-format

Author: srividya-sundaram

clang/lib/Sema/SemaSYCL.cpp

@@ -2475,12 +2475,14 @@ class SyclKernelIntHeaderCreator : public SyclKernelFieldHandler {
 
 } // namespace
 
-class SYCLKernelNameTypeVisitor : public TypeVisitor<SYCLKernelNameTypeVisitor>,
-                        public ConstTemplateArgumentVisitor<SYCLKernelNameTypeVisitor> {
+class SYCLKernelNameTypeVisitor
+    : public TypeVisitor<SYCLKernelNameTypeVisitor>,
+      public ConstTemplateArgumentVisitor<SYCLKernelNameTypeVisitor> {
   Sema &S;
   SourceLocation Loc;
   using InnerTypeVisitor = TypeVisitor<SYCLKernelNameTypeVisitor>;
-  using InnerTAVisitor = ConstTemplateArgumentVisitor<SYCLKernelNameTypeVisitor>;
+  using InnerTAVisitor =
+      ConstTemplateArgumentVisitor<SYCLKernelNameTypeVisitor>;
 
 public:
   SYCLKernelNameTypeVisitor(Sema &S, SourceLocation Loc) : S(S), Loc(Loc) {}
@@ -2524,6 +2526,7 @@ class SYCLKernelNameTypeVisitor : public TypeVisitor<SYCLKernelNameTypeVisitor>,
     bool UnnamedLambdaEnabled =
         S.getASTContext().getLangOpts().SYCLUnnamedLambda;
     if (Tag && !Tag->getDeclContext()->isTranslationUnit() &&
+        !dyn_cast_or_null<NamespaceDecl>(Tag->getDeclContext()) &&
         !UnnamedLambdaEnabled) {
       const bool KernelNameIsMissing = Tag->getName().empty();
       if (KernelNameIsMissing) {
@@ -2553,7 +2556,7 @@ class SYCLKernelNameTypeVisitor : public TypeVisitor<SYCLKernelNameTypeVisitor>,
     }
     return;
   }
-  
+
   void VisitIntegralTemplateArgument(const TemplateArgument &TA) {
     QualType T = TA.getIntegralType();
     if (const EnumType *ET = T->getAs<EnumType>()) {

clang/test/SemaSYCL/args-size-overflow.cpp

@@ -34,8 +34,14 @@ void use() {
     int Array[1991];
   } Args;
   auto L = [=]() { (void)Args; };
-#if defined(GPU) || defined(ERROR)
-  // expected-note@+2 {{in instantiation of function template specialization 'parallel_for<Foo}}
+#ifdef GPU
+  // expected-note@+8 {{in instantiation of function template specialization 'parallel_for<Foo}}
+#elif ERROR
+  // expected-note@+6 {{Foo declared here}}
+  // expected-error@22 {{SYCL 1.2.1 specification requires an explicit forward declaration for a kernel type name; your program may not be portable}}
+  // expected-note@+4 {{in instantiation of function template specialization 'parallel_for<Foo}}
+#else
+  // expected-no-diagnostics
 #endif
   parallel_for<class Foo>(L);
 }

clang/test/SemaSYCL/unnamed-kernel.cpp

@@ -66,7 +66,6 @@ struct MyWrapper {
 
     using ValidAlias = MyWrapper;
     q.submit([&](cl::sycl::handler &h) {
-      
       h.single_task<ValidAlias>([] {});
     });
 
@@ -102,8 +101,8 @@ struct MyWrapper {
 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}}
+  // expected-error@Inputs/sycl.hpp:220 {{kernel name is missing}}
+  // expected-note@+2{{in instantiation of function template specialization}}
 #endif
   q.submit([&](cl::sycl::handler &h) { h.single_task([] {}); });