fix comments

Author: shiltian

clang/include/clang/Basic/Attr.td

@@ -1574,7 +1574,7 @@ def HIPManaged : InheritableAttr {
 
 def CUDAClusterDims : InheritableAttr {
   let Spellings = [GNU<"cluster_dims">, Declspec<"cluster_dims">];
-  let Args = [ExprArgument<"X">, ExprArgument<"Y", 1>, ExprArgument<"Z", 1>];
+  let Args = [ExprArgument<"X">, ExprArgument<"Y", /*opt=*/1>, ExprArgument<"Z", /*opt=*/1>];
   let Subjects = SubjectList<[ObjCMethod, FunctionLike]>;
   let LangOpts = [CUDA];
   let Documentation = [CUDAClusterDimsAttrDoc];

clang/lib/CodeGen/Targets/AMDGPU.cpp

@@ -407,20 +407,15 @@ void AMDGPUTargetCodeGenInfo::setFunctionDeclAttributes(
   }
 
   if (auto *Attr = FD->getAttr<CUDAClusterDimsAttr>()) {
-    uint32_t X =
-        Attr->getX()->EvaluateKnownConstInt(M.getContext()).getExtValue();
-    uint32_t Y =
-        Attr->getY()
-            ? Attr->getY()->EvaluateKnownConstInt(M.getContext()).getExtValue()
-            : 1;
-    uint32_t Z =
-        Attr->getZ()
-            ? Attr->getZ()->EvaluateKnownConstInt(M.getContext()).getExtValue()
-            : 1;
-
+    auto GetExprVal = [&](const auto &E) {
+      return E ? E->EvaluateKnownConstInt(M.getContext()).getExtValue() : 1;
+    };
+    unsigned X = GetExprVal(Attr->getX());
+    unsigned Y = GetExprVal(Attr->getY());
+    unsigned Z = GetExprVal(Attr->getZ());
     llvm::SmallString<32> AttrVal;
     llvm::raw_svector_ostream OS(AttrVal);
-    OS << X << ',' << Y << ',' << Z;
+    OS << X << ", " << Y << ", " << Z;
     F->addFnAttr("amdgpu-cluster-dims", AttrVal.str());
   }
 

clang/lib/Sema/SemaTemplateInstantiateDecl.cpp

@@ -720,19 +720,19 @@ static void instantiateDependentCUDAClusterDimsAttr(
   if (Attr.getX()) {
     ExprResult ResultX = S.SubstExpr(Attr.getX(), TemplateArgs);
     if (ResultX.isUsable())
-      XExpr = ResultX.getAs<Expr>();
+      XExpr = ResultX.get();
   }
 
   if (Attr.getY()) {
     ExprResult ResultY = S.SubstExpr(Attr.getY(), TemplateArgs);
     if (ResultY.isUsable())
-      YExpr = ResultY.getAs<Expr>();
+      YExpr = ResultY.get();
   }
 
   if (Attr.getZ()) {
     ExprResult ResultZ = S.SubstExpr(Attr.getZ(), TemplateArgs);
     if (ResultZ.isUsable())
-      ZExpr = ResultZ.getAs<Expr>();
+      ZExpr = ResultZ.get();
   }
 
   if (XExpr)