clenaups

Author: ktoso

include/swift/AST/Witness.h

@@ -180,7 +180,6 @@ class Witness {
 
   /// Retrieve the witness thunk generic signature.
   GenericSignature getWitnessThunkSignature() const {
-    // TODO: find what creates/sets that
     if (auto *storedWitness = storage.dyn_cast<StoredWitness *>())
       return storedWitness->witnessThunkSig;
     return nullptr;

lib/IRGen/GenProto.cpp

@@ -794,10 +794,6 @@ void EmitPolymorphicParameters::injectAdHocDistributedRequirements() {
         IGM.getConformsToProtocolFunctionPointer(),
         {metadata, IGM.getAddrOfProtocolDescriptor(proto)});
 
-    // TODO: insufficient for lookup conformance
-
-    // TODO: dynamic is fine, but also put the requiremtn in the witness thunk
-
     IGF.setUnscopedLocalTypeData(
         archetypeTy,
         LocalTypeDataKind::forAbstractProtocolWitnessTable(proto),

lib/SILGen/SILGenType.cpp

@@ -752,7 +752,6 @@ SILFunction *SILGenModule::emitProtocolWitness(
   // thunk's generic signature.
   auto reqtSubMap = witness.getRequirementToWitnessThunkSubs();
 
-  // TODO: maybe fix those signature here
   // The generic environment for the witness thunk.
   auto *genericEnv = witness.getWitnessThunkSignature().getGenericEnvironment();
   auto genericSig = witness.getWitnessThunkSignature().getCanonicalSignature();

lib/Sema/CSSimplify.cpp

@@ -8801,18 +8801,18 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
 
         if (witness->isGeneric()) {
           // `DistributedActorSystem.remoteCall`
-          if (witness->isDistributedActorSystemRemoteCall(/*isVoidReturn=*/false, /*allowRequirement=*/true)) {
+          if (witness->isDistributedActorSystemRemoteCall(/*isVoidReturn=*/false, /*allowRequirement=*/false)) {
             if (GP->isEqual(cast<FuncDecl>(witness)->getResultInterfaceType()))
               return synthesizeConformance();
           }
 
           // `DistributedTargetInvocationEncoder.record{Argument, ResultType}`
           // `DistributedTargetInvocationDecoder.decodeNextArgument`
           // `DistributedTargetInvocationResultHandler.onReturn`
-          if (witness->isDistributedTargetInvocationEncoderRecordArgument(/*allowRequirement=*/true) ||
-              witness->isDistributedTargetInvocationEncoderRecordReturnType(/*allowRequirement=*/true) ||
-              witness->isDistributedTargetInvocationDecoderDecodeNextArgument(/*allowRequirement=*/true) ||
-              witness->isDistributedTargetInvocationResultHandlerOnReturn(/*allowRequirement=*/true)) {
+          if (witness->isDistributedTargetInvocationEncoderRecordArgument(/*allowRequirement=*/false) ||
+              witness->isDistributedTargetInvocationEncoderRecordReturnType(/*allowRequirement=*/false) ||
+              witness->isDistributedTargetInvocationDecoderDecodeNextArgument(/*allowRequirement=*/false) ||
+              witness->isDistributedTargetInvocationResultHandlerOnReturn(/*allowRequirement=*/false)) {
             auto genericParams = witness->getGenericParams()->getParams();
             if (GP->isEqual(genericParams.front()->getDeclaredInterfaceType()))
               return synthesizeConformance();

lib/Sema/TypeCheckProtocol.cpp

@@ -5646,12 +5646,6 @@ void ConformanceChecker::resolveValueWitnesses() {
     Conformance->setPreconcurrencyEffectful();
   }
 
-  // TODO: make sure this new we don't include this new requirement as we do lowering
-  //       but we do dynamic lookup in IR so we dont need to keep that requirement
-  //       since we dont have a source for that; since there is not WT to pass in, since we'll look it up
-  //       metadata source for that new requirement -- may already work
-
-  // TODO: maybe we dont need this here after we fix signature
   // Finally, check some ad-hoc protocol requirements.
   //
   // These protocol requirements are not expressible in Swift today, but as

test/Distributed/Runtime/distributed_actor_remoteCall_roundtrip_optimized_or_not.swift

@@ -1,9 +1,9 @@
 // RUN: %empty-directory(%t)
 
-// X: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -target %target-swift-5.7-abi-triple %S/../Inputs/FakeDistributedActorSystems.swift
-// X: %target-build-swift -module-name main -target %target-swift-5.7-abi-triple -j2 -parse-as-library -I %t %s %S/../Inputs/FakeDistributedActorSystems.swift -o %t/a.out
-// X: %target-codesign %t/a.out
-// X: %target-run %t/a.out | %FileCheck %s --enable-var-scope
+// RUN: %target-swift-frontend-emit-module -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -target %target-swift-5.7-abi-triple %S/../Inputs/FakeDistributedActorSystems.swift
+// RUN: %target-build-swift -module-name main -target %target-swift-5.7-abi-triple -j2 -parse-as-library -I %t %s %S/../Inputs/FakeDistributedActorSystems.swift -o %t/a.out
+// RUN: %target-codesign %t/a.out
+// RUN: %target-run %t/a.out | %FileCheck %s --enable-var-scope
 
 // The same test, but in optimized mode
 // RUN: %target-swift-frontend-emit-module -O -emit-module-path %t/FakeDistributedActorSystems.swiftmodule -module-name FakeDistributedActorSystems -target %target-swift-5.7-abi-triple %S/../Inputs/FakeDistributedActorSystems.swift