code review feedback

Author: hekota

clang/lib/CodeGen/CGHLSLBuiltins.cpp

@@ -293,17 +293,17 @@ Value *CodeGenFunction::EmitHLSLBuiltinExpr(unsigned BuiltinID,
   }
   case Builtin::BI__builtin_hlsl_resource_createhandlefrombinding: {
     llvm::Type *HandleTy = CGM.getTypes().ConvertType(E->getType());
-    Value *RegisterNoOp = EmitScalarExpr(E->getArg(1));
-    Value *SpaceNoOp = EmitScalarExpr(E->getArg(2));
+    Value *RegisterOp = EmitScalarExpr(E->getArg(1));
+    Value *SpaceOp = EmitScalarExpr(E->getArg(2));
     Value *RangeOp = EmitScalarExpr(E->getArg(3));
     Value *IndexOp = EmitScalarExpr(E->getArg(4));
     // FIXME: NonUniformResourceIndex bit is not yet implemented
+    // (llvm/llvm-project#135452)
     Value *NonUniform =
         llvm::ConstantInt::get(llvm::Type::getInt1Ty(getLLVMContext()), false);
     return Builder.CreateIntrinsic(
         HandleTy, CGM.getHLSLRuntime().getCreateHandleFromBindingIntrinsic(),
-        ArrayRef<Value *>{SpaceNoOp, RegisterNoOp, RangeOp, IndexOp,
-                          NonUniform});
+        ArrayRef<Value *>{SpaceOp, RegisterOp, RangeOp, IndexOp, NonUniform});
   }
   case Builtin::BI__builtin_hlsl_all: {
     Value *Op0 = EmitScalarExpr(E->getArg(0));

clang/lib/Sema/SemaHLSL.cpp

@@ -3248,8 +3248,8 @@ static bool initGlobalResourceDecl(Sema &S, VarDecl *VD) {
   return initVarDeclWithCtor(S, VD, Args);
 }
 
-// Returns true in the initialization has been handled;
-// Return false to let Clang handle the default initializaton.
+// Returns true if the initialization has been handled.
+// Returns false to use default initialization.
 bool SemaHLSL::ActOnUninitializedVarDecl(VarDecl *VD) {
   // Objects in the hlsl_constant address space are initialized
   // externally, so don't synthesize an implicit initializer.
@@ -3261,7 +3261,8 @@ bool SemaHLSL::ActOnUninitializedVarDecl(VarDecl *VD) {
     return false;
 
   // FIXME: We currectly support only simple resources - no arrays of resources
-  // or resources in user defined structs).
+  // or resources in user defined structs.
+  // (llvm/llvm-project#133835, llvm/llvm-project#133837)
   if (VD->getType()->isHLSLResourceRecord())
     return initGlobalResourceDecl(SemaRef, VD);