FrontendTool: parse all delayed member decls when we're dumping parse tree or verifying parse diagnostics.

Author: nkcsgexi

include/swift/AST/LazyResolver.h

@@ -104,6 +104,9 @@ class LazyMemberParser {
 
   /// Return whether the iterable decl context needs parsing.
   virtual bool hasUnparsedMembers(const IterableDeclContext *IDC) = 0;
+
+  /// Parse all delayed decl list members.
+  virtual void parseAllDelayedDeclLists() = 0;
 };
 
 /// Context data for generic contexts.

include/swift/Frontend/Frontend.h

@@ -552,7 +552,8 @@ class CompilerInstance {
 
   /// Parses the input file but does no type-checking or module imports.
   /// Note that this only supports parsing an invocation with a single file.
-  void performParseOnly(bool EvaluateConditionals = false);
+  void performParseOnly(bool EvaluateConditionals = false,
+                        bool ParseDelayedBodyOnEnd = false);
 
   /// Parses and performs name binding on all input files.
   ///

include/swift/Parse/PersistentParserState.h

@@ -178,6 +178,8 @@ class PersistentParserState: public LazyMemberParser {
     return DelayedDeclListStates.find(IDC) != DelayedDeclListStates.end();
   }
 
+  void parseAllDelayedDeclLists() override;
+
   TopLevelContext &getTopLevelContext() {
     return TopLevelCode;
   }

lib/Frontend/Frontend.cpp

@@ -925,7 +925,8 @@ SourceFile *CompilerInstance::createSourceFileForMainModule(
   return inputFile;
 }
 
-void CompilerInstance::performParseOnly(bool EvaluateConditionals) {
+void CompilerInstance::performParseOnly(bool EvaluateConditionals,
+                                        bool ParseDelayedBodyOnEnd) {
   const InputFileKind Kind = Invocation.getInputKind();
   ModuleDecl *const MainModule = getMainModule();
   Context->LoadedModules[MainModule->getName()] = MainModule;
@@ -947,6 +948,10 @@ void CompilerInstance::performParseOnly(bool EvaluateConditionals) {
   }
 
   PersistentParserState PersistentState(getASTContext());
+  SWIFT_DEFER {
+    if (ParseDelayedBodyOnEnd)
+      PersistentState.parseAllDelayedDeclLists();
+  };
   PersistentState.PerformConditionEvaluation = EvaluateConditionals;
   // Parse all the library files.
   for (auto BufferID : InputSourceCodeBufferIDs) {

lib/FrontendTool/FrontendTool.cpp

@@ -902,8 +902,12 @@ static bool performCompile(CompilerInstance &Instance,
     return compileLLVMIR(Invocation, Instance, Stats);
 
   if (FrontendOptions::shouldActionOnlyParse(Action)) {
+    bool ParseDelayedDeclListsOnEnd =
+      Action == FrontendOptions::ActionType::DumpParse ||
+      Invocation.getDiagnosticOptions().VerifyMode != DiagnosticOptions::NoVerify;
     Instance.performParseOnly(/*EvaluateConditionals*/
-                    Action == FrontendOptions::ActionType::EmitImportedModules);
+                    Action == FrontendOptions::ActionType::EmitImportedModules,
+                              ParseDelayedDeclListsOnEnd);
   } else if (Action == FrontendOptions::ActionType::ResolveImports) {
     Instance.performParseAndResolveImportsOnly();
   } else {

lib/Parse/PersistentParserState.cpp

@@ -81,6 +81,16 @@ void PersistentParserState::delayDeclList(IterableDeclContext* D,
     ParentContext, BodyRange, PreviousLoc, ScopeInfo.saveCurrentScope());
 }
 
+void PersistentParserState::parseAllDelayedDeclLists() {
+  std::vector<IterableDeclContext*> AllDelayed;
+  for (auto &P: DelayedDeclListStates) {
+    AllDelayed.push_back(P.first);
+  }
+  for (auto *D: AllDelayed) {
+    parseMembers(D);
+  }
+}
+
 void PersistentParserState::delayTopLevel(TopLevelCodeDecl *TLCD,
                                           SourceRange BodyRange,
                                           SourceLoc PreviousLoc) {