ASTBridging: Bridge swift::DeclAttrKind directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -21,6 +21,7 @@
 //
 
 #include "swift/AST/AccessorKind.h"
+#include "swift/AST/AttrKind.h"
 #include "swift/AST/DiagnosticKind.h"
 #include "swift/AST/DiagnosticList.h"
 #include "swift/Basic/BasicBridging.h"
@@ -830,14 +831,11 @@ class BridgedParsedAutoDiffParameter {
 // MARK: DeclAttributes
 //===----------------------------------------------------------------------===//
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedDeclAttrKind {
-#define DECL_ATTR(_, CLASS, ...) BridgedDeclAttrKind##CLASS,
-#include "swift/AST/DeclAttr.def"
-  BridgedDeclAttrKindNone,
-};
+BRIDGED_OPTIONAL(swift::DeclAttrKind, DeclAttrKind)
 
-SWIFT_NAME("BridgedDeclAttrKind.init(from:)")
-BridgedDeclAttrKind BridgedDeclAttrKind_fromString(BridgedStringRef cStr);
+SWIFT_NAME("BridgedOptionalDeclAttrKind.init(from:)")
+BridgedOptionalDeclAttrKind
+BridgedOptionalDeclAttrKind_fromString(BridgedStringRef cStr);
 
 struct BridgedDeclAttributes {
   BridgedNullableDeclAttribute chain;
@@ -850,18 +848,18 @@ struct BridgedDeclAttributes {
 };
 
 SWIFT_NAME("BridgedDeclAttribute.shouldBeRejectedByParser(_:)")
-bool BridgedDeclAttribute_shouldBeRejectedByParser(BridgedDeclAttrKind cKind);
+bool BridgedDeclAttribute_shouldBeRejectedByParser(swift::DeclAttrKind kind);
 
 SWIFT_NAME("BridgedDeclAttribute.isDeclModifier(_:)")
-bool BridgedDeclAttribute_isDeclModifier(BridgedDeclAttrKind cKind);
+bool BridgedDeclAttribute_isDeclModifier(swift::DeclAttrKind kind);
 
 SWIFT_NAME("BridgedDeclAttributes.add(self:_:)")
 void BridgedDeclAttributes_add(BridgedDeclAttributes *_Nonnull attrs,
                                BridgedDeclAttribute add);
 
 SWIFT_NAME("BridgedDeclAttribute.createSimple(_:kind:atLoc:nameLoc:)")
 BridgedDeclAttribute BridgedDeclAttribute_createSimple(
-    BridgedASTContext cContext, BridgedDeclAttrKind cKind,
+    BridgedASTContext cContext, swift::DeclAttrKind kind,
     BridgedSourceLoc cAtLoc, BridgedSourceLoc cNameLoc);
 
 SWIFT_NAME("BridgedABIAttr.createParsed(_:atLoc:range:abiDecl:)")

include/swift/AST/Attr.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 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
@@ -106,7 +106,41 @@ class alignas(1 << AttrAlignInBits) AttributeBase
 class DeclAttributes;
 enum class DeclKind : uint8_t;
 
-  /// Represents one declaration attribute.
+enum : unsigned {
+  NumInlineKindBits =
+      countBitsUsed(static_cast<unsigned>(InlineKind::Last_InlineKind))
+};
+
+enum : unsigned {
+  NumEffectsKindBits =
+      countBitsUsed(static_cast<unsigned>(EffectsKind::Last_EffectsKind))
+};
+
+enum : unsigned {
+  NumExposureKindBits =
+      countBitsUsed(static_cast<unsigned>(ExposureKind::Last_ExposureKind))
+};
+
+enum : unsigned {
+  NumExternKindBits =
+      countBitsUsed(static_cast<unsigned>(ExternKind::Last_ExternKind))
+};
+
+enum : unsigned {
+  NumNonIsolatedModifierBits = countBitsUsed(
+      static_cast<unsigned>(NonIsolatedModifier::Last_NonIsolatedModifier))
+};
+
+enum : unsigned {
+  NumInheritActorContextKindBits = countBitsUsed(static_cast<unsigned>(
+      InheritActorContextModifier::Last_InheritActorContextKind))
+};
+
+enum : unsigned { NumDeclAttrKindBits = countBitsUsed(NumDeclAttrKinds - 1) };
+
+enum : unsigned { NumTypeAttrKindBits = countBitsUsed(NumTypeAttrKinds - 1) };
+
+/// Represents one declaration attribute.
 class DeclAttribute : public AttributeBase {
   friend class DeclAttributes;
 
@@ -3466,6 +3500,9 @@ class ABIAttr : public DeclAttribute {
   }
 };
 
+/// The kind of unary operator, if any.
+enum class UnaryOperatorKind : uint8_t { None, Prefix, Postfix };
+
 /// Attributes that may be applied to declarations.
 class DeclAttributes {
   /// Linked list of declaration attributes.

include/swift/AST/AttrKind.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 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
@@ -17,10 +17,14 @@
 #ifndef SWIFT_ATTRKIND_H
 #define SWIFT_ATTRKIND_H
 
-#include "swift/Basic/InlineBitfield.h"
-#include "swift/Basic/LLVM.h"
-#include "swift/Config.h"
-#include "llvm/Support/DataTypes.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 llvm {
+class StringRef;
+}
 
 namespace swift {
 
@@ -41,14 +45,8 @@ enum class Associativity : uint8_t {
 };
 
 /// Returns the in-source spelling of the given associativity.
-StringRef getAssociativitySpelling(Associativity value);
-
-/// The kind of unary operator, if any.
-enum class UnaryOperatorKind : uint8_t {
-  None,
-  Prefix,
-  Postfix
-};
+SWIFT_UNAVAILABLE("Unavailable in Swift")
+llvm::StringRef getAssociativitySpelling(Associativity value);
 
 /// Access control levels.
 // These are used in diagnostics and with < and similar operations,
@@ -74,18 +72,15 @@ enum class AccessLevel : uint8_t {
 };
 
 /// Returns the in-source spelling of the given access level.
-StringRef getAccessLevelSpelling(AccessLevel value);
+SWIFT_UNAVAILABLE("Unavailable in Swift")
+llvm::StringRef getAccessLevelSpelling(AccessLevel value);
 
 enum class InlineKind : uint8_t {
   Never = 0,
   Always = 1,
   Last_InlineKind = Always
 };
 
-enum : unsigned { NumInlineKindBits =
-  countBitsUsed(static_cast<unsigned>(InlineKind::Last_InlineKind)) };
-
-
 /// This enum represents the possible values of the @_effects attribute.
 /// These values are ordered from the strongest guarantee to the weakest,
 /// so please do not reorder existing values.
@@ -99,19 +94,9 @@ enum class EffectsKind : uint8_t {
   Last_EffectsKind = Unspecified
 };
 
-enum : unsigned { NumEffectsKindBits =
-  countBitsUsed(static_cast<unsigned>(EffectsKind::Last_EffectsKind)) };
-
 /// This enum represents the possible values of the @_expose attribute.
-enum class ExposureKind: uint8_t {
-  Cxx,
-  Wasm,
-  Last_ExposureKind = Wasm
-};
+enum class ExposureKind : uint8_t { Cxx, Wasm, Last_ExposureKind = Wasm };
 
-enum : unsigned { NumExposureKindBits =
-  countBitsUsed(static_cast<unsigned>(ExposureKind::Last_ExposureKind)) };
-  
 /// This enum represents the possible values of the @_extern attribute.
 enum class ExternKind: uint8_t {
   /// Reference an externally defined C function.
@@ -127,21 +112,13 @@ enum class ExternKind: uint8_t {
   Last_ExternKind = Wasm
 };
 
-enum : unsigned { NumExternKindBits =
-  countBitsUsed(static_cast<unsigned>(ExternKind::Last_ExternKind)) };
-
 enum class NonIsolatedModifier : uint8_t {
   None = 0,
   Unsafe,
   NonSending,
   Last_NonIsolatedModifier = NonSending
 };
 
-enum : unsigned {
-  NumNonIsolatedModifierBits = countBitsUsed(
-      static_cast<unsigned>(NonIsolatedModifier::Last_NonIsolatedModifier))
-};
-
 enum class InheritActorContextModifier : uint8_t {
   /// Inherit the actor execution context if the isolated parameter was
   /// captured by the closure, context is nonisolated or isolated to a
@@ -153,22 +130,17 @@ enum class InheritActorContextModifier : uint8_t {
   Last_InheritActorContextKind = Always
 };
 
-enum : unsigned {
-  NumInheritActorContextKindBits = countBitsUsed(static_cast<unsigned>(
-      InheritActorContextModifier::Last_InheritActorContextKind))
-};
-
-enum class DeclAttrKind : unsigned {
+enum class ENUM_EXTENSIBILITY_ATTR(closed) DeclAttrKind : unsigned {
 #define DECL_ATTR(_, CLASS, ...) CLASS,
 #define LAST_DECL_ATTR(CLASS) Last_DeclAttr = CLASS,
 #include "swift/AST/DeclAttr.def"
 };
 
-StringRef getDeclAttrKindID(DeclAttrKind kind);
+SWIFT_UNAVAILABLE("Unavailable in Swift")
+llvm::StringRef getDeclAttrKindID(DeclAttrKind kind);
 
 enum : unsigned {
-  NumDeclAttrKinds = static_cast<unsigned>(DeclAttrKind::Last_DeclAttr) + 1,
-  NumDeclAttrKindBits = countBitsUsed(NumDeclAttrKinds - 1),
+  NumDeclAttrKinds = static_cast<unsigned>(DeclAttrKind::Last_DeclAttr) + 1
 };
 
 // Define enumerators for each type attribute, e.g. TypeAttrKind::Weak.
@@ -179,8 +151,7 @@ enum class TypeAttrKind {
 };
 
 enum : unsigned {
-  NumTypeAttrKinds = static_cast<unsigned>(TypeAttrKind::Last_TypeAttr) + 1,
-  NumTypeAttrKindBits = countBitsUsed(NumTypeAttrKinds - 1),
+  NumTypeAttrKinds = static_cast<unsigned>(TypeAttrKind::Last_TypeAttr) + 1
 };
 
 } // end namespace swift

include/swift/AST/KnownProtocols.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 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
@@ -14,6 +14,7 @@
 #define SWIFT_AST_KNOWNPROTOCOLS_H
 
 #include "swift/ABI/InvertibleProtocols.h"
+#include "swift/Basic/InlineBitfield.h"
 #include "swift/Config.h"
 
 namespace llvm {

include/swift/AST/Type.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 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
@@ -26,6 +26,7 @@
 #include "swift/Basic/ArrayRefView.h"
 #include "swift/Basic/Compiler.h"
 #include "swift/Basic/Debug.h"
+#include "swift/Basic/InlineBitfield.h"
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/OptionSet.h"
 #include "llvm/ADT/DenseMap.h"

include/swift/Basic/BasicBridging.h

@@ -55,13 +55,6 @@
 #include <vector>
 #endif
 
-#if __has_attribute(availability)
-#define SWIFT_UNAVAILABLE(msg) \
-  __attribute__((availability(swift, unavailable, message=msg)))
-#else
-#define SWIFT_UNAVAILABLE(msg)
-#endif
-
 #ifdef PURE_BRIDGING_MODE
 // In PURE_BRIDGING_MODE, briding functions are not inlined
 #define BRIDGED_INLINE

include/swift/Basic/SwiftBridging.h

@@ -89,5 +89,12 @@
 #define SWIFT_NAME(_name)
 #endif
 
+#if __has_attribute(availability)
+#define SWIFT_UNAVAILABLE(msg)                                                 \
+  __attribute__((availability(swift, unavailable, message = msg)))
+#else
+#define SWIFT_UNAVAILABLE(msg)
+#endif
+
 #endif // SWIFT_BASIC_SWIFT_BRIDGING_H
 

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -68,51 +68,28 @@ ParsedAutoDiffParameter BridgedParsedAutoDiffParameter::unbridged() const {
   }
 #include "swift/AST/DeclAttr.def"
 
-BridgedDeclAttrKind BridgedDeclAttrKind_fromString(BridgedStringRef cStr) {
+BridgedOptionalDeclAttrKind
+BridgedOptionalDeclAttrKind_fromString(BridgedStringRef cStr) {
   auto optKind = DeclAttribute::getAttrKindFromString(cStr.unbridged());
-  if (!optKind)
-    return BridgedDeclAttrKindNone;
-  switch (*optKind) {
-#define DECL_ATTR(_, CLASS, ...)                                               \
-  case DeclAttrKind::CLASS:                                                    \
-    return BridgedDeclAttrKind##CLASS;
-#include "swift/AST/DeclAttr.def"
-  }
-}
-
-std::optional<DeclAttrKind> unbridged(BridgedDeclAttrKind kind) {
-  switch (kind) {
-#define DECL_ATTR(_, CLASS, ...)                                               \
-  case BridgedDeclAttrKind##CLASS:                                             \
-    return DeclAttrKind::CLASS;
-#include "swift/AST/DeclAttr.def"
-  case BridgedDeclAttrKindNone:
-    return std::nullopt;
+  if (!optKind) {
+    return BridgedOptionalDeclAttrKind();
   }
-  llvm_unreachable("unhandled enum value");
+  return *optKind;
 }
 
 BridgedDeclAttribute BridgedDeclAttribute_createSimple(
-    BridgedASTContext cContext, BridgedDeclAttrKind cKind,
+    BridgedASTContext cContext, swift::DeclAttrKind kind,
     BridgedSourceLoc cAtLoc, BridgedSourceLoc cAttrLoc) {
-  auto optKind = unbridged(cKind);
-  assert(optKind && "creating attribute of invalid kind?");
-  return DeclAttribute::createSimple(cContext.unbridged(), *optKind,
+  return DeclAttribute::createSimple(cContext.unbridged(), kind,
                                      cAtLoc.unbridged(), cAttrLoc.unbridged());
 }
 
-bool BridgedDeclAttribute_shouldBeRejectedByParser(BridgedDeclAttrKind cKind) {
-  auto optKind = unbridged(cKind);
-  if (!optKind)
-    return false;
-  return DeclAttribute::shouldBeRejectedByParser(*optKind);
+bool BridgedDeclAttribute_shouldBeRejectedByParser(swift::DeclAttrKind kind) {
+  return DeclAttribute::shouldBeRejectedByParser(kind);
 }
 
-bool BridgedDeclAttribute_isDeclModifier(BridgedDeclAttrKind cKind) {
-  auto optKind = unbridged(cKind);
-  if (!optKind)
-    return false;
-  return DeclAttribute::isDeclModifier(*optKind);
+bool BridgedDeclAttribute_isDeclModifier(swift::DeclAttrKind kind) {
+  return DeclAttribute::isDeclModifier(kind);
 }
 
 void BridgedDeclAttributes_add(BridgedDeclAttributes *cAttrs,