[ASTGen] Bridge ASTContext.Id_x

Author: rintaro

include/swift/AST/ASTBridging.h

@@ -116,10 +116,6 @@ inline const void *_Nullable BridgedIdentifier_raw(BridgedIdentifier ident) {
   return ident.Raw;
 }
 
-SWIFT_NAME("getter:BridgedIdentifier.str(self:)")
-BRIDGED_INLINE BridgedStringRef
-BridgedIdentifier_getStr(BridgedIdentifier ident);
-
 SWIFT_NAME("getter:BridgedIdentifier.isOperator(self:)")
 BRIDGED_INLINE bool BridgedIdentifier_isOperator(const BridgedIdentifier);
 
@@ -227,6 +223,11 @@ class BridgedASTContext {
   BRIDGED_INLINE swift::ASTContext &unbridged() const;
 };
 
+#define IDENTIFIER_WITH_NAME(Name, _) \
+SWIFT_NAME("getter:BridgedASTContext.id_" #Name "(self:)") \
+BRIDGED_INLINE BridgedIdentifier BridgedASTContext_id_##Name(BridgedASTContext bridged);
+#include "swift/AST/KnownIdentifiers.def"
+
 SWIFT_NAME("getter:BridgedASTContext.raw(self:)")
 BRIDGED_INLINE
 void * _Nonnull BridgedASTContext_raw(BridgedASTContext bridged);

include/swift/AST/ASTBridgingImpl.h

@@ -40,10 +40,6 @@ swift::Identifier BridgedIdentifier::unbridged() const {
   return swift::Identifier::getFromOpaquePointer(Raw);
 }
 
-BridgedStringRef BridgedIdentifier_getStr(const BridgedIdentifier ident) {
-  return ident.unbridged().str();
-}
-
 bool BridgedIdentifier_isOperator(const BridgedIdentifier ident) {
   return ident.unbridged().isOperator();
 }
@@ -121,6 +117,12 @@ BridgedStringRef BridgedASTContext_allocateCopyString(BridgedASTContext bridged,
   return bridged.unbridged().AllocateCopy(cStr.unbridged());
 }
 
+#define IDENTIFIER_WITH_NAME(Name, _) \
+BridgedIdentifier BridgedASTContext_id_##Name(BridgedASTContext bridged) { \
+return bridged.unbridged().Id_##Name; \
+}
+#include "swift/AST/KnownIdentifiers.def"
+
 //===----------------------------------------------------------------------===//
 // MARK: BridgedDeclContext
 //===----------------------------------------------------------------------===//

include/swift/Basic/BasicBridging.h

@@ -251,10 +251,6 @@ BRIDGED_INLINE SwiftInt BridgedStringRef_count(BridgedStringRef str);
 SWIFT_NAME("getter:BridgedStringRef.isEmpty(self:)")
 BRIDGED_INLINE bool BridgedStringRef_empty(BridgedStringRef str);
 
-SWIFT_NAME("BridgedStringRef.equals(self:_:)")
-BRIDGED_INLINE bool BridgedStringRef_equals(BridgedStringRef lhs,
-                                            BridgedStringRef rhs);
-
 class BridgedOwnedString {
   char *_Nonnull Data;
   size_t Length;

include/swift/Basic/BasicBridgingImpl.h

@@ -70,10 +70,6 @@ bool BridgedStringRef_empty(BridgedStringRef str) {
   return str.unbridged().empty();
 }
 
-bool BridgedStringRef_equals(BridgedStringRef lhs, BridgedStringRef rhs) {
-  return lhs.unbridged() == rhs.unbridged();
-}
-
 //===----------------------------------------------------------------------===//
 // MARK: BridgedOwnedString
 //===----------------------------------------------------------------------===//

lib/ASTGen/Sources/ASTGen/Bridge.swift

@@ -166,12 +166,6 @@ extension BridgedStringRef: /*@retroactive*/ Swift.ExpressibleByStringLiteral {
   }
 }
 
-extension BridgedStringRef: /*@retroactive*/ Swift.Equatable {
-  public static func ==(lhs: BridgedStringRef, rhs: BridgedStringRef) -> Bool {
-    lhs.equals(rhs)
-  }
-}
-
 extension VersionTuple {
   var bridged: BridgedVersionTuple {
     switch self.components.count {

lib/ASTGen/Sources/ASTGen/Exprs.swift

@@ -308,7 +308,7 @@ extension ASTGenVisitor {
     )
 
     // If we captured something under the name "self", remember that.
-    if nameAndLoc.identifier.str == "self" {
+    if nameAndLoc.identifier == ctx.id_self {
       capturedSelfDecl = entry.varDecl
     }