[ASTGen] Support specifiers on types such as inout and consuming

Author: DougGregor

include/swift/AST/CASTBridging.h

@@ -112,6 +112,17 @@ typedef enum ENUM_EXTENSIBILITY_ATTR(open) BridgedMacroDefinitionKind : long {
   BridgedBuiltinExternalMacro
 } BridgedMacroDefinitionKind;
 
+/// Bridged parameter specifiers
+typedef enum ENUM_EXTENSIBILITY_ATTR(open) BridgedAttributedTypeSpecifier : long {
+  BridgedAttributedTypeSpecifierInOut,
+  BridgedAttributedTypeSpecifierBorrowing,
+  BridgedAttributedTypeSpecifierConsuming,
+  BridgedAttributedTypeSpecifierLegacyShared,
+  BridgedAttributedTypeSpecifierLegacyOwned,
+  BridgedAttributedTypeSpecifierConst,
+  BridgedAttributedTypeSpecifierIsolated,
+} BridgedAttributedTypeSpecifier;
+
 #ifdef __cplusplus
 extern "C" {
 
@@ -261,6 +272,8 @@ void *ImplicitlyUnwrappedOptionalTypeRepr_create(void *ctx, void *base,
                                                  void *exclamationLoc);
 void *MetatypeTypeRepr_create(void *ctx, void *baseType, void *typeLoc);
 void *ProtocolTypeRepr_create(void *ctx, void *baseType, void *protoLoc);
+void *AttributedTypeSpecifierRepr_create(
+    void *ctx, void *base, BridgedAttributedTypeSpecifier specifier, void *specifierLoc);
 void *PackExpansionTypeRepr_create(void *ctx, void *base, void *repeatLoc);
 void *TupleTypeRepr_create(void *ctx, BridgedArrayRef elements, void *lParenLoc,
                            void *rParenLoc);

lib/AST/CASTBridging.cpp

@@ -484,6 +484,30 @@ void *PackExpansionTypeRepr_create(void *ctx, void *base, void *repeatLoc) {
       getSourceLocFromPointer(repeatLoc), (TypeRepr *)base);
 }
 
+void *AttributedTypeSpecifierRepr_create(
+    void *ctx, void *base, BridgedAttributedTypeSpecifier specifier, void *specifierLoc
+) {
+  ASTContext &Context = *static_cast<ASTContext *>(ctx);
+  SourceLoc loc = getSourceLocFromPointer(specifierLoc);
+  TypeRepr *baseType = (TypeRepr *)base;
+  switch (specifier) {
+  case BridgedAttributedTypeSpecifierInOut:
+    return new (Context) OwnershipTypeRepr(baseType, ParamSpecifier::InOut, loc);
+  case BridgedAttributedTypeSpecifierBorrowing:
+    return new (Context) OwnershipTypeRepr(baseType, ParamSpecifier::Borrowing, loc);
+  case BridgedAttributedTypeSpecifierConsuming:
+    return new (Context) OwnershipTypeRepr(baseType, ParamSpecifier::Consuming, loc);
+  case BridgedAttributedTypeSpecifierLegacyShared:
+    return new (Context) OwnershipTypeRepr(baseType, ParamSpecifier::LegacyShared, loc);
+  case BridgedAttributedTypeSpecifierLegacyOwned:
+    return new (Context) OwnershipTypeRepr(baseType, ParamSpecifier::LegacyOwned, loc);
+  case BridgedAttributedTypeSpecifierConst:
+    return new (Context) CompileTimeConstTypeRepr(baseType, loc);
+  case BridgedAttributedTypeSpecifierIsolated:
+    return new (Context) IsolatedTypeRepr(baseType, loc);
+  }
+}
+
 void *TupleTypeRepr_create(void *ctx, BridgedArrayRef elements, void *lParenLoc,
                            void *rParenLoc) {
   ASTContext &Context = *static_cast<ASTContext *>(ctx);

lib/ASTGen/Sources/ASTGen/Types.swift

@@ -161,8 +161,30 @@ extension ASTGenVisitor {
   }
 
   public func visit(_ node: AttributedTypeSyntax) -> ASTNode {
+    var type = visit(node.baseType)
+
+    // Handle specifiers.
+    if let specifier = node.specifier {
+      let specifierLoc = self.base.advanced(by: specifier.position.utf8Offset).raw
+
+      let kind: BridgedAttributedTypeSpecifier
+      switch specifier.tokenKind {
+        case .keyword(.inout): kind = .inOut
+        case .keyword(.borrowing): kind = .borrowing
+        case .keyword(.consuming): kind = .consuming
+        case .keyword(.__shared): kind = .legacyShared
+        case .keyword(.__owned): kind = .legacyOwned
+        case .keyword(._const): kind = .const
+        case .keyword(.isolated): kind = .isolated
+        default: fatalError("unhandled specifier \(specifier.debugDescription)")
+      }
+
+      type = .type(AttributedTypeSpecifierRepr_create(self.ctx, type.rawValue, kind, specifierLoc))
+    }
+
     // FIXME: Respect the attributes
-    return visit(node.baseType)
+
+    return type
   }
 }
 

test/ASTGen/verify-parse.swift

@@ -38,3 +38,10 @@ func test6(_ b: Bool) -> Int {
   let x = if b { 0 } else { 1 }
   return x
 }
+
+func test7(_ b: inout Bool) {
+  // b = true
+}
+
+func test8(_ i: _const Int) {
+}