ASTVerifier: avoid verifying IterableDeclContext if it has unparsed members.

Author: nkcsgexi

include/swift/AST/ASTContext.h

@@ -791,6 +791,10 @@ class ASTContext final {
   /// \param IDC The context whose member decls should be lazily parsed.
   void parseMembers(IterableDeclContext *IDC);
 
+  /// Use the lazy parsers associated with the context to check whether the decl
+  /// context has been parsed.
+  bool hasUnparsedMembers(const IterableDeclContext *IDC) const;
+
   /// Get the lazy function data for the given generic context.
   ///
   /// \param lazyLoader If non-null, the lazy loader to use when creating the

include/swift/AST/LazyResolver.h

@@ -101,6 +101,9 @@ class LazyMemberParser {
   ///
   /// The implementation should add the members to IDC.
   virtual void parseMembers(IterableDeclContext *IDC) = 0;
+
+  /// Return whether the iterable decl context needs parsing.
+  virtual bool hasUnparsedMembers(const IterableDeclContext *IDC) = 0;
 };
 
 /// Context data for generic contexts.

include/swift/Parse/PersistentParserState.h

@@ -174,7 +174,7 @@ class PersistentParserState: public LazyMemberParser {
   std::unique_ptr<DelayedDeclListState>
     takeDelayedDeclListState(IterableDeclContext *IDC);
 
-  bool hasDelayedDeclList(IterableDeclContext *IDC) {
+  bool hasUnparsedMembers(const IterableDeclContext *IDC) override {
     return DelayedDeclListStates.find(IDC) != DelayedDeclListStates.end();
   }
 

lib/AST/ASTContext.cpp

@@ -1903,9 +1903,16 @@ LazyContextData *ASTContext::getOrCreateLazyContextData(
   return contextData;
 }
 
+bool ASTContext::hasUnparsedMembers(const IterableDeclContext *IDC) const {
+  auto parsers = getImpl().lazyParsers;
+  return std::any_of(parsers.begin(), parsers.end(),
+    [IDC](LazyMemberParser *p) { return p->hasUnparsedMembers(IDC); });
+}
+
 void ASTContext::parseMembers(IterableDeclContext *IDC) {
   for (auto *p: getImpl().lazyParsers) {
-    p->parseMembers(IDC);
+    if (p->hasUnparsedMembers(IDC))
+      p->parseMembers(IDC);
   }
 }
 

lib/AST/ASTVerifier.cpp

@@ -709,6 +709,8 @@ class Verifier : public ASTWalker {
       pushScope(fn);                                            \
       if (fn->hasLazyMembers())                                 \
         return false;                                           \
+      if (fn->getASTContext().hasUnparsedMembers(fn))           \
+        return false;                                           \
       return shouldVerify(cast<ASTNodeBase<NODE*>::BaseTy>(fn));\
     }                                                           \
     void cleanup(NODE *fn) {                                    \

lib/Parse/ParseDecl.cpp

@@ -181,8 +181,6 @@ namespace {
 } // end anonymous namespace
 
 void PersistentParserState::parseMembers(IterableDeclContext *IDC) {
-  if (!hasDelayedDeclList(IDC))
-    return;
   SourceFile &SF = *IDC->getDecl()->getDeclContext()->getParentSourceFile();
   assert(!SF.hasInterfaceHash() &&
     "Cannot delay parsing if we care about the interface hash.");