ASTBridging: Bridge swift::EffectsKind directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -983,19 +983,10 @@ BridgedDynamicReplacementAttr BridgedDynamicReplacementAttr_createParsed(
     BridgedSourceLoc cAttrNameLoc, BridgedSourceLoc cLParenLoc,
     BridgedDeclNameRef cReplacedFunction, BridgedSourceLoc cRParenLoc);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedEffectsKind {
-  BridgedEffectsKindReadNone,
-  BridgedEffectsKindReadOnly,
-  BridgedEffectsKindReleaseNone,
-  BridgedEffectsKindReadWrite,
-  BridgedEffectsKindUnspecified,
-  BridgedEffectsKindCustom,
-};
-
 SWIFT_NAME("BridgedEffectsAttr.createParsed(_:atLoc:range:effectKind:)")
 BridgedEffectsAttr BridgedEffectsAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
-    BridgedSourceRange cRange, BridgedEffectsKind cEffectKind);
+    BridgedSourceRange cRange, swift::EffectsKind effectKind);
 
 SWIFT_NAME("BridgedEffectsAttr.createParsed(_:atLoc:range:customString:"
            "customStringLoc:)")

include/swift/AST/AttrKind.h

@@ -84,14 +84,14 @@ enum class InlineKind : uint8_t {
 /// 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.
-enum class EffectsKind : uint8_t {
-  ReadNone,
-  ReadOnly,
-  ReleaseNone,
-  ReadWrite,
-  Unspecified,
-  Custom,
-  Last_EffectsKind = Unspecified
+enum class ENUM_EXTENSIBILITY_ATTR(closed) EffectsKind : uint8_t {
+  ReadNone SWIFT_NAME("readnone"),
+  ReadOnly SWIFT_NAME("readonly"),
+  ReleaseNone SWIFT_NAME("releasenone"),
+  ReadWrite SWIFT_NAME("readwrite"),
+  Unspecified SWIFT_NAME("unspecified"),
+  Custom SWIFT_NAME("custom"),
+  Last_EffectsKind = Custom
 };
 
 /// This enum represents the possible values of the @_expose attribute.

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -296,29 +296,11 @@ BridgedDocumentationAttr BridgedDocumentationAttr_createParsed(
       optAccessLevel, /*implicit=*/false);
 }
 
-static EffectsKind unbridged(BridgedEffectsKind kind) {
-  switch (kind) {
-  case BridgedEffectsKindReadNone:
-    return EffectsKind::ReadNone;
-  case BridgedEffectsKindReadOnly:
-    return EffectsKind::ReadOnly;
-  case BridgedEffectsKindReleaseNone:
-    return EffectsKind::ReleaseNone;
-  case BridgedEffectsKindReadWrite:
-    return EffectsKind::ReadWrite;
-  case BridgedEffectsKindUnspecified:
-    return EffectsKind::Unspecified;
-  case BridgedEffectsKindCustom:
-    return EffectsKind::Custom;
-  }
-  llvm_unreachable("unhandled kind");
-}
-
 BridgedEffectsAttr BridgedEffectsAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
-    BridgedSourceRange cRange, BridgedEffectsKind cEffectKind) {
-  return new (cContext.unbridged()) EffectsAttr(
-      cAtLoc.unbridged(), cRange.unbridged(), unbridged(cEffectKind));
+    BridgedSourceRange cRange, swift::EffectsKind effectKind) {
+  return new (cContext.unbridged())
+      EffectsAttr(cAtLoc.unbridged(), cRange.unbridged(), effectKind);
 }
 
 BridgedEffectsAttr BridgedEffectsAttr_createParsed(

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -838,16 +838,16 @@ extension ASTGenVisitor {
       // TODO: Diagnose?
       return nil
     }
-    let effectKind: BridgedEffectsKind
+    let effectKind: swift.EffectsKind
     switch arguments.first!.rawText {
     case "readonly":
-      effectKind = .readOnly
+      effectKind = .readonly
     case "readnone":
-      effectKind = .readNone
+      effectKind = .readnone
     case "releasenone":
-      effectKind = .releaseNone
+      effectKind = .releasenone
     case "readwrite":
-      effectKind = .readWrite
+      effectKind = .readwrite
     default:
       effectKind = .custom
     }