[NFC] [ASTGen] Refactor attribute attachment

Create a method that is used to attach attributes to a decl instead of assigning them directly. This is a convenient place to add logic which processes attributes after the decl they’re attached to has been converted to AST.

Author: beccadax

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -23,6 +23,10 @@ extension ASTGenVisitor {
     var staticSpelling: BridgedStaticSpelling
     var staticLoc: BridgedSourceLoc
     var initContext: BridgedPatternBindingInitializer?
+
+    func attach(to decl: BridgedDecl) {
+      decl.attrs = attributes
+    }
   }
 
   func generateDeclAttributes(_ node: some WithAttributesSyntax & WithModifiersSyntax, allowStatic: Bool) -> DeclAttributesResult {

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.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
     return decl
   }
 
@@ -129,7 +129,7 @@ extension ASTGenVisitor {
         end: node.memberBlock.rightBrace
       )
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     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.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     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.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     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.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     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.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     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.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
     return decl
   }
 }
@@ -297,7 +297,7 @@ extension ASTGenVisitor {
         end: node.memberBlock.rightBrace
       )
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     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.attrs = attrs.attributes
+      attrs.attach(to: elemDecl.asDecl)
       return elemDecl
     })
     return .createParsed(
@@ -403,7 +403,8 @@ extension ASTGenVisitor {
       throwsSpecifierLoc: self.generateSourceLoc(node.effectSpecifiers?.throwsClause),
       thrownType: self.generate(type: node.effectSpecifiers?.thrownError)
     )
-    accessor.asDecl.setAttrs(attrs)
+    // FIXME: Ought to use DeclAttributesResult.attach(to:)
+    accessor.asDecl.attrs = attrs
     if let body = node.body {
       self.withDeclContext(accessor.asDeclContext) {
         accessor.setParsedBody(self.generate(codeBlock: body))
@@ -564,7 +565,7 @@ extension ASTGenVisitor {
       arrowLoc: self.generateSourceLoc(node.returnClause.arrow),
       returnType: self.generate(type: node.returnClause.type)
     )
-    subscriptDecl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: subscriptDecl.asDecl)
 
     if let accessors = node.accessorBlock {
       let storage = subscriptDecl.asAbstractStorageDecl
@@ -599,7 +600,7 @@ extension ASTGenVisitor {
       returnType: self.generate(type: node.signature.returnClause?.type),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     if let body = node.body {
       self.withDeclContext(decl.asDeclContext) {
@@ -626,7 +627,7 @@ extension ASTGenVisitor {
       thrownType: self.generate(type: node.signature.effectSpecifiers?.thrownError),
       genericWhereClause: self.generate(genericWhereClause: node.genericWhereClause)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     if let body = node.body {
       self.withDeclContext(decl.asDeclContext) {
@@ -645,7 +646,7 @@ extension ASTGenVisitor {
       declContext: self.declContext,
       deinitKeywordLoc: self.generateSourceLoc(node.deinitKeyword)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
 
     if let body = node.body {
       self.withDeclContext(decl.asDeclContext) {
@@ -675,7 +676,7 @@ extension ASTGenVisitor {
       resultType: self.generate(type: node.signature.returnClause?.type),
       definition: self.generate(expr: node.definition?.value)
     )
-    decl.asDecl.setAttrs(attrs.attributes);
+    attrs.attach(to: decl.asDecl)
     return decl;
   }
 }
@@ -854,7 +855,7 @@ extension ASTGenVisitor {
       lowerThanNames: self.generate(precedenceGroupNameList: body.lowerThanRelation?.precedenceGroups),
       rightBraceLoc: self.generateSourceLoc(node.rightBrace)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
     return decl
   }
 }
@@ -901,7 +902,7 @@ extension ASTGenVisitor {
         self.generateLocatedIdentifier($0.name)
       }.bridgedArray(in: self)
     )
-    decl.asDecl.attrs = attrs.attributes
+    attrs.attach(to: decl.asDecl)
     return decl
   }
 }