[ASTGen] Update swift_parse_test_main for ParseSourceFileRequest change

Author: rintaro

lib/DriverTool/swift_parse_test_main.cpp

@@ -18,7 +18,6 @@
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/LangOptions.h"
 #include "swift/Bridging/ASTGen.h"
-#include "swift/Parse/Parser.h"
 #include "swift/Subsystems.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Error.h"
@@ -86,6 +85,9 @@ struct LibParseExecutor {
     std::unique_ptr<ASTContext> ctx(ASTContext::get(
         langOpts, typeckOpts, silOpts, searchPathOpts, clangOpts, symbolOpts,
         casOpts, serializationOpts, SM, diagEngine));
+    auto &eval = ctx->evaluator;
+    registerParseRequestFunctions(eval);
+    registerTypeCheckerRequestFunctions(eval);
 
     SourceFile::ParsingOptions parseOpts;
     parseOpts |= SourceFile::ParsingFlags::DisablePoundIfEvaluation;
@@ -96,13 +98,9 @@ struct LibParseExecutor {
     SourceFile *SF =
         new (*ctx) SourceFile(*M, SourceFileKind::Library, bufferID, parseOpts);
 
-    Parser parser(bufferID, *SF, /*SILParserState=*/nullptr);
-    SmallVector<ASTNode> items;
-    parser.parseTopLevelItems(items);
+    auto items = evaluateOrDefault(eval, ParseSourceFileRequest{SF}, {}).TopLevelItems;
 
     if (opts.contains(ExecuteOptionFlag::Dump)) {
-      registerParseRequestFunctions(ctx->evaluator);
-      registerTypeCheckerRequestFunctions(ctx->evaluator);
       for (auto &item : items) {
         item.dump(llvm::outs());
       }
@@ -163,8 +161,9 @@ struct ASTGenExecutor {
     std::unique_ptr<ASTContext> ctx(ASTContext::get(
         langOpts, typeckOpts, silOpts, searchPathOpts, clangOpts, symbolOpts,
         casOpts, serializationOpts, SM, diagEngine));
-    registerParseRequestFunctions(ctx->evaluator);
-    registerTypeCheckerRequestFunctions(ctx->evaluator);
+    auto &eval = ctx->evaluator;
+    registerParseRequestFunctions(eval);
+    registerTypeCheckerRequestFunctions(eval);
 
     SourceFile::ParsingOptions parseOpts;
     parseOpts |= SourceFile::ParsingFlags::DisablePoundIfEvaluation;
@@ -175,9 +174,7 @@ struct ASTGenExecutor {
     SourceFile *SF =
         new (*ctx) SourceFile(*M, SourceFileKind::Library, bufferID, parseOpts);
 
-    Parser P(bufferID, *SF, nullptr);
-    SmallVector<ASTNode> items;
-    P.parseTopLevelItems(items);
+    auto items = evaluateOrDefault(eval, ParseSourceFileRequest{SF}, {}).TopLevelItems;
 
     if (opts.contains(ExecuteOptionFlag::Dump)) {
       for (auto &item : items) {