Corrects SPIR-V decoration emitted for node base index.

Author: danbrown-amd

tools/clang/lib/SPIRV/EmitVisitor.cpp

@@ -2956,29 +2956,29 @@ void EmitTypeHandler::emitDecorationsForNodePayloadArrayTypes(
   // Emit decorations
   const ParmVarDecl *nodeDecl = npaType->getNodeDecl();
   if (hlsl::IsHLSLNodeOutputType(nodeDecl->getType())) {
-    StringRef name = nodeDecl->getName();
-    unsigned index = 0;
+    StringRef name;
+    llvm::Optional<unsigned> index;
     if (auto nodeID = nodeDecl->getAttr<HLSLNodeIdAttr>()) {
       name = nodeID->getName();
-      index = nodeID->getArrayIndex();
+      index = getAttrArgInstr(astContext, nodeID->getArrayIndex());
+    } else {
+      name = nodeDecl->getName();
+      index = llvm::None;
     }
 
     auto *str = new (context) SpirvConstantString(name);
     uint32_t nodeName = getOrCreateConstantString(str);
     emitDecoration(id, spv::Decoration::PayloadNodeNameAMDX, {nodeName},
                    llvm::None, true);
-    if (index) {
-      uint32_t baseIndex = getOrCreateConstantInt(
-          llvm::APInt(32, index), context.getUIntType(32), false);
-      emitDecoration(id, spv::Decoration::PayloadNodeBaseIndexAMDX, {baseIndex},
-                     llvm::None, true);
+    if (index.hasValue()) {
+      emitDecoration(id, spv::Decoration::PayloadNodeBaseIndexAMDX,
+                     {index.getValue()}, llvm::None, true);
     }
   }
 
   uint32_t maxRecords;
   if (const auto *attr = nodeDecl->getAttr<HLSLMaxRecordsAttr>()) {
-    maxRecords = getOrCreateConstantInt(llvm::APInt(32, attr->getMaxCount()),
-                                        context.getUIntType(32), false);
+    maxRecords = getAttrArgInstr(astContext, attr->getMaxCount(), 1);
   } else {
     maxRecords = getOrCreateConstantInt(llvm::APInt(32, 1),
                                         context.getUIntType(32), false);