Move getSelfForInitDelegationInConstructor to ASTContext

Author: CodaFi

include/swift/AST/ASTContext.h

@@ -917,6 +917,13 @@ class ASTContext final {
   /// array literals exist.
   bool requireArrayLiteralIntrinsics(SourceLoc loc);
 
+public:
+  /// If an expression references 'self.init' or 'super.init' in an
+  /// initializer context, returns the implicit 'self' decl of the constructor.
+  /// Otherwise, return nil.
+  VarDecl *getSelfForInitDelegationInConstructor(DeclContext *DC,
+                                                 UnresolvedDotExpr *ctorRef);
+
 private:
   friend Decl;
   Optional<RawComment> getRawComment(const Decl *D);

lib/AST/ASTContext.cpp

@@ -4646,6 +4646,30 @@ bool ASTContext::requireArrayLiteralIntrinsics(SourceLoc loc) {
   return true;
 }
 
+/// If an expression references 'self.init' or 'super.init' in an
+/// initializer context, returns the implicit 'self' decl of the constructor.
+/// Otherwise, return nil.
+VarDecl *
+ASTContext::getSelfForInitDelegationInConstructor(DeclContext *DC,
+                                                  UnresolvedDotExpr *ctorRef) {
+  // If the reference isn't to a constructor, we're done.
+  if (ctorRef->getName().getBaseName() != DeclBaseName::createConstructor())
+    return nullptr;
+
+  if (auto ctorContext
+        = dyn_cast_or_null<ConstructorDecl>(DC->getInnermostMethodContext())) {
+    auto nestedArg = ctorRef->getBase();
+    if (auto inout = dyn_cast<InOutExpr>(nestedArg))
+      nestedArg = inout->getSubExpr();
+    if (nestedArg->isSuperExpr())
+      return ctorContext->getImplicitSelfDecl();
+    if (auto declRef = dyn_cast<DeclRefExpr>(nestedArg))
+      if (declRef->getDecl()->getFullName() == Id_self)
+        return ctorContext->getImplicitSelfDecl();
+  }
+  return nullptr;
+}
+
 VarDecl *VarDecl::getOriginalWrappedProperty(
     Optional<PropertyWrapperSynthesizedPropertyKind> kind) const {
   if (!Bits.VarDecl.IsPropertyWrapperBackingProperty)

lib/Sema/ConstraintSystem.cpp

@@ -482,7 +482,7 @@ ConstraintSystem::getCalleeLocator(ConstraintLocator *locator,
 
   if (auto *UDE = dyn_cast<UnresolvedDotExpr>(anchor)) {
     return getConstraintLocator(
-        anchor, TC.getSelfForInitDelegationInConstructor(DC, UDE)
+        anchor, getASTContext().getSelfForInitDelegationInConstructor(DC, UDE)
                   ? ConstraintLocator::ConstructorMember
                   : ConstraintLocator::Member);
   }

lib/Sema/TypeCheckConstraints.cpp

@@ -802,30 +802,6 @@ Expr *TypeChecker::resolveDeclRefExpr(UnresolvedDeclRefExpr *UDRE,
   return new (Context) ErrorExpr(UDRE->getSourceRange());
 }
 
-/// If an expression references 'self.init' or 'super.init' in an
-/// initializer context, returns the implicit 'self' decl of the constructor.
-/// Otherwise, return nil.
-VarDecl *
-TypeChecker::getSelfForInitDelegationInConstructor(DeclContext *DC,
-                                                   UnresolvedDotExpr *ctorRef) {
-  // If the reference isn't to a constructor, we're done.
-  if (ctorRef->getName().getBaseName() != DeclBaseName::createConstructor())
-    return nullptr;
-
-  if (auto ctorContext
-        = dyn_cast_or_null<ConstructorDecl>(DC->getInnermostMethodContext())) {
-    auto nestedArg = ctorRef->getBase();
-    if (auto inout = dyn_cast<InOutExpr>(nestedArg))
-      nestedArg = inout->getSubExpr();
-    if (nestedArg->isSuperExpr())
-      return ctorContext->getImplicitSelfDecl();
-    if (auto declRef = dyn_cast<DeclRefExpr>(nestedArg))
-      if (declRef->getDecl()->getFullName() == Context.Id_self)
-        return ctorContext->getImplicitSelfDecl();
-  }
-  return nullptr;
-}
-
 namespace {
   /// Update the function reference kind based on adding a direct call to a
   /// callee with this kind.
@@ -1236,9 +1212,10 @@ namespace {
       // determine where to place the RebindSelfInConstructorExpr node.
       // When updating this logic, also update
       // RebindSelfInConstructorExpr::getCalledConstructor.
+      auto &ctx = getASTContext();
       if (auto unresolvedDot = dyn_cast<UnresolvedDotExpr>(expr)) {
         if (auto self
-              = TC.getSelfForInitDelegationInConstructor(DC, unresolvedDot)) {
+              = ctx.getSelfForInitDelegationInConstructor(DC, unresolvedDot)) {
           // Walk our ancestor expressions looking for the appropriate place
           // to insert the RebindSelfInConstructorExpr.
           Expr *target = nullptr;
@@ -1295,7 +1272,7 @@ namespace {
       // RebindSelfInConstructorExpr, wrap it in the
       // RebindSelfInConstructorExpr.
       if (expr == UnresolvedCtorRebindTarget) {
-        expr = new (getASTContext())
+        expr = new (ctx)
             RebindSelfInConstructorExpr(expr, UnresolvedCtorSelf);
         UnresolvedCtorRebindTarget = nullptr;
         return expr;

lib/Sema/TypeChecker.h

@@ -1840,12 +1840,6 @@ class TypeChecker final {
     return DiagnosedExprs[E];
   }
 
-  /// If an expression references 'self.init' or 'super.init' in an
-  /// initializer context, returns the implicit 'self' decl of the constructor.
-  /// Otherwise, return nil.
-  VarDecl *getSelfForInitDelegationInConstructor(DeclContext *DC,
-                                                 UnresolvedDotExpr *ctorRef);
-
   /// Diagnose assigning variable to itself.
   bool diagnoseSelfAssignment(const Expr *E);