ASTBridging: Bridge swift::InheritActorContextModifier directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -1213,17 +1213,10 @@ BridgedNonisolatedAttr_createParsed(BridgedASTContext cContext,
                                     BridgedSourceRange cRange,
                                     BridgedNonIsolatedModifier modifier);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedInheritActorContextModifier {
-  BridgedInheritActorContextModifierNone,
-  BridgedInheritActorContextModifierAlways,
-};
-
 SWIFT_NAME("BridgedInheritActorContextAttr.createParsed(_:atLoc:range:modifier:)")
-BridgedInheritActorContextAttr
-BridgedInheritActorContextAttr_createParsed(BridgedASTContext cContext,
-                                            BridgedSourceLoc cAtLoc,
-                                            BridgedSourceRange cRange,
-                                            BridgedInheritActorContextModifier modifier);
+BridgedInheritActorContextAttr BridgedInheritActorContextAttr_createParsed(
+    BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
+    BridgedSourceRange cRange, swift::InheritActorContextModifier modifier);
 
 SWIFT_NAME("BridgedObjCAttr.createParsedUnnamed(_:atLoc:attrNameLoc:)")
 BridgedObjCAttr

include/swift/AST/AttrKind.h

@@ -119,16 +119,17 @@ enum class NonIsolatedModifier : uint8_t {
   Last_NonIsolatedModifier = NonSending
 };
 
-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
-  /// global actor.
-  None = 0,
-  /// Always inherit the actor context, even when the isolated parameter
-  /// for the context is not closed over explicitly.
-  Always,
-  Last_InheritActorContextKind = Always
-};
+enum class ENUM_EXTENSIBILITY_ATTR(closed)
+    InheritActorContextModifier : uint8_t {
+      /// Inherit the actor execution context if the isolated parameter was
+      /// captured by the closure, context is nonisolated or isolated to a
+      /// global actor.
+      None SWIFT_NAME("none") = 0,
+      /// Always inherit the actor context, even when the isolated parameter
+      /// for the context is not closed over explicitly.
+      Always SWIFT_NAME("always"),
+      Last_InheritActorContextKind = Always
+    };
 
 enum class ENUM_EXTENSIBILITY_ATTR(closed) DeclAttrKind : unsigned {
 #define DECL_ATTR(_, CLASS, ...) CLASS,

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -590,23 +590,12 @@ BridgedNonisolatedAttr_createParsed(BridgedASTContext cContext,
       /*implicit=*/false);
 }
 
-static InheritActorContextModifier
-unbridged(BridgedInheritActorContextModifier modifier) {
-  switch (modifier) {
-  case BridgedInheritActorContextModifierNone:
-    return InheritActorContextModifier::None;
-  case BridgedInheritActorContextModifierAlways:
-    return InheritActorContextModifier::Always;
-  }
-  llvm_unreachable("unhandled enum value");
-}
-
 BridgedInheritActorContextAttr BridgedInheritActorContextAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
-    BridgedSourceRange cRange, BridgedInheritActorContextModifier modifier) {
-  return new (cContext.unbridged()) InheritActorContextAttr(
-      cAtLoc.unbridged(), cRange.unbridged(), unbridged(modifier),
-      /*implicit=*/false);
+    BridgedSourceRange cRange, swift::InheritActorContextModifier modifier) {
+  return new (cContext.unbridged())
+      InheritActorContextAttr(cAtLoc.unbridged(), cRange.unbridged(), modifier,
+                              /*implicit=*/false);
 }
 
 BridgedObjCAttr

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -1423,15 +1423,15 @@ extension ASTGenVisitor {
   }
 
   func generateInheritActorContextAttr(attribute node: AttributeSyntax) -> BridgedInheritActorContextAttr? {
-    let modifier: BridgedInheritActorContextModifier? = self.generateSingleAttrOption(
+    let modifier: swift.InheritActorContextModifier? = self.generateSingleAttrOption(
       attribute: node,
       {
         switch $0.rawText {
         case "always": return .always
         default: return nil
         }
       },
-      valueIfOmitted: BridgedInheritActorContextModifier.none
+      valueIfOmitted: swift.InheritActorContextModifier.none
     )
     guard let modifier else {
       return nil