Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/SILGen/SILGenLValue.cpp

@@ -1431,8 +1431,6 @@ namespace {
         // Create the allocating setter function. It captures the base address.
         auto setterInfo = SGF.getConstantInfo(setter);
         SILValue setterFRef = SGF.emitGlobalFunctionRef(loc, setter, setterInfo);
-        auto setterSubs = SGF.getFunction().getForwardingSubstitutionMap();
-
         CanSILFunctionType setterTy = setterFRef->getType().castTo<SILFunctionType>();
         SILFunctionConventions setterConv(setterTy, SGF.SGM.M);
 
@@ -1446,7 +1444,7 @@ namespace {
 
         PartialApplyInst *setterPAI =
           SGF.B.createPartialApply(loc, setterFRef,
-                                   setterSubs, { capturedBase },
+                                   Substitutions, { capturedBase },
                                    ParameterConvention::Direct_Guaranteed);
         ManagedValue setterFn = SGF.emitManagedRValueWithCleanup(setterPAI);
 

test/SILOptimizer/di_property_wrappers.swift

@@ -61,6 +61,12 @@ struct IntStruct {
      }
      wrapped = 27
   }
+
+  // Check that we don't crash if the function has unrelated generic parameters.
+  // SR-11484
+  mutating func setit<V>(_ v: V) {
+    wrapped = 5
+  }
 }
 
 final class IntClass {
@@ -142,10 +148,15 @@ func testIntStruct() {
 
   // CHECK-NEXT:   .. init 42
   // CHECK-NEXT:   .. set 27
-  let t1 = IntStruct()
+  var t1 = IntStruct()
   // CHECK-NEXT: 27
   print(t1.wrapped)
 
+  // CHECK-NEXT:   .. set 5
+  t1.setit(false)
+  // CHECK-NEXT: 5
+  print(t1.wrapped)
+
   // CHECK-NEXT:   .. init 42
   let t2 = IntStruct(conditional: false)
   // CHECK-NEXT: 42