[Distributed] Another fix for getting required protocols for SR

Author: ktoso

include/swift/AST/ASTSynthesis.h

@@ -41,16 +41,15 @@ enum SingletonTypeSynthesizer {
   _any,
   _bridgeObject,
   _error,
-  _executor, // the 'BuiltinExecutor' type
+  _executor,
   _job,
   _nativeObject,
   _never,
   _rawPointer,
   _rawUnsafeContinuation,
   _void,
   _word,
-  _executorProtocol, // the '_Concurrency.Executor' protocol
-  _serialExecutor, // the '_Concurrency.SerialExecutor' protocol
+  _serialExecutor,
 };
 inline Type synthesizeType(SynthesisContext &SC,
                            SingletonTypeSynthesizer kind) {
@@ -67,15 +66,9 @@ inline Type synthesizeType(SynthesisContext &SC,
   case _void: return SC.Context.TheEmptyTupleType;
   case _word: return BuiltinIntegerType::get(BuiltinIntegerWidth::pointer(),
                                              SC.Context);
-  case _executorProtocol:
-    return SC.Context.getProtocol(KnownProtocolKind::Executor)
-      ->getDeclaredInterfaceType();
-    case _serialExecutor:
+  case _serialExecutor:
     return SC.Context.getProtocol(KnownProtocolKind::SerialExecutor)
       ->getDeclaredInterfaceType();
-  case _taskExecutor:
-    return SC.Context.getProtocol(KnownProtocolKind::TaskExecutor)
-      ->getDeclaredInterfaceType();
   }
 }
 

lib/AST/DistributedDecl.cpp

@@ -119,15 +119,8 @@ Type swift::getSerializationRequirementTypesForMember(
     }
 
     // Also store all `SerializationRequirement : SomeProtocol` requirements
-    for (auto requirement: signature.getRequirements()) {
-      if (requirement.getFirstType()->isEqual(SerReqAssocType) &&
-          requirement.getKind() == RequirementKind::Conformance) {
-        if (auto nominal = requirement.getSecondType()->getAnyNominal()) {
-          if (auto protocol = dyn_cast<ProtocolDecl>(nominal)) {
-            serializationRequirements.insert(protocol);
-          }
-        }
-      }
+    for (auto proto: signature->getRequiredProtocols(SerReqAssocType)) {
+      serializationRequirements.insert(proto);
     }
 
     // Note that this may be null, e.g. if we're a distributed func inside