ASTBridging: Bridge swift::InlineKind directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -1037,16 +1037,11 @@ BridgedImplementsAttr BridgedImplementsAttr_createParsed(
     BridgedSourceRange cRange, BridgedTypeRepr cProtocolType,
     BridgedDeclNameRef cMemberName, BridgedDeclNameLoc cMemberNameLoc);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedInlineKind {
-  BridgedInlineKindNever,
-  BridgedInlineKindAlways,
-};
-
 SWIFT_NAME("BridgedInlineAttr.createParsed(_:atLoc:range:kind:)")
 BridgedInlineAttr BridgedInlineAttr_createParsed(BridgedASTContext cContext,
                                                  BridgedSourceLoc cAtLoc,
                                                  BridgedSourceRange cRange,
-                                                 BridgedInlineKind cKind);
+                                                 swift::InlineKind kind);
 
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedParsedLifetimeDependenceKind {
   BridgedParsedLifetimeDependenceKindDefault,

include/swift/AST/AttrKind.h

@@ -75,9 +75,9 @@ enum class ENUM_EXTENSIBILITY_ATTR(closed) AccessLevel : uint8_t {
 SWIFT_UNAVAILABLE("Unavailable in Swift")
 llvm::StringRef getAccessLevelSpelling(AccessLevel value);
 
-enum class InlineKind : uint8_t {
-  Never = 0,
-  Always = 1,
+enum class ENUM_EXTENSIBILITY_ATTR(closed) InlineKind : uint8_t {
+  Never SWIFT_NAME("never") = 0,
+  Always SWIFT_NAME("always") = 1,
   Last_InlineKind = Always
 };
 

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -387,22 +387,12 @@ BridgedImplementsAttr BridgedImplementsAttr_createParsed(
                                 cMemberNameLoc.unbridged());
 }
 
-static InlineKind unbridged(BridgedInlineKind kind) {
-  switch (kind) {
-  case BridgedInlineKindNever:
-    return InlineKind::Never;
-  case BridgedInlineKindAlways:
-    return InlineKind::Always;
-  }
-  llvm_unreachable("unhandled enum value");
-}
-
 BridgedInlineAttr BridgedInlineAttr_createParsed(BridgedASTContext cContext,
                                                  BridgedSourceLoc cAtLoc,
                                                  BridgedSourceRange cRange,
-                                                 BridgedInlineKind cKind) {
+                                                 swift::InlineKind kind) {
   return new (cContext.unbridged())
-      InlineAttr(cAtLoc.unbridged(), cRange.unbridged(), unbridged(cKind));
+      InlineAttr(cAtLoc.unbridged(), cRange.unbridged(), kind);
 }
 
 static swift::ParsedLifetimeDependenceKind

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -1047,7 +1047,7 @@ extension ASTGenVisitor {
   ///   @inline(__always)
   ///   ```
   func generateInlineAttr(attribute node: AttributeSyntax) -> BridgedInlineAttr? {
-    let kind: BridgedInlineKind? = self.generateSingleAttrOption(
+    let kind: swift.InlineKind? = self.generateSingleAttrOption(
       attribute: node,
       {
         switch $0.rawText {