Apply changes from PR llvm#130342 to the moved code

Author: hekota

clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.cpp

@@ -577,7 +577,7 @@ BuiltinTypeDeclBuilder::addMemberVariable(StringRef Name, QualType Type,
 }
 
 BuiltinTypeDeclBuilder &
-BuiltinTypeDeclBuilder::addHandleMember(ResourceClass RC, ResourceKind RK,
+BuiltinTypeDeclBuilder::addHandleMember(ResourceClass RC,
                                         bool IsROV, bool RawBuffer,
                                         AccessSpecifier Access) {
   assert(!Record->isCompleteDefinition() && "record is already complete");
@@ -595,10 +595,9 @@ BuiltinTypeDeclBuilder::addHandleMember(ResourceClass RC, ResourceKind RK,
       ElementTypeInfo
           ? HLSLContainedTypeAttr::CreateImplicit(Ctx, ElementTypeInfo)
           : nullptr};
-  Attr *ResourceAttr = HLSLResourceAttr::CreateImplicit(Ctx, RK);
   if (CreateHLSLAttributedResourceType(SemaRef, Ctx.HLSLResourceTy, Attrs,
                                        AttributedResTy))
-    addMemberVariable("__handle", AttributedResTy, {ResourceAttr}, Access);
+    addMemberVariable("__handle", AttributedResTy, {}, Access);
   return *this;
 }
 

clang/lib/Sema/HLSLBuiltinTypeDeclBuilder.h

@@ -19,7 +19,6 @@
 #include "llvm/ADT/StringMap.h"
 
 using llvm::hlsl::ResourceClass;
-using llvm::hlsl::ResourceKind;
 
 namespace clang {
 
@@ -73,7 +72,7 @@ class BuiltinTypeDeclBuilder {
                     AccessSpecifier Access = AccessSpecifier::AS_private);
 
   BuiltinTypeDeclBuilder &
-  addHandleMember(ResourceClass RC, ResourceKind RK, bool IsROV, bool RawBuffer,
+  addHandleMember(ResourceClass RC, bool IsROV, bool RawBuffer,
                   AccessSpecifier Access = AccessSpecifier::AS_private);
   BuiltinTypeDeclBuilder &addArraySubscriptOperators();