Merge pull request #30679 from CodaFi/repetez-repartee

Author: swift-ci

include/swift/AST/Decl.h

@@ -2436,6 +2436,7 @@ class ValueDecl : public Decl {
   friend class IsDynamicRequest;
   friend class IsImplicitlyUnwrappedOptionalRequest;
   friend class InterfaceTypeRequest;
+  friend class CheckRedeclarationRequest;
   friend class Decl;
   SourceLoc getLocFromSource() const { return NameLoc; }
 protected:
@@ -2457,24 +2458,24 @@ class ValueDecl : public Decl {
     Bits.ValueDecl.AlreadyInLookupTable = value;
   }
 
-public:
-  /// Return true if this protocol member is a protocol requirement.
-  ///
-  /// Asserts if this is not a member of a protocol.
-  bool isProtocolRequirement() const;
-
   /// Determine whether we have already checked whether this
   /// declaration is a redeclaration.
-  bool alreadyCheckedRedeclaration() const { 
+  bool alreadyCheckedRedeclaration() const {
     return Bits.ValueDecl.CheckedRedeclaration;
   }
 
   /// Set whether we have already checked this declaration as a
   /// redeclaration.
-  void setCheckedRedeclaration(bool checked) {
-    Bits.ValueDecl.CheckedRedeclaration = checked;
+  void setCheckedRedeclaration() {
+    Bits.ValueDecl.CheckedRedeclaration = true;
   }
 
+public:
+  /// Return true if this protocol member is a protocol requirement.
+  ///
+  /// Asserts if this is not a member of a protocol.
+  bool isProtocolRequirement() const;
+
   void setUserAccessible(bool Accessible) {
     Bits.ValueDecl.IsUserAccessible = Accessible;
   }

include/swift/AST/TypeCheckRequests.h

@@ -2209,6 +2209,27 @@ class LookupAllConformancesInContextRequest :
   evaluate(Evaluator &evaluator, const DeclContext *DC) const;
 };
 
+class CheckRedeclarationRequest :
+    public SimpleRequest<CheckRedeclarationRequest,
+                         evaluator::SideEffect (ValueDecl *),
+                         CacheKind::SeparatelyCached> {
+public:
+  using SimpleRequest::SimpleRequest;
+
+ private:
+  friend SimpleRequest;
+
+   // Evaluation.
+  evaluator::SideEffect
+  evaluate(Evaluator &evaluator, ValueDecl *VD) const;
+
+ public:
+  // Separate caching.
+  bool isCached() const { return true; }
+  Optional<evaluator::SideEffect> getCachedResult() const;
+  void cacheResult(evaluator::SideEffect) const;
+};
+
 // Allow AnyValue to compare two Type values, even though Type doesn't
 // support ==.
 template<>

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -29,6 +29,9 @@ SWIFT_REQUEST(TypeChecker, AttachedPropertyWrappersRequest,
               NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, CallerSideDefaultArgExprRequest,
               Expr *(DefaultArgumentExpr *), SeparatelyCached, NoLocationInfo)
+SWIFT_REQUEST(TypeChecker, CheckRedeclarationRequest,
+              evaluator::SideEffect(ValueDecl *),
+              Uncached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, ClassAncestryFlagsRequest,
               AncestryFlags(ClassDecl *), Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, CompareDeclSpecializationRequest,

lib/AST/TypeCheckRequests.cpp

@@ -1264,6 +1264,21 @@ void DifferentiableAttributeTypeCheckRequest::cacheResult(
   attr->ParameterIndicesAndBit.setPointerAndInt(parameterIndices, true);
 }
 
+//----------------------------------------------------------------------------//
+// CheckRedeclarationRequest computation.
+//----------------------------------------------------------------------------//
+
+Optional<evaluator::SideEffect>
+CheckRedeclarationRequest::getCachedResult() const {
+  if (!std::get<0>(getStorage())->alreadyCheckedRedeclaration())
+    return None;
+  return std::make_tuple<>();
+}
+
+void CheckRedeclarationRequest::cacheResult(evaluator::SideEffect) const {
+  std::get<0>(getStorage())->setCheckedRedeclaration();
+}
+
 //----------------------------------------------------------------------------//
 // TypeCheckSourceFileRequest computation.
 //----------------------------------------------------------------------------//

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -479,24 +479,18 @@ static void checkRedeclaration(PrecedenceGroupDecl *group) {
 }
 
 /// Check whether \c current is a redeclaration.
-static void checkRedeclaration(ASTContext &ctx, ValueDecl *current) {
-  // If we've already checked this declaration, don't do it again.
-  if (current->alreadyCheckedRedeclaration())
-    return;
-
-  // Make sure we don't do this checking again.
-  current->setCheckedRedeclaration(true);
-
+evaluator::SideEffect
+CheckRedeclarationRequest::evaluate(Evaluator &eval, ValueDecl *current) const {
   // Ignore invalid and anonymous declarations.
   if (current->isInvalid() || !current->hasName())
-    return;
+    return std::make_tuple<>();
 
   // If this declaration isn't from a source file, don't check it.
   // FIXME: Should restrict this to the source file we care about.
   DeclContext *currentDC = current->getDeclContext();
   SourceFile *currentFile = currentDC->getParentSourceFile();
   if (!currentFile || currentDC->isLocalContext())
-    return;
+    return std::make_tuple<>();
 
   ReferencedNameTracker *tracker = currentFile->getReferencedNameTracker();
   bool isCascading = (current->getFormalAccess() > AccessLevel::FilePrivate);
@@ -525,6 +519,7 @@ static void checkRedeclaration(ASTContext &ctx, ValueDecl *current) {
   OverloadSignature currentSig = current->getOverloadSignature();
   CanType currentSigType = current->getOverloadSignatureType();
   ModuleDecl *currentModule = current->getModuleContext();
+  auto &ctx = current->getASTContext();
   for (auto other : otherDefinitions) {
     // Skip invalid declarations and ourselves.
     //
@@ -726,10 +721,11 @@ static void checkRedeclaration(ASTContext &ctx, ValueDecl *current) {
       // set this at the beginning of the function, but we might have swapped
       // the decls for diagnostics; so ensure we also set this for the actual
       // decl we diagnosed on.
-      current->setCheckedRedeclaration(true);
+      current->setCheckedRedeclaration();
       break;
     }
   }
+  return std::make_tuple<>();
 }
 
 static Optional<unsigned>
@@ -1250,11 +1246,13 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
     if (auto VD = dyn_cast<ValueDecl>(decl)) {
       auto &Context = getASTContext();
       TypeChecker::checkForForbiddenPrefix(Context, VD->getBaseName());
-      
-      checkRedeclaration(Context, VD);
 
       // Force some requests, which can produce diagnostics.
 
+      // Check redeclaration.
+      (void) evaluateOrDefault(decl->getASTContext().evaluator,
+                               CheckRedeclarationRequest{VD}, {});
+
       // Compute access level.
       (void) VD->getFormalAccess();