[Distributed] remove distributed aware emitClassMemberDestruction for now

Author: ktoso

lib/SILGen/SILGenDestructor.cpp

@@ -225,128 +225,6 @@ void SILGenFunction::emitClassMemberDestruction(ManagedValue selfValue,
   }
 }
 
-//void SILGenFunction::emitClassMemberDestruction(ManagedValue selfValue,
-//                                                ClassDecl *cd,
-//                                                CleanupLocation cleanupLoc) {
-//  assert(selfValue.getOwnershipKind() == OwnershipKind::Guaranteed);
-//  ASTContext &ctx = getASTContext();
-//  auto normalBB = createBasicBlock();
-//
-//  // TODO(distributed): a remote actor does not have properties,
-//  //                    so do not destroy them if the actor is remote
-//  if (cd->isDistributedActor()) {
-//    // FIXME(distributed): if remote, do the logic below, otherwise do the normal logic
-//    auto selfType = cd->getDeclaredInterfaceType();
-//
-//    auto loc = SILLocation(cd);
-//    loc.markAutoGenerated();
-//    Scope scope(Cleanups, CleanupLocation(loc));
-//
-//    auto isRemoteBB = createBasicBlock();
-//    auto isLocalBB = createBasicBlock();
-//
-//    // TODO(distributed): de-duplicate with the thunk logic in SILGenDistributed
-//    // if __isRemoteActor(self) {
-//    //   ...
-//    // } else {
-//    //   ...
-//    // }
-//    {
-//      FuncDecl *isRemoteFn = ctx.getIsRemoteDistributedActor();
-//      assert(isRemoteFn && "Could not find 'is remote' function, is the "
-//                           "'_Distributed' module available?");
-//
-//      ManagedValue selfAnyObject =
-//          B.createInitExistentialRef(loc, getLoweredType(ctx.getAnyObjectType()),
-//                                     CanType(selfType), selfValue, {});
-//      auto result = emitApplyOfLibraryIntrinsic(
-//          loc, isRemoteFn, SubstitutionMap(), {selfAnyObject}, SGFContext());
-//
-//      SILValue isRemoteResult =
-//          std::move(result).forwardAsSingleValue(*this, loc);
-//      SILValue isRemoteResultUnwrapped =
-//          emitUnwrapIntegerResult(loc, isRemoteResult);
-//
-//      B.createCondBranch(loc, isRemoteResultUnwrapped, isRemoteBB, isLocalBB);
-//    }
-//
-//    // // if __isRemoteActor(self)
-//    // {
-//    //  // nothing
-//    // }
-//    {
-//      B.emitBlock(isRemoteBB);
-//
-//      // TODO: deduplicate in this func, make another bb
-//      auto builtinName = getASTContext().getIdentifier(
-//          getBuiltinName(BuiltinValueKind::DestroyDefaultActor));
-//      auto resultTy = SGM.Types.getEmptyTupleType();
-//
-//      B.createBuiltin(cleanupLoc, builtinName, resultTy, /*subs*/{},
-//                      { selfValue.getValue() });
-//    }
-//
-//    // // else (local distributed actor)
-//    // {
-//    //   <continue normal deinit>
-//    // }
-//    {
-//      B.emitBlock(isLocalBB);
-//
-//      B.createBranch(loc, normalBB, {selfValue});
-//    }
-//  }
-//
-//  {
-//    if (cd->isDistributedActor())
-//      B.emitBlock(normalBB);
-//
-//    for (VarDecl *vd : cd->getStoredProperties()) {
-//      const TypeLowering &ti = getTypeLowering(vd->getType());
-//      if (!ti.isTrivial()) {
-//        SILValue addr =
-//            B.createRefElementAddr(cleanupLoc, selfValue.getValue(), vd,
-//                                   ti.getLoweredType().getAddressType());
-//        addr = B.createBeginAccess(
-//            cleanupLoc, addr, SILAccessKind::Deinit, SILAccessEnforcement::Static,
-//            false /*noNestedConflict*/, false /*fromBuiltin*/);
-//        B.createDestroyAddr(cleanupLoc, addr);
-//        B.createEndAccess(cleanupLoc, addr, false /*is aborting*/);
-//      }
-//    }
-//
-//    if (cd->isRootDefaultActor()) {
-//      auto builtinName = getASTContext().getIdentifier(
-//          getBuiltinName(BuiltinValueKind::DestroyDefaultActor));
-//      auto resultTy = SGM.Types.getEmptyTupleType();
-//
-//      B.createBuiltin(cleanupLoc, builtinName, resultTy, /*subs*/{},
-//                      { selfValue.getValue() });
-//    }
-//  }
-//
-//
-//
-////  // Additional destroy logic for actors
-////  {
-////    llvm::Optional<Identifier> builtinName;
-////    if (cd->isDistributedActor()) {
-////      builtinName = getASTContext().getIdentifier(
-////          getBuiltinName(BuiltinValueKind::DestroyDistributedActor));
-////    } else if (cd->isRootDefaultActor()) {
-////      builtinName = getASTContext().getIdentifier(
-////          getBuiltinName(BuiltinValueKind::DestroyDefaultActor));
-////    }
-////
-////    if (builtinName.hasValue()) {
-////      auto resultTy = SGM.Types.getEmptyTupleType();
-////      B.createBuiltin(cleanupLoc, *builtinName, resultTy, /*subs*/ {},
-////                      {selfValue.getValue()});
-////    }
-////  }
-//}
-
-
 void SILGenFunction::emitObjCDestructor(SILDeclRef dtor) {
   auto dd = cast<DestructorDecl>(dtor.getDecl());
   auto cd = cast<ClassDecl>(dd->getDeclContext());

lib/Sema/CodeSynthesisDistributedActor.cpp

@@ -45,6 +45,7 @@ using namespace swift;
 ///
 /// factory function in the AST, with an empty body. Its body is
 /// expected to be filled-in during SILGen.
+// TODO(distributed): move this synthesis to DerivedConformance style
 static void addFactoryResolveFunction(ClassDecl *decl) {
   assert(decl->isDistributedActor());
   auto &C = decl->getASTContext();
@@ -127,6 +128,7 @@ createStoredProperty(ClassDecl *classDecl, ASTContext &ctx,
 /// Adds the following, fairly special, properties to each distributed actor:
 /// - actorTransport
 /// - id
+// TODO(distributed): move this synthesis to DerivedConformance style
 static void addImplicitDistributedActorStoredProperties(ClassDecl *decl) {
   assert(decl->isDistributedActor());