Merge remote-tracking branch 'upstream/main'

Author: MAJKFL

BUILD.bazel

@@ -83,6 +83,42 @@ swift_syntax_test(
     ],
 )
 
+swift_syntax_library(
+    name = "SwiftIfConfig",
+    deps = [
+        ":SwiftDiagnostics",
+        ":SwiftOperators",
+        ":SwiftSyntax",
+        ":SwiftSyntaxBuilder",
+    ],
+)
+
+swift_syntax_test(
+    name = "SwiftIfConfigTest",
+    deps = [
+        ":SwiftIfConfig",
+        ":SwiftParser",
+        ":SwiftSyntaxMacrosGenericTestSupport",
+        ":_SwiftSyntaxTestSupport",
+    ],
+)
+
+swift_syntax_library(
+    name = "SwiftLexicalLookup",
+    deps = [
+        ":SwiftIfConfig",
+        ":SwiftSyntax",
+    ],
+)
+
+swift_syntax_test(
+    name = "SwiftLexicalLookupTest",
+    deps = [
+        ":SwiftLexicalLookup",
+        ":_SwiftSyntaxTestSupport",
+    ],
+)
+
 swift_syntax_library(
     name = "SwiftLibraryPluginProvider",
     deps = [
@@ -196,6 +232,13 @@ swift_syntax_library(
     ],
 )
 
+swift_syntax_library(
+    name = "SwiftSyntax601",
+    srcs = glob(["Sources/VersionMarkerModules/SwiftSyntax601/**/*.swift"]),
+    deps = [
+    ],
+)
+
 swift_syntax_library(
     name = "SwiftSyntaxBuilder",
     deps = [

CMakeLists.txt

@@ -44,15 +44,11 @@ option(SWIFT_SYNTAX_ENABLE_WMO_PRE_3_26
 include(AddSwiftHostLibrary)
 include(SwiftCompilerCapability)
 
-# Don't link with 'string-processing' and 'backtracing'.
+# Don't link with 'string-processing'
 swift_supports_implicit_module("string-processing" SWIFT_SUPPORTS_DISABLE_IMPLICIT_STRING_PROCESSING_MODULE_IMPORT)
-swift_supports_implicit_module("backtracing" SWIFT_SUPPORTS_DISABLE_IMPLICIT_BACKTRACING_MODULE_IMPORT)
 if(SWIFT_SUPPORTS_DISABLE_IMPLICIT_STRING_PROCESSING_MODULE_IMPORT)
   add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-string-processing-module-import>")
 endif()
-if(SWIFT_SUPPORTS_DISABLE_IMPLICIT_BACKTRACING_MODULE_IMPORT)
-  add_compile_options("$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xfrontend -disable-implicit-backtracing-module-import>")
-endif()
 
 if(NOT DEFINED Swift_COMPILER_PACKAGE_CMO_SUPPORT AND SWIFTSYNTAX_EMIT_MODULE)
   swift_get_package_cmo_support(Swift_COMPILER_PACKAGE_CMO_SUPPORT)

CONTRIBUTING.md

@@ -84,11 +84,13 @@ Once you've pushed your branch, you should see an option on this repository's pa
 > [!TIP]
 > If you are stuck, it’s encouraged to submit a PR that describes the issue you’re having, e.g. if there are tests that are failing, build failures you can’t resolve, or if you have architectural questions. We’re happy to work with you to resolve those issue.
 
-## Opening a PR for Release Branch
+### Opening a PR for Release Branch
 
-See the [dedicated section][section] on the Swift project website.
+See the [dedicated section](https://www.swift.org/contributing/#release-branch-pull-requests) on the Swift project website.
 
-[section]: https://www.swift.org/contributing/#release-branch-pull-requests
+## Changing public API
+
+If you are modifying public API, request feedback for these changes from the community by opening a RFC as described by the [RFC Process](Contributor%20Documentation/RFC%20Process.md).
 
 ## Review and CI Testing
 

CodeGeneration/Sources/SyntaxSupport/AttributeNodes.swift

@@ -139,6 +139,11 @@ public let ATTRIBUTE_NODES: [Node] = [
             name: "documentationArguments",
             kind: .node(kind: .documentationAttributeArgumentList)
           ),
+          Child(
+            name: "abiArguments",
+            kind: .node(kind: .abiAttributeArguments),
+            experimentalFeature: .abiAttribute
+          ),
         ]),
         documentation: """
           The arguments of the attribute.
@@ -267,6 +272,30 @@ public let ATTRIBUTE_NODES: [Node] = [
     ]
   ),
 
+  Node(
+    kind: .abiAttributeArguments,
+    base: .syntax,
+    experimentalFeature: .abiAttribute,
+    nameForDiagnostics: "ABI-providing declaration",
+    documentation: "The arguments of the '@abi' attribute",
+    children: [
+      Child(
+        name: "provider",
+        kind: .nodeChoices(choices: [
+          Child(name: "associatedType", kind: .node(kind: .associatedTypeDecl)),
+          Child(name: "deinitializer", kind: .node(kind: .deinitializerDecl)),
+          Child(name: "enumCase", kind: .node(kind: .enumCaseDecl)),
+          Child(name: "function", kind: .node(kind: .functionDecl)),
+          Child(name: "initializer", kind: .node(kind: .initializerDecl)),
+          Child(name: "missing", kind: .node(kind: .missingDecl)),
+          Child(name: "subscript", kind: .node(kind: .subscriptDecl)),
+          Child(name: "typeAlias", kind: .node(kind: .typeAliasDecl)),
+          Child(name: "variable", kind: .node(kind: .variableDecl)),
+        ])
+      )
+    ]
+  ),
+
   Node(
     kind: .conventionAttributeArguments,
     base: .syntax,
@@ -356,7 +385,7 @@ public let ATTRIBUTE_NODES: [Node] = [
       ),
       Child(
         name: "accessorSpecifier",
-        kind: .token(choices: [.keyword(.get), .keyword(.set)]),
+        kind: .token(choices: [.keyword(.get), .keyword(.set), .keyword(._modify)]),
         documentation: "The accessor name.",
         isOptional: true
       ),

CodeGeneration/Sources/SyntaxSupport/Child.swift

@@ -93,6 +93,9 @@ public class Child: NodeChoiceConvertible {
   /// Whether this child is optional and can be `nil`.
   public let isOptional: Bool
 
+  /// Whether this child provides a default value when used as a parameter in a function.
+  public let providesDefaultInitialization: Bool
+
   public let experimentalFeature: ExperimentalFeature?
 
   /// A name of this child that can be shown in diagnostics.
@@ -303,6 +306,7 @@ public class Child: NodeChoiceConvertible {
     nameForDiagnostics: String? = nil,
     documentation: String? = nil,
     isOptional: Bool = false,
+    providesDefaultInitialization: Bool = true,
     newerChildPath: [Child] = []
   ) {
     precondition(name.first?.isLowercase ?? true, "The first letter of a child’s name should be lowercase")
@@ -314,6 +318,7 @@ public class Child: NodeChoiceConvertible {
     self.documentationSummary = SwiftSyntax.Trivia.docCommentTrivia(from: documentation)
     self.documentationAbstract = String(documentation?.split(whereSeparator: \.isNewline).first ?? "")
     self.isOptional = isOptional
+    self.providesDefaultInitialization = providesDefaultInitialization
   }
 
   /// Create a node that is a copy of the last node in `newerChildPath`, but
@@ -329,6 +334,7 @@ public class Child: NodeChoiceConvertible {
     self.documentationSummary = other.documentationSummary
     self.documentationAbstract = other.documentationAbstract
     self.isOptional = other.isOptional
+    self.providesDefaultInitialization = other.providesDefaultInitialization
   }
 
   /// Create a child for the unexpected nodes between two children (either or
@@ -353,6 +359,7 @@ public class Child: NodeChoiceConvertible {
       nameForDiagnostics: nil,
       documentation: nil,
       isOptional: true,
+      providesDefaultInitialization: true,
       newerChildPath: newerChildPath
     )
   }

CodeGeneration/Sources/SyntaxSupport/ExperimentalFeatures.swift

@@ -20,6 +20,8 @@ public enum ExperimentalFeature: String, CaseIterable {
   case trailingComma
   case coroutineAccessors
   case valueGenerics
+  case abiAttribute
+  case unsafeExpression
 
   /// The name of the feature as it is written in the compiler's `Features.def` file.
   public var featureName: String {
@@ -38,6 +40,10 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "CoroutineAccessors"
     case .valueGenerics:
       return "ValueGenerics"
+    case .abiAttribute:
+      return "ABIAttribute"
+    case .unsafeExpression:
+      return "WarnUnsafe"
     }
   }
 
@@ -58,6 +64,10 @@ public enum ExperimentalFeature: String, CaseIterable {
       return "coroutine accessors"
     case .valueGenerics:
       return "value generics"
+    case .abiAttribute:
+      return "@abi attribute"
+    case .unsafeExpression:
+      return "'unsafe' expression"
     }
   }
 

CodeGeneration/Sources/SyntaxSupport/ExprNodes.swift

@@ -180,6 +180,23 @@ public let EXPR_NODES: [Node] = [
     ]
   ),
 
+  Node(
+    kind: .unsafeExpr,
+    base: .expr,
+    experimentalFeature: .unsafeExpression,
+    nameForDiagnostics: "'unsafe' expression",
+    children: [
+      Child(
+        name: "unsafeKeyword",
+        kind: .token(choices: [.keyword(.unsafe)])
+      ),
+      Child(
+        name: "expression",
+        kind: .node(kind: .expr)
+      ),
+    ]
+  ),
+
   Node(
     kind: .binaryOperatorExpr,
     base: .expr,
@@ -944,7 +961,8 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "leftParen",
         kind: .token(choices: [.token(.leftParen)]),
-        isOptional: true
+        isOptional: true,
+        providesDefaultInitialization: false
       ),
       Child(
         name: "arguments",
@@ -954,7 +972,8 @@ public let EXPR_NODES: [Node] = [
       Child(
         name: "rightParen",
         kind: .token(choices: [.token(.rightParen)]),
-        isOptional: true
+        isOptional: true,
+        providesDefaultInitialization: false
       ),
       Child(
         name: "trailingClosure",

CodeGeneration/Sources/SyntaxSupport/KeywordSpec.swift

@@ -131,6 +131,7 @@ public enum Keyword: CaseIterable {
   case _underlyingVersion
   case _UnknownLayout
   case _version
+  case abi
   case accesses
   case actor
   case addressWithNativeOwner
@@ -405,6 +406,8 @@ public enum Keyword: CaseIterable {
       return KeywordSpec("_UnknownLayout")
     case ._version:
       return KeywordSpec("_version")
+    case .abi:
+      return KeywordSpec("abi", experimentalFeature: .abiAttribute)
     case .accesses:
       return KeywordSpec("accesses")
     case .actor:

CodeGeneration/Sources/SyntaxSupport/SyntaxNodeKind.swift

@@ -22,6 +22,7 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon
 
   case _canImportExpr
   case _canImportVersionInfo
+  case abiAttributeArguments
   case accessorBlock
   case accessorDecl
   case accessorDeclList
@@ -298,6 +299,7 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon
   case unresolvedAsExpr
   case unresolvedIsExpr
   case unresolvedTernaryExpr
+  case unsafeExpr
   case valueBindingPattern
   case variableDecl
   case versionComponent
@@ -340,14 +342,23 @@ public enum SyntaxNodeKind: String, CaseIterable, IdentifierConvertible, TypeCon
     return .identifier(rawValue)
   }
 
+  public var uppercasedFirstWordRawValue: String {
+    switch self {
+    case .abiAttributeArguments:
+      "ABIAttributeArguments"
+    default:
+      rawValue.withFirstCharacterUppercased
+    }
+  }
+
   public var syntaxType: TypeSyntax {
     switch self {
     case .syntax:
       return "Syntax"
     case .syntaxCollection:
       return "SyntaxCollection"
     default:
-      return "\(raw: rawValue.withFirstCharacterUppercased)Syntax"
+      return "\(raw: uppercasedFirstWordRawValue)Syntax"
     }
   }