Relocate IsConst checks as requested by Prem, others

Also fixes up the issues found by the bots, including the lacking
signed-off-by.

Signed-off-by: Erich Keane <erich.keane@intel.com>

Author: Erich Keane

clang/lib/Sema/SemaDecl.cpp

@@ -7062,8 +7062,8 @@ NamedDecl *Sema::ActOnVariableDeclarator(
   // constexpr
   if (getLangOpts().SYCLIsDevice) {
     if (SCSpec == DeclSpec::SCS_static && !R.isConstant(Context))
-    SYCLDiagIfDeviceCode(D.getIdentifierLoc(), diag::err_sycl_restrict)
-        << Sema::KernelNonConstStaticDataVariable;
+      SYCLDiagIfDeviceCode(D.getIdentifierLoc(), diag::err_sycl_restrict)
+          << Sema::KernelNonConstStaticDataVariable;
     else if (NewVD->getTSCSpec() == DeclSpec::TSCS_thread_local)
       SYCLDiagIfDeviceCode(D.getIdentifierLoc(), diag::err_thread_unsupported);
   }

clang/lib/Sema/SemaExpr.cpp

@@ -216,11 +216,10 @@ bool Sema::DiagnoseUseOfDecl(NamedDecl *D, ArrayRef<SourceLocation> Locs,
       if (VD->getTLSKind() != VarDecl::TLS_None)
         SYCLDiagIfDeviceCode(*Locs.begin(), diag::err_thread_unsupported);
 
-      if (VD->getStorageClass() == SC_Static &&
-          !IsConst)
+      if (!IsConst && VD->getStorageClass() == SC_Static)
         SYCLDiagIfDeviceCode(*Locs.begin(), diag::err_sycl_restrict)
             << Sema::KernelNonConstStaticDataVariable;
-      else if (VD->hasGlobalStorage() && !isa<ParmVarDecl>(VD) && !IsConst)
+      else if (!IsConst && VD->hasGlobalStorage() && !isa<ParmVarDecl>(VD))
         SYCLDiagIfDeviceCode(*Locs.begin(), diag::err_sycl_restrict)
             << Sema::KernelGlobalVariable;
     }

clang/test/SemaSYCL/prohibit-thread-local.cpp

@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -fsycl-is-device -verify -fsyntax-only -std=c++17 %s
+// RUN: %clang_cc1 -fsycl-is-device -verify -fsyntax-only %s
 
 thread_local const int prohobit_ns_scope = 0;
 thread_local int prohobit_ns_scope2 = 0;
@@ -39,11 +39,12 @@ void usage() {
 
 template <typename name, typename Func>
 __attribute__((sycl_kernel))
-// expected-note@+1 2{{called by}}
-void kernel_single_task(Func kernelFunc) { kernelFunc(); }
+// expected-note@+2 2{{called by}}
+void
+kernel_single_task(Func kernelFunc) { kernelFunc(); }
 
 int main() {
   // expected-note@+1 2{{called by}}
-  kernel_single_task<class fake_kernel>([](){ usage(); } );
+  kernel_single_task<class fake_kernel>([]() { usage(); });
   return 0;
 }