ASTBridging: Bridge swift::AccessorKind directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2022 Apple Inc. and the Swift project authors
+// Copyright (c) 2022 - 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
@@ -19,6 +19,8 @@
 // Pure bridging mode does not permit including any C++/llvm/swift headers.
 // See also the comments for `BRIDGING_MODE` in the top-level CMakeLists.txt file.
 //
+
+#include "swift/AST/AccessorKind.h"
 #include "swift/AST/DiagnosticKind.h"
 #include "swift/Basic/BasicBridging.h"
 
@@ -524,13 +526,6 @@ struct BridgedPatternBindingEntry {
   BridgedNullablePatternBindingInitializer initContext;
 };
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedAccessorKind {
-#define ACCESSOR(ID) BridgedAccessorKind##ID,
-#include "swift/AST/AccessorKinds.def"
-};
-
-swift::AccessorKind unbridged(BridgedAccessorKind kind);
-
 //===----------------------------------------------------------------------===//
 // MARK: Diagnostic Engine
 //===----------------------------------------------------------------------===//
@@ -971,7 +966,7 @@ BridgedDerivativeAttr BridgedDerivativeAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedNullableTypeRepr cBaseType,
     BridgedDeclNameRef cOriginalName, BridgedDeclNameLoc cOriginalNameLoc,
-    BridgedAccessorKind cAccessorKind, BridgedArrayRef cParams);
+    swift::AccessorKind AccessorKind, BridgedArrayRef cParams);
 
 SWIFT_NAME("BridgedDerivativeAttr.createParsed(_:atLoc:range:baseType:"
            "originalName:originalNameLoc:params:)")
@@ -1450,7 +1445,7 @@ SWIFT_NAME("BridgedAccessorDecl.createParsed(_:declContext:kind:storage:"
            "throwsSpecifierLoc:thrownType:)")
 BridgedAccessorDecl BridgedAccessorDecl_createParsed(
     BridgedASTContext cContext, BridgedDeclContext cDeclContext,
-    BridgedAccessorKind cKind, BridgedAbstractStorageDecl cStorage,
+    swift::AccessorKind Kind, BridgedAbstractStorageDecl cStorage,
     BridgedSourceLoc cDeclLoc, BridgedSourceLoc cAccessorKeywordLoc,
     BridgedNullableParameterList cParamList, BridgedSourceLoc cAsyncLoc,
     BridgedSourceLoc cThrowsLoc, BridgedNullableTypeRepr cThrownType);

include/swift/AST/AccessorKind.h

@@ -0,0 +1,34 @@
+//===-- AST/AccessorKind.h --------------------------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_AST_ACCESSOR_KIND_H
+#define SWIFT_AST_ACCESSOR_KIND_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"
+
+namespace swift {
+
+// Note that the values of these enums line up with %select values in
+// diagnostics.
+enum class ENUM_EXTENSIBILITY_ATTR(closed) AccessorKind {
+#define ACCESSOR(ID, KEYWORD) ID SWIFT_NAME(#KEYWORD),
+#define LAST_ACCESSOR(ID) Last = ID
+#include "swift/AST/AccessorKinds.def"
+#undef ACCESSOR
+#undef LAST_ACCESSOR
+};
+
+} // namespace swift
+
+#endif // SWIFT_AST_ACCESSOR_KIND_H

include/swift/AST/AccessorKinds.def

@@ -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
@@ -20,22 +20,22 @@
 #error must define either ACCESSOR or ACCESSOR_KEYWORD
 #endif
 
-/// ACCESSOR(ID)
+/// ACCESSOR(ID, KEYWORD)
 ///   There is an accessor with the enumerator value AccessorKind::ID.
 #if !defined(ACCESSOR) && defined(ACCESSOR_KEYWORD)
-#define ACCESSOR(ID)
+#define ACCESSOR(ID, KEYWORD)
 #endif
 
 /// SINGLETON_ACCESSOR(ID, KEYWORD)
 ///   The given accessor has only one matching accessor keyword.
 ///
-/// Defaults to ACCESSOR(ID) or ACCESSOR_KEYWORD(KEYWORD), depending on which
-/// is defined.
+/// Defaults to ACCESSOR(ID, KEYWORD) or ACCESSOR_KEYWORD(KEYWORD), depending
+/// on which is defined.
 #ifndef SINGLETON_ACCESSOR
 #if defined(ACCESSOR_KEYWORD)
 #define SINGLETON_ACCESSOR(ID, KEYWORD) ACCESSOR_KEYWORD(KEYWORD)
 #else
-#define SINGLETON_ACCESSOR(ID, KEYWORD) ACCESSOR(ID)
+#define SINGLETON_ACCESSOR(ID, KEYWORD) ACCESSOR(ID, KEYWORD)
 #endif
 #endif
 

include/swift/AST/Decl.h

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2020 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
@@ -8629,7 +8629,7 @@ class AccessorDecl final : public FuncDecl {
     switch (getAccessorKind()) {
 #define OBSERVING_ACCESSOR(ID, KEYWORD) \
     case AccessorKind::ID: return true;
-#define ACCESSOR(ID) \
+#define ACCESSOR(ID, KEYWORD)                                                  \
     case AccessorKind::ID: return false;
 #include "swift/AST/AccessorKinds.def"
     }
@@ -8652,7 +8652,7 @@ class AccessorDecl final : public FuncDecl {
     switch (getAccessorKind()) {
 #define COROUTINE_ACCESSOR(ID, KEYWORD) \
     case AccessorKind::ID: return true;
-#define ACCESSOR(ID) \
+#define ACCESSOR(ID, KEYWORD)                                                  \
     case AccessorKind::ID: return false;
 #include "swift/AST/AccessorKinds.def"
     }

include/swift/AST/StorageImpl.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
@@ -18,6 +18,7 @@
 #ifndef SWIFT_STORAGEIMPL_H
 #define SWIFT_STORAGEIMPL_H
 
+#include "swift/AST/AccessorKind.h"
 #include "swift/Basic/Range.h"
 #include "llvm/ADT/StringRef.h"
 
@@ -47,16 +48,6 @@ enum class OpaqueReadOwnership : uint8_t {
   OwnedOrBorrowed
 };
 
-// Note that the values of these enums line up with %select values in
-// diagnostics.
-enum class AccessorKind {
-#define ACCESSOR(ID) ID,
-#define LAST_ACCESSOR(ID) Last = ID
-#include "swift/AST/AccessorKinds.def"
-#undef ACCESSOR
-#undef LAST_ACCESSOR
-};
-
 inline bool requiresFeatureCoroutineAccessors(AccessorKind kind) {
   switch (kind) {
   case AccessorKind::Read2:
@@ -144,7 +135,7 @@ static inline IntRange<AccessorKind> allAccessorKinds() {
 static inline llvm::StringRef accessorKindName(AccessorKind ak) {
   switch(ak) {
 
-#define ACCESSOR(ID) ID
+#define ACCESSOR(ID, KEYWORD) ID
 #define SINGLETON_ACCESSOR(ID, KEYWORD)                                        \
   case AccessorKind::ID:                                                       \
     return #KEYWORD;

lib/APIDigester/ModuleAnalyzerNodes.cpp

@@ -752,7 +752,7 @@ SDKNode* SDKNode::constructSDKNode(SDKContext &Ctx,
         AccessorKind unknownKind = (AccessorKind)((uint8_t)(AccessorKind::Last) + 1);
         Info.AccKind = llvm::StringSwitch<AccessorKind>(
           GetScalarString(Pair.getValue()))
-#define ACCESSOR(ID)
+#define ACCESSOR(ID, KEYWORD)
 #define SINGLETON_ACCESSOR(ID, KEYWORD) .Case(#KEYWORD, AccessorKind::ID)
 #include "swift/AST/AccessorKinds.def"
           .Default(unknownKind);
@@ -1165,8 +1165,9 @@ static StringRef getSimpleName(ValueDecl *VD) {
   }
   if (auto *AD = dyn_cast<AccessorDecl>(VD)) {
     switch(AD->getAccessorKind()) {
-#define ACCESSOR(ID) \
-case AccessorKind::ID: return #ID;
+#define ACCESSOR(ID, KEYWORD)                                                  \
+    case AccessorKind::ID:                                                     \
+      return #ID;
 #include "swift/AST/AccessorKinds.def"
     }
   }
@@ -2267,7 +2268,7 @@ struct ScalarEnumerationTraits<DeclKind> {
 template<>
 struct ScalarEnumerationTraits<AccessorKind> {
   static void enumeration(Output &out, AccessorKind &value) {
-#define ACCESSOR(ID)
+#define ACCESSOR(ID, KEYWORD)
 #define SINGLETON_ACCESSOR(ID, KEYWORD) \
   out.enumCase(value, #KEYWORD, AccessorKind::ID);
 #include "swift/AST/AccessorKinds.def"

lib/AST/ASTDumper.cpp

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2020 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
@@ -6748,7 +6748,7 @@ void GenericEnvironment::dump() const {
 
 StringRef swift::getAccessorKindString(AccessorKind value) {
   switch (value) {
-#define ACCESSOR(ID)
+#define ACCESSOR(ID, KEYWORD)
 #define SINGLETON_ACCESSOR(ID, KEYWORD) \
   case AccessorKind::ID: return #KEYWORD;
 #include "swift/AST/AccessorKinds.def"

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2022-2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2022-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
@@ -267,10 +267,7 @@ BridgedDerivativeAttr BridgedDerivativeAttr_createParsedImpl(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedNullableTypeRepr cBaseType,
     BridgedDeclNameRef cOriginalName, BridgedDeclNameLoc cOriginalNameLoc,
-    std::optional<BridgedAccessorKind> cAccessorKind, BridgedArrayRef cParams) {
-  std::optional<AccessorKind> accessorKind;
-  if (cAccessorKind)
-    accessorKind = unbridged(*cAccessorKind);
+    std::optional<swift::AccessorKind> AccessorKind, BridgedArrayRef cParams) {
   SmallVector<ParsedAutoDiffParameter, 2> params;
   for (auto &elem : cParams.unbridged<BridgedParsedAutoDiffParameter>())
     params.push_back(elem.unbridged());
@@ -280,18 +277,18 @@ BridgedDerivativeAttr BridgedDerivativeAttr_createParsedImpl(
                                 cRange.unbridged(), cBaseType.unbridged(),
                                 DeclNameRefWithLoc{cOriginalName.unbridged(),
                                                    cOriginalNameLoc.unbridged(),
-                                                   accessorKind},
+                                                   AccessorKind},
                                 params);
 }
 
 BridgedDerivativeAttr BridgedDerivativeAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedNullableTypeRepr cBaseType,
     BridgedDeclNameRef cOriginalName, BridgedDeclNameLoc cOriginalNameLoc,
-    BridgedAccessorKind cAccessorKind, BridgedArrayRef cParams) {
+    swift::AccessorKind AccessorKind, BridgedArrayRef cParams) {
   return BridgedDerivativeAttr_createParsedImpl(
       cContext, cAtLoc, cRange, cBaseType, cOriginalName, cOriginalNameLoc,
-      cAccessorKind, cParams);
+      AccessorKind, cParams);
 }
 
 BridgedDerivativeAttr BridgedDerivativeAttr_createParsed(

lib/AST/Bridging/DeclBridging.cpp

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2022-2024 Apple Inc. and the Swift project authors
+// Copyright (c) 2022-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
@@ -129,10 +129,6 @@ static StaticSpellingKind unbridged(BridgedStaticSpelling kind) {
   return static_cast<StaticSpellingKind>(kind);
 }
 
-AccessorKind unbridged(BridgedAccessorKind kind) {
-  return static_cast<AccessorKind>(kind);
-}
-
 void BridgedDecl_attachParsedAttrs(BridgedDecl decl,
                                    BridgedDeclAttributes attrs) {
   decl.unbridged()->attachParsedAttrs(attrs.unbridged());
@@ -148,15 +144,15 @@ void BridgedDecl_forEachDeclToHoist(BridgedDecl cDecl,
 
 BridgedAccessorDecl BridgedAccessorDecl_createParsed(
     BridgedASTContext cContext, BridgedDeclContext cDeclContext,
-    BridgedAccessorKind cKind, BridgedAbstractStorageDecl cStorage,
+    swift::AccessorKind Kind, BridgedAbstractStorageDecl cStorage,
     BridgedSourceLoc cDeclLoc, BridgedSourceLoc cAccessorKeywordLoc,
     BridgedNullableParameterList cParamList, BridgedSourceLoc cAsyncLoc,
     BridgedSourceLoc cThrowsLoc, BridgedNullableTypeRepr cThrownType) {
   return AccessorDecl::createParsed(
-      cContext.unbridged(), unbridged(cKind), cStorage.unbridged(),
-      cDeclLoc.unbridged(), cAccessorKeywordLoc.unbridged(),
-      cParamList.unbridged(), cAsyncLoc.unbridged(), cThrowsLoc.unbridged(),
-      cThrownType.unbridged(), cDeclContext.unbridged());
+      cContext.unbridged(), Kind, cStorage.unbridged(), cDeclLoc.unbridged(),
+      cAccessorKeywordLoc.unbridged(), cParamList.unbridged(),
+      cAsyncLoc.unbridged(), cThrowsLoc.unbridged(), cThrownType.unbridged(),
+      cDeclContext.unbridged());
 }
 
 static VarDecl::Introducer unbridged(BridgedVarDeclIntroducer introducer) {

lib/AST/Decl.cpp

@@ -2,7 +2,7 @@
 //
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2018 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
@@ -3379,8 +3379,7 @@ bool AbstractStorageDecl::requiresOpaqueAccessor(AccessorKind kind) const {
 
   // Other accessors are never part of the opaque-accessors set.
 #define OPAQUE_ACCESSOR(ID, KEYWORD)
-#define ACCESSOR(ID) \
-  case AccessorKind::ID:
+#define ACCESSOR(ID, KEYWORD) case AccessorKind::ID:
 #include "swift/AST/AccessorKinds.def"
     return false;
   }
@@ -7623,7 +7622,7 @@ void AbstractStorageDecl::setAccessors(SourceLoc lbraceLoc,
 // Compute the number of opaque accessors.
 const size_t NumOpaqueAccessors =
   0
-#define ACCESSOR(ID)
+#define ACCESSOR(ID, KEYWORD)
 #define OPAQUE_ACCESSOR(ID, KEYWORD) \
   + 1
 #include "swift/AST/AccessorKinds.def"
@@ -7646,14 +7645,14 @@ AbstractStorageDecl::AccessorRecord::create(ASTContext &ctx,
   // Make sure that we have enough space to add implicit opaque accessors later.
   size_t numMissingOpaque = NumOpaqueAccessors;
   {
-#define ACCESSOR(ID)
+#define ACCESSOR(ID, KEYWORD)
 #define OPAQUE_ACCESSOR(ID, KEYWORD)          \
     bool has##ID = false;
 #include "swift/AST/AccessorKinds.def"
     for (auto accessor : accessors) {
       switch (accessor->getAccessorKind()) {
-#define ACCESSOR(ID)                          \
-      case AccessorKind::ID:                  \
+#define ACCESSOR(ID, KEYWORD)                                                  \
+      case AccessorKind::ID:                                                   \
         continue;
 #define OPAQUE_ACCESSOR(ID, KEYWORD)          \
       case AccessorKind::ID:                  \
@@ -12214,10 +12213,10 @@ StringRef swift::getAccessorLabel(AccessorKind kind) {
   switch (kind) {
   #define SINGLETON_ACCESSOR(ID, KEYWORD) \
     case AccessorKind::ID: return #KEYWORD;
-  #define ACCESSOR(ID)
-  #include "swift/AST/AccessorKinds.def"
-    }
-    llvm_unreachable("bad accessor kind");
+#define ACCESSOR(ID, KEYWORD)
+#include "swift/AST/AccessorKinds.def"
+  }
+  llvm_unreachable("bad accessor kind");
 }
 
 void swift::simple_display(llvm::raw_ostream &out, AccessorKind kind) {