Bridging: Bridge swift::DeclBaseName directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -135,28 +135,6 @@ struct BridgedConsumedLookupResult {
                                              SwiftInt flag);
 };
 
-class BridgedDeclBaseName {
-  swift::Identifier Ident;
-
-public:
-  BRIDGED_INLINE BridgedDeclBaseName(swift::DeclBaseName baseName);
-
-  BRIDGED_INLINE swift::DeclBaseName unbridged() const;
-};
-
-SWIFT_NAME("BridgedDeclBaseName.createConstructor()")
-BridgedDeclBaseName BridgedDeclBaseName_createConstructor();
-
-SWIFT_NAME("BridgedDeclBaseName.createDestructor()")
-BridgedDeclBaseName BridgedDeclBaseName_createDestructor();
-
-SWIFT_NAME("BridgedDeclBaseName.createSubscript()")
-BridgedDeclBaseName BridgedDeclBaseName_createSubscript();
-
-SWIFT_NAME("BridgedDeclBaseName.createIdentifier(_:)")
-BridgedDeclBaseName
-BridgedDeclBaseName_createIdentifier(swift::Identifier identifier);
-
 class BridgedDeclNameRef {
   void *_Nullable opaque;
 
@@ -169,14 +147,13 @@ class BridgedDeclNameRef {
 };
 
 SWIFT_NAME("BridgedDeclNameRef.createParsed(_:baseName:argumentLabels:)")
-BridgedDeclNameRef
-BridgedDeclNameRef_createParsed(BridgedASTContext cContext,
-                                BridgedDeclBaseName cBaseName,
-                                BridgedArrayRef cLabels);
+BridgedDeclNameRef BridgedDeclNameRef_createParsed(BridgedASTContext cContext,
+                                                   swift::DeclBaseName baseName,
+                                                   BridgedArrayRef cLabels);
 
 SWIFT_NAME("BridgedDeclNameRef.createParsed(_:)")
 BridgedDeclNameRef
-BridgedDeclNameRef_createParsed(BridgedDeclBaseName cBaseName);
+BridgedDeclNameRef_createParsed(swift::DeclBaseName baseName);
 
 class BridgedDeclNameLoc {
   const void *_Nullable LocationInfo;

include/swift/AST/ASTBridgingImpl.h

@@ -33,18 +33,7 @@
 SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
 
 //===----------------------------------------------------------------------===//
-// MARK: BridgedDeclBaseName
-//===----------------------------------------------------------------------===//
-
-BridgedDeclBaseName::BridgedDeclBaseName(swift::DeclBaseName baseName)
-  : Ident(baseName.Ident) {}
-
-swift::DeclBaseName BridgedDeclBaseName::unbridged() const {
-  return swift::DeclBaseName(Ident);
-}
-
-//===----------------------------------------------------------------------===//
-// MARK: BridgedDeclBaseName
+// MARK: BridgedConsumedLookupResult
 //===----------------------------------------------------------------------===//
 
 BridgedConsumedLookupResult::BridgedConsumedLookupResult(

include/swift/AST/Identifier.h

@@ -320,15 +320,13 @@ namespace llvm {
 
 } // end namespace llvm
 
-class BridgedDeclBaseName;
+#endif // #ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
 
 namespace swift {
 
 /// Wrapper that may either be an Identifier or a special name
 /// (e.g. for subscripts)
 class DeclBaseName {
-  friend class ::BridgedDeclBaseName;
-
 public:
   enum class Kind: uint8_t {
     Normal,
@@ -367,6 +365,9 @@ class DeclBaseName {
     return DeclBaseName(Identifier((const char *)&DestructorIdentifierData));
   }
 
+// Not imported into Swift in pure bridging mode.
+#ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
+
   Kind getKind() const {
     if (Ident.get() == (const char *)&SubscriptIdentifierData) {
       return Kind::Subscript;
@@ -454,10 +455,15 @@ class DeclBaseName {
   static DeclBaseName getFromOpaquePointer(void *_Nullable P) {
     return Identifier::getFromOpaquePointer(P);
   }
+
+#endif // #ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
 };
 
 } // end namespace swift
 
+// Not imported into Swift in pure bridging mode.
+#ifdef NOT_COMPILED_WITH_SWIFT_PURE_BRIDGING_MODE
+
 namespace llvm {
 
 raw_ostream &operator<<(raw_ostream &OS, swift::DeclBaseName D);

lib/AST/Bridging/DeclBridging.cpp

@@ -32,36 +32,17 @@ using namespace swift;
 // MARK: DeclName
 //===----------------------------------------------------------------------===//
 
-BridgedDeclBaseName BridgedDeclBaseName_createConstructor() {
-  return DeclBaseName::createConstructor();
-}
-
-BridgedDeclBaseName BridgedDeclBaseName_createDestructor() {
-  return DeclBaseName::createDestructor();
-}
-
-BridgedDeclBaseName BridgedDeclBaseName_createSubscript() {
-  return DeclBaseName::createSubscript();
-}
-
-BridgedDeclBaseName
-BridgedDeclBaseName_createIdentifier(swift::Identifier identifier) {
-  return DeclBaseName(identifier);
-}
-
-BridgedDeclNameRef
-BridgedDeclNameRef_createParsed(BridgedASTContext cContext,
-                                BridgedDeclBaseName cBaseName,
-                                BridgedArrayRef cLabels) {
+BridgedDeclNameRef BridgedDeclNameRef_createParsed(BridgedASTContext cContext,
+                                                   DeclBaseName baseName,
+                                                   BridgedArrayRef cLabels) {
   ASTContext &context = cContext.unbridged();
   auto labels = cLabels.unbridged<swift::Identifier>();
 
-  return DeclNameRef(DeclName(context, cBaseName.unbridged(), labels));
+  return DeclNameRef(DeclName(context, baseName, labels));
 }
 
-BridgedDeclNameRef
-BridgedDeclNameRef_createParsed(BridgedDeclBaseName cBaseName) {
-  return DeclNameRef(cBaseName.unbridged());
+BridgedDeclNameRef BridgedDeclNameRef_createParsed(DeclBaseName baseName) {
+  return DeclNameRef(baseName);
 }
 
 BridgedDeclNameLoc BridgedDeclNameLoc_createParsed(

lib/ASTGen/Sources/ASTGen/Bridge.swift

@@ -16,6 +16,7 @@ import SwiftIfConfig
 @_spi(RawSyntax) import SwiftSyntax
 
 public typealias Identifier = swift.Identifier
+public typealias DeclBaseName = swift.DeclBaseName
 
 public protocol BridgedNullable: ExpressibleByNilLiteral {
   associatedtype RawPtr

lib/ASTGen/Sources/ASTGen/DeclAttrs.swift

@@ -1272,7 +1272,7 @@ extension ASTGenVisitor {
       if let arg = arg.as(DeclReferenceExprSyntax.self) {
         name = self.generateDeclNameRef(declReferenceExpr: arg).name
       } else if arg.is(DiscardAssignmentExprSyntax.self) {
-        name = BridgedDeclNameRef.createParsed(.createIdentifier(self.ctx.getIdentifier("_")))
+        name = BridgedDeclNameRef.createParsed(.init(self.ctx.getIdentifier("_")))
       } else {
         // TODO: Diagnose
         fatalError("expected name")

lib/ASTGen/Sources/ASTGen/Exprs.swift

@@ -520,7 +520,7 @@ extension ASTGenVisitor {
   func generateDeclNameRef(declReferenceExpr node: DeclReferenceExprSyntax) -> (
     name: BridgedDeclNameRef, loc: BridgedDeclNameLoc
   ) {
-    let baseName: BridgedDeclBaseName
+    let baseName: DeclBaseName
     switch node.baseName.keywordKind {
     case .`init`:
       baseName = .createConstructor()
@@ -529,7 +529,7 @@ extension ASTGenVisitor {
     case .subscript:
       baseName = .createSubscript()
     default:
-      baseName = .createIdentifier(self.generateIdentifier(node.baseName))
+      baseName = .init(self.generateIdentifier(node.baseName))
     }
     let baseNameLoc = self.generateSourceLoc(node.baseName)
 
@@ -858,7 +858,7 @@ extension ASTGenVisitor {
 
     return FreestandingMacroExpansionInfo(
       poundLoc: poundLoc,
-      macroNameRef: .createParsed(.createIdentifier(nameLoc.identifier)),
+      macroNameRef: .createParsed(.init(nameLoc.identifier)),
       macroNameLoc: .createParsed(nameLoc.sourceLoc),
       leftAngleLoc: leftAngleLoc,
       genericArgs: genericArgs.lazy.bridgedArray(in: self),
@@ -1332,7 +1332,7 @@ extension ASTGenVisitor {
 
     return .createParsed(
       self.ctx,
-      name: .createParsed(.createIdentifier(name)),
+      name: .createParsed(.init(name)),
       kind: kind,
       loc: .createParsed(nameLoc)
     );

lib/ASTGen/Sources/ASTGen/Literals.swift

@@ -76,12 +76,12 @@ extension ASTGenVisitor {
     // Name reference to `appendLiteral(_:)`
     let appendLiteral = BridgedDeclNameRef.createParsed(
       self.ctx,
-      baseName: .createIdentifier(self.ctx.getIdentifier("appendLiteral")),
+      baseName: .init(self.ctx.getIdentifier("appendLiteral")),
       argumentLabels: CollectionOfOne(Identifier()).bridgedArray(in: self)
     )
     // Name reference to `appendInterpolation`. Arguments labels are not determined yet.
     let appendInterpolation = BridgedDeclNameRef.createParsed(
-      .createIdentifier(self.ctx.getIdentifier("appendInterpolation"))
+      .init(self.ctx.getIdentifier("appendInterpolation"))
     )
 
     // Total byte length of "literal" segments.

lib/ASTGen/Sources/ASTGen/Stmts.swift

@@ -221,7 +221,7 @@ extension ASTGenVisitor {
         let identifier = pat.boundName
         if identifier != nil {
           // For `if let foo { }` Create a `foo` expression as the initializer.
-          let ref = BridgedDeclNameRef.createParsed(.createIdentifier(identifier))
+          let ref = BridgedDeclNameRef.createParsed(.init(identifier))
           let loc = BridgedDeclNameLoc.createParsed(self.generateSourceLoc(node.pattern))
           initializer =
             BridgedUnresolvedDeclRefExpr.createParsed(