Merge branch 'users/hekota/pr-124840' of https://github.com/llvm/llvm-project into cbuffer-codegen5

Author: hekota

clang/lib/Sema/SemaHLSL.cpp

@@ -285,14 +285,15 @@ static bool isResourceRecordTypeOrArrayOf(const Type *Ty) {
 // array, or a builtin intangible type. Returns false it is a valid leaf element
 // type or if it is a record type that needs to be inspected further.
 static bool isInvalidConstantBufferLeafElementType(const Type *Ty) {
+  Ty = Ty->getUnqualifiedDesugaredType();
   if (isResourceRecordTypeOrArrayOf(Ty))
     return true;
   if (Ty->isRecordType())
     return Ty->getAsCXXRecordDecl()->isEmpty();
   if (Ty->isConstantArrayType() &&
       isZeroSizedArray(cast<ConstantArrayType>(Ty)))
     return true;
-  if (Ty->isHLSLBuiltinIntangibleType())
+  if (Ty->isHLSLBuiltinIntangibleType() || Ty->isHLSLAttributedResourceType())
     return true;
   return false;
 }

clang/test/AST/HLSL/cbuffer.hlsl

@@ -75,6 +75,8 @@ cbuffer CB {
   groupshared float g2;
   // CHECK: VarDecl {{.*}} e2 'hlsl_constant float'
   float e2;
+  // CHECK: VarDecl {{.*}} h2 '__hlsl_resource_t'
+  __hlsl_resource_t h2;
   // CHECK: CXXRecordDecl {{.*}} implicit referenced struct __cblayout_CB_1 definition
   // CHECK: PackedAttr
   // CHECK-NEXT: FieldDecl {{.*}} a2 'float'