Merge pull request #77076 from drexin/wip-137954177-6.0

[6.0][IRGen] Don't try to emit single payload CVW for incompatible multi p…

Author: drexin

lib/IRGen/TypeLayout.cpp

@@ -2406,7 +2406,8 @@ bool EnumTypeLayoutEntry::refCountString(IRGenModule &IGM,
     if (isMultiPayloadEnum() &&
         buildMultiPayloadRefCountString(IGM, B, genericSig)) {
       return true;
-    } else if (buildSinglePayloadRefCountString(IGM, B, genericSig)) {
+    } else if (!isMultiPayloadEnum() &&
+               buildSinglePayloadRefCountString(IGM, B, genericSig)) {
       return true;
     }
 

test/Interpreter/layout_string_witnesses_objc.swift

@@ -48,3 +48,45 @@ func testNestedResilientObjc() {
 }
 
 testNestedResilientObjc()
+
+protocol P {}
+
+extension ObjCPrintOnDealloc: P {}
+
+enum MultiPayloadObjCExistential {
+    case x(AnyObject)
+    case y(P & ObjCPrintOnDealloc)
+}
+
+struct MultiPayloadObjCExistentialWrapper {
+    let x: MultiPayloadObjCExistential
+    let y: Int = 0
+}
+
+func testMultiPayloadObjCExistentialWrapper() {
+    let ptr = allocateInternalGenericPtr(of: NestedWrapper<MultiPayloadObjCExistentialWrapper>.self)
+
+    do {
+        let x = MultiPayloadObjCExistentialWrapper(x: .y(ObjCPrintOnDealloc()))
+        testGenericInit(ptr, to: x)
+    }
+
+    do {
+        let y = MultiPayloadObjCExistentialWrapper(x: .y(ObjCPrintOnDealloc()))
+        // CHECK: Before deinit
+        print("Before deinit")
+
+        // CHECK-NEXT: ObjCPrintOnDealloc deinitialized!
+        testGenericAssign(ptr, from: y)
+    }
+
+    // CHECK-NEXT: Before deinit
+    print("Before deinit")
+
+    // CHECK-NEXT: ObjCPrintOnDealloc deinitialized!
+    testGenericDestroy(ptr, of: NestedWrapper<MultiPayloadObjCExistentialWrapper>.self)
+
+    ptr.deallocate()
+}
+
+testMultiPayloadObjCExistentialWrapper()