Merge pull request #74669 from slavapestov/fix-issue-74648-6.0

[6.0] SILGen: Fix emission of 'modify' witness when all generic params are concrete

Author: slavapestov

lib/SILGen/SILGenApply.cpp

@@ -6054,6 +6054,11 @@ SILGenFunction::emitBeginApplyWithRethrow(SILLocation loc, SILValue fn,
                                           SubstitutionMap subs,
                                           ArrayRef<SILValue> args,
                                           SmallVectorImpl<SILValue> &yields) {
+  // We completely drop the generic signature if all generic parameters were
+  // concrete.
+  if (subs && subs.getGenericSignature()->areAllParamsConcrete())
+    subs = SubstitutionMap();
+
   // TODO: adjust this to create try_begin_apply when appropriate.
   assert(!substFnType.castTo<SILFunctionType>()->hasErrorResult());
 

test/SILGen/constrained_extensions.swift

@@ -239,4 +239,23 @@ extension S<Int> {
       fatalError()
     }
   }
-}
+}
+
+// https://github.com/swiftlang/swift/issues/74648
+
+protocol HasX {
+  var x: Int { get set }
+}
+
+extension S: HasX where T == Int {
+  var x: Int {
+    get { 3 }
+    set { }
+  }
+}
+
+// CHECK-LABEL: sil private [transparent] [thunk] [ossa] @$s22constrained_extensions1SVyxGAA4HasXAASiRszlAaEP1xSivMTW : $@yield_once @convention(witness_method: HasX) @substituted <τ_0_0> (@inout τ_0_0) -> @yields @inout Int for <S<Int>> {
+// CHECK: [[WITNESS_FN:%.*]] = function_ref @$s22constrained_extensions1SVAASiRszlE1xSivM : $@yield_once @convention(method) (@inout S<Int>) -> @yields @inout Int
+// CHECK: begin_apply [[WITNESS_FN]](%0) : $@yield_once @convention(method) (@inout S<Int>) -> @yields @inout Int
+// CHECK: yield
+// CHECK: unwind