Merge pull request #68548 from drexin/wip-5ef441-5.10

[5.10][IRGen] Only use value witness getEnumTag function for "normal" enums

Author: drexin

lib/IRGen/GenValueWitness.cpp

@@ -905,6 +905,9 @@ static llvm::Constant *getEnumTagFunction(IRGenModule &IGM,
   if (!typeLayoutEntry->layoutString(IGM, genericSig) &&
       !isRuntimeInstatiatedLayoutString(IGM, typeLayoutEntry)) {
     return nullptr;
+  } else if (typeLayoutEntry->copyDestroyKind(IGM) !=
+             EnumTypeLayoutEntry::CopyDestroyStrategy::Normal) {
+    return nullptr;
   } else if (typeLayoutEntry->isSingleton()) {
     return IGM.getSingletonEnumGetEnumTagFn();
   } else if (!typeLayoutEntry->isFixedSize(IGM)) {
@@ -939,6 +942,9 @@ getDestructiveInjectEnumTagFunction(IRGenModule &IGM,
   if ((!typeLayoutEntry->layoutString(IGM, genericSig) &&
        !isRuntimeInstatiatedLayoutString(IGM, typeLayoutEntry))) {
     return nullptr;
+  } else if (typeLayoutEntry->copyDestroyKind(IGM) !=
+             EnumTypeLayoutEntry::CopyDestroyStrategy::Normal) {
+    return nullptr;
   } else if (typeLayoutEntry->isSingleton()) {
     return IGM.getSingletonEnumDestructiveInjectEnumTagFn();
   } else if (!typeLayoutEntry->isFixedSize(IGM)) {

test/Interpreter/Inputs/layout_string_witnesses_types_resilient.swift

@@ -25,6 +25,11 @@ public enum ResilientSinglePayloadEnumGeneric<T> {
     case nonEmpty(T)
 }
 
+public enum ResilientSinglePayloadEnumIndirect {
+    case empty
+    indirect case nonEmpty(AnyObject)
+}
+
 public enum ResilientMultiPayloadEnumGeneric<T> {
     case empty0
     case empty1
@@ -55,6 +60,14 @@ public enum ResilientSingletonEnum {
     case nonEmpty(AnyObject)
 }
 
+public func getResilientSinglePayloadEnumIndirectEmpty() -> ResilientSinglePayloadEnumIndirect {
+    return .empty
+}
+
+public func getResilientSinglePayloadEnumIndirectNonEmpty(_ x: AnyObject) -> ResilientSinglePayloadEnumIndirect {
+    return .nonEmpty(x)
+}
+
 public func getResilientSinglePayloadEnumGenericEmpty0<T>(_ t: T.Type) -> ResilientSinglePayloadEnumGeneric<T> {
     return .empty0
 }

test/Interpreter/layout_string_witnesses_dynamic.swift

@@ -842,6 +842,26 @@ func testResilientSinglePayloadEnumSimpleTag() {
 
 testResilientSinglePayloadEnumSimpleTag()
 
+func testResilientSinglePayloadEnumIndirectTag() {
+    let x = switch getResilientSinglePayloadEnumIndirectNonEmpty(SimpleClass(x: 23)) {
+    case .nonEmpty: 0
+    case .empty: 1
+    }
+
+    // CHECK: Enum case: 0
+    print("Enum case: \(x)")
+
+    let y = switch getResilientSinglePayloadEnumIndirectEmpty() {
+    case .nonEmpty: 0
+    case .empty: 1
+    }
+
+    // CHECK: Enum case: 1
+    print("Enum case: \(y)")
+}
+
+testResilientSinglePayloadEnumIndirectTag()
+
 func testResilientSinglePayloadEnumComplexTag() {
     let x = switch getResilientSinglePayloadEnumComplexEmpty0() {
     case .nonEmpty: 0