Address comments

Author: V-FEXrt

clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp

@@ -613,16 +613,14 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addHandleMember(
     ResourceClass RC, bool IsROV, bool RawBuffer, AccessSpecifier Access) {
   assert(!Record->isCompleteDefinition() && "record is already complete");
 
-  ResClass = RC;
-
   ASTContext &Ctx = SemaRef.getASTContext();
   TypeSourceInfo *ElementTypeInfo =
       Ctx.getTrivialTypeSourceInfo(getHandleElementType(), SourceLocation());
 
   // add handle member with resource type attributes
   QualType AttributedResTy = QualType();
   SmallVector<const Attr *> Attrs = {
-      HLSLResourceClassAttr::CreateImplicit(Ctx, ResClass),
+      HLSLResourceClassAttr::CreateImplicit(Ctx, RC),
       IsROV ? HLSLROVAttr::CreateImplicit(Ctx) : nullptr,
       RawBuffer ? HLSLRawBufferAttr::CreateImplicit(Ctx) : nullptr,
       ElementTypeInfo
@@ -699,7 +697,7 @@ BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::addArraySubscriptOperators() {
       AST.DeclarationNames.getCXXOperatorName(OO_Subscript);
 
   addHandleAccessFunction(Subscript, /*IsConst=*/true, /*IsRef=*/true);
-  if (ResClass == llvm::dxil::ResourceClass::UAV)
+  if (getResourceAttrs().ResourceClass == llvm::dxil::ResourceClass::UAV)
     addHandleAccessFunction(Subscript, /*IsConst=*/false, /*IsRef=*/true);
 
   return *this;
@@ -742,6 +740,12 @@ QualType BuiltinTypeDeclBuilder::getHandleElementType() {
   return SemaRef.getASTContext().Char8Ty;
 }
 
+HLSLAttributedResourceType::Attributes
+BuiltinTypeDeclBuilder::getResourceAttrs() {
+  QualType HandleType = getResourceHandleField()->getType();
+  return cast<HLSLAttributedResourceType>(HandleType)->getAttrs();
+}
+
 // BuiltinTypeDeclBuilder &BuiltinTypeDeclBuilder::startDefinition() {
 //   assert(!Record->isCompleteDefinition() && "record is already complete");
 //   Record->startDefinition();

clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.h

@@ -52,7 +52,6 @@ class BuiltinTypeDeclBuilder {
   ClassTemplateDecl *PrevTemplate = nullptr;
   NamespaceDecl *HLSLNamespace = nullptr;
   llvm::StringMap<FieldDecl *> Fields;
-  ResourceClass ResClass;
 
 public:
   friend struct TemplateParameterListBuilder;
@@ -96,6 +95,7 @@ class BuiltinTypeDeclBuilder {
   QualType getFirstTemplateTypeParam();
   QualType getHandleElementType();
   Expr *getConstantIntExpr(int value);
+  HLSLAttributedResourceType::Attributes getResourceAttrs();
 };
 
 } // namespace hlsl