ASTBridging: Bridge swift::NonIsolatedModifier directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -1200,18 +1200,10 @@ BridgedNonSendableAttr BridgedNonSendableAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedNonSendableKind cKind);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedNonIsolatedModifier {
-  BridgedNonIsolatedModifierNone,
-  BridgedNonIsolatedModifierUnsafe,
-  BridgedNonIsolatedModifierNonSending
-};
-
 SWIFT_NAME("BridgedNonisolatedAttr.createParsed(_:atLoc:range:modifier:)")
-BridgedNonisolatedAttr
-BridgedNonisolatedAttr_createParsed(BridgedASTContext cContext,
-                                    BridgedSourceLoc cAtLoc,
-                                    BridgedSourceRange cRange,
-                                    BridgedNonIsolatedModifier modifier);
+BridgedNonisolatedAttr BridgedNonisolatedAttr_createParsed(
+    BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
+    BridgedSourceRange cRange, swift::NonIsolatedModifier modifier);
 
 SWIFT_NAME("BridgedInheritActorContextAttr.createParsed(_:atLoc:range:modifier:)")
 BridgedInheritActorContextAttr BridgedInheritActorContextAttr_createParsed(

include/swift/AST/AttrKind.h

@@ -112,10 +112,10 @@ enum class ExternKind: uint8_t {
   Last_ExternKind = Wasm
 };
 
-enum class NonIsolatedModifier : uint8_t {
-  None = 0,
-  Unsafe,
-  NonSending,
+enum class ENUM_EXTENSIBILITY_ATTR(closed) NonIsolatedModifier : uint8_t {
+  None SWIFT_NAME("none") = 0,
+  Unsafe SWIFT_NAME("unsafe"),
+  NonSending SWIFT_NAME("nonsending"),
   Last_NonIsolatedModifier = NonSending
 };
 

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -568,26 +568,12 @@ BridgedNonSendableAttr BridgedNonSendableAttr_createParsed(
       NonSendableAttr(cAtLoc.unbridged(), cRange.unbridged(), unbridged(cKind));
 }
 
-static NonIsolatedModifier unbridged(BridgedNonIsolatedModifier modifier) {
-  switch (modifier) {
-  case BridgedNonIsolatedModifierNone:
-    return NonIsolatedModifier::None;
-  case BridgedNonIsolatedModifierUnsafe:
-    return NonIsolatedModifier::Unsafe;
-  case BridgedNonIsolatedModifierNonSending:
-    return NonIsolatedModifier::NonSending;
-  }
-  llvm_unreachable("unhandled enum value");
-}
-
-BridgedNonisolatedAttr
-BridgedNonisolatedAttr_createParsed(BridgedASTContext cContext,
-                                    BridgedSourceLoc cAtLoc,
-                                    BridgedSourceRange cRange,
-                                    BridgedNonIsolatedModifier modifier) {
-  return new (cContext.unbridged()) NonisolatedAttr(
-      cAtLoc.unbridged(), cRange.unbridged(), unbridged(modifier),
-      /*implicit=*/false);
+BridgedNonisolatedAttr BridgedNonisolatedAttr_createParsed(
+    BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
+    BridgedSourceRange cRange, swift::NonIsolatedModifier modifier) {
+  return new (cContext.unbridged())
+      NonisolatedAttr(cAtLoc.unbridged(), cRange.unbridged(), modifier,
+                      /*implicit=*/false);
 }
 
 BridgedInheritActorContextAttr BridgedInheritActorContextAttr_createParsed(

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -1400,16 +1400,16 @@ extension ASTGenVisitor {
 
   // FIXME: This is a decl modifier
   func generateNonisolatedAttr(attribute node: AttributeSyntax) -> BridgedNonisolatedAttr? {
-    let modifier: BridgedNonIsolatedModifier? = self.generateSingleAttrOption(
+    let modifier: swift.NonIsolatedModifier? = self.generateSingleAttrOption(
       attribute: node,
       {
         switch $0.rawText {
         case "unsafe": return .unsafe
-        case "nonsending": return .nonSending
+        case "nonsending": return .nonsending
         default: return nil
         }
       },
-      valueIfOmitted: BridgedNonIsolatedModifier.none
+      valueIfOmitted: swift.NonIsolatedModifier.none
     )
     guard let modifier else {
       return nil
@@ -2446,12 +2446,12 @@ extension ASTGenVisitor {
   }
 
   func generateNonisolatedAttr(declModifier node: DeclModifierSyntax) -> BridgedNonisolatedAttr? {
-    let modifier: BridgedNonIsolatedModifier
+    let modifier: swift.NonIsolatedModifier
     switch node.detail?.detail.rawText {
     case "unsafe":
       modifier = .unsafe
     case "nonsending":
-      modifier = .nonSending
+      modifier = .nonsending
     case nil:
       modifier = .none
     case let text?: