Move findHandleTypeOnResource to static method on HLSLAttributedResourceType

Author: hekota

clang/include/clang/AST/Type.h

@@ -6320,6 +6320,10 @@ class HLSLAttributedResourceType : public Type, public llvm::FoldingSetNode {
   static bool classof(const Type *T) {
     return T->getTypeClass() == HLSLAttributedResource;
   }
+
+  // Returns handle type from HLSL resource, if the type is a resource
+  static const HLSLAttributedResourceType *
+  findHandleTypeOnResource(const Type *RT);
 };
 
 class TemplateTypeParmType : public Type, public llvm::FoldingSetNode {

clang/lib/AST/Type.cpp

@@ -5334,3 +5334,18 @@ std::string FunctionEffectWithCondition::description() const {
     Result += "(expr)";
   return Result;
 }
+
+const HLSLAttributedResourceType *
+HLSLAttributedResourceType::findHandleTypeOnResource(const Type *RT) {
+  // If the type T is an HLSL resource class, the first field must
+  // be the resource handle of type HLSLAttributedResourceType
+  const clang::Type *Ty = RT->getUnqualifiedDesugaredType();
+  if (const RecordDecl *RD = Ty->getAsCXXRecordDecl()) {
+    if (!RD->fields().empty()) {
+      const auto &FirstFD = RD->fields().begin();
+      return dyn_cast<HLSLAttributedResourceType>(
+          FirstFD->getType().getTypePtr());
+    }
+  }
+  return nullptr;
+}

clang/lib/CodeGen/CGHLSLRuntime.cpp

@@ -495,20 +495,10 @@ void CGHLSLRuntime::generateGlobalCtorDtorCalls() {
   }
 }
 
-// Returns handle type of a resource, if the type is a resource
-// or an array of resources
-static const HLSLAttributedResourceType *findHandleTypeOnResource(QualType QT) {
-  // If the type is a resource class, the first field must
-  // be the resource handle of type HLSLAttributedResourceType
-  const clang::Type *Ty = QT->getUnqualifiedDesugaredType();
-  if (RecordDecl *RD = Ty->getAsCXXRecordDecl()) {
-    if (!RD->fields().empty()) {
-      const auto &FirstFD = RD->fields().begin();
-      return dyn_cast<HLSLAttributedResourceType>(
-          FirstFD->getType().getTypePtr());
-    }
-  }
-  return nullptr;
+// Returns handle type from a resource, if the type is a resource
+static const HLSLAttributedResourceType *
+findHandleTypeOnResource(const clang::Type *Ty) {
+  return HLSLAttributedResourceType::findHandleTypeOnResource(Ty);
 }
 
 void CGHLSLRuntime::handleGlobalVarDefinition(const VarDecl *VD,
@@ -519,7 +509,7 @@ void CGHLSLRuntime::handleGlobalVarDefinition(const VarDecl *VD,
   if (!RBA)
     return;
 
-  if (!findHandleTypeOnResource(VD->getType()))
+  if (!findHandleTypeOnResource(VD->getType().getTypePtr()))
     // FIXME: Only simple declarations of resources are supported for now.
     // Arrays of resources or resources in user defined classes are
     // not implemented yet.
@@ -557,7 +547,7 @@ llvm::Function *CGHLSLRuntime::createResourceBindingInitFn() {
         continue;
 
       const HLSLAttributedResourceType *AttrResType =
-          findHandleTypeOnResource(VD->getType());
+          findHandleTypeOnResource(VD->getType().getTypePtr());
 
       // FIXME: Only simple declarations of resources are supported for now.
       // Arrays of resources or resources in user defined classes are

clang/lib/Sema/SemaHLSL.cpp

@@ -1000,16 +1000,8 @@ static CXXRecordDecl *getRecordDeclFromVarDecl(VarDecl *VD) {
 }
 
 static const HLSLAttributedResourceType *
-findAttributedResourceTypeOnField(VarDecl *VD) {
-  assert(VD != nullptr && "expected VarDecl");
-  if (RecordDecl *RD = getRecordDeclFromVarDecl(VD)) {
-    for (auto *FD : RD->fields()) {
-      if (const HLSLAttributedResourceType *AttrResType =
-              dyn_cast<HLSLAttributedResourceType>(FD->getType().getTypePtr()))
-        return AttrResType;
-    }
-  }
-  return nullptr;
+findHandleTypeOnResource(const Type *Ty) {
+  return HLSLAttributedResourceType::findHandleTypeOnResource(Ty);
 }
 
 // Iterate over RecordType fields and return true if any of them matched the