[cxx-interop] Emit retain/release correctly for FRT's that are stored in optionals and have custom ref counting instructions.

Author: zoecarver

lib/IRGen/GenEnum.cpp

@@ -133,6 +133,7 @@
 #include "ScalarTypeInfo.h"
 #include "StructLayout.h"
 #include "SwitchBuilder.h"
+#include "ClassTypeInfo.h"
 
 using namespace swift;
 using namespace irgen;
@@ -2467,9 +2468,17 @@ namespace {
     void retainRefcountedPayload(IRGenFunction &IGF,
                                  llvm::Value *ptr) const {
       switch (CopyDestroyKind) {
-      case NullableRefcounted:
+      case NullableRefcounted: {
+        if (Refcounting == ReferenceCounting::Custom) {
+          Explosion e;
+          e.add(ptr);
+          getPayloadTypeInfo().as<ClassTypeInfo>().strongRetain(IGF, e, IGF.getDefaultAtomicity());
+          return;
+        }
+
         IGF.emitStrongRetain(ptr, Refcounting, IGF.getDefaultAtomicity());
         return;
+      }
       case ForwardToPayload:
       case POD:
       case Normal:
@@ -2495,9 +2504,17 @@ namespace {
     void releaseRefcountedPayload(IRGenFunction &IGF,
                                   llvm::Value *ptr) const {
       switch (CopyDestroyKind) {
-      case NullableRefcounted:
+      case NullableRefcounted: {
+        if (Refcounting == ReferenceCounting::Custom) {
+          Explosion e;
+          e.add(ptr);
+          getPayloadTypeInfo().as<ClassTypeInfo>().strongRelease(IGF, e, IGF.getDefaultAtomicity());
+          return;
+        }
+
         IGF.emitStrongRelease(ptr, Refcounting, IGF.getDefaultAtomicity());
         return;
+      }
       case ForwardToPayload:
       case POD:
       case Normal:

test/Interop/Cxx/foreign-reference/reference-counted.swift

@@ -1,11 +1,9 @@
-// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify -g)
+// RUN: %target-run-simple-swift(-I %S/Inputs/ -Xfrontend -enable-experimental-cxx-interop -Xfrontend -validate-tbd-against-ir=none -Xfrontend -disable-llvm-verify)
 //
 // REQUIRES: executable_test
 // TODO: This should work without ObjC interop in the future rdar://97497120
 // REQUIRES: objc_interop
 
-// REQUIRES: rdar97532642
-
 import StdlibUnittest
 import ReferenceCounted
 
@@ -29,6 +27,14 @@ ReferenceCountedTestSuite.test("Local") {
     expectEqual(finalLocalRefCount, 0)
 }
 
+var globalOptional: NS.LocalCount? = nil
+
+ReferenceCountedTestSuite.test("Global optional holding local ref count") {
+    expectEqual(finalLocalRefCount, 0)
+    globalOptional = NS.LocalCount.create()
+    expectEqual(finalLocalRefCount, 1)
+}
+
 @inline(never)
 func globalTest1() {
     var x = GlobalCount.create()