ASTBridging: Bridge swift::ExternKind directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -1012,17 +1012,12 @@ BridgedExposeAttr BridgedExposeAttr_createParsed(BridgedASTContext cContext,
                                                  BridgedStringRef cName,
                                                  swift::ExposureKind kind);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedExternKind {
-  BridgedExternKindC,
-  BridgedExternKindWasm,
-};
-
 SWIFT_NAME("BridgedExternAttr.createParsed(_:atLoc:range:lParenLoc:rParenLoc:"
            "kind:moduleName:name:)")
 BridgedExternAttr BridgedExternAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedSourceLoc cLParenLoc,
-    BridgedSourceLoc cRParenLoc, BridgedExternKind cKind,
+    BridgedSourceLoc cRParenLoc, swift::ExternKind kind,
     BridgedStringRef cModuleName, BridgedStringRef cName);
 
 SWIFT_NAME("BridgedImplementsAttr.createParsed(_:atLoc:range:protocolType:"

include/swift/AST/AttrKind.h

@@ -102,17 +102,17 @@ enum class ENUM_EXTENSIBILITY_ATTR(closed) ExposureKind : uint8_t {
 };
 
 /// This enum represents the possible values of the @_extern attribute.
-enum class ExternKind: uint8_t {
+enum class ENUM_EXTENSIBILITY_ATTR(closed) ExternKind : uint8_t {
   /// Reference an externally defined C function.
   /// The imported function has C function pointer representation,
   /// and is called using the C calling convention.
-  C,
+  C SWIFT_NAME("c"),
   /// Reference an externally defined function through WebAssembly's
   /// import mechanism.
   /// This does not specify the calling convention and can be used
   /// with other extern kinds together.
   /// Effectively, this is no-op on non-WebAssembly targets.
-  Wasm,
+  Wasm SWIFT_NAME("wasm"),
   Last_ExternKind = Wasm
 };
 

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -338,20 +338,10 @@ BridgedExposeAttr BridgedExposeAttr_createParsed(BridgedASTContext cContext,
                  kind, /*Implicit=*/false);
 }
 
-static ExternKind unbridged(BridgedExternKind kind) {
-  switch (kind) {
-  case BridgedExternKindC:
-    return ExternKind::C;
-  case BridgedExternKindWasm:
-    return ExternKind::Wasm;
-  }
-  llvm_unreachable("unhandled enum value");
-}
-
 BridgedExternAttr BridgedExternAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedSourceLoc cLParenLoc,
-    BridgedSourceLoc cRParenLoc, BridgedExternKind cKind,
+    BridgedSourceLoc cRParenLoc, swift::ExternKind kind,
     BridgedStringRef cModuleName, BridgedStringRef cName) {
   std::optional<StringRef> moduleName = cModuleName.unbridged();
   if (moduleName->empty())
@@ -363,7 +353,7 @@ BridgedExternAttr BridgedExternAttr_createParsed(
 
   return new (cContext.unbridged())
       ExternAttr(moduleName, name, cAtLoc.unbridged(), cLParenLoc.unbridged(),
-                 cRParenLoc.unbridged(), cRange.unbridged(), unbridged(cKind),
+                 cRParenLoc.unbridged(), cRange.unbridged(), kind,
                  /*Implicit=*/false);
 }
 

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -950,10 +950,10 @@ extension ASTGenVisitor {
   ///   ```
   func generateExternAttr(attribute node: AttributeSyntax) -> BridgedExternAttr? {
     return self.generateWithLabeledExprListArguments(attribute: node) { args in
-      let kind: BridgedExternKind? = self.generateConsumingPlainIdentifierAttrOption(args: &args) {
+      let kind: swift.ExternKind? = self.generateConsumingPlainIdentifierAttrOption(args: &args) {
         switch $0.rawText {
         case "c":
-          return .C
+          return .c
         case "wasm":
           return .wasm
         default:
@@ -968,7 +968,7 @@ extension ASTGenVisitor {
       let moduleName: BridgedStringRef?
       let symbolName: BridgedStringRef?
       switch kind {
-      case .C:
+      case .c:
         moduleName = nil
         symbolName = args.isEmpty ? nil : self.generateConsumingSimpleStringLiteralAttrOption(args: &args)
       case .wasm: