[nfc][cxx-interop] Create and use custom metadata builder, visitor for foreign reference types.

Author: zoecarver

lib/IRGen/ForeignClassMetadataVisitor.h

@@ -71,6 +71,28 @@ class ForeignClassMetadataScanner : public ForeignClassMetadataVisitor<Impl> {
   }
 };
 
+template <class Impl>
+class ForeignReferenceTypeMetadataVisitor
+    : public NominalMetadataVisitor<Impl> {
+  using super = NominalMetadataVisitor<Impl>;
+protected:
+  ClassDecl *Target;
+  using super::asImpl;
+public:
+  ForeignReferenceTypeMetadataVisitor(IRGenModule &IGM, ClassDecl *target)
+      : super(IGM), Target(target) {}
+
+  void layout() {
+    super::layout();
+    asImpl().addNominalTypeDescriptor();
+    asImpl().addReservedWord();
+  }
+
+  CanType getTargetType() const {
+    return Target->getDeclaredType()->getCanonicalType();
+  }
+};
+
 } // end namespace irgen
 } // end namespace swift
 

lib/IRGen/GenMeta.cpp

@@ -5410,21 +5410,21 @@ namespace {
     }
   };
 
-  template<class Impl>
+  class ForeignClassMetadataBuilder;
   class ForeignClassMetadataBuilderBase :
-      public ForeignClassMetadataVisitor<Impl> {
+      public ForeignClassMetadataVisitor<ForeignClassMetadataBuilder> {
   protected:
     ConstantStructBuilder &B;
 
     ForeignClassMetadataBuilderBase(IRGenModule &IGM, ClassDecl *target,
                                     ConstantStructBuilder &B)
-      : ForeignClassMetadataVisitor<Impl>(IGM, target), B(B) {}
+      : ForeignClassMetadataVisitor(IGM, target), B(B) {}
   };
 
   /// A builder for ForeignClassMetadata.
   class ForeignClassMetadataBuilder :
       public ForeignMetadataBuilderBase<ForeignClassMetadataBuilder,
-                                        ForeignClassMetadataBuilderBase<ForeignClassMetadataBuilder>> {
+                                        ForeignClassMetadataBuilderBase> {
   public:
     ForeignClassMetadataBuilder(IRGenModule &IGM, ClassDecl *target,
                                 ConstantStructBuilder &B)
@@ -5521,10 +5521,21 @@ namespace {
     }
   };
 
+  class ForeignReferenceTypeMetadataBuilder;
+  class ForeignReferenceTypeMetadataBuilderBase :
+      public ForeignReferenceTypeMetadataVisitor<ForeignReferenceTypeMetadataBuilder> {
+  protected:
+    ConstantStructBuilder &B;
+
+    ForeignReferenceTypeMetadataBuilderBase(IRGenModule &IGM, ClassDecl *target,
+                                            ConstantStructBuilder &B)
+        : ForeignReferenceTypeMetadataVisitor(IGM, target), B(B) {}
+  };
+
   /// A builder for ForeignReferenceTypeMetadata.
   class ForeignReferenceTypeMetadataBuilder :
       public ForeignMetadataBuilderBase<ForeignReferenceTypeMetadataBuilder,
-                                        ForeignClassMetadataBuilderBase<ForeignReferenceTypeMetadataBuilder>> {
+                                        ForeignReferenceTypeMetadataBuilderBase> {
   public:
     ForeignReferenceTypeMetadataBuilder(IRGenModule &IGM, ClassDecl *target,
                                         ConstantStructBuilder &B)
@@ -5560,11 +5571,6 @@ namespace {
                          PointerAuthEntity::Special::TypeDescriptor);
     }
 
-    void addSuperclass() {
-      assert(!Target->hasSuperclass() &&
-             "foreign reference types should not have superclasses.");
-    }
-
     void addReservedWord() {
       B.addNullPointer(IGM.Int8PtrTy);
     }