Merge pull request swiftlang#79438 from rintaro/astgen-static-var

[ASTGen] Correctly store static spelling and location to PBD

Author: rintaro

include/swift/AST/ASTBridging.h

@@ -1286,13 +1286,20 @@ BridgedAccessorDecl BridgedAccessorDecl_createParsed(
     BridgedNullableParameterList cParamList, BridgedSourceLoc cAsyncLoc,
     BridgedSourceLoc cThrowsLoc, BridgedNullableTypeRepr cThrownType);
 
-SWIFT_NAME(
-    "BridgedPatternBindingDecl.createParsed(_:declContext:bindingKeywordLoc:"
-    "entries:attributes:isStatic:isLet:)")
+enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedVarDeclIntroducer {
+  BridgedVarDeclIntroducerLet = 0,
+  BridgedVarDeclIntroducerVar = 1,
+  BridgedVarDeclIntroducerInOut = 2,
+  BridgedVarDeclIntroducerBorrowing = 3,
+};
+
+SWIFT_NAME("BridgedPatternBindingDecl.createParsed(_:declContext:attributes:"
+           "staticLoc:staticSpelling:introducerLoc:introducer:entries:)")
 BridgedPatternBindingDecl BridgedPatternBindingDecl_createParsed(
     BridgedASTContext cContext, BridgedDeclContext cDeclContext,
-    BridgedSourceLoc cBindingKeywordLoc, BridgedArrayRef cBindingEntries, BridgedDeclAttributes cAttrs,
-                                                                 bool isStatic, bool isLet);
+    BridgedDeclAttributes cAttrs, BridgedSourceLoc cStaticLoc,
+    BridgedStaticSpelling cStaticSpelling, BridgedSourceLoc cIntroducerLoc,
+    BridgedVarDeclIntroducer cIntorducer, BridgedArrayRef cBindingEntries);
 
 SWIFT_NAME("BridgedParamDecl.createParsed(_:declContext:specifierLoc:argName:"
            "argNameLoc:paramName:paramNameLoc:type:defaultValue:)")

lib/AST/Bridging/DeclBridging.cpp

@@ -141,13 +141,33 @@ BridgedAccessorDecl BridgedAccessorDecl_createParsed(
       cThrownType.unbridged(), cDeclContext.unbridged());
 }
 
+static VarDecl::Introducer unbridged(BridgedVarDeclIntroducer introducer) {
+  switch (introducer) {
+  case BridgedVarDeclIntroducerLet:
+    return swift::VarDecl::Introducer::Let;
+  case BridgedVarDeclIntroducerVar:
+    return swift::VarDecl::Introducer::Var;
+  case BridgedVarDeclIntroducerInOut:
+    return swift::VarDecl::Introducer::InOut;
+  case BridgedVarDeclIntroducerBorrowing:
+    return swift::VarDecl::Introducer::Borrowing;
+  }
+  llvm_unreachable("unhandled enum value");
+}
+
 BridgedPatternBindingDecl BridgedPatternBindingDecl_createParsed(
     BridgedASTContext cContext, BridgedDeclContext cDeclContext,
-    BridgedSourceLoc cBindingKeywordLoc, BridgedArrayRef cBindingEntries, BridgedDeclAttributes cAttrs, bool isStatic, bool isLet) {
+    BridgedDeclAttributes cAttrs, BridgedSourceLoc cStaticLoc,
+    BridgedStaticSpelling cStaticSpelling, BridgedSourceLoc cIntroducerLoc,
+    BridgedVarDeclIntroducer cIntroducer, BridgedArrayRef cBindingEntries) {
+
   ASTContext &context = cContext.unbridged();
   DeclContext *declContext = cDeclContext.unbridged();
 
-  auto introducer = isLet ? VarDecl::Introducer::Let : VarDecl::Introducer::Var;
+  auto introducer = unbridged(cIntroducer);
+  auto introducerLoc = cIntroducerLoc.unbridged();
+  auto staticSpelling = unbridged(cStaticSpelling);
+  auto staticLoc = cStaticLoc.unbridged();
 
   SmallVector<PatternBindingEntry, 4> entries;
   for (auto &entry : cBindingEntries.unbridged<BridgedPatternBindingEntry>()) {
@@ -156,7 +176,7 @@ BridgedPatternBindingDecl BridgedPatternBindingDecl_createParsed(
     // Configure all vars.
     pattern->forEachVariable([&](VarDecl *VD) {
       VD->attachParsedAttrs(cAttrs.unbridged());
-      VD->setStatic(isStatic);
+      VD->setStatic(staticLoc.isValid());
       VD->setIntroducer(introducer);
       VD->setTopLevelGlobal(isa<TopLevelCodeDecl>(declContext));
     });
@@ -165,12 +185,8 @@ BridgedPatternBindingDecl BridgedPatternBindingDecl_createParsed(
                          entry.init.unbridged(), entry.initContext.unbridged());
   }
 
-  return PatternBindingDecl::create(
-      context,
-      /*StaticLoc=*/SourceLoc(),
-      // FIXME: 'class' spelling kind.
-      isStatic ? StaticSpellingKind::KeywordStatic : StaticSpellingKind::None,
-      cBindingKeywordLoc.unbridged(), entries, declContext);
+  return PatternBindingDecl::create(context, staticLoc, staticSpelling,
+                                    introducerLoc, entries, declContext);
 }
 
 BridgedParamDecl BridgedParamDecl_createParsed(

lib/ASTGen/Sources/ASTGen/Decls.swift

@@ -574,7 +574,18 @@ extension ASTGenVisitor {
 
   func generate(variableDecl node: VariableDeclSyntax) -> BridgedDecl {
     let attrs = self.generateDeclAttributes(node, allowStatic: true)
-    let isLet = node.bindingSpecifier.keywordKind == .let
+    let introducer: BridgedVarDeclIntroducer
+    switch node.bindingSpecifier.rawText {
+    case "let":
+      introducer = .let
+    case "var":
+      introducer = .var
+    case "inout":
+      introducer = .inOut
+    default:
+      // TODO: Diagnostics
+      fatalError("invalid pattern binding introducer")
+    }
     let topLevelDecl: BridgedTopLevelCodeDecl?
     if self.declContext.isModuleScopeContext, self.declContext.parentSourceFile.isScriptMode {
       topLevelDecl = BridgedTopLevelCodeDecl.create(self.ctx, declContext: self.declContext)
@@ -585,11 +596,12 @@ extension ASTGenVisitor {
     let decl = BridgedPatternBindingDecl.createParsed(
       self.ctx,
       declContext: topLevelDecl?.asDeclContext ?? self.declContext,
-      bindingKeywordLoc: self.generateSourceLoc(node.bindingSpecifier),
-      entries: self.generateBindingEntries(for: node, attrs: attrs, topLevelDecl: topLevelDecl),
       attributes: attrs.attributes,
-      isStatic: attrs.staticLoc.isValid,
-      isLet: isLet
+      staticLoc: attrs.staticLoc,
+      staticSpelling: attrs.staticSpelling,
+      introducerLoc: self.generateSourceLoc(node.bindingSpecifier),
+      introducer: introducer,
+      entries: self.generateBindingEntries(for: node, attrs: attrs, topLevelDecl: topLevelDecl)
     )
     if let topLevelDecl {
       let range = self.generateImplicitBraceRange(node)

test/ASTGen/decls.swift

@@ -301,3 +301,8 @@ func testMagicIdentifier(file: String = #file, line: Int = #line) {
     let _: String = file
     let _: Int = line
 }
+
+class StaticTest {
+  class var classVar: Int { 42 }
+  static let staticVar = 42
+}