Merge pull request #42025 from ktoso/wip-mini-cleanups

swift-ci · web-flow · commit 5acea84313ae · 2022-03-25T07:59:57.000-07:00
[Distributed] Review followups, cleanups
diff --git a/all.txt b/all.txt
diff --git a/include/swift/AST/Decl.h b/include/swift/AST/Decl.h
@@ -3506,11 +3506,6 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
   /// Find the 'RemoteCallArgument(label:name:value:)' initializer function.
   ConstructorDecl* getDistributedRemoteCallArgumentInitFunction() const;
 
-  /// Find the
-  /// 'DistributedActorSystem.invokeHandlerOnReturn(handler:value:metatype:)
-  /// function.
-  FuncDecl *getDistributedActorSystemInvokeHandlerOnReturnFunction() const;
-
   /// Collect the set of protocols to which this type should implicitly
   /// conform, such as AnyObject (for classes).
   void getImplicitProtocols(SmallVectorImpl<ProtocolDecl *> &protocols);
diff --git a/include/swift/AST/TypeCheckRequests.h b/include/swift/AST/TypeCheckRequests.h
@@ -1269,25 +1269,6 @@ class GetDistributedThunkRequest :
   bool isCached() const { return true; }
 };
 
-/// Synthesize and return the 'invokeHandlerOnReturn' method for a concrete
-/// actor system.
-class GetDistributedActorSystemInvokeHandlerOnReturnRequest
-    : public SimpleRequest<
-          GetDistributedActorSystemInvokeHandlerOnReturnRequest,
-          FuncDecl *(NominalTypeDecl *), RequestFlags::Cached> {
-public:
-  using SimpleRequest::SimpleRequest;
-
-private:
-  friend SimpleRequest;
-
-  FuncDecl *evaluate(Evaluator &evaluator, NominalTypeDecl *system) const;
-
-public:
-  // Caching
-  bool isCached() const { return true; }
-};
-
 /// Obtain the 'id' property of a 'distributed actor'.
 class GetDistributedActorIDPropertyRequest :
     public SimpleRequest<GetDistributedActorIDPropertyRequest,
diff --git a/include/swift/AST/TypeCheckerTypeIDZone.def b/include/swift/AST/TypeCheckerTypeIDZone.def
@@ -148,9 +148,6 @@ SWIFT_REQUEST(TypeChecker, GetDistributedRemoteCallTargetInitFunctionRequest,
 SWIFT_REQUEST(TypeChecker, GetDistributedRemoteCallArgumentInitFunctionRequest,
               ConstructorDecl *(NominalTypeDecl *),
               Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, GetDistributedActorSystemInvokeHandlerOnReturnRequest,
-              FuncDecl *(NominalTypeDecl *),
-              Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, GetDistributedActorInvocationDecoderRequest,
               NominalTypeDecl *(NominalTypeDecl *),
               Cached, NoLocationInfo)
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
@@ -2625,11 +2625,11 @@ class PrintExpr : public ExprVisitor<PrintExpr> {
     printCommon(E, name) << ' ';
     if (auto checkedCast = dyn_cast<CheckedCastExpr>(E))
       OS << getCheckedCastKindName(checkedCast->getCastKind()) << ' ';
-        OS << "writtenType='";
-        if (GetTypeOfTypeRepr)
-          GetTypeOfTypeRepr(E->getCastTypeRepr()).print(OS);
-        else
-          E->getCastType().print(OS);
+    OS << "writtenType='";
+    if (GetTypeOfTypeRepr)
+      GetTypeOfTypeRepr(E->getCastTypeRepr()).print(OS);
+    else
+      E->getCastType().print(OS);
     OS << "'\n";
     printRec(E->getSubExpr());
     PrintWithColorRAII(OS, ParenthesisColor) << ')';
diff --git a/lib/AST/DistributedDecl.cpp b/lib/AST/DistributedDecl.cpp
@@ -1236,16 +1236,6 @@ NominalTypeDecl::getDistributedRemoteCallArgumentInitFunction() const {
       nullptr);
 }
 
-FuncDecl *
-NominalTypeDecl::getDistributedActorSystemInvokeHandlerOnReturnFunction()
-    const {
-  auto mutableThis = const_cast<NominalTypeDecl *>(this);
-  return evaluateOrDefault(
-      getASTContext().evaluator,
-      GetDistributedActorSystemInvokeHandlerOnReturnRequest(mutableThis),
-      nullptr);
-}
-
 AbstractFunctionDecl *ASTContext::getRemoteCallOnDistributedActorSystem(
     NominalTypeDecl *actorOrSystem, bool isVoidReturn) const {
   assert(actorOrSystem && "distributed actor (or system) decl must be provided");
diff --git a/lib/SILGen/InitializeDistActorIdentity.h b/lib/SILGen/InitializeDistActorIdentity.h
@@ -14,8 +14,6 @@
 
 namespace swift {
 
-class AllocStackInst;
-
 namespace Lowering {
 
 /// A clean-up designed to emit an initialization of a distributed actor's
diff --git a/lib/SILGen/SILGenDistributed.cpp b/lib/SILGen/SILGenDistributed.cpp
@@ -330,7 +330,7 @@ void SILGenFunction::emitDistributedActorReady(
 
   // --- load the actor system from the actor instance
   ManagedValue actorSystem;
-  SGFContext sgfCxt; // TODO: is this right?
+  SGFContext sgfCxt;
   {
     VarDecl *property = lookupProperty(classDecl, C.Id_actorSystem);
     Type formalType = F.mapTypeIntoContext(property->getInterfaceType());
diff --git a/lib/SILGen/SILGenFunction.h b/lib/SILGen/SILGenFunction.h
@@ -2086,8 +2086,6 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
                                  SILValue selfVal,
                                  SILValue actorSystemVal);
 
-  void registerDistActorIdentityInit();
-
   /// Given a function representing a distributed actor factory, emits the
   /// corresponding SIL function for it.
   void emitDistributedActorFactory(
diff --git a/lib/Sema/CodeSynthesisDistributedActor.cpp b/lib/Sema/CodeSynthesisDistributedActor.cpp
@@ -786,18 +786,6 @@ VarDecl *GetDistributedActorSystemPropertyRequest::evaluate(
   return nullptr;
 }
 
-FuncDecl *GetDistributedActorSystemInvokeHandlerOnReturnRequest::evaluate(
-    Evaluator &evaluator, NominalTypeDecl *system) const {
-  auto &C = system->getASTContext();
-
-  // not via `ensureDistributedModuleLoaded` to avoid generating a warning,
-  // we won't be emitting the offending decl after all.
-  if (!C.getLoadedModule(C.Id_Distributed))
-    return nullptr;
-
-  return nullptr; // FIXME
-}
-
 NormalProtocolConformance *GetDistributedActorImplicitCodableRequest::evaluate(
     Evaluator &evaluator, NominalTypeDecl *nominal,
     KnownProtocolKind protoKind) const {
diff --git a/lib/Sema/DerivedConformanceDistributedActor.cpp b/lib/Sema/DerivedConformanceDistributedActor.cpp
@@ -56,25 +56,18 @@ static FuncDecl *deriveDistributedActor_resolve(DerivedConformance &derived) {
   assert(decl->isDistributedActor());
   auto &C = decl->getASTContext();
 
-  auto mkParam = [&](Identifier argName, Identifier paramName, Type ty) -> ParamDecl* {
-    auto *param = new (C) ParamDecl(SourceLoc(),
-                                    SourceLoc(), argName,
-                                    SourceLoc(), paramName, decl);
-    param->setImplicit();
-    param->setSpecifier(ParamSpecifier::Default);
-    param->setInterfaceType(ty);
-    return param;
-  };
-
   auto idType = getDistributedActorIDType(decl);
   auto actorSystemType = getDistributedActorSystemType(decl);
 
   // (id: Self.ID, using system: Self.ActorSystem)
   auto *params = ParameterList::create(
       C,
       /*LParenLoc=*/SourceLoc(),
-      /*params=*/{ mkParam(C.Id_id, C.Id_id, idType),
-                   mkParam(C.Id_using, C.Id_system, actorSystemType)
+      /*params=*/{
+          ParamDecl::createImplicit(
+              C, C.Id_id, C.Id_id, idType, decl),
+          ParamDecl::createImplicit(
+              C, C.Id_using, C.Id_system, actorSystemType, decl)
       },
       /*RParenLoc=*/SourceLoc()
   );
@@ -364,16 +357,6 @@ static FuncDecl *deriveDistributedActorSystem_invokeHandlerOnReturn(
   auto system = derived.Nominal;
   auto &C = system->getASTContext();
 
-  auto mkParam = [&](Identifier argName, Identifier paramName,
-                     Type ty) -> ParamDecl * {
-    auto *param = new (C) ParamDecl(SourceLoc(), SourceLoc(), argName,
-                                    SourceLoc(), paramName, system);
-    param->setImplicit();
-    param->setSpecifier(ParamSpecifier::Default);
-    param->setInterfaceType(ty);
-    return param;
-  };
-
   // auto serializationRequirementType = getDistributedActorSystemType(decl);
   auto resultHandlerType = getDistributedActorSystemResultHandlerType(system);
   auto unsafeRawPointerType = C.getUnsafeRawPointerType();
@@ -390,10 +373,17 @@ static FuncDecl *deriveDistributedActorSystem_invokeHandlerOnReturn(
       C,
       /*LParenLoc=*/SourceLoc(),
       /*params=*/
-      {mkParam(C.Id_handler, C.Id_handler,
-               system->mapTypeIntoContext(resultHandlerType)),
-       mkParam(C.Id_resultBuffer, C.Id_resultBuffer, unsafeRawPointerType),
-       mkParam(C.Id_metatype, C.Id_metatype, anyTypeType)},
+      {
+          ParamDecl::createImplicit(
+              C, C.Id_handler, C.Id_handler,
+              system->mapTypeIntoContext(resultHandlerType), system),
+          ParamDecl::createImplicit(
+              C, C.Id_resultBuffer, C.Id_resultBuffer,
+              unsafeRawPointerType, system),
+          ParamDecl::createImplicit(
+              C, C.Id_metatype, C.Id_metatype,
+              anyTypeType, system)
+      },
       /*RParenLoc=*/SourceLoc());
 
   // Func name: invokeHandlerOnReturn(handler:resultBuffer:metatype)

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ void SILGenFunction::emitDistributedActorReady(`
`330`	`330`
`331`	`331`	`// --- load the actor system from the actor instance`
`332`	`332`	`ManagedValue actorSystem;`
`333`		`- SGFContext sgfCxt; // TODO: is this right?`
	`333`	`+ SGFContext sgfCxt;`
`334`	`334`	`{`
`335`	`335`	`VarDecl *property = lookupProperty(classDecl, C.Id_actorSystem);`
`336`	`336`	`Type formalType = F.mapTypeIntoContext(property->getInterfaceType());`