Addresses reviewer comments.

Author: danbrown-amd

tools/clang/include/clang/AST/OperationKinds.h

@@ -21,7 +21,7 @@
 #include <limits> // HLSL Change
 
 namespace clang {
-
+  
 /// CastKind - The kind of operation required for a conversion.
 enum CastKind {
   /// CK_Dependent - A conversion which cannot yet be analyzed because
@@ -340,55 +340,35 @@ static_assert(
 enum BinaryOperatorKind {
   // Operators listed in order of precedence.
   // Note that additions to this should also update the StmtVisitor class.
-  BO_PtrMemD,
-  BO_PtrMemI, // [C++ 5.5] Pointer-to-member operators.
-  BO_Mul,
-  BO_Div,
-  BO_Rem, // [C99 6.5.5] Multiplicative operators.
-  BO_Add,
-  BO_Sub, // [C99 6.5.6] Additive operators.
-  BO_Shl,
-  BO_Shr, // [C99 6.5.7] Bitwise shift operators.
-  BO_LT,
-  BO_GT,
-  BO_LE,
-  BO_GE, // [C99 6.5.8] Relational operators.
-  BO_EQ,
-  BO_NE,   // [C99 6.5.9] Equality operators.
-  BO_And,  // [C99 6.5.10] Bitwise AND operator.
-  BO_Xor,  // [C99 6.5.11] Bitwise XOR operator.
-  BO_Or,   // [C99 6.5.12] Bitwise OR operator.
-  BO_LAnd, // [C99 6.5.13] Logical AND operator.
-  BO_LOr,  // [C99 6.5.14] Logical OR operator.
-  BO_Assign,
-  BO_MulAssign, // [C99 6.5.16] Assignment operators.
-  BO_DivAssign,
-  BO_RemAssign,
-  BO_AddAssign,
-  BO_SubAssign,
-  BO_ShlAssign,
-  BO_ShrAssign,
-  BO_AndAssign,
-  BO_XorAssign,
+  BO_PtrMemD, BO_PtrMemI,       // [C++ 5.5] Pointer-to-member operators.
+  BO_Mul, BO_Div, BO_Rem,       // [C99 6.5.5] Multiplicative operators.
+  BO_Add, BO_Sub,               // [C99 6.5.6] Additive operators.
+  BO_Shl, BO_Shr,               // [C99 6.5.7] Bitwise shift operators.
+  BO_LT, BO_GT, BO_LE, BO_GE,   // [C99 6.5.8] Relational operators.
+  BO_EQ, BO_NE,                 // [C99 6.5.9] Equality operators.
+  BO_And,                       // [C99 6.5.10] Bitwise AND operator.
+  BO_Xor,                       // [C99 6.5.11] Bitwise XOR operator.
+  BO_Or,                        // [C99 6.5.12] Bitwise OR operator.
+  BO_LAnd,                      // [C99 6.5.13] Logical AND operator.
+  BO_LOr,                       // [C99 6.5.14] Logical OR operator.
+  BO_Assign, BO_MulAssign,      // [C99 6.5.16] Assignment operators.
+  BO_DivAssign, BO_RemAssign,
+  BO_AddAssign, BO_SubAssign,
+  BO_ShlAssign, BO_ShrAssign,
+  BO_AndAssign, BO_XorAssign,
   BO_OrAssign,
-  BO_Comma // [C99 6.5.17] Comma operator.
+  BO_Comma                      // [C99 6.5.17] Comma operator.
 };
 
 enum UnaryOperatorKind {
   // Note that additions to this should also update the StmtVisitor class.
-  UO_PostInc,
-  UO_PostDec, // [C99 6.5.2.4] Postfix increment and decrement
-  UO_PreInc,
-  UO_PreDec, // [C99 6.5.3.1] Prefix increment and decrement
-  UO_AddrOf,
-  UO_Deref, // [C99 6.5.3.2] Address and indirection
-  UO_Plus,
-  UO_Minus, // [C99 6.5.3.3] Unary arithmetic
-  UO_Not,
-  UO_LNot, // [C99 6.5.3.3] Unary arithmetic
-  UO_Real,
-  UO_Imag,     // "__real expr"/"__imag expr" Extension.
-  UO_Extension // __extension__ marker.
+  UO_PostInc, UO_PostDec, // [C99 6.5.2.4] Postfix increment and decrement
+  UO_PreInc, UO_PreDec,   // [C99 6.5.3.1] Prefix increment and decrement
+  UO_AddrOf, UO_Deref,    // [C99 6.5.3.2] Address and indirection
+  UO_Plus, UO_Minus,      // [C99 6.5.3.3] Unary arithmetic
+  UO_Not, UO_LNot,        // [C99 6.5.3.3] Unary arithmetic
+  UO_Real, UO_Imag,       // "__real expr"/"__imag expr" Extension.
+  UO_Extension            // __extension__ marker.
 };
 
 /// \brief The kind of bridging performed by the Objective-C bridge cast.
@@ -404,6 +384,6 @@ enum ObjCBridgeCastKind {
   OBC_BridgeRetained
 };
 
-} // namespace clang
+}
 
 #endif

tools/clang/lib/AST/HlslTypes.cpp

@@ -910,46 +910,46 @@ bool IsHLSLRayQueryType(clang::QualType type) {
 }
 
 #ifdef ENABLE_SPIRV_CODEGEN
+static llvm::Optional<std::pair<clang::QualType, unsigned>>
+MaybeGetVKBufferPointerParams(clang::QualType type) {
+  const RecordType *RT = dyn_cast<RecordType>(type.getCanonicalType());
+  if (!RT)
+    return llvm::None;
+
+  const ClassTemplateSpecializationDecl *templateDecl =
+      dyn_cast<ClassTemplateSpecializationDecl>(RT->getAsCXXRecordDecl());
+  if (!templateDecl || !templateDecl->getName().equals("BufferPointer"))
+    return llvm::None;
+
+  auto *namespaceDecl =
+      dyn_cast_or_null<NamespaceDecl>(templateDecl->getDeclContext());
+  if (!namespaceDecl || !namespaceDecl->getName().equals("vk"))
+    return llvm::None;
+
+  const TemplateArgumentList &argList = templateDecl->getTemplateArgs();
+  QualType bufferType = argList[0].getAsType();
+  unsigned align =
+      argList.size() > 1 ? argList[1].getAsIntegral().getLimitedValue() : 0;
+  return std::make_pair(bufferType, align);
+}
+
 bool IsVKBufferPointerType(clang::QualType type) {
-  type = type.getCanonicalType();
-  if (const RecordType *RT = dyn_cast<RecordType>(type)) {
-    if (const ClassTemplateSpecializationDecl *templateDecl =
-            dyn_cast<ClassTemplateSpecializationDecl>(
-                RT->getAsCXXRecordDecl())) {
-      if (auto *namespaceDecl =
-              dyn_cast_or_null<NamespaceDecl>(templateDecl->getDeclContext())) {
-        if (namespaceDecl->getName().equals("vk") &&
-            templateDecl->getName().equals("BufferPointer")) {
-          return true;
-        }
-      }
-    }
-  }
-  return false;
+  return MaybeGetVKBufferPointerParams(type).hasValue();
 }
 
 QualType GetVKBufferPointerBufferType(clang::QualType type) {
-  return GetHLSLResourceTemplateParamType(type);
+  auto bpParams = MaybeGetVKBufferPointerParams(type);
+  assert(bpParams.hasValue() &&
+         "cannot get pointer type for type that is not a vk::BufferPointer");
+  return bpParams.getValue().first;
 }
 
 unsigned GetVKBufferPointerAlignment(clang::QualType type) {
-  type = type.getCanonicalType();
-  if (const RecordType *RT = dyn_cast<RecordType>(type)) {
-    if (const ClassTemplateSpecializationDecl *templateDecl =
-            dyn_cast<ClassTemplateSpecializationDecl>(
-                RT->getAsCXXRecordDecl())) {
-      if (auto *namespaceDecl =
-              dyn_cast_or_null<NamespaceDecl>(templateDecl->getDeclContext())) {
-        if (namespaceDecl->getName().equals("vk") &&
-            templateDecl->getName().equals("BufferPointer")) {
-          const TemplateArgumentList &argList = templateDecl->getTemplateArgs();
-          return (unsigned)argList[1].getAsIntegral().getLimitedValue();
-        }
-      }
-    }
-  }
-
-  return 0; // TODO: error
+  auto bpParams = MaybeGetVKBufferPointerParams(type);
+  assert(
+      bpParams.hasValue() &&
+      "cannot get pointer alignment for type that is not a vk::BufferPointer");
+  return bpParams.getValue().second;
 }
 #endif