[NFC] [ASTGen] Make BridgedDecl.attrs property

…subsuming BridgedDecl.setAttrs(_:) as its setter.

Author: beccadax

include/swift/AST/ASTBridging.h

@@ -863,7 +863,10 @@ BridgedSILGenNameAttr BridgedSILGenNameAttr_createParsed(
 // MARK: Decls
 //===----------------------------------------------------------------------===//
 
-SWIFT_NAME("BridgedDecl.setAttrs(self:_:)")
+SWIFT_NAME("getter:BridgedDecl.attrs(self:)")
+BridgedDeclAttributes BridgedDecl_getAttrs(BridgedDecl decl);
+
+SWIFT_NAME("setter:BridgedDecl.attrs(self:newValue:)")
 void BridgedDecl_setAttrs(BridgedDecl decl, BridgedDeclAttributes attrs);
 
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedStaticSpelling {

lib/AST/Bridging/DeclBridging.cpp

@@ -115,6 +115,10 @@ static AccessorKind unbridged(BridgedAccessorKind kind) {
   return static_cast<AccessorKind>(kind);
 }
 
+BridgedDeclAttributes BridgedDecl_getAttrs(BridgedDecl decl) {
+  return decl.unbridged()->getAttrs();
+}
+
 void BridgedDecl_setAttrs(BridgedDecl decl, BridgedDeclAttributes attrs) {
   decl.unbridged()->getAttrs() = attrs.unbridged();
 }

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -105,7 +105,7 @@ extension ASTGenVisitor {
       underlyingType: self.generate(type: node.initializer.value),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
     return decl
   }
 
@@ -129,7 +129,7 @@ extension ASTGenVisitor {
         end: node.memberBlock.rightBrace
       )
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members).lazy.bridgedArray(in: self))
@@ -158,7 +158,7 @@ extension ASTGenVisitor {
         end: node.memberBlock.rightBrace
       )
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members).lazy.bridgedArray(in: self))
@@ -188,7 +188,7 @@ extension ASTGenVisitor {
       ),
       isActor: false
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members).lazy.bridgedArray(in: self))
@@ -218,7 +218,7 @@ extension ASTGenVisitor {
       ),
       isActor: true
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members).lazy.bridgedArray(in: self))
@@ -250,7 +250,7 @@ extension ASTGenVisitor {
         end: node.memberBlock.rightBrace
       )
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members).lazy.bridgedArray(in: self))
@@ -275,7 +275,7 @@ extension ASTGenVisitor {
       defaultType: self.generate(type: node.initializer?.value),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
     return decl
   }
 }
@@ -297,7 +297,7 @@ extension ASTGenVisitor {
         end: node.memberBlock.rightBrace
       )
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
 
     self.withDeclContext(decl.asDeclContext) {
       decl.setParsedMembers(self.generate(memberBlockItemList: node.memberBlock.members).lazy.bridgedArray(in: self))
@@ -334,7 +334,7 @@ extension ASTGenVisitor {
       guard let elemDecl = self.generate(enumCaseElement: elem) else {
         return nil
       }
-      elemDecl.asDecl.setAttrs(attrs.attributes)
+      elemDecl.asDecl.attrs = attrs.attributes
       return elemDecl
     })
     return .createParsed(
@@ -564,7 +564,7 @@ extension ASTGenVisitor {
       arrowLoc: self.generateSourceLoc(node.returnClause.arrow),
       returnType: self.generate(type: node.returnClause.type)
     )
-    subscriptDecl.asDecl.setAttrs(attrs.attributes)
+    subscriptDecl.asDecl.attrs = attrs.attributes
 
     if let accessors = node.accessorBlock {
       let storage = subscriptDecl.asAbstractStorageDecl
@@ -599,7 +599,7 @@ extension ASTGenVisitor {
       returnType: self.generate(type: node.signature.returnClause?.type),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
 
     if let body = node.body {
       self.withDeclContext(decl.asDeclContext) {
@@ -626,7 +626,7 @@ extension ASTGenVisitor {
       thrownType: self.generate(type: node.signature.effectSpecifiers?.thrownError),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
 
     if let body = node.body {
       self.withDeclContext(decl.asDeclContext) {
@@ -645,7 +645,7 @@ extension ASTGenVisitor {
       declContext: self.declContext,
       deinitKeywordLoc: self.generateSourceLoc(node.deinitKeyword)
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
 
     if let body = node.body {
       self.withDeclContext(decl.asDeclContext) {
@@ -697,7 +697,7 @@ extension ASTGenVisitor {
       rightAngleLoc: info.rightAngleLoc,
       args: info.arguments
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
 
     return decl
   }
@@ -854,7 +854,7 @@ extension ASTGenVisitor {
       lowerThanNames: self.generate(precedenceGroupNameList: body.lowerThanRelation?.precedenceGroups),
       rightBraceLoc: self.generateSourceLoc(node.rightBrace)
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
     return decl
   }
 }
@@ -901,7 +901,7 @@ extension ASTGenVisitor {
         self.generateLocatedIdentifier($0.name)
       }.bridgedArray(in: self)
     )
-    decl.asDecl.setAttrs(attrs.attributes)
+    decl.asDecl.attrs = attrs.attributes
     return decl
   }
 }