ASTBridging: Bridge swift::AccessLevel directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -901,21 +901,13 @@ void BridgedAvailableAttr_setIsGroupedWithWildcard(BridgedAvailableAttr cAttr);
 SWIFT_NAME("BridgedAvailableAttr.setIsGroupTerminator(self:)")
 void BridgedAvailableAttr_setIsGroupTerminator(BridgedAvailableAttr cAttr);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedAccessLevel {
-  BridgedAccessLevelPrivate,
-  BridgedAccessLevelFilePrivate,
-  BridgedAccessLevelInternal,
-  BridgedAccessLevelPackage,
-  BridgedAccessLevelPublic,
-  BridgedAccessLevelOpen,
-  BridgedAccessLevelNone,
-};
+BRIDGED_OPTIONAL(swift::AccessLevel, AccessLevel)
 
 SWIFT_NAME("BridgedAccessControlAttr.createParsed(_:range:accessLevel:)")
 BridgedAccessControlAttr
 BridgedAccessControlAttr_createParsed(BridgedASTContext cContext,
                                       BridgedSourceRange cRange,
-                                      BridgedAccessLevel cAccessLevel);
+                                      swift::AccessLevel accessLevel);
 
 SWIFT_NAME("BridgedAlignmentAttr.createParsed(_:atLoc:range:value:)")
 BridgedAlignmentAttr
@@ -981,7 +973,7 @@ SWIFT_NAME("BridgedDocumentationAttr.createParsed(_:atLoc:range:metadata:"
 BridgedDocumentationAttr BridgedDocumentationAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedStringRef cMetadata,
-    BridgedAccessLevel cAccessLevel);
+    BridgedOptionalAccessLevel accessLevel);
 
 SWIFT_NAME(
     "BridgedDynamicReplacementAttr.createParsed(_:atLoc:attrNameLoc:lParenLoc:"
@@ -1351,7 +1343,7 @@ SWIFT_NAME("BridgedSetterAccessAttr.createParsed(_:range:accessLevel:)")
 BridgedSetterAccessAttr
 BridgedSetterAccessAttr_createParsed(BridgedASTContext cContext,
                                      BridgedSourceRange cRange,
-                                     BridgedAccessLevel cAccessLevel);
+                                     swift::AccessLevel accessLevel);
 
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedSpecializationKind : uint8_t {
   BridgedSpecializationKindFull,

include/swift/AST/AttrKind.h

@@ -51,24 +51,24 @@ llvm::StringRef getAssociativitySpelling(Associativity value);
 /// Access control levels.
 // These are used in diagnostics and with < and similar operations,
 // so please do not reorder existing values.
-enum class AccessLevel : uint8_t {
+enum class ENUM_EXTENSIBILITY_ATTR(closed) AccessLevel : uint8_t {
   /// Private access is limited to the current scope.
-  Private = 0,
+  Private SWIFT_NAME("private") = 0,
   /// File-private access is limited to the current file.
-  FilePrivate,
+  FilePrivate SWIFT_NAME("fileprivate"),
   /// Internal access is limited to the current module.
-  Internal,
+  Internal SWIFT_NAME("internal"),
   /// Package access is not limited, but some capabilities may be
   /// restricted outside of the current package containing modules.
   /// It's similar to Public in that it's accessible from other modules
   /// and subclassable only within the defining module as long as
   /// the modules are in the same package.
-  Package,
+  Package SWIFT_NAME("package"),
   /// Public access is not limited, but some capabilities may be
   /// restricted outside of the current module.
-  Public,
+  Public SWIFT_NAME("public"),
   /// Open access is not limited, and all capabilities are unrestricted.
-  Open,
+  Open SWIFT_NAME("open"),
 };
 
 /// Returns the in-source spelling of the given access level.

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -152,26 +152,6 @@ void BridgedAvailableAttr_setIsGroupTerminator(BridgedAvailableAttr cAttr) {
   cAttr.unbridged()->setIsGroupTerminator();
 }
 
-static std::optional<AccessLevel> unbridge(BridgedAccessLevel level) {
-  switch (level) {
-  case BridgedAccessLevelPrivate:
-    return AccessLevel::Private;
-  case BridgedAccessLevelFilePrivate:
-    return AccessLevel::FilePrivate;
-  case BridgedAccessLevelInternal:
-    return AccessLevel::Internal;
-  case BridgedAccessLevelPackage:
-    return AccessLevel::Package;
-  case BridgedAccessLevelPublic:
-    return AccessLevel::Public;
-  case BridgedAccessLevelOpen:
-    return AccessLevel::Open;
-  case BridgedAccessLevelNone:
-    return std::nullopt;
-  }
-  llvm_unreachable("unhandled BridgedAccessLevel");
-}
-
 BridgedABIAttr BridgedABIAttr_createParsed(BridgedASTContext cContext,
                                            BridgedSourceLoc atLoc,
                                            BridgedSourceRange range,
@@ -185,9 +165,9 @@ BridgedABIAttr BridgedABIAttr_createParsed(BridgedASTContext cContext,
 BridgedAccessControlAttr
 BridgedAccessControlAttr_createParsed(BridgedASTContext cContext,
                                       BridgedSourceRange cRange,
-                                      BridgedAccessLevel cAccessLevel) {
+                                      swift::AccessLevel accessLevel) {
   return new (cContext.unbridged()) AccessControlAttr(
-      /*atLoc=*/{}, cRange.unbridged(), unbridge(cAccessLevel).value());
+      /*atLoc=*/{}, cRange.unbridged(), accessLevel);
 }
 
 BridgedAlignmentAttr
@@ -306,10 +286,14 @@ BridgedDynamicReplacementAttr BridgedDynamicReplacementAttr_createParsed(
 BridgedDocumentationAttr BridgedDocumentationAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedStringRef cMetadata,
-    BridgedAccessLevel cAccessLevel) {
+    BridgedOptionalAccessLevel accessLevel) {
+  std::optional<swift::AccessLevel> optAccessLevel;
+  if (accessLevel.getHasValue()) {
+    optAccessLevel.emplace(accessLevel.getValue());
+  }
   return new (cContext.unbridged()) DocumentationAttr(
       cAtLoc.unbridged(), cRange.unbridged(), cMetadata.unbridged(),
-      unbridge(cAccessLevel), /*implicit=*/false);
+      optAccessLevel, /*implicit=*/false);
 }
 
 static EffectsKind unbridged(BridgedEffectsKind kind) {
@@ -808,9 +792,9 @@ BridgedSemanticsAttr BridgedSemanticsAttr_createParsed(
 BridgedSetterAccessAttr
 BridgedSetterAccessAttr_createParsed(BridgedASTContext cContext,
                                      BridgedSourceRange cRange,
-                                     BridgedAccessLevel cAccessLevel) {
+                                     swift::AccessLevel accessLevel) {
   return new (cContext.unbridged()) SetterAccessAttr(
-      /*atLoc=*/{}, cRange.unbridged(), unbridge(cAccessLevel).value());
+      /*atLoc=*/{}, cRange.unbridged(), accessLevel);
 }
 
 static SpecializeAttr::SpecializationKind

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -767,13 +767,13 @@ extension ASTGenVisitor {
       return nil
     }
 
-    var visibility: BridgedAccessLevel = .none
+    var visibility: swift.AccessLevel?
     var metadata: BridgedStringRef? = nil
 
     while let arg = args.popFirst() {
       switch arg.label.rawText {
       case "visibility":
-        guard visibility == .none else {
+        guard visibility == nil else {
           // TODO: Diagnose duplicated 'visibility" arguments
           continue
         }
@@ -787,7 +787,7 @@ extension ASTGenVisitor {
         case .package: visibility = .package
         case .internal: visibility = .internal
         case .private: visibility = .private
-        case .fileprivate: visibility = .filePrivate
+        case .fileprivate: visibility = .fileprivate
         default:
           // TODO: Diagnose
           continue
@@ -821,7 +821,7 @@ extension ASTGenVisitor {
       atLoc: self.generateSourceLoc(node.atSign),
       range: self.generateAttrSourceRange(node),
       metadata: metadata ?? "",
-      accessLevel: visibility
+      accessLevel: visibility == nil ? .init() : .init(visibility!)
     )
   }
 
@@ -2395,7 +2395,7 @@ extension ASTGenVisitor {
     case .private:
       return self.generateAccessControlAttr(declModifier: node, level: .private)
     case .fileprivate:
-      return self.generateAccessControlAttr(declModifier: node, level: .filePrivate)
+      return self.generateAccessControlAttr(declModifier: node, level: .fileprivate)
     case .internal:
       return self.generateAccessControlAttr(declModifier: node, level: .internal)
     case .package:
@@ -2423,7 +2423,7 @@ extension ASTGenVisitor {
     }
   }
 
-  func generateAccessControlAttr(declModifier node: DeclModifierSyntax, level: BridgedAccessLevel)
+  func generateAccessControlAttr(declModifier node: DeclModifierSyntax, level: swift.AccessLevel)
     -> BridgedDeclAttribute?
   {
     if let detail = node.detail {