[ASTGen] Bridge TypeAttribute subclasses

Author: rintaro

include/swift/AST/ASTBridging.h

@@ -444,6 +444,15 @@ struct BridgedASTNode {
       Bridged##CLASS##Attr attr);
 #include "swift/AST/DeclAttr.def"
 
+// Declare `.asTypeAttr` on each BridgedXXXTypeAttr type, which upcasts a
+// wrapper for a TypeAttr subclass to a BridgedTypeAttr.
+#define SIMPLE_TYPE_ATTR(...)
+#define TYPE_ATTR(SPELLING, CLASS)                                             \
+  SWIFT_NAME("getter:Bridged" #CLASS "TypeAttr.asTypeAttribute(self:)")        \
+  BridgedTypeAttribute Bridged##CLASS##TypeAttr_asTypeAttribute(               \
+      Bridged##CLASS##TypeAttr attr);
+#include "swift/AST/TypeAttr.def"
+
 struct BridgedPatternBindingEntry {
   BridgedPattern pattern;
   BridgedSourceLoc equalLoc;
@@ -2200,23 +2209,25 @@ enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedIsolatedTypeAttrIsolationKind {
   BridgedIsolatedTypeAttrIsolationKind_DynamicIsolation,
 };
 
-SWIFT_NAME("BridgedTypeAttribute.createIsolated(_:atLoc:nameLoc:lpLoc:isolationKindLoc:isolationKind:rpLoc:)")
-BridgedTypeAttribute BridgedTypeAttribute_createIsolated(
-    BridgedASTContext cContext,
-    BridgedSourceLoc cAtLoc, BridgedSourceLoc cNameLoc,
-    BridgedSourceLoc cLPLoc, BridgedSourceLoc cIsolationLoc,
+SWIFT_NAME("BridgedIsolatedTypeAttr.createParsed(_:atLoc:nameLoc:lpLoc:"
+           "isolationKindLoc:isolationKind:rpLoc:)")
+BridgedIsolatedTypeAttr BridgedIsolatedTypeAttr_createParsed(
+    BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
+    BridgedSourceLoc cNameLoc, BridgedSourceLoc cLPLoc,
+    BridgedSourceLoc cIsolationLoc,
     BridgedIsolatedTypeAttrIsolationKind cIsolation, BridgedSourceLoc cRPLoc);
 
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedExecutionTypeAttrExecutionKind {
   BridgedExecutionTypeAttrExecutionKind_Concurrent,
   BridgedExecutionTypeAttrExecutionKind_Caller
 };
 
-SWIFT_NAME("BridgedTypeAttribute.createExecution(_:atLoc:nameLoc:lpLoc:behaviorLoc:behavior:rpLoc:)")
-BridgedTypeAttribute BridgedTypeAttribute_createExecution(
-    BridgedASTContext cContext,
-    BridgedSourceLoc cAtLoc, BridgedSourceLoc cNameLoc,
-    BridgedSourceLoc cLPLoc, BridgedSourceLoc cBehaviorLoc,
+SWIFT_NAME("BridgedExecutionTypeAttr.createParsed(_:atLoc:nameLoc:lpLoc:"
+           "behaviorLoc:behavior:rpLoc:)")
+BridgedExecutionTypeAttr BridgedExecutionTypeAttr_createParsed(
+    BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
+    BridgedSourceLoc cNameLoc, BridgedSourceLoc cLPLoc,
+    BridgedSourceLoc cBehaviorLoc,
     BridgedExecutionTypeAttrExecutionKind behavior, BridgedSourceLoc cRPLoc);
 
 //===----------------------------------------------------------------------===//

include/swift/AST/ASTBridgingWrappers.def

@@ -85,6 +85,12 @@
 #endif
 #include "swift/AST/DeclAttr.def"
 
+#ifndef TYPE_ATTR
+#define SIMPLE_TYPE_ATTR(...)
+#define TYPE_ATTR(SPELLING, CLASS) AST_BRIDGING_WRAPPER_NONNULL(CLASS##TypeAttr)
+#endif
+#include "swift/AST/TypeAttr.def"
+
 // Some of the base classes need to be nullable to allow them to be used as
 // optional parameters.
 AST_BRIDGING_WRAPPER_NULLABLE(Decl)

lib/AST/Bridging/TypeAttributeBridging.cpp

@@ -23,6 +23,16 @@ using namespace swift;
 // MARK: TypeAttributes
 //===----------------------------------------------------------------------===//
 
+// Define `.asTypeAttr` on each BridgedXXXTypeAttr type.
+#define SIMPLE_TYPE_ATTR(...)
+#define TYPE_ATTR(SPELLING, CLASS)                                             \
+  SWIFT_NAME("getter:Bridged" #CLASS "TypeAttr.asTypeAttribute(self:)")        \
+  BridgedTypeAttribute Bridged##CLASS##TypeAttr_asTypeAttribute(               \
+      Bridged##CLASS##TypeAttr attr) {                                         \
+    return attr.unbridged();                                                   \
+  }
+#include "swift/AST/TypeAttr.def"
+
 BridgedTypeAttrKind BridgedTypeAttrKind_fromString(BridgedStringRef cStr) {
   auto optKind = TypeAttribute::getAttrKindFromString(cStr.unbridged());
   if (!optKind)
@@ -74,7 +84,7 @@ BridgedTypeAttribute BridgedTypeAttribute_createSimple(
                                      cAtLoc.unbridged(), cNameLoc.unbridged());
 }
 
-BridgedTypeAttribute BridgedTypeAttribute_createIsolated(
+BridgedIsolatedTypeAttr BridgedIsolatedTypeAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceLoc cNameLoc, BridgedSourceLoc cLPLoc,
     BridgedSourceLoc cIsolationLoc,
@@ -92,7 +102,7 @@ BridgedTypeAttribute BridgedTypeAttribute_createIsolated(
                        {isolationKind, cIsolationLoc.unbridged()});
 }
 
-BridgedTypeAttribute BridgedTypeAttribute_createExecution(
+BridgedExecutionTypeAttr BridgedExecutionTypeAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceLoc cNameLoc, BridgedSourceLoc cLPLoc,
     BridgedSourceLoc cBehaviorLoc,
@@ -110,4 +120,4 @@ BridgedTypeAttribute BridgedTypeAttribute_createExecution(
       ExecutionTypeAttr(cAtLoc.unbridged(), cNameLoc.unbridged(),
                         {cLPLoc.unbridged(), cRPLoc.unbridged()},
                         {behaviorKind, cBehaviorLoc.unbridged()});
-}
+}

lib/ASTGen/Sources/ASTGen/TypeAttrs.swift

@@ -89,10 +89,10 @@ extension ASTGenVisitor {
         fatalError("unimplemented")
 
       case .isolated:
-        return self.generateIsolatedTypeAttr(attribute: node)
+        return self.generateIsolatedTypeAttr(attribute: node)?.asTypeAttribute
 
       case .execution:
-        return self.generateExecutionTypeAttr(attribute: node)
+        return self.generateExecutionTypeAttr(attribute: node)?.asTypeAttribute
 
       // SIL type attributes are not supported.
       case .autoreleased,
@@ -145,8 +145,8 @@ extension ASTGenVisitor {
       nameLoc: self.generateSourceLoc(node.attributeName)
     )
   }
-
-  func generateIsolatedTypeAttr(attribute node: AttributeSyntax) -> BridgedTypeAttribute? {
+  
+  func generateIsolatedTypeAttr(attribute node: AttributeSyntax) -> BridgedIsolatedTypeAttr? {
     guard case .argumentList(let isolatedArgs) = node.arguments,
           isolatedArgs.count == 1,
           let labelArg = isolatedArgs.first,
@@ -167,17 +167,18 @@ extension ASTGenVisitor {
       return nil
     }
 
-    return BridgedTypeAttribute.createIsolated(
+    return BridgedIsolatedTypeAttr.createParsed(
       self.ctx,
       atLoc: self.generateSourceLoc(node.atSign),
       nameLoc: self.generateSourceLoc(node.attributeName),
       lpLoc: self.generateSourceLoc(node.leftParen!),
       isolationKindLoc: self.generateSourceLoc(isolationKindExpr.baseName),
       isolationKind: isolationKind,
-      rpLoc: self.generateSourceLoc(node.rightParen!))
+      rpLoc: self.generateSourceLoc(node.rightParen!)
+    )
   }
 
-  func generateExecutionTypeAttr(attribute node: AttributeSyntax) -> BridgedTypeAttribute? {
+  func generateExecutionTypeAttr(attribute node: AttributeSyntax) -> BridgedExecutionTypeAttr? {
     guard case .argumentList(let executionArgs) = node.arguments,
           executionArgs.count == 1,
           let labelArg = executionArgs.first,
@@ -198,13 +199,14 @@ extension ASTGenVisitor {
       return nil
     }
 
-    return BridgedTypeAttribute.createExecution(
+    return BridgedExecutionTypeAttr.createParsed(
       self.ctx,
       atLoc: self.generateSourceLoc(node.atSign),
       nameLoc: self.generateSourceLoc(node.attributeName),
       lpLoc: self.generateSourceLoc(node.leftParen!),
       behaviorLoc: self.generateSourceLoc(behaviorExpr.baseName),
       behavior: behavior,
-      rpLoc: self.generateSourceLoc(node.rightParen!))
+      rpLoc: self.generateSourceLoc(node.rightParen!)
+    )
   }
 }