[SYCL] non-const static variables defined outside kernel must be forbidden in it. (fix #3)

Signed-off-by: Aleksander Fadeev <aleksander.fadeev@intel.com>

Author: fadeeval

clang/lib/Sema/SemaExpr.cpp

@@ -211,12 +211,14 @@ bool Sema::DiagnoseUseOfDecl(NamedDecl *D, ArrayRef<SourceLocation> Locs,
                              bool AvoidPartialAvailabilityChecks,
                              ObjCInterfaceDecl *ClassReceiver) {
 
-  if (isa<VarDecl>(D) && getLangOpts().SYCLIsDevice &&
-      cast<VarDecl>(D)->getStorageClass() == SC_Static &&
-      !cast<VarDecl>(D)->getType().isConstant(Context))
-    SYCLDiagIfDeviceCode(*Locs.begin(), diag::err_sycl_restrict)
-        << Sema::KernelNonConstStaticDataVariable;
-
+  if (getLangOpts().SYCLIsDevice) {
+    if (auto VD = dyn_cast<VarDecl>(D)) {
+      if (VD->getStorageClass() == SC_Static &&
+          !VD->getType().isConstant(Context))
+        SYCLDiagIfDeviceCode(*Locs.begin(), diag::err_sycl_restrict)
+            << Sema::KernelNonConstStaticDataVariable;
+    }
+  }
   SourceLocation Loc = Locs.front();
   if (getLangOpts().CPlusPlus && isa<FunctionDecl>(D)) {
     // If there were any diagnostics suppressed by template argument deduction,
@@ -18457,4 +18459,3 @@ bool Sema::IsDependentFunctionNameExpr(Expr *E) {
   assert(E->isTypeDependent());
   return isa<UnresolvedLookupExpr>(E);
 }
-

clang/lib/Sema/SemaSYCL.cpp

@@ -321,16 +321,6 @@ class MarkDeviceFunction : public RecursiveASTVisitor<MarkDeviceFunction> {
     return true;
   }
 
-  bool VisitMemberExpr(MemberExpr *E) {
-    if (VarDecl *VD = dyn_cast<VarDecl>(E->getMemberDecl())) {
-      bool IsConst = VD->getType().getNonReferenceType().isConstQualified();
-      if (!IsConst && VD->isStaticDataMember())
-        SemaRef.Diag(E->getExprLoc(), diag::err_sycl_restrict)
-            << Sema::KernelNonConstStaticDataVariable;
-    }
-    return true;
-  }
-
   bool VisitDeclRefExpr(DeclRefExpr *E) {
     Decl* D = E->getDecl();
     if (SemaRef.isKnownGoodSYCLDecl(D))
@@ -339,10 +329,7 @@ class MarkDeviceFunction : public RecursiveASTVisitor<MarkDeviceFunction> {
     CheckSYCLType(E->getType(), E->getSourceRange());
     if (VarDecl *VD = dyn_cast<VarDecl>(D)) {
       bool IsConst = VD->getType().getNonReferenceType().isConstQualified();
-      if (!IsConst && VD->isStaticDataMember())
-        SemaRef.Diag(E->getExprLoc(), diag::err_sycl_restrict)
-            << Sema::KernelNonConstStaticDataVariable;
-      else if (!IsConst && VD->hasGlobalStorage() && !VD->isStaticLocal() &&
+      if (!IsConst && VD->hasGlobalStorage() && !VD->isStaticLocal() &&
                !VD->isStaticDataMember() && !isa<ParmVarDecl>(VD)) {
         if (VD->getTLSKind() != VarDecl::TLS_None)
           SemaRef.Diag(E->getLocation(), diag::err_thread_unsupported);

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

@@ -11,12 +11,12 @@ int main() {
   static int n = 0;
   const static int l = 0;
   kernel_single_task<class fake_kernel>([]() {
-  int m = l;
-  m = glob1;
-  // expected-error@+1{{SYCL kernel cannot use a non-const static data variable}}
-	m = n;
-  // expected-error@+1{{SYCL kernel cannot use a non-const global variable}}
-  m = glob2;
+    int m = l;
+    m = glob1;
+    // expected-error@+1{{SYCL kernel cannot use a non-const static data variable}}
+    m = n;
+    // expected-error@+1{{SYCL kernel cannot use a non-const global variable}}
+    m = glob2;
   });
   return 0;
 }

clang/test/SemaSYCL/sycl-restrict.cpp

@@ -91,7 +91,6 @@ typedef struct A {
 
   int fm(void)
   {
-    // expected-error@+2 {{SYCL kernel cannot use a non-const static data variable}}
     // expected-error@+1 {{SYCL kernel cannot use a non-const static data variable}}
     return stat_member;
   }
@@ -164,12 +163,11 @@ int use2 ( a_type ab, a_type *abp ) {
 
   if (ab.constexpr_stat_member) return 2;
   if (ab.const_stat_member) return 1;
-  // expected-error@+2 {{SYCL kernel cannot use a non-const static data variable}}
   // expected-error@+1 {{SYCL kernel cannot use a non-const static data variable}}
   if (ab.stat_member) return 0;
-  // expected-error@+2 {{SYCL kernel cannot use a non-const static data variable}}
   // expected-error@+1 {{SYCL kernel cannot use a non-const static data variable}}
   if (abp->stat_member) return 0;
+  // expected-note@+1 {{called by 'use2'}}
   if (ab.fm()) return 0;
   // expected-error@+1 {{SYCL kernel cannot use a non-const global variable}}
   return another_global ;
@@ -194,7 +192,7 @@ __attribute__((sycl_kernel)) void kernel_single_task(Func kernelFunc) {
   kernelFunc();
   a_type ab;
   a_type *p;
-  // expected-note@+1 5{{called by 'kernel_single_task}}
+  // expected-note@+1 7{{called by 'kernel_single_task}}
   use2(ab, p);
 }