[ASTGen] Remove ASTGenTypes experimental feature

There's no reason to generate only TypeRepr using ASTGen anymore.
Use ParserASTGen feature to test test/ASTGen/types.swift because
ASTGen now can generate the whole test file for type checking.

Author: rintaro

include/swift/Basic/Features.def

@@ -193,10 +193,6 @@ EXPERIMENTAL_FEATURE(ImplicitSome, false)
 /// corresponding syntax tree.
 EXPERIMENTAL_FEATURE(ParserASTGen, false)
 
-/// Use the syntax tree produced by the Swift (swift-syntax) parser for type
-/// parsing, using ASTGen to translate them into AST nodes.
-EXPERIMENTAL_FEATURE(ASTGenTypes, false)
-
 /// Parse using the Swift (swift-syntax) parser and use ASTGen to generate the
 /// corresponding syntax tree.
 EXPERIMENTAL_FEATURE(BuiltinMacros, false)

lib/AST/ASTBridging.cpp

@@ -326,7 +326,42 @@ BridgedParamDecl BridgedParamDecl_createParsed(
   auto *paramDecl = new (cContext.unbridged())
       ParamDecl(cSpecifierLoc.unbridged(), firstNameLoc, firstName,
                 secondNameLoc, secondName, declContext);
-  paramDecl->setTypeRepr(opaqueType.unbridged());
+
+  if (auto type = opaqueType.unbridged()) {
+    paramDecl->setTypeRepr(type);
+
+    // FIXME: Copied from 'Parser::parsePattern()'. This should be in Sema.
+    // Dig through the type to find any attributes or modifiers that are
+    // associated with the type but should also be reflected on the
+    // declaration.
+    auto unwrappedType = type;
+    while (true) {
+      if (auto *ATR = dyn_cast<AttributedTypeRepr>(unwrappedType)) {
+        auto &attrs = ATR->getAttrs();
+        // At this point we actually don't know if that's valid to mark
+        // this parameter declaration as `autoclosure` because type has
+        // not been resolved yet - it should either be a function type
+        // or typealias with underlying function type.
+        paramDecl->setAutoClosure(attrs.has(TypeAttrKind::TAK_autoclosure));
+
+        unwrappedType = ATR->getTypeRepr();
+        continue;
+      }
+
+      if (auto *STR = dyn_cast<SpecifierTypeRepr>(unwrappedType)) {
+        if (isa<IsolatedTypeRepr>(STR))
+          paramDecl->setIsolated(true);
+        else if (isa<CompileTimeConstTypeRepr>(STR))
+          paramDecl->setCompileTimeConst(true);
+
+        unwrappedType = STR->getBase();
+        continue;
+      }
+
+      break;
+    }
+  }
+
   paramDecl->setDefaultExpr(defaultValue, /*isTypeChecked*/ false);
   paramDecl->setDefaultArgumentKind(defaultArgumentKind);
 

lib/AST/ASTPrinter.cpp

@@ -3422,10 +3422,6 @@ static bool usesFeatureParserASTGen(Decl *decl) {
   return false;
 }
 
-static bool usesFeatureASTGenTypes(Decl *decl) {
-  return false;
-}
-
 static bool usesFeatureBuiltinMacros(Decl *decl) {
   return false;
 }

lib/ASTGen/Sources/ASTGen/ParameterClause.swift

@@ -31,6 +31,8 @@ fileprivate protocol ValueParameterSyntax: SyntaxProtocol {
   // FIXME: Rename once we support covariant witnesses.
   var optionalType: TypeSyntax? { get }
 
+  var ellipsis: TokenSyntax? { get }
+
   var defaultValue: InitializerClauseSyntax? { get }
 }
 
@@ -52,6 +54,10 @@ extension EnumCaseParameterSyntax: ValueParameterSyntax {
   fileprivate var optionalType: TypeSyntax? {
     type
   }
+
+  fileprivate var ellipsis: TokenSyntax? {
+    nil
+  }
 }
 
 extension ASTGenVisitor {
@@ -77,6 +83,15 @@ extension ASTGenVisitor {
 
     let (secondName, secondNameLoc) = node.secondName.bridgedIdentifierAndSourceLoc(in: self)
 
+    var type = self.generate(node.optionalType)
+    if let ellipsis = node.ellipsis, let base = type {
+      type = BridgedVarargTypeRepr.createParsed(
+        self.ctx,
+        base: base,
+        ellipsisLoc: ellipsis.bridgedSourceLoc(in: self)
+      )
+    }
+
     return .createParsed(
       self.ctx,
       declContext: self.declContext,
@@ -85,7 +100,7 @@ extension ASTGenVisitor {
       firstNameLoc: node.optionalFirstName.bridgedSourceLoc(in: self),
       secondName: secondName,
       secondNameLoc: secondNameLoc,
-      type: self.generate(node.optionalType).asNullable,
+      type: type.asNullable,
       defaultValue: self.generate(node.defaultValue?.value).asNullable
     )
   }

test/ASTGen/types.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -enable-experimental-feature ASTGenTypes
+// RUN: %target-typecheck-verify-swift -enable-experimental-feature ParserASTGen
 
 // -enable-experimental-feature requires an asserts build
 // REQUIRES: asserts

test/ASTGen/verify-parse.swift

@@ -5,7 +5,6 @@
 // RUN: %diff -u %t/astgen.ast %t/cpp-parser.ast
 
 // RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking -enable-experimental-feature SwiftParser -enable-experimental-feature ParserASTGen)
-// RUN: %target-run-simple-swift(-Xfrontend -disable-availability-checking -enable-experimental-feature ASTGenTypes)
 
 // REQUIRES: executable_test