Merge pull request #4721 from swiftwasm/release/5.7

[pull] swiftwasm-release/5.7 from release/5.7

Author: kateinoigakukun

lib/IRGen/GenMeta.cpp

@@ -913,6 +913,10 @@ namespace {
         if (entry.getFunction().isAutoDiffDerivativeFunction())
           declRef = declRef.asAutoDiffDerivativeFunction(
               entry.getFunction().getAutoDiffDerivativeFunctionIdentifier());
+        if (entry.getFunction().isDistributedThunk()) {
+          flags = flags.withIsAsync(true);
+          declRef = declRef.asDistributed();
+        }
         addDiscriminator(flags, schema, declRef);
       }
 

lib/IRGen/GenProto.cpp

@@ -1352,6 +1352,8 @@ class AccessorConformanceInfo : public ConformanceInfo {
       auto &entry = SILEntries.front();
       SILEntries = SILEntries.slice(1);
 
+      bool isAsyncRequirement = requirement.hasAsync();
+
 #ifndef NDEBUG
       assert(entry.getKind() == SILWitnessTable::Method
              && "sil witness table does not match protocol");
@@ -1364,10 +1366,9 @@ class AccessorConformanceInfo : public ConformanceInfo {
 #endif
 
       SILFunction *Func = entry.getMethodWitness().Witness;
-      auto *afd = cast<AbstractFunctionDecl>(
-          entry.getMethodWitness().Requirement.getDecl());
       llvm::Constant *witness = nullptr;
       if (Func) {
+        assert(Func->isAsync() == isAsyncRequirement);
         if (Func->isAsync()) {
           witness = IGM.getAddrOfAsyncFunctionPointer(Func);
         } else {
@@ -1376,7 +1377,7 @@ class AccessorConformanceInfo : public ConformanceInfo {
       } else {
         // The method is removed by dead method elimination.
         // It should be never called. We add a pointer to an error function.
-        if (afd->hasAsync()) {
+        if (isAsyncRequirement) {
           witness = llvm::ConstantExpr::getBitCast(
               IGM.getDeletedAsyncMethodErrorAsyncFunctionPointer(),
               IGM.FunctionPtrTy);
@@ -1388,8 +1389,9 @@ class AccessorConformanceInfo : public ConformanceInfo {
       witness = llvm::ConstantExpr::getBitCast(witness, IGM.Int8PtrTy);
 
       PointerAuthSchema schema =
-          afd->hasAsync() ? IGM.getOptions().PointerAuth.AsyncProtocolWitnesses
-                          : IGM.getOptions().PointerAuth.ProtocolWitnesses;
+          isAsyncRequirement
+              ? IGM.getOptions().PointerAuth.AsyncProtocolWitnesses
+              : IGM.getOptions().PointerAuth.ProtocolWitnesses;
       Table.addSignedPointer(witness, schema, requirement);
       return;
     }

stdlib/public/runtime/Metadata.cpp

@@ -471,7 +471,8 @@ static void swift_objc_classCopyFixupHandler(Class oldClass, Class newClass) {
             reinterpret_cast<void *const *>(&src[i]),
             descriptors[i].Flags.getExtraDiscriminator(),
             !descriptors[i].Flags.isAsync(),
-            /*allowNull*/ false); // Don't allow NULL for Obj-C classes
+            /*allowNull*/ true); // NULL allowed for VFE (methods in the vtable
+                                 // might be proven unused and null'ed)
       }
     }
 

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_through_generic.swift

@@ -7,9 +7,6 @@
 // REQUIRES: concurrency
 // REQUIRES: distributed
 
-// FIXME: rdar://96520492 Test fails on specific config: Tools Opt+Assert, Stdlib Opt+DebInfo+Assert, iOS_arm64e
-// UNSUPPORTED: CPU=arm64e
-
 // rdar://76038845
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime

test/Distributed/Runtime/distributed_actor_func_calls_remoteCall_through_generic_and_inner.swift

@@ -11,9 +11,6 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
-// FIXME: rdar://96520224 Test fails on specific config: Tools Opt+Assert, Stdlib Opt+DebInfo+Assert, iOS_arm64e
-// UNSUPPORTED: CPU=arm64e
-
 // FIXME(distributed): Distributed actors currently have some issues on windows, isRemote always returns false. rdar://82593574
 // UNSUPPORTED: OS=windows-msvc