address review comments

Author: Victor Lomuller

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -12491,7 +12491,7 @@ def err_sycl_wg_scope : Error<
   "SYCL work group scope only applies to class with a trivial "
   "%select{default constructor|destructor}0">;
 def err_sycl_field_with_wg_scope : Error<
-  "type with a SYCL work group scope attribute cannot be used with a non-static data members">;
+  "non-static data member is of a type with a SYCL work group scope attribute applied to it">;
 def err_sycl_virtual_types : Error<
   "no class with a vtable can be used in a SYCL kernel or any code included in the kernel">;
 def note_sycl_recursive_function_declared_here: Note<"function implemented using recursion declared here">;

clang/lib/Sema/SemaDecl.cpp

@@ -8665,12 +8665,9 @@ void Sema::CheckVariableDeclarationType(VarDecl *NewVD) {
   // ISO/IEC TR 18037 S5.1.2
   if (!getLangOpts().OpenCL && NewVD->hasLocalStorage() &&
       T.getAddressSpace() != LangAS::Default) {
-    if (!getLangOpts().SYCLIsDevice &&
-        T.getAddressSpace() != LangAS::sycl_local) {
-      Diag(NewVD->getLocation(), diag::err_as_qualified_auto_decl) << 0;
-      NewVD->setInvalidDecl();
-      return;
-    }
+    Diag(NewVD->getLocation(), diag::err_as_qualified_auto_decl) << 0;
+    NewVD->setInvalidDecl();
+    return;
   }
 
   // OpenCL v1.2 s6.8 - The static qualifier is valid only in program

clang/test/SemaSYCL/sycl_wg_scope.cpp

@@ -1,3 +1,4 @@
+// Verify the use of wg_scope is correctly diagnosed.
 // RUN: %clang_cc1 -fsycl-is-device -verify %s
 
 class [[__sycl_detail__::wg_scope]] G1 {};
@@ -65,14 +66,14 @@ B12<Valid> b12;
 B12<InvalidCtor> b13;
 
 class B14 {
-  G1 field; // expected-error {{type with a SYCL work group scope attribute cannot be used with a non-static data members}}
+  G1 field; // expected-error {{non-static data member is of a type with a SYCL work group scope attribute applied to it}}
 };
 
 template <typename T> class B15 {
   T field; // #B15-field
 };
 
-// expected-error@#B15-field {{type with a SYCL work group scope attribute cannot be used with a non-static data members}}
+// expected-error@#B15-field {{non-static data member is of a type with a SYCL work group scope attribute applied to it}}
 // expected-note@+1 {{in instantiation of template class 'B15<G1>' requested here}}
 B15<G1> b15;
 

sycl/doc/extensions/experimental/sycl_ext_oneapi_work_group_scratch_memory.asciidoc

@@ -151,7 +151,7 @@ then the implementation must throw a synchronous exception with the
 local memory into account, whether via the `work_group_scratch_size` property
 or other APIs such as `local_accessor`.
 
-=== Example
+== Example
 
 [source,c++]
 ----

sycl/doc/extensions/experimental/sycl_ext_oneapi_work_group_static.asciidoc

@@ -116,7 +116,7 @@ public:
 } // namespace sycl::ext::oneapi::experimental
 ----
 
-`T` must be a cv-unqualified trivially constructible and trivially destructible.
+`T` must be cv-unqualified, trivially constructible and trivially destructible.
 
 The storage for the object is allocated in device local memory before
 calling the user's kernel lambda, and deallocated when all work-items
@@ -188,7 +188,7 @@ then the implementation must throw a synchronous exception with the
 local memory into account, whether via the `work_group_scratch_size` property
 or other APIs such as `local_accessor`.
 
-=== Example
+== Example
 
 [source,c++]
 ----