ASTBridging: Bridge swift::GenericTypeParamKind directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -24,6 +24,7 @@
 #include "swift/AST/AttrKind.h"
 #include "swift/AST/DiagnosticKind.h"
 #include "swift/AST/DiagnosticList.h"
+#include "swift/AST/GenericTypeParamKind.h"
 #include "swift/AST/LayoutConstraintKind.h"
 #include "swift/Basic/BasicBridging.h"
 
@@ -2928,15 +2929,6 @@ BridgedRequirementRepr BridgedRequirementRepr_createLayoutConstraint(
     BridgedLayoutConstraint cLayout, BridgedSourceLoc cLayoutLoc,
     bool isExpansionPattern);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedGenericTypeParamKind : size_t {
-  /// A regular generic type parameter: 'T'
-  BridgedGenericTypeParamKindType = 0,
-  /// A generic parameter pack: 'each T'
-  BridgedGenericTypeParamKindPack,
-  /// A generic value parameter: 'let T'
-  BridgedGenericTypeParamKindValue,
-};
-
 SWIFT_NAME("BridgedGenericParamList.createParsed(_:leftAngleLoc:parameters:"
            "genericWhereClause:rightAngleLoc:)")
 BridgedGenericParamList BridgedGenericParamList_createParsed(
@@ -2952,7 +2944,7 @@ BridgedGenericTypeParamDecl BridgedGenericTypeParamDecl_createParsed(
     BridgedASTContext cContext, BridgedDeclContext cDeclContext,
     BridgedSourceLoc cSpecifierLoc, BridgedIdentifier cName,
     BridgedSourceLoc cNameLoc, BridgedNullableTypeRepr opaqueInheritedType,
-    size_t index, BridgedGenericTypeParamKind paramKind);
+    size_t index, swift::GenericTypeParamKind paramKind);
 
 SWIFT_NAME(
     "BridgedTrailingWhereClause.createParsed(_:whereKeywordLoc:requirements:)")

include/swift/AST/GenericTypeParamKind.h

@@ -2,31 +2,36 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2024 - 2025 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See https://swift.org/LICENSE.txt for license information
 // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 //===----------------------------------------------------------------------===//
-//
-// This file defines the GenericTypeParamKind enum.
-//
+///
+/// This file defines the `GenericTypeParamKind` enum.
+///
 //===----------------------------------------------------------------------===//
 
 #ifndef SWIFT_AST_GENERICTYPEPARAMKIND_H
 #define SWIFT_AST_GENERICTYPEPARAMKIND_H
 
+/// This header is included in a bridging header. Be *very* careful with what
+/// you include here! See include caveats in `ASTBridging.h`.
+#include "swift/Basic/SwiftBridging.h"
+#include <stdint.h>
+
 namespace swift {
 /// Describes the kind of a generic type parameter that occurs within generic
 /// parameter lists.
-enum class GenericTypeParamKind: uint8_t {
+enum class ENUM_EXTENSIBILITY_ATTR(closed) GenericTypeParamKind : uint8_t {
   /// A regular generic type parameter: 'T'
-  Type,
+  Type SWIFT_NAME("type"),
   /// A generic parameter pack: 'each T'
-  Pack,
+  Pack SWIFT_NAME("pack"),
   /// A generic value parameter: 'let T'
-  Value
+  Value SWIFT_NAME("value")
 };
 
 } // namespace swift

lib/AST/Bridging/GenericsBridging.cpp

@@ -46,23 +46,9 @@ BridgedGenericTypeParamDecl BridgedGenericTypeParamDecl_createParsed(
     BridgedASTContext cContext, BridgedDeclContext cDeclContext,
     BridgedSourceLoc cSpecifierLoc, BridgedIdentifier cName,
     BridgedSourceLoc cNameLoc, BridgedNullableTypeRepr bridgedInheritedType,
-    size_t index, BridgedGenericTypeParamKind cParamKind) {
+    size_t index, swift::GenericTypeParamKind paramKind) {
   auto specifierLoc = cSpecifierLoc.unbridged();
 
-  GenericTypeParamKind paramKind;
-
-  switch (cParamKind) {
-  case BridgedGenericTypeParamKindType:
-    paramKind = GenericTypeParamKind::Type;
-    break;
-  case BridgedGenericTypeParamKindPack:
-    paramKind = GenericTypeParamKind::Pack;
-    break;
-  case BridgedGenericTypeParamKindValue:
-    paramKind = GenericTypeParamKind::Value;
-    break;
-  }
-
   auto *decl = GenericTypeParamDecl::createParsed(
       cDeclContext.unbridged(), cName.unbridged(), cNameLoc.unbridged(),
       specifierLoc, index, paramKind);

lib/ASTGen/Sources/ASTGen/Generics.swift

@@ -41,13 +41,14 @@ extension ASTGenVisitor {
       preconditionFailure("Node not part of the parent?")
     }
 
-    var paramKind: BridgedGenericTypeParamKind = .type
-
-    if node.specifier?.tokenKind == .keyword(.each) {
-      paramKind = .pack
-    } else if node.specifier?.tokenKind == .keyword(.let) {
-      paramKind = .value
-    }
+    let paramKind: swift.GenericTypeParamKind =
+      if node.specifier?.tokenKind == .keyword(.each) {
+        .pack
+      } else if node.specifier?.tokenKind == .keyword(.let) {
+        .value
+      } else {
+        .type
+      }
 
     return .createParsed(
       self.ctx,