potential fix

Author: ktoso

lib/AST/RequirementMachine/GenericSignatureQueries.cpp

@@ -762,7 +762,6 @@ bool RequirementMachine::haveSameShape(Type type1, Type type2) const {
 }
 
 void RequirementMachine::verify(const MutableTerm &term) const {
-#ifndef NDEBUG
   // If the term is in the generic parameter domain, ensure we have a valid
   // generic parameter.
   if (term.begin()->getKind() == Symbol::Kind::GenericParam) {
@@ -847,5 +846,4 @@ void RequirementMachine::verify(const MutableTerm &term) const {
     dump(llvm::errs());
     abort();
   }
-#endif
 }

lib/IRGen/GenDistributed.cpp

@@ -271,17 +271,20 @@ static CanSILFunctionType getAccessorType(IRGenModule &IGM,
     auto *actor = getDistributedActorOf(Target);
     assert(actor);
 
-    for (auto *genericParam : actor->getInnermostGenericParamTypes())
-      genericParams.push_back(genericParam);
-
+//    for (auto *genericParam : actor->getInnermostGenericParamTypes())
+//      genericParams.push_back(genericParam);
+//
     // Add a generic parameter `D` which stands for decoder type in the
     // accessor signature - `inout D`.
     genericParams.push_back(decoderType);
     // Add a requirement that decoder conforms to the expected protocol.
     genericRequirements.push_back(
         {RequirementKind::Conformance, decoderType, decoderProtocolTy});
 
-    signature = GenericSignature::get(genericParams, genericRequirements);
+//    signature = GenericSignature::get(genericParams, genericRequirements);
+    signature = buildGenericSignature(Context, actor->getGenericSignature(),
+                          std::move(genericParams),
+                          std::move(genericRequirements));
   }
 
   auto accessorTy = GenericFunctionType::get(
@@ -659,6 +662,8 @@ void DistributedAccessor::emit() {
   // Witness table for decoder conformance to DistributedTargetInvocationDecoder
   auto *decoderProtocolWitness = params.claimNext();
 
+  (void) params.claimAll();
+
   // Preliminary: Setup async context for this accessor.
   {
     auto fpKind = FunctionPointerKind::defaultAsync();