Revert "SILGen: Cast the materializeForSet callback to the correct type when applying it"

This reverts commit 194c170.

Author: benlangmuir

lib/SILGen/SILGenLValue.cpp

@@ -905,7 +905,6 @@ namespace {
       // warnings if we manage to devirtualize materializeForSet.
       loc.markAutoGenerated();
 
-      SILModule &M = gen.SGM.M;
       ASTContext &ctx = gen.getASTContext();
 
       SILBasicBlock *contBB = gen.createBasicBlock();
@@ -920,7 +919,6 @@ namespace {
 
         auto emptyTupleTy =
           SILType::getPrimitiveObjectType(TupleType::getEmpty(ctx));
-        auto rawPointerTy = SILType::getRawPointerType(ctx);
 
         SILType callbackSILType = gen.getLoweredType(
                   materialized.callback->getType().getSwiftRValueType()
@@ -930,15 +928,8 @@ namespace {
         SILValue callback =
           writebackBB->createBBArg(callbackSILType);
 
-        // Cast the callback to the correct polymorphic function type.
-        auto origCallbackFnType = gen.SGM.Types.getMaterializeForSetCallbackType(
-            decl, materialized.genericSig, materialized.origSelfType);
-        auto origCallbackType = SILType::getPrimitiveObjectType(origCallbackFnType);
-        auto substCallbackFnType = origCallbackFnType->substGenericArgs(
-            M, M.getSwiftModule(), substitutions);
-        auto substCallbackType = SILType::getPrimitiveObjectType(substCallbackFnType);
-
-        auto metatypeType = substCallbackFnType->getParameters().back().getSILType();
+        auto callbackType = callbackSILType.castTo<SILFunctionType>();
+        SILType metatypeType = callbackType->getParameters().back().getSILType();
 
         // We need to borrow the base here.  We can't just consume it
         // because we're in conditionally-executed code (and because
@@ -958,21 +949,17 @@ namespace {
         // Otherwise, we have to pass something; use an empty tuple
         // and an undef metatype.
         } else {
-          baseAddress = SILUndef::get(emptyTupleTy.getAddressType(), M);
-          baseMetatype = SILUndef::get(metatypeType, M);
+          baseAddress = SILUndef::get(emptyTupleTy.getAddressType(), gen.SGM.M);
+          baseMetatype = SILUndef::get(metatypeType, gen.SGM.M);
         }
 
         SILValue temporaryPointer =
           gen.B.createAddressToPointer(loc,
                                        materialized.temporary.getValue(),
-                                       rawPointerTy);
-
-        callback = gen.B.createThinFunctionToPointer(loc, callback, rawPointerTy);
-        callback = gen.B.createPointerToThinFunction(loc, callback, origCallbackType);
+                                       SILType::getRawPointerType(ctx));
 
         // Apply the callback.
-        gen.B.createApply(loc, callback, substCallbackType,
-                          emptyTupleTy, substitutions, {
+        gen.B.createApply(loc, callback, {
                             temporaryPointer,
                             materialized.callbackStorage,
                             baseAddress,

test/SILGen/accessors.swift

@@ -62,8 +62,6 @@ func test0(ref: A) {
 // CHECK-NEXT: store %0 to [[TEMP2]] : $*A
 // CHECK-NEXT: [[T0:%.*]] = metatype $@thick A.Type
 // CHECK-NEXT: [[T1:%.*]] = address_to_pointer [[ADDR]] : $*OrdinarySub to $Builtin.RawPointer
-// CHECK-NEXT: [[CALLBACK_ADDR:%.*]] = thin_function_to_pointer [[CALLBACK]] : $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout A, @thick A.Type) -> () to $Builtin.RawPointer
-// CHECK-NEXT: [[CALLBACK:%.*]] = pointer_to_thin_function [[CALLBACK_ADDR]] : $Builtin.RawPointer to $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout A, @thick A.Type) -> ()
 // CHECK-NEXT: apply [[CALLBACK]]([[T1]], [[STORAGE]], [[TEMP2]], [[T0]])
 // CHECK-NEXT: dealloc_stack [[TEMP2]]
 // CHECK-NEXT: br [[CONT]]
@@ -119,8 +117,6 @@ func test1(ref: B) {
 // CHECK-NEXT: store %0 to [[TEMP2]] : $*B
 // CHECK-NEXT: [[T0:%.*]] = metatype $@thick B.Type
 // CHECK-NEXT: [[T1:%.*]] = address_to_pointer [[ADDR]] : $*MutatingSub to $Builtin.RawPointer
-// CHECK-NEXT: [[CALLBACK_ADDR:%.*]] = thin_function_to_pointer [[CALLBACK]] : $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout B, @thick B.Type) -> () to $Builtin.RawPointer
-// CHECK-NEXT: [[CALLBACK:%.*]] = pointer_to_thin_function [[CALLBACK_ADDR]] : $Builtin.RawPointer to $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout B, @thick B.Type) -> ()
 // CHECK-NEXT: apply [[CALLBACK]]([[T1]], [[STORAGE]], [[TEMP2]], [[T0]])
 // CHECK-NEXT: dealloc_stack [[TEMP2]]
 // CHECK-NEXT: br [[CONT]]
@@ -144,8 +140,6 @@ func test1(ref: B) {
 // CHECK-NEXT: store %0 to [[TEMP2]] : $*B
 // CHECK-NEXT: [[T0:%.*]] = metatype $@thick B.Type
 // CHECK-NEXT: [[T1:%.*]] = address_to_pointer [[ADDR]] : $*MutatingSub to $Builtin.RawPointer
-// CHECK-NEXT: [[CALLBACK_ADDR:%.*]] = thin_function_to_pointer [[CALLBACK]] : $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout B, @thick B.Type) -> () to $Builtin.RawPointer
-// CHECK-NEXT: [[CALLBACK:%.*]] = pointer_to_thin_function [[CALLBACK_ADDR]] : $Builtin.RawPointer to $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout B, @thick B.Type) -> ()
 // CHECK-NEXT: apply [[CALLBACK]]([[T1]], [[STORAGE2]], [[TEMP2]], [[T0]])
 // CHECK-NEXT: dealloc_stack [[TEMP2]]
 // CHECK-NEXT: br [[CONT]]

test/SILGen/lifetime.swift

@@ -384,8 +384,6 @@ func logical_lvalue_lifetime(r: RefWithProp, _ i: Int, _ v: Val) {
   // CHECK: {{.*}}([[CALLBACK:%.*]] : 
   // CHECK: [[TEMP:%.*]] = alloc_stack $RefWithProp
   // CHECK: store [[R2]] to [[TEMP]]
-  // CHECK: [[CALLBACK_ADDR:%.*]] = thin_function_to_pointer [[CALLBACK]] : $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout RefWithProp, @thick RefWithProp.Type) -> () to $Builtin.RawPointer
-  // CHECK: [[CALLBACK:%.*]] = pointer_to_thin_function [[CALLBACK_ADDR]] : $Builtin.RawPointer to $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout RefWithProp, @thick RefWithProp.Type) -> ()
   // CHECK: apply [[CALLBACK]]({{.*}}, [[STORAGE]], [[TEMP]], {{%.*}})
 }
 

test/SILGen/properties.swift

@@ -232,8 +232,6 @@ func logical_struct_in_reftype_set(value: inout Val, z1: Int) {
   // CHECK: store [[VAL_REF]] to [[REF_MAT]]
   // CHECK: [[T0:%.*]] = metatype $@thick Ref.Type
   // CHECK: [[T1:%.*]] = address_to_pointer [[VAL_REF_VAL_PROP_MAT]]
-  // CHECK: [[CALLBACK_ADDR:%.*]] = thin_function_to_pointer [[CALLBACK]] : $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout Ref, @thick Ref.Type) -> () to $Builtin.RawPointer
-  // CHECK: [[CALLBACK:%.*]] = pointer_to_thin_function [[CALLBACK_ADDR]] : $Builtin.RawPointer to $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout Ref, @thick Ref.Type) -> ()
   // CHECK: apply [[CALLBACK]]([[T1]], [[STORAGE]], [[REF_MAT]], [[T0]])
   // CHECK: br [[CONT]]
   // CHECK: [[CONT]]:

test/SILGen/protocols.swift

@@ -401,33 +401,6 @@ func testExistentialPropertyRead<T: ExistentialProperty>(t: inout T) {
 // CHECK-NOT:  witness_method
 // CHECK:      return
 
-func modify(x: inout Int) {}
-
-// Make sure we call the materializeForSet callback with the correct
-// generic signature.
-
-func modifyProperty<T : PropertyWithGetterSetter>(x: inout T) {
-  modify(&x.b)
-}
-// CHECK-LABEL: sil hidden @_TF9protocols14modifyPropertyuRxS_24PropertyWithGetterSetterrFRxT_
-// CHECK:      [[SELF_BOX:%.*]] = alloc_box $T
-// CHECK:      [[SELF:%.*]] = project_box %1 : $@box T
-// CHECK:      [[MODIFY_FN:%.*]] = function_ref @_TF9protocols6modifyFRSiT_
-// CHECK:      [[WITNESS_FN:%.*]] = witness_method $T, #PropertyWithGetterSetter.b!materializeForSet.1
-// CHECK:      [[RESULT:%.*]] = apply [[WITNESS_FN]]<T>
-// CHECK:      [[TEMPORARY:%.*]] = tuple_extract [[RESULT]]
-// CHECK:      [[CALLBACK:%.*]] = tuple_extract [[RESULT]]
-// CHECK:      [[TEMPORARY_ADDR_TMP:%.*]] = pointer_to_address [[TEMPORARY]] : $Builtin.RawPointer to $*Int
-// CHECK:      [[TEMPORARY_ADDR:%.*]] = mark_dependence [[TEMPORARY_ADDR_TMP]] : $*Int on [[SELF]] : $*T
-// CHECK:      apply [[MODIFY_FN]]([[TEMPORARY_ADDR]])
-// CHECK:      switch_enum [[CALLBACK]] : $Optional<@convention(thin) (Builtin.RawPointer, inout Builtin.UnsafeValueBuffer, inout T, @thick T.Type) -> ()>, case #Optional.some!enumelt.1: bb1, case #Optional.none!enumelt: bb2
-// CHECK:    bb1([[CALLBACK:%.*]] : $@convention(thin) (Builtin.RawPointer, @inout Builtin.UnsafeValueBuffer, @inout T, @thick T.Type) -> ()):
-// CHECK:      [[METATYPE:%.*]] = metatype $@thick T.Type
-// CHECK:      [[TEMPORARY:%.*]] = address_to_pointer [[TEMPORARY_ADDR]] : $*Int to $Builtin.RawPointer
-// CHECK:      [[CALLBACK_ADDR:%.*]] = thin_function_to_pointer [[CALLBACK]]
-// CHECK:      [[CALLBACK:%.*]] = pointer_to_thin_function [[CALLBACK_ADDR]]
-// CHECK:      apply [[CALLBACK]]<T>
-
 // CHECK-LABEL: sil_witness_table hidden ClassWithGetter: PropertyWithGetter module protocols {
 // CHECK-NEXT:  method #PropertyWithGetter.a!getter.1: @_TTWC9protocols15ClassWithGetterS_18PropertyWithGetterS_FS1_g1aSi
 // CHECK-NEXT: }