review comments

Author: VigneshwarJ

clang/lib/Sema/SemaDecl.cpp

@@ -8715,16 +8715,13 @@ void Sema::CheckVariableDeclarationType(VarDecl *NewVD) {
   }
 
   // zero sized static arrays are not allowed in HIP device functions
-  if (LangOpts.CUDAIsDevice && LangOpts.HIP) {
-    if (FunctionDecl *FD = getCurFunctionDecl();
-        FD &&
-        (FD->hasAttr<CUDADeviceAttr>() || FD->hasAttr<CUDAGlobalAttr>())) {
-      if (QualType NextTy = NewVD->getType(); NextTy->isArrayType()) {
-        if (const ConstantArrayType *ArrayT =
-                getASTContext().getAsConstantArrayType(NextTy);
-            ArrayT && ArrayT->isZeroSize()) {
-          Diag(NewVD->getLocation(), diag::err_typecheck_zero_array_size) << 2;
-        }
+  if (getLangOpts().HIP &&
+      DeclAttrsMatchCUDAMode(getLangOpts(), getCurFunctionDecl())) {
+    if (QualType NextTy = NewVD->getType(); NextTy->isArrayType()) {
+      if (const ConstantArrayType *ArrayT =
+              getASTContext().getAsConstantArrayType(NextTy);
+          ArrayT && ArrayT->isZeroSize()) {
+        Diag(NewVD->getLocation(), diag::err_typecheck_zero_array_size) << 2;
       }
     }
   }