Survive using SDK which does not have TaskExecutor declared when

creating tasks with new builtin defaulted "owned" task executor parameter.
swiftlang · Jun 10, 2024 · c310d08 · c310d08
1 parent 55cf283
commit c310d08
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/include/swift/AST/ASTSynthesis.h b/include/swift/AST/ASTSynthesis.h
@@ -77,8 +77,11 @@ inline Type synthesizeType(SynthesisContext &SC,
     return SC.Context.getProtocol(KnownProtocolKind::SerialExecutor)
       ->getDeclaredInterfaceType();
   case _taskExecutor:
-    return SC.Context.getProtocol(KnownProtocolKind::TaskExecutor)
-      ->getDeclaredInterfaceType();
+    if (auto ty = SC.Context.getProtocol(KnownProtocolKind::TaskExecutor)) {
+      return ty->getDeclaredInterfaceType();
+    } else {
+      return nullptr;
+    }
   case _actor:
     return SC.Context.getProtocol(KnownProtocolKind::Actor)
       ->getDeclaredInterfaceType();

diff --git a/lib/SIL/Verifier/SILVerifier.cpp b/lib/SIL/Verifier/SILVerifier.cpp
@@ -2393,8 +2393,17 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
                   "third argument of createAsyncTask");
       requireType(arguments[3]->getType(), _object(_optional(_executor)),
                   "fourth argument of createAsyncTask");
-      requireType(arguments[4]->getType(), _object(_optional(_existential(_taskExecutor))),
-                  "fifth argument of createAsyncTask");
+      if (F.getASTContext().getProtocol(swift::KnownProtocolKind::TaskExecutor)) {
+        requireType(arguments[4]->getType(),
+                    _object(_optional(_existential(_taskExecutor))),
+                    "fifth argument of createAsyncTask");
+      } else {
+        // This is just a placeholder type for being able to pass 'nil' for it
+        // with SDKs which do not have the TaskExecutor type.
+        requireType(arguments[4]->getType(),
+                    _object(_optional(_executor)),
+                    "fifth argument of createAsyncTask");
+      }
       auto fnType = requireObjectType(SILFunctionType, arguments[5],
                                       "result of createAsyncTask");
       auto expectedExtInfo =

diff --git a/lib/SILGen/SILGenBuiltin.cpp b/lib/SILGen/SILGenBuiltin.cpp
@@ -1607,11 +1607,14 @@ static ManagedValue emitCreateAsyncTask(SILGenFunction &SGF, SILLocation loc,
   ManagedValue taskExecutorConsuming = [&] {
     if (options & CreateTaskOptions::OptionalEverything) {
       return nextArg().getAsSingleValue(SGF);
-    } else {
-      auto theTaskExecutorProto = ctx.getProtocol(KnownProtocolKind::TaskExecutor);
-      assert(theTaskExecutorProto && "Could not find TaskExecutor");
+    } else if (auto theTaskExecutorProto = ctx.getProtocol(KnownProtocolKind::TaskExecutor)) {
       return emitOptionalNone(theTaskExecutorProto->getDeclaredExistentialType()
                                   ->getCanonicalType());
+    } else {
+      // This builtin executor type here is just a placeholder type for being
+      // able to pass 'nil' for it with SDKs which do not have the TaskExecutor
+      // type.
+      return emitOptionalNone(ctx.TheExecutorType);
     }
   }();
 

diff --git a/...rency/Runtime/actor_assert_precondition_executor_checkIsolated_dispatch_swift6_mode.swift b/...rency/Runtime/actor_assert_precondition_executor_checkIsolated_dispatch_swift6_mode.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-build-swift -emit-silgen -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library %s -o %t/a.out
+// RUN: %target-build-swift -Xfrontend -disable-availability-checking %import-libdispatch -parse-as-library %s -o %t/a.out
 // RUN: %env-SWIFT_IS_CURRENT_EXECUTOR_LEGACY_MODE_OVERRIDE=swift6 %target-run %t/a.out
 
 // REQUIRES: executable_test