cleanup after merge, add one more comment

Author: hekota

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -248,6 +248,9 @@ static std::optional<llvm::Value *> initializeLocalResourceArray(
         Args);
 
     if (!CreateMethod)
+      // This can happen if someone creates an array of structs that looks like
+      // an HLSL resource record array but it does not have the required static
+      // create method. No binding will be generated for it.
       return std::nullopt;
 
     callResourceInitMethod(CGF, CreateMethod, Args, ReturnAddress);

clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp

@@ -130,7 +130,6 @@ struct BuiltinTypeMethodBuilder {
   StorageClass SC;
   llvm::SmallVector<Param> Params;
   llvm::SmallVector<Stmt *> StmtsList;
-  llvm::SmallVector<VarDecl *> LocalVars;
 
   // Argument placeholders, inspired by std::placeholder. These are the indices
   // of arguments to forward to `callBuiltin` and other method builder methods.
@@ -139,16 +138,7 @@ struct BuiltinTypeMethodBuilder {
   //   LastStmt - refers to the last statement in the method body; referencing
   //              LastStmt will remove the statement from the method body since
   //              it will be linked from the new expression being constructed.
-  enum class PlaceHolder {
-    _0,
-    _1,
-    _2,
-    _3,
-    _4,
-    LocalVar_0 = 64,
-    Handle = 128,
-    LastStmt
-  };
+  enum class PlaceHolder { _0, _1, _2, _3, _4, Handle = 128, LastStmt };
 
   Expr *convertPlaceholder(PlaceHolder PH);
   Expr *convertPlaceholder(LocalVar &Var);
@@ -365,17 +355,6 @@ Expr *BuiltinTypeMethodBuilder::convertPlaceholder(PlaceHolder PH) {
   }
 
   ASTContext &AST = DeclBuilder.SemaRef.getASTContext();
-  if (PH >= PlaceHolder::LocalVar_0) {
-    unsigned Index = static_cast<unsigned>(PH) -
-                     static_cast<unsigned>(PlaceHolder::LocalVar_0);
-    assert(Index < LocalVars.size() && "local var index out of range");
-    VarDecl *VD = LocalVars[Index];
-    return DeclRefExpr::Create(
-        AST, NestedNameSpecifierLoc(), SourceLocation(), VD, false,
-        DeclarationNameInfo(VD->getDeclName(), SourceLocation()), VD->getType(),
-        VK_LValue);
-  }
-
   ParmVarDecl *ParamDecl = Method->getParamDecl(static_cast<unsigned>(PH));
   return DeclRefExpr::Create(
       AST, NestedNameSpecifierLoc(), SourceLocation(), ParamDecl, false,