address review comments

Signed-off-by: Soumi Manna <[email protected]>

Author: smanna12

clang/include/clang/Sema/Sema.h

@@ -9987,8 +9987,8 @@ class Sema final {
   void AddIntelFPGABankBitsAttr(Decl *D, const AttributeCommonInfo &CI,
                                 Expr **Exprs, unsigned Size);
   template <typename AttrType>
-  void addIntelSYCLFunctionAttr(Decl *D, const AttributeCommonInfo &CI,
-                                Expr *E);
+  void addIntelSYCLSingleArgFunctionAttr(Decl *D,
+                                         const AttributeCommonInfo &CI, Expr *E);
   /// AddAlignedAttr - Adds an aligned attribute to a particular declaration.
   void AddAlignedAttr(Decl *D, const AttributeCommonInfo &CI, Expr *E,
                       bool IsPackExpansion);
@@ -12835,28 +12835,29 @@ class Sema final {
 };
 
 template <typename AttrType>
-void Sema::addIntelSYCLFunctionAttr(Decl *D, const AttributeCommonInfo &Attr,
-                                    Expr *E) {
+void Sema::addIntelSYCLSingleArgFunctionAttr(Decl *D,
+                                             const AttributeCommonInfo &CI,
+                                             Expr *E) {
   if (!E)
     return;
 
   if (!E->isInstantiationDependent()) {
     Optional<llvm::APSInt> ArgVal = E->getIntegerConstantExpr(getASTContext());
     if (!ArgVal) {
       Diag(E->getExprLoc(), diag::err_attribute_argument_type)
-          << Attr.getAttrName() << AANT_ArgumentIntegerConstant
+          << CI.getAttrName() << AANT_ArgumentIntegerConstant
           << E->getSourceRange();
       return;
     }
     int32_t ArgInt = ArgVal->getSExtValue();
     if (ArgInt <= 0) {
       Diag(E->getExprLoc(), diag::err_attribute_requires_positive_integer)
-          << Attr.getAttrName() << /*positive*/ 0;
+          << CI.getAttrName() << /*positive*/ 0;
       return;
     }
   }
 
-  D->addAttr(::new (Context) AttrType(Context, Attr, E));
+  D->addAttr(::new (Context) AttrType(Context, CI, E));
 }
 
 template <typename AttrType>

clang/lib/Sema/SemaDeclAttr.cpp

@@ -2988,7 +2988,7 @@ static void handleSubGroupSize(Sema &S, Decl *D, const ParsedAttr &AL) {
   if (D->getAttr<IntelReqdSubGroupSizeAttr>())
     S.Diag(AL.getLoc(), diag::warn_duplicate_attribute) << AL;
 
-  S.addIntelSYCLFunctionAttr<IntelReqdSubGroupSizeAttr>(D, AL, E);
+  S.addIntelSYCLSingleArgFunctionAttr<IntelReqdSubGroupSizeAttr>(D, AL, E);
 }
 
 // Handles num_simd_work_items.
@@ -3002,7 +3002,7 @@ static void handleNumSimdWorkItemsAttr(Sema &S, Decl *D,
   if (D->getAttr<SYCLIntelNumSimdWorkItemsAttr>())
     S.Diag(Attr.getLoc(), diag::warn_duplicate_attribute) << Attr;
 
-  S.addIntelSYCLFunctionAttr<SYCLIntelNumSimdWorkItemsAttr>(D, Attr, E);
+  S.addIntelSYCLSingleArgFunctionAttr<SYCLIntelNumSimdWorkItemsAttr>(D, Attr, E);
 }
 
 // Handles max_global_work_dim.

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

@@ -549,7 +549,8 @@ static void instantiateIntelSYCLFunctionAttr(
       S, Sema::ExpressionEvaluationContext::ConstantEvaluated);
   ExprResult Result = S.SubstExpr(Attr->getValue(), TemplateArgs);
   if (!Result.isInvalid())
-    S.addIntelSYCLFunctionAttr<AttrName>(New, *Attr, Result.getAs<Expr>());
+    S.addIntelSYCLSingleArgFunctionAttr<AttrName>(New, *Attr,
+                                                  Result.getAs<Expr>());
 }
 
 void Sema::InstantiateAttrsForDecl(