Rewrite isHLSLResrouceWrapper as suggested

Author: s-perron

clang/include/clang/AST/Type.h

@@ -2661,7 +2661,7 @@ class alignas(TypeAlignment) Type : public ExtQualsTypeCommonBase {
   bool isHLSLSpecificType() const; // Any HLSL specific type
   bool isHLSLBuiltinIntangibleType() const; // Any HLSL builtin intangible type
   bool isHLSLAttributedResourceType() const;
-  bool isHLSLResourceWrapper() const;
+  bool isHLSLResourceClass() const;
   bool isHLSLIntangibleType()
       const; // Any HLSL intangible type (builtin, array, class)
 

clang/lib/AST/Type.cpp

@@ -5114,31 +5114,8 @@ bool Type::hasSizedVLAType() const {
   return false;
 }
 
-bool Type::isHLSLResourceWrapper() const {
-  const Type *Ty = getUnqualifiedDesugaredType();
-
-  // check if it's a builtin type first
-  if (Ty->isBuiltinType())
-    return Ty->isHLSLBuiltinIntangibleType();
-
-  // unwrap arrays
-  while (isa<ConstantArrayType>(Ty))
-    Ty = Ty->getArrayElementTypeNoTypeQual();
-
-  const RecordType *RT =
-      dyn_cast<RecordType>(Ty->getUnqualifiedDesugaredType());
-  if (!RT)
-    return false;
-
-  CXXRecordDecl *RD = RT->getAsCXXRecordDecl();
-  assert(RD != nullptr &&
-         "all HLSL structs and classes should be CXXRecordDecl");
-  assert(RD->isCompleteDefinition() && "expecting complete type");
-  if (RD->field_empty()) {
-    return false;
-  }
-  const FieldDecl *FirstField = *RD->field_begin();
-  return FirstField->getType()->isHLSLAttributedResourceType();
+bool Type::isHLSLResourceClass() const {
+  return HLSLAttributedResourceType::findHandleTypeOnResource(this) != nullptr;
 }
 
 bool Type::isHLSLIntangibleType() const {

clang/lib/Sema/SemaHLSL.cpp

@@ -3065,7 +3065,11 @@ void SemaHLSL::ActOnVariableDeclarator(VarDecl *VD) {
     if (VD->getType()->isHLSLIntangibleType())
       collectResourceBindingsOnVarDecl(VD);
 
-    if (VD->getType()->isHLSLResourceWrapper()) {
+    const Type *VarType = VD->getType().getTypePtr();
+    if (VarType->isArrayType()) {
+      VarType = VarType->getArrayElementTypeNoTypeQual();
+    }
+    if (VarType->isHLSLResourceClass()) {
       // Make the variable for resources static. The global externally visible
       // storage is accessed through the handle, which is a member. The variable
       // itself is not externally visible.