Merge pull request #27839 from slavapestov/caller-side-generic-arg-subst-5.1

Sema: Fix substitutions of generic caller-side default arguments [5.1]

Author: tkremenek

lib/Sema/CSApply.cpp

@@ -5093,8 +5093,8 @@ getCallerDefaultArg(ConstraintSystem &cs, DeclContext *dc,
   }
 
   // Convert the literal to the appropriate type.
-  auto defArgType = owner.getDecl()->getDeclContext()->mapTypeIntoContext(
-      param->getInterfaceType());
+  auto defArgType =
+      param->getInterfaceType().subst(owner.getSubstitutions());
   auto resultTy =
       tc.typeCheckParameterDefault(init, dc, defArgType,
                                    /*isAutoClosure=*/param->isAutoClosure(),

test/SILGen/stored_property_default_arg.swift

@@ -207,4 +207,20 @@ func checkReferenceTuple() {
 // CHECK-NEXT: [[AA1_REF:%.*]] = function_ref @$s27stored_property_default_arg2AAV2abAcA1ZCSg2ac_AG2adt_tcfC : $@convention(method) (@owned Optional<Z>, @owned Optional<Z>, @thin AA.Type) -> @owned AA
 // CHECK-NEXT: [[AA1:%.*]] = apply [[AA1_REF]]([[ELT0]], [[ELT1]], {{.*}}) : $@convention(method) (@owned Optional<Z>, @owned Optional<Z>, @thin AA.Type) -> @owned AA
   let ae = AA.init(ab:)()
-}
+}
+
+struct OptionalGeneric<T> {
+  var t: T?
+  var x: Int
+}
+
+// CHECK-LABEL: sil hidden [ossa] @$s27stored_property_default_arg31checkDefaultInitGenericOptionalyyF : $@convention(thin) () -> () {
+func checkDefaultInitGenericOptional() {
+  let og = OptionalGeneric<Int>(x: 0)
+
+  // CHECK: [[VALUE:%.*]] = enum $Optional<Int>, #Optional.none!enumelt
+  // CHECK: [[NIL:%.*]] = alloc_stack $Optional<Int>
+  // CHECK: store [[VALUE]] to [trivial] [[NIL]] : $*Optional<Int>
+  // CHECK: [[FN:%.*]] =  function_ref @$s27stored_property_default_arg15OptionalGenericV1t1xACyxGxSg_SitcfC : $@convention(method) <τ_0_0> (@in Optional<τ_0_0>, Int, @thin OptionalGeneric<τ_0_0>.Type) -> @out OptionalGeneric<τ_0_0>
+  // CHECK: apply [[FN]]<Int>(%0, [[NIL]], {{%.*}}, %1)
+}