code review feedback - fix typo and naked constant

Author: hekota

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -188,7 +188,7 @@ createBufferHandleType(const HLSLBufferDecl *BufDecl) {
 // 2. default constant buffer declarations at global scope can have
 //    register(c#) annotations (translates to HLSLResourceBindingAttr with
 //    RegisterType::C)
-// It is not quaranteed that all declarations in a buffer have an annotation.
+// It is not guaranteed that all declarations in a buffer have an annotation.
 // For those where it is not specified a -1 value is added to the Layout
 // vector. In the final layout these declarations will be placed at the end
 // of the HLSL buffer after all of the elements with specified offset.
@@ -213,7 +213,7 @@ static void fillPackoffsetLayout(const HLSLBufferDecl *BufDecl,
           if (RBA->getRegisterType() ==
               HLSLResourceBindingAttr::RegisterType::C) {
             // size of constant buffer row is 16 bytes
-            Offset = RBA->getSlotNumber() * 16U;
+            Offset = RBA->getSlotNumber() * CGHLSLRuntime::BufferRowSizeInBytes;
           }
         }
       }

clang/lib/CodeGen/CGHLSLRuntime.h

@@ -134,6 +134,8 @@ class CGHLSLRuntime {
     BufferResBinding(HLSLResourceBindingAttr *Attr);
   };
 
+  static const unsigned BufferRowSizeInBytes = 16U;
+
 protected:
   CodeGenModule &CGM;
 

clang/lib/CodeGen/HLSLBufferLayoutBuilder.cpp

@@ -196,8 +196,8 @@ bool HLSLBufferLayoutBuilder::layoutField(const FieldDecl *FD,
   unsigned ArrayCount = 1;
   unsigned ArrayStride = 0;
 
-  const unsigned BufferRowAlign = 16U;
-  unsigned NextRowOffset = llvm::alignTo(EndOffset, BufferRowAlign);
+  unsigned NextRowOffset =
+      llvm::alignTo(EndOffset, CGHLSLRuntime::BufferRowSizeInBytes);
 
   llvm::Type *ElemLayoutTy = nullptr;
   QualType FieldTy = FD->getType();
@@ -227,7 +227,7 @@ bool HLSLBufferLayoutBuilder::layoutField(const FieldDecl *FD,
           getScalarOrVectorSizeInBytes(CGM.getTypes().ConvertTypeForMem(Ty));
       ElemLayoutTy = CGM.getTypes().ConvertTypeForMem(FieldTy);
     }
-    ArrayStride = llvm::alignTo(ElemSize, BufferRowAlign);
+    ArrayStride = llvm::alignTo(ElemSize, CGHLSLRuntime::BufferRowSizeInBytes);
     ElemOffset = (Packoffset != -1) ? Packoffset : NextRowOffset;
 
   } else if (FieldTy->isStructureType()) {