Bridging: Bridge swift::Identifier directly

Author: AnthonyLatsis

include/swift/AST/ASTBridging.h

@@ -32,21 +32,6 @@
 
 SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
 
-//===----------------------------------------------------------------------===//
-// MARK: BridgedIdentifier
-//===----------------------------------------------------------------------===//
-
-BridgedIdentifier::BridgedIdentifier(swift::Identifier ident)
-    : Raw(ident.getAsOpaquePointer()) {}
-
-swift::Identifier BridgedIdentifier::unbridged() const {
-  return swift::Identifier::getFromOpaquePointer(Raw);
-}
-
-bool BridgedIdentifier::getIsOperator() const {
-  return unbridged().isOperator();
-}
-
 //===----------------------------------------------------------------------===//
 // MARK: BridgedDeclBaseName
 //===----------------------------------------------------------------------===//
@@ -55,7 +40,7 @@ BridgedDeclBaseName::BridgedDeclBaseName(swift::DeclBaseName baseName)
   : Ident(baseName.Ident) {}
 
 swift::DeclBaseName BridgedDeclBaseName::unbridged() const {
-  return swift::DeclBaseName(Ident.unbridged());
+  return swift::DeclBaseName(Ident);
 }
 
 //===----------------------------------------------------------------------===//
@@ -64,8 +49,7 @@ swift::DeclBaseName BridgedDeclBaseName::unbridged() const {
 
 BridgedConsumedLookupResult::BridgedConsumedLookupResult(
     swift::Identifier name, swift::SourceLoc sourceLoc, SwiftInt flag)
-    : Name(BridgedIdentifier(name)), NameLoc(BridgedSourceLoc(sourceLoc)),
-      Flag(flag) {}
+    : Name(name), NameLoc(BridgedSourceLoc(sourceLoc)), Flag(flag) {}
 
 //===----------------------------------------------------------------------===//
 // MARK: BridgedDeclNameRef
@@ -115,10 +99,10 @@ 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; \
-}
+#define IDENTIFIER_WITH_NAME(Name, _)                                          \
+  swift::Identifier BridgedASTContext_id_##Name(BridgedASTContext bridged) {   \
+    return bridged.unbridged().Id_##Name;                                      \
+  }
 #include "swift/AST/KnownIdentifiers.def"
 
 //===----------------------------------------------------------------------===//
@@ -323,7 +307,7 @@ bool BridgedAvailabilityDomainOrIdentifier_isDomain(
   return cVal.unbridged().isDomain();
 }
 
-BridgedIdentifier BridgedAvailabilityDomainOrIdentifier_getAsIdentifier(
+swift::Identifier BridgedAvailabilityDomainOrIdentifier_getAsIdentifier(
     BridgedAvailabilityDomainOrIdentifier cVal) {
   if (auto ident = cVal.unbridged().getAsIdentifier())
     return *ident;
@@ -387,16 +371,15 @@ BridgedVarDecl_asAbstractStorageDecl(BridgedVarDecl decl) {
 //===----------------------------------------------------------------------===//
 
 swift::Argument BridgedCallArgument::unbridged() const {
-  return swift::Argument(labelLoc.unbridged(), label.unbridged(),
-                         argExpr.unbridged());
+  return swift::Argument(labelLoc.unbridged(), label, argExpr.unbridged());
 }
 
 //===----------------------------------------------------------------------===//
 // MARK: BridgedLabeledStmtInfo
 //===----------------------------------------------------------------------===//
 
 swift::LabeledStmtInfo BridgedLabeledStmtInfo::unbridged() const {
-  return {Name.unbridged(), Loc.unbridged()};
+  return {Name, Loc.unbridged()};
 }
 
 //===----------------------------------------------------------------------===//