code review feedback - add comment, simplify arg handling for better readability

Author: hekota

clang/lib/CodeGen/CGHLSLBuiltins.cpp

@@ -302,16 +302,11 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID,
 
     auto [IntrinsicID, HasNameArg] =
         CGM.getHLSLRuntime().getCreateHandleFromBindingIntrinsic();
-    if (HasNameArg) {
-      Value *NameOp = EmitScalarExpr(E->getArg(5));
-      return Builder.CreateIntrinsic(HandleTy, IntrinsicID,
-                                     ArrayRef<Value *>{SpaceOp, RegisterOp,
-                                                       RangeOp, IndexOp,
-                                                       NonUniform, NameOp});
-    }
-    return Builder.CreateIntrinsic(
-        HandleTy, IntrinsicID,
-        ArrayRef<Value *>{SpaceOp, RegisterOp, RangeOp, IndexOp, NonUniform});
+    SmallVector<Value *> Args{SpaceOp, RegisterOp, RangeOp, IndexOp,
+                              NonUniform};
+    if (HasNameArg)
+      Args.push_back(EmitScalarExpr(E->getArg(5)));
+    return Builder.CreateIntrinsic(HandleTy, IntrinsicID, Args);
   }
   case Builtin::BI__builtin_hlsl_resource_handlefromimplicitbinding: {
     llvm::Type *HandleTy = CGM.getTypes().ConvertType(E->getType());
@@ -326,16 +321,10 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID,
 
     auto [IntrinsicID, HasNameArg] =
         CGM.getHLSLRuntime().getCreateHandleFromImplicitBindingIntrinsic();
-    if (HasNameArg) {
-      Value *NameOp = EmitScalarExpr(E->getArg(5));
-      return Builder.CreateIntrinsic(HandleTy, IntrinsicID,
-                                     ArrayRef<Value *>{OrderID, SpaceOp,
-                                                       RangeOp, IndexOp,
-                                                       NonUniform, NameOp});
-    }
-    return Builder.CreateIntrinsic(
-        HandleTy, IntrinsicID,
-        ArrayRef<Value *>{OrderID, SpaceOp, RangeOp, IndexOp, NonUniform});
+    SmallVector<Value *> Args{OrderID, SpaceOp, RangeOp, IndexOp, NonUniform};
+    if (HasNameArg)
+      Args.push_back(EmitScalarExpr(E->getArg(5)));
+    return Builder.CreateIntrinsic(HandleTy, IntrinsicID, Args);
   }
   case Builtin::BI__builtin_hlsl_all: {
     Value *Op0 = EmitScalarExpr(E->getArg(0));

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -608,22 +608,18 @@ void CGHLSLRuntime::initializeBufferFromBinding(const HLSLBufferDecl *BufDecl,
   // buffer with explicit binding
   if (RBA->hasRegisterSlot()) {
     auto *RegSlot = llvm::ConstantInt::get(CGM.IntTy, RBA->getSlotNumber());
+    SmallVector<Value *> Args{Space, RegSlot, RangeSize, Index, NonUniform};
     if (Name)
-      initializeBuffer(CGM, GV, IntrinsicID,
-                       {Space, RegSlot, RangeSize, Index, NonUniform, Name});
-    else
-      initializeBuffer(CGM, GV, IntrinsicID,
-                       {Space, RegSlot, RangeSize, Index, NonUniform});
+      Args.push_back(Name);
+    initializeBuffer(CGM, GV, IntrinsicID, Args);
   } else {
     // buffer with implicit binding
     auto *OrderID =
         llvm::ConstantInt::get(CGM.IntTy, RBA->getImplicitBindingOrderID());
+    SmallVector<Value *> Args{OrderID, Space, RangeSize, Index, NonUniform};
     if (Name)
-      initializeBuffer(CGM, GV, IntrinsicID,
-                       {OrderID, Space, RangeSize, Index, NonUniform, Name});
-    else
-      initializeBuffer(CGM, GV, IntrinsicID,
-                       {OrderID, Space, RangeSize, Index, NonUniform});
+      Args.push_back(Name);
+    initializeBuffer(CGM, GV, IntrinsicID, Args);
   }
 }
 

clang/lib/CodeGen/CGHLSLRuntime.h

@@ -125,7 +125,12 @@ class CGHLSLRuntime {
   // End of reserved area for HLSL intrinsic getters.
   //===----------------------------------------------------------------------===//
 
+  // Returns ID of the intrinsic that initializes resource handle from binding
+  // and a bool value indicating whether the last argument of the intrinsic is
+  // the resource name (not all targets need that).
   std::pair<llvm::Intrinsic::ID, bool> getCreateHandleFromBindingIntrinsic();
+
+  // Same as above but for implicit binding.
   std::pair<llvm::Intrinsic::ID, bool>
   getCreateHandleFromImplicitBindingIntrinsic();