[wip][cxx-interop] Re-factor ClassTypeInfo specific logic into that class.

Author: zoecarver

lib/IRGen/ClassTypeInfo.h

@@ -58,6 +58,58 @@ class ClassTypeInfo : public HeapTypeInfo<ClassTypeInfo> {
 
   StructLayout *createLayoutWithTailElems(IRGenModule &IGM, SILType classType,
                                           ArrayRef<SILType> tailTypes) const;
+
+  void emitScalarRelease(IRGenFunction &IGF, llvm::Value *value,
+                         Atomicity atomicity) const override {
+    if (getReferenceCounting() == ReferenceCounting::CxxCustom) {
+      auto releaseFn = findForeignReferenceTypeRefCountingOperation(getClass(),
+          ForeignReferenceTypeRefCountingOperation::release);
+      IGF.emitForeignReferenceTypeLifetimeOperation(releaseFn, value);
+      return;
+    }
+
+    HeapTypeInfo::emitScalarRelease(IGF, value, atomicity);
+  }
+
+  void emitScalarRetain(IRGenFunction &IGF, llvm::Value *value,
+                        Atomicity atomicity) const override {
+    if (getReferenceCounting() == ReferenceCounting::CxxCustom) {
+      auto releaseFn = findForeignReferenceTypeRefCountingOperation(getClass(),
+          ForeignReferenceTypeRefCountingOperation::retain);
+      IGF.emitForeignReferenceTypeLifetimeOperation(releaseFn, value);
+      return;
+    }
+
+    HeapTypeInfo::emitScalarRetain(IGF, value, atomicity);
+  }
+
+  // Implement the primary retain/release operations of ReferenceTypeInfo
+  // using basic reference counting.
+  void strongRetain(IRGenFunction &IGF, Explosion &e,
+                    Atomicity atomicity) const override {
+    if (getReferenceCounting() == ReferenceCounting::CxxCustom) {
+      llvm::Value *value = e.claimNext();
+      auto releaseFn = findForeignReferenceTypeRefCountingOperation(getClass(),
+          ForeignReferenceTypeRefCountingOperation::retain);
+      IGF.emitForeignReferenceTypeLifetimeOperation(releaseFn, value);
+      return;
+    }
+
+    HeapTypeInfo::strongRetain(IGF, e, atomicity);
+  }
+
+  void strongRelease(IRGenFunction &IGF, Explosion &e,
+                     Atomicity atomicity) const override {
+    if (getReferenceCounting() == ReferenceCounting::CxxCustom) {
+      llvm::Value *value = e.claimNext();
+      auto releaseFn = findForeignReferenceTypeRefCountingOperation(getClass(),
+          ForeignReferenceTypeRefCountingOperation::release);
+      IGF.emitForeignReferenceTypeLifetimeOperation(releaseFn, value);
+      return;
+    }
+
+    HeapTypeInfo::strongRelease(IGF, e, atomicity);
+  }
 };
 
 } // namespace irgen

lib/IRGen/HeapTypeInfo.h

@@ -74,8 +74,6 @@ enum class IsaEncoding : uint8_t {
   Unknown = ObjC,
 };
 
-class ClassTypeInfo;
-
 /// HeapTypeInfo - A type designed for use implementing a type
 /// which consists solely of something reference-counted.
 ///
@@ -134,81 +132,35 @@ class HeapTypeInfo
 
   // Emit the copy/destroy operations required by SingleScalarTypeInfo
   // using strong reference counting.
-  void emitScalarRelease(IRGenFunction &IGF, llvm::Value *value,
+  virtual void emitScalarRelease(IRGenFunction &IGF, llvm::Value *value,
                          Atomicity atomicity) const {
-    if (asDerived().getReferenceCounting() == ReferenceCounting::CxxCustom) {
-      if constexpr (__is_same(Impl, ClassTypeInfo)) {
-        auto releaseFn = findForeignReferenceTypeRefCountingOperation(
-            asDerived().getClass(),
-            ForeignReferenceTypeRefCountingOperation::release);
-        IGF.emitForeignReferenceTypeLifetimeOperation(releaseFn, value);
-        return;
-      } else {
-        llvm_unreachable("");
-      }
-    }
-
+    assert(asDerived().getReferenceCounting() != ReferenceCounting::CxxCustom);
     IGF.emitStrongRelease(value, asDerived().getReferenceCounting(), atomicity);
   }
 
   void emitScalarFixLifetime(IRGenFunction &IGF, llvm::Value *value) const {
     return IGF.emitFixLifetime(value);
   }
 
-  void emitScalarRetain(IRGenFunction &IGF, llvm::Value *value,
+  virtual void emitScalarRetain(IRGenFunction &IGF, llvm::Value *value,
                         Atomicity atomicity) const {
-    if (asDerived().getReferenceCounting() == ReferenceCounting::CxxCustom) {
-      if constexpr (__is_same(Impl, ClassTypeInfo)) {
-        auto releaseFn = findForeignReferenceTypeRefCountingOperation(
-            asDerived().getClass(),
-            ForeignReferenceTypeRefCountingOperation::retain);
-        IGF.emitForeignReferenceTypeLifetimeOperation(releaseFn, value);
-        return;
-      } else {
-        llvm_unreachable("");
-      }
-    }
-
+    assert(asDerived().getReferenceCounting() != ReferenceCounting::CxxCustom);
     IGF.emitStrongRetain(value, asDerived().getReferenceCounting(), atomicity);
   }
 
   // Implement the primary retain/release operations of ReferenceTypeInfo
   // using basic reference counting.
   void strongRetain(IRGenFunction &IGF, Explosion &e,
                     Atomicity atomicity) const override {
+    assert(asDerived().getReferenceCounting() != ReferenceCounting::CxxCustom);
     llvm::Value *value = e.claimNext();
-
-    if (asDerived().getReferenceCounting() == ReferenceCounting::CxxCustom) {
-      if constexpr (__is_same(Impl, ClassTypeInfo)) {
-        auto releaseFn = findForeignReferenceTypeRefCountingOperation(
-            asDerived().getClass(),
-            ForeignReferenceTypeRefCountingOperation::retain);
-        IGF.emitForeignReferenceTypeLifetimeOperation(releaseFn, value);
-        return;
-      } else {
-        llvm_unreachable("");
-      }
-    }
-
     asDerived().emitScalarRetain(IGF, value, atomicity);
   }
 
   void strongRelease(IRGenFunction &IGF, Explosion &e,
                      Atomicity atomicity) const override {
+    assert(asDerived().getReferenceCounting() != ReferenceCounting::CxxCustom);
     llvm::Value *value = e.claimNext();
-
-    if (asDerived().getReferenceCounting() == ReferenceCounting::CxxCustom) {
-      if constexpr (__is_same(Impl, ClassTypeInfo)) {
-        auto releaseFn = findForeignReferenceTypeRefCountingOperation(
-            asDerived().getClass(),
-            ForeignReferenceTypeRefCountingOperation::release);
-        IGF.emitForeignReferenceTypeLifetimeOperation(releaseFn, value);
-        return;
-      } else {
-        llvm_unreachable("");
-      }
-    }
-
     asDerived().emitScalarRelease(IGF, value, atomicity);
   }