Merge pull request swiftlang#35838 from jckarter/enum-case-witness-default-conventions

SIL: Pick default ARC convention for witness thunks based on the kind of the original decl.

Author: jckarter

lib/SIL/IR/SILFunctionType.cpp

@@ -2486,7 +2486,7 @@ static CanSILFunctionType getNativeSILFunctionType(
   case SILFunctionType::Representation::Method:
   case SILFunctionType::Representation::Closure:
   case SILFunctionType::Representation::WitnessMethod: {
-    switch (constant ? constant->kind : SILDeclRef::Kind::Func) {
+    switch (origConstant ? origConstant->kind : SILDeclRef::Kind::Func) {
     case SILDeclRef::Kind::Initializer:
     case SILDeclRef::Kind::EnumElement:
       return getSILFunctionTypeForConventions(DefaultInitializerConventions());

test/SILGen/enum_witness_thunks.swift

@@ -0,0 +1,15 @@
+// RUN: %target-swift-emit-silgen %s | %FileCheck %s
+
+class C {}
+
+protocol P {
+    static func c(_: C) -> Self
+}
+
+enum E: P {
+    case c(C)
+}
+
+// CHECK-LABEL: sil {{.*}} @$s19enum_witness_thunks1EOAA1PA2aDP1cyxAA1CCFZTW : $@convention(witness_method: P) (@guaranteed C, @thick E.Type) -> @out E
+// CHECK:         [[COPY:%.*]] = copy_value
+// CHECK:         apply {{.*}}([[COPY]]