ASTBridging: Bridge swift::ExposureKind directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -1005,17 +1005,12 @@ BridgedExclusivityAttr BridgedExclusivityAttr_createParsed(
     BridgedASTContext cContext, BridgedSourceLoc cAtLoc,
     BridgedSourceRange cRange, BridgedExclusivityAttrMode cMode);
 
-enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedExposureKind {
-  BridgedExposureKindCxx,
-  BridgedExposureKindWasm,
-};
-
 SWIFT_NAME("BridgedExposeAttr.createParsed(_:atLoc:range:name:kind:)")
 BridgedExposeAttr BridgedExposeAttr_createParsed(BridgedASTContext cContext,
                                                  BridgedSourceLoc cAtLoc,
                                                  BridgedSourceRange cRange,
                                                  BridgedStringRef cName,
-                                                 BridgedExposureKind cKind);
+                                                 swift::ExposureKind kind);
 
 enum ENUM_EXTENSIBILITY_ATTR(closed) BridgedExternKind {
   BridgedExternKindC,

include/swift/AST/AttrKind.h

@@ -95,7 +95,11 @@ enum class ENUM_EXTENSIBILITY_ATTR(closed) EffectsKind : uint8_t {
 };
 
 /// This enum represents the possible values of the @_expose attribute.
-enum class ExposureKind : uint8_t { Cxx, Wasm, Last_ExposureKind = Wasm };
+enum class ENUM_EXTENSIBILITY_ATTR(closed) ExposureKind : uint8_t {
+  Cxx SWIFT_NAME("cxx"),
+  Wasm SWIFT_NAME("wasm"),
+  Last_ExposureKind = Wasm
+};
 
 /// This enum represents the possible values of the @_extern attribute.
 enum class ExternKind: uint8_t {

lib/AST/Bridging/DeclAttributeBridging.cpp

@@ -328,24 +328,14 @@ BridgedExclusivityAttr BridgedExclusivityAttr_createParsed(
       ExclusivityAttr(cAtLoc.unbridged(), cRange.unbridged(), unbridged(cMode));
 }
 
-static ExposureKind unbridged(BridgedExposureKind kind) {
-  switch (kind) {
-  case BridgedExposureKindCxx:
-    return ExposureKind::Cxx;
-  case BridgedExposureKindWasm:
-    return ExposureKind::Wasm;
-  }
-  llvm_unreachable("unhandled enum value");
-}
-
 BridgedExposeAttr BridgedExposeAttr_createParsed(BridgedASTContext cContext,
                                                  BridgedSourceLoc cAtLoc,
                                                  BridgedSourceRange cRange,
                                                  BridgedStringRef cName,
-                                                 BridgedExposureKind cKind) {
+                                                 swift::ExposureKind kind) {
   return new (cContext.unbridged())
       ExposeAttr(cName.unbridged(), cAtLoc.unbridged(), cRange.unbridged(),
-                 unbridged(cKind), /*Implicit=*/false);
+                 kind, /*Implicit=*/false);
 }
 
 static ExternKind unbridged(BridgedExternKind kind) {

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -907,7 +907,7 @@ extension ASTGenVisitor {
     // FIXME: SwiftParser should parse the argument as LabeledExprListArguments
     return self.generateWithLabeledExprListArguments(attribute: node) { args in
       // Exposure kind.
-      let kind: BridgedExposureKind? = self.generateConsumingPlainIdentifierAttrOption(args: &args) {
+      let kind: swift.ExposureKind? = self.generateConsumingPlainIdentifierAttrOption(args: &args) {
         switch $0.rawText {
         case "Cxx":
           return .cxx