Merge pull request swiftlang#31799 from jckarter/simple-partial-apply-arm64e

IRGen: "Simple" partial_apply still needs to re-sign the entry point pointer.

Author: jckarter

lib/IRGen/IRGenSIL.cpp

@@ -2661,16 +2661,20 @@ void IRGenSILFunction::visitPartialApplyInst(swift::PartialApplyInst *i) {
   if (isSimplePartialApply(*this, i)) {
     Explosion function;
 
-    auto schema = IGM.getTypeInfo(v->getType()).getSchema();
+    auto &ti = IGM.getTypeInfo(v->getType());
+    auto schema = ti.getSchema();
     assert(schema.size() == 2);
     auto calleeTy = schema[0].getScalarType();
     auto contextTy = schema[1].getScalarType();
-    
     auto callee = getLoweredExplosion(i->getCallee());
     auto calleeValue = callee.claimNext();
     assert(callee.empty());
     calleeValue = Builder.CreateBitOrPointerCast(calleeValue, calleeTy);
-    function.add(calleeValue);
+    
+    // Re-sign the implementation pointer as a closure entry point.
+    auto calleeFn = FunctionPointer::forExplosionValue(*this, calleeValue,
+                                                       i->getOrigCalleeType());
+    function.add(calleeFn.getExplosionValue(*this, i->getFunctionType()));
 
     Explosion context;
     for (auto arg : i->getArguments()) {

test/IRGen/simple_partial_apply.sil

@@ -1,4 +1,4 @@
-// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s
+// RUN: %target-swift-frontend -emit-ir %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-cpu
 
 sil_stage canonical
 
@@ -13,7 +13,8 @@ struct SingleRefcounted {
 }
 
 // CHECK-LABEL: define {{.*}} @escape_partial_apply_swift_class
-// CHECK:      [[FPTR:%.*]] = insertvalue { i8*, %swift.refcounted* } undef, i8* %0, 0
+// CHECK-arm64e:  call i64 @llvm.ptrauth.resign.i64
+// CHECK:      [[FPTR:%.*]] = insertvalue { i8*, %swift.refcounted* } undef, i8* {{.*}}, 0
 // CHECK-NEXT: [[FCTX:%.*]] = insertvalue { i8*, %swift.refcounted* } [[FPTR]], %swift.refcounted* {{.*}}, 1
 // CHECK-NEXT: ret { i8*, %swift.refcounted* } [[FCTX]]
 sil @escape_partial_apply_swift_class : $@convention(thin) (@convention(method) (Int, @guaranteed C) -> Int, @guaranteed C) -> @callee_guaranteed (Int) -> Int {
@@ -23,7 +24,8 @@ entry(%body : $@convention(method) (Int, @guaranteed C) -> Int, %context : $C):
 }
 
 // CHECK-LABEL: define {{.*}} @escape_partial_apply_swift_single_refcount_struct
-// CHECK:      [[FPTR:%.*]] = insertvalue { i8*, %swift.refcounted* } undef, i8* %0, 0
+// CHECK-arm64e:  call i64 @llvm.ptrauth.resign.i64
+// CHECK:      [[FPTR:%.*]] = insertvalue { i8*, %swift.refcounted* } undef, i8* {{.*}}, 0
 // CHECK-NEXT: [[FCTX:%.*]] = insertvalue { i8*, %swift.refcounted* } [[FPTR]], %swift.refcounted* {{.*}}, 1
 // CHECK-NEXT: ret { i8*, %swift.refcounted* } [[FCTX]]
 sil @escape_partial_apply_swift_single_refcount_struct : $@convention(thin) (@convention(method) (Int, @guaranteed SingleRefcounted) -> Int, @guaranteed SingleRefcounted) -> @callee_guaranteed (Int) -> Int {
@@ -33,9 +35,10 @@ entry(%body : $@convention(method) (Int, @guaranteed SingleRefcounted) -> Int, %
 }
 
 // CHECK-LABEL: define {{.*}} @noescape_partial_apply_swift_indirect
+// CHECK-arm64e:  call i64 @llvm.ptrauth.resign.i64
 // CHECK:         [[CTX:%.*]] = bitcast {{.*}}** %1 to %swift.opaque*
 // CHECK-NEXT:    [[CONT:%.*]] = bitcast i8* %2
-// CHECK-NEXT:    call {{.*}}void [[CONT]](i8* %0, %swift.opaque* [[CTX]], %swift.refcounted* {{.*}}%3)
+// CHECK-NEXT:    call {{.*}}void [[CONT]](i8* {{.*}}, %swift.opaque* [[CTX]], %swift.refcounted* {{.*}}%3)
 sil @noescape_partial_apply_swift_indirect : $@convention(thin) (@convention(method) (Int, @in_guaranteed C) -> Int, @in_guaranteed C, @guaranteed @callee_guaranteed (@noescape @callee_guaranteed (Int) -> Int) -> ()) -> () {
 entry(%body : $@convention(method) (Int, @in_guaranteed C) -> Int, %context : $*C, %cont : $@callee_guaranteed (@noescape @callee_guaranteed (Int) -> Int) -> ()):
   %closure = partial_apply [callee_guaranteed] [on_stack] %body(%context) : $@convention(method) (Int, @in_guaranteed C) -> Int
@@ -45,9 +48,10 @@ entry(%body : $@convention(method) (Int, @in_guaranteed C) -> Int, %context : $*
 }
 
 // CHECK-LABEL: define {{.*}} @noescape_partial_apply_swift_direct_word
+// CHECK-arm64e:  call i64 @llvm.ptrauth.resign.i64
 // CHECK:         [[CTX:%.*]] = inttoptr i{{.*}} %1 to %swift.opaque*
 // CHECK-NEXT:    [[CONT:%.*]] = bitcast i8* %2
-// CHECK-NEXT:    call {{.*}}void [[CONT]](i8* %0, %swift.opaque* [[CTX]], %swift.refcounted* {{.*}}%3)
+// CHECK-NEXT:    call {{.*}}void [[CONT]](i8* {{.*}}, %swift.opaque* [[CTX]], %swift.refcounted* {{.*}}%3)
 sil @noescape_partial_apply_swift_direct_word : $@convention(thin) (@convention(method) (Int, Int) -> Int, Int, @guaranteed @callee_guaranteed (@noescape @callee_guaranteed (Int) -> Int) -> ()) -> () {
 entry(%body : $@convention(method) (Int, Int) -> Int, %context : $Int, %cont : $@callee_guaranteed (@noescape @callee_guaranteed (Int) -> Int) -> ()):
   %closure = partial_apply [callee_guaranteed] [on_stack] %body(%context) : $@convention(method) (Int, Int) -> Int