[AST] Remove BridgedVarDecl + BridgedNominalTypeDecl duplicates

These are now stamped out by the ASTBridgingWrappers.

Author: hamishknight

SwiftCompilerSources/Sources/SIL/Instruction.swift

@@ -358,8 +358,8 @@ public struct VarDecl {
   var bridged: BridgedVarDecl
 
   public init?(bridged: BridgedNullableVarDecl) {
-    guard let decl = bridged.get() else { return nil }
-    self.bridged = BridgedVarDecl(decl: decl)
+    guard let decl = bridged.raw else { return nil }
+    self.bridged = BridgedVarDecl(raw: decl)
   }
 
   public var userFacingName: String { String(bridged.getUserFacingName()) }

SwiftCompilerSources/Sources/SIL/Type.swift

@@ -216,11 +216,11 @@ public struct NominalTypeDecl : Equatable, Hashable {
   public var name: StringRef { StringRef(bridged: bridged.getName()) }
 
   public static func ==(lhs: NominalTypeDecl, rhs: NominalTypeDecl) -> Bool {
-    lhs.bridged.decl == rhs.bridged.decl
+    lhs.bridged.raw == rhs.bridged.raw
   }
 
   public func hash(into hasher: inout Hasher) {
-    hasher.combine(bridged.decl)
+    hasher.combine(bridged.raw)
   }
 
   public var isStructWithUnreferenceableStorage: Bool {

include/swift/AST/ASTBridging.h

@@ -28,8 +28,6 @@ SWIFT_BEGIN_NULLABILITY_ANNOTATIONS
 namespace swift {
   class DiagnosticArgument;
   class DiagnosticEngine;
-  class NominalTypeDecl;
-  class VarDecl;
 }
 
 //===----------------------------------------------------------------------===//
@@ -60,22 +58,19 @@ bool ASTContext_langOptsHasFeature(BridgedASTContext cContext,
 // AST nodes
 //===----------------------------------------------------------------------===//
 
+// Forward declare the underlying AST node type for each wrapper.
+namespace swift {
+#define AST_BRIDGING_WRAPPER(Name) class Name;
+#include "swift/AST/ASTBridgingWrappers.def"
+} // end namespace swift
+
 // Define the bridging wrappers for each AST node.
-#define AST_BRIDGING_WRAPPER_NONNULL(Name)                                     \
-  typedef struct {                                                             \
-    void *_Nonnull raw;                                                        \
-  } Bridged##Name;
-
-// For nullable nodes, define both a nullable and non-null variant.
-#define AST_BRIDGING_WRAPPER_NULLABLE(Name)                                    \
-  typedef struct {                                                             \
-    void *_Nullable raw;                                                       \
-  } BridgedNullable##Name;                                                     \
-                                                                               \
-  typedef struct {                                                             \
-    void *_Nonnull raw;                                                        \
-  } Bridged##Name;
+#define AST_BRIDGING_WRAPPER(Name) BRIDGING_WRAPPER_NONNULL(Name)
+#include "swift/AST/ASTBridgingWrappers.def"
 
+// For nullable nodes, also define a nullable variant.
+#define AST_BRIDGING_WRAPPER_NULLABLE(Name) BRIDGING_WRAPPER_NULLABLE(Name)
+#define AST_BRIDGING_WRAPPER_NONNULL(Name)
 #include "swift/AST/ASTBridgingWrappers.def"
 
 // Declare `.asDecl` on each BridgedXXXDecl type, which upcasts a wrapper for
@@ -219,17 +214,6 @@ void Diagnostic_finish(BridgedDiagnostic cDiag);
 // NominalTypeDecl
 //===----------------------------------------------------------------------===//
 
-class BridgedNominalTypeDecl {
-  swift::NominalTypeDecl * _Nonnull Ptr;
-
-public:
-#ifdef USED_IN_CPP_SOURCE
-  BridgedNominalTypeDecl(swift::NominalTypeDecl * _Nonnull ptr) : Ptr(ptr) {}
-
-  swift::NominalTypeDecl * _Nonnull get() const { return Ptr; }
-#endif
-};
-
 SWIFT_NAME("BridgedNominalTypeDecl.getName(self:)")
 BRIDGED_INLINE
 BridgedStringRef BridgedNominalTypeDecl_getName(BridgedNominalTypeDecl decl);
@@ -250,32 +234,10 @@ void NominalTypeDecl_setParsedMembers(BridgedNominalTypeDecl decl,
 // VarDecl
 //===----------------------------------------------------------------------===//
 
-class BridgedVarDecl {
-  swift::VarDecl * _Nonnull Ptr;
-
-public:
-#ifdef USED_IN_CPP_SOURCE
-  BridgedVarDecl(swift::VarDecl * _Nonnull ptr) : Ptr(ptr) {}
-
-  swift::VarDecl * _Nonnull get() const { return Ptr; }
-#endif
-};
-
 SWIFT_NAME("BridgedVarDecl.getUserFacingName(self:)")
 BRIDGED_INLINE
 BridgedStringRef BridgedVarDecl_getUserFacingName(BridgedVarDecl decl);
 
-class BridgedNullableVarDecl {
-  swift::VarDecl * _Nullable Ptr;
-
-public:
-#ifdef USED_IN_CPP_SOURCE
-  BridgedNullableVarDecl(swift::VarDecl * _Nullable ptr) : Ptr(ptr) {}
-
-  swift::VarDecl * _Nullable get() const { return Ptr; }
-#endif
-};
-
 //===----------------------------------------------------------------------===//
 // Misc
 //===----------------------------------------------------------------------===//

include/swift/AST/ASTBridgingWrappers.def

@@ -31,9 +31,8 @@
 #define AST_BRIDGING_WRAPPER_NONNULL(Name) AST_BRIDGING_WRAPPER(Name)
 #endif
 
-// Each AST node subclass stores a non-null raw value.
 #ifndef DECL
-#define DECL(Id, Parent) AST_BRIDGING_WRAPPER_NONNULL(Id##Decl)
+#define DECL(Id, Parent) AST_BRIDGING_WRAPPER_NULLABLE(Id##Decl)
 #endif
 #define ABSTRACT_DECL(Id, Parent) DECL(Id, Parent)
 #include "swift/AST/DeclNodes.def"

lib/AST/ASTBridging.cpp

@@ -150,13 +150,13 @@ bool BridgedNominalTypeDecl_isStructWithUnreferenceableStorage(
 // Define `unbridged` overloads for each AST node.
 #define AST_BRIDGING_WRAPPER(Name)                                             \
   [[maybe_unused]] static Name *unbridged(Bridged##Name bridged) {             \
-    return static_cast<Name *>(bridged.raw);                                   \
+    return bridged.get();                                                      \
   }
 #include "swift/AST/ASTBridgingWrappers.def"
 
 #define AST_BRIDGING_WRAPPER_NULLABLE(Name)                                    \
   [[maybe_unused]] static Name *unbridged(BridgedNullable##Name bridged) {     \
-    return static_cast<Name *>(bridged.raw);                                   \
+    return bridged.get();                                                      \
   }
 #define AST_BRIDGING_WRAPPER_NONNULL(Name)
 #include "swift/AST/ASTBridgingWrappers.def"