Fix diagnostic message and comment

Signed-off-by: Premanand M Rao <[email protected]>

Author: premanandrao

clang/include/clang/Basic/DiagnosticSemaKinds.td

@@ -10850,7 +10850,7 @@ def err_sycl_restrict : Error<
   "|call a dllimport function"
   "|call a variadic function"
   "|call an undefined function without SYCL_EXTERNAL attribute"
-  "|use a const static variable that is neither zero-initialized "
+  "|use a const static or global variable that is neither zero-initialized "
   "nor constant-initialized"
   "}0">;
 def err_sycl_virtual_types : Error<

clang/lib/Sema/SemaExpr.cpp

@@ -223,8 +223,8 @@ bool Sema::DiagnoseUseOfDecl(NamedDecl *D, ArrayRef<SourceLocation> Locs,
                VD->hasGlobalStorage() && !isa<ParmVarDecl>(VD))
         SYCLDiagIfDeviceCode(*Locs.begin(), diag::err_sycl_restrict)
             << Sema::KernelGlobalVariable;
-      // Disallow const statics that are not zero-initialized
-      // or constant-initialized
+      // Disallow const statics and globals that are not zero-initialized
+      // or constant-initialized.
       else if (IsConst && VD->hasGlobalStorage() && !VD->isConstexpr() &&
                !checkAllowedSYCLInitializer(VD, /*CheckValueDependent =*/true))
         SYCLDiagIfDeviceCode(*Locs.begin(), diag::err_sycl_restrict)

clang/test/SemaSYCL/sycl-device-const-static.cpp

@@ -28,11 +28,11 @@ void usage() {
   const static int cs = 0;
   constexpr static int ces = 0;
   static const S s6;
-  // expected-error@+1{{SYCL kernel cannot use a const static variable that is neither zero-initialized nor constant-initialized}}
+  // expected-error@+1{{SYCL kernel cannot use a const static or global variable that is neither zero-initialized nor constant-initialized}}
   (void)T::s1;
-  // expected-error@+1{{SYCL kernel cannot use a const static variable that is neither zero-initialized nor constant-initialized}}
+  // expected-error@+1{{SYCL kernel cannot use a const static or global variable that is neither zero-initialized nor constant-initialized}}
   (void)s5;
-  // expected-error@+1{{SYCL kernel cannot use a const static variable that is neither zero-initialized nor constant-initialized}}
+  // expected-error@+1{{SYCL kernel cannot use a const static or global variable that is neither zero-initialized nor constant-initialized}}
   (void)s6;
 }
 
@@ -42,7 +42,7 @@ __attribute__((sycl_kernel)) void kernel_single_task(Func kernelFunc) {
   static int z;
   // expected-note-re@+3{{called by 'kernel_single_task<fake_kernel, (lambda at {{.*}})>}}
   // expected-note-re@+2{{called by 'kernel_single_task<fake_kernel, (lambda at {{.*}})>}}
-  // expected-error@+1{{SYCL kernel cannot use a const static variable that is neither zero-initialized nor constant-initialized}}
+  // expected-error@+1{{SYCL kernel cannot use a const static or global variable that is neither zero-initialized nor constant-initialized}}
   kernelFunc(U<Base>::s2);
 }