Remove -emit-syntax and -verify-syntax-tree

CodaFi · CodaFi · commit 37e7052c6859 · 2022-11-16T15:07:48.000-08:00
diff --git a/include/swift/Basic/LangOptions.h b/include/swift/Basic/LangOptions.h
@@ -420,19 +420,6 @@ namespace swift {
     /// Whether collect tokens during parsing for syntax coloring.
     bool CollectParsedToken = false;
 
-    /// Whether to parse syntax tree. If the syntax tree is built, the generated
-    /// AST may not be correct when syntax nodes are reused as part of
-    /// incrementals parsing.
-    bool BuildSyntaxTree = false;
-
-    /// Whether parsing is occurring for creation of syntax tree only, and no typechecking will occur after
-    /// parsing e.g. when parsing for SwiftSyntax. This is intended to affect parsing, e.g. disable
-    /// unnecessary name lookups that are not useful for pure syntactic parsing.
-    bool ParseForSyntaxTreeOnly = false;
-
-    /// Whether to verify the parsed syntax tree and emit related diagnostics.
-    bool VerifySyntaxTree = false;
-
     /// Whether to disable the evaluation of '#if' decls, such that the bodies
     /// of active clauses aren't hoisted into the enclosing scope.
     bool DisablePoundIfEvaluation = false;
diff --git a/include/swift/Frontend/FrontendOptions.h b/include/swift/Frontend/FrontendOptions.h
@@ -126,7 +126,6 @@ class FrontendOptions {
     Typecheck,         ///< Parse and type-check only
     DumpParse,         ///< Parse only and dump AST
     DumpInterfaceHash, ///< Parse and dump the interface token hash.
-    EmitSyntax,        ///< Parse and dump Syntax tree as JSON
     DumpAST,           ///< Parse, type-check, and dump AST
     PrintAST,          ///< Parse, type-check, and pretty-print AST
     PrintASTDecl,      ///< Parse, type-check, and pretty-print AST declarations
diff --git a/include/swift/Option/FrontendOptions.td b/include/swift/Option/FrontendOptions.td
@@ -119,9 +119,6 @@ def verify_generic_signatures : Separate<["-"], "verify-generic-signatures">,
   MetaVarName<"<module-name>">,
   HelpText<"Verify the generic signatures in the given module">;
 
-def verify_syntax_tree : Flag<["-"], "verify-syntax-tree">,
-  HelpText<"Verify that no unknown nodes exist in the libSyntax tree">;
-
 def show_diagnostics_after_fatal : Flag<["-"], "show-diagnostics-after-fatal">,
   HelpText<"Keep emitting subsequent diagnostics after a fatal error">;
   
@@ -835,9 +832,6 @@ def emit_sorted_sil : Flag<["-"], "emit-sorted-sil">,
   HelpText<"When printing SIL, print out all sil entities sorted by name to "
            "ease diffing">;
 
-def emit_syntax : Flag<["-"], "emit-syntax">,
-  HelpText<"Parse input file(s) and emit the Syntax tree(s) as JSON">, ModeOpt;
-
 def cxx_interop_getters_setters_as_properties :
   Flag<["-"], "cxx-interop-getters-setters-as-properties">,
   HelpText<"Import getters and setters as computed properties in Swift">,
diff --git a/lib/AST/RawComment.cpp b/lib/AST/RawComment.cpp
@@ -83,7 +83,7 @@ static RawComment toRawComment(ASTContext &Context, CharSourceRange Range) {
   LangOptions FakeLangOpts;
   Lexer L(FakeLangOpts, SM, BufferID, nullptr, LexerMode::Swift,
           HashbangMode::Disallowed, CommentRetentionMode::ReturnAsTokens,
-          TriviaRetentionMode::WithoutTrivia, Offset, EndOffset);
+          Offset, EndOffset);
 
   SmallVector<SingleRawComment, 16> Comments;
   Token Tok;
diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
@@ -1602,7 +1602,6 @@ void Driver::buildOutputInfo(const ToolChain &TC, const DerivedArgList &Args,
     case options::OPT_resolve_imports:
     case options::OPT_typecheck:
     case options::OPT_dump_parse:
-    case options::OPT_emit_syntax:
     case options::OPT_print_ast:
     case options::OPT_dump_type_refinement_contexts:
     case options::OPT_dump_scope_maps:
diff --git a/lib/Frontend/ArgsToFrontendOptionsConverter.cpp b/lib/Frontend/ArgsToFrontendOptionsConverter.cpp
@@ -488,8 +488,6 @@ ArgsToFrontendOptionsConverter::determineRequestedAction(const ArgList &args) {
     return FrontendOptions::ActionType::DumpParse;
   if (Opt.matches(OPT_dump_ast))
     return FrontendOptions::ActionType::DumpAST;
-  if (Opt.matches(OPT_emit_syntax))
-    return FrontendOptions::ActionType::EmitSyntax;
   if (Opt.matches(OPT_merge_modules))
     return FrontendOptions::ActionType::MergeModules;
   if (Opt.matches(OPT_dump_scope_maps))
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -572,11 +572,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
 
   Opts.NamedLazyMemberLoading &= !Args.hasArg(OPT_disable_named_lazy_member_loading);
 
-  if (Args.hasArg(OPT_verify_syntax_tree)) {
-    Opts.BuildSyntaxTree = true;
-    Opts.VerifySyntaxTree = true;
-  }
-
   if (Args.hasArg(OPT_emit_fine_grained_dependency_sourcefile_dot_files))
     Opts.EmitFineGrainedDependencySourcefileDotFiles = true;
 
@@ -985,11 +980,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
     Opts.entryPointFunctionName = A->getValue();
   }
 
-  if (FrontendOpts.RequestedAction == FrontendOptions::ActionType::EmitSyntax) {
-    Opts.BuildSyntaxTree = true;
-    Opts.VerifySyntaxTree = true;
-  }
-
   // Configure lexing to parse and remember comments if:
   //   - Emitting a swiftdoc/swiftsourceinfo
   //   - Performing index-while-building
diff --git a/lib/Frontend/FrontendOptions.cpp b/lib/Frontend/FrontendOptions.cpp
@@ -36,7 +36,6 @@ bool FrontendOptions::needsProperModuleName(ActionType action) {
   case ActionType::Typecheck:
   case ActionType::DumpParse:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::DumpInterfaceHash:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
@@ -77,7 +76,6 @@ bool FrontendOptions::shouldActionOnlyParse(ActionType action) {
   switch (action) {
   case ActionType::Parse:
   case ActionType::DumpParse:
-  case ActionType::EmitSyntax:
   case ActionType::DumpInterfaceHash:
   case ActionType::EmitImportedModules:
   case ActionType::ScanDependencies:
@@ -94,7 +92,6 @@ bool FrontendOptions::doesActionRequireSwiftStandardLibrary(ActionType action) {
   case ActionType::NoneAction:
   case ActionType::Parse:
   case ActionType::DumpParse:
-  case ActionType::EmitSyntax:
   case ActionType::DumpInterfaceHash:
   case ActionType::EmitImportedModules:
   case ActionType::ScanDependencies:
@@ -143,7 +140,6 @@ bool FrontendOptions::doesActionRequireInputs(ActionType action) {
   case ActionType::REPL:
   case ActionType::Parse:
   case ActionType::DumpParse:
-  case ActionType::EmitSyntax:
   case ActionType::DumpInterfaceHash:
   case ActionType::EmitImportedModules:
   case ActionType::ScanDependencies:
@@ -189,7 +185,6 @@ bool FrontendOptions::doesActionPerformEndOfPipelineActions(ActionType action) {
   case ActionType::REPL:
   case ActionType::Parse:
   case ActionType::DumpParse:
-  case ActionType::EmitSyntax:
   case ActionType::DumpInterfaceHash:
   case ActionType::EmitImportedModules:
   case ActionType::ScanDependencies:
@@ -256,7 +251,6 @@ FrontendOptions::formatForPrincipalOutputFileForAction(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::DumpScopeMaps:
@@ -325,7 +319,6 @@ bool FrontendOptions::canActionEmitDependencies(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::DumpScopeMaps:
@@ -369,7 +362,6 @@ bool FrontendOptions::canActionEmitReferenceDependencies(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::DumpScopeMaps:
@@ -412,7 +404,6 @@ bool FrontendOptions::canActionEmitModuleSummary(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::EmitImportedModules:
@@ -455,7 +446,6 @@ bool FrontendOptions::canActionEmitClangHeader(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::EmitPCH:
@@ -497,7 +487,6 @@ bool FrontendOptions::canActionEmitLoadedModuleTrace(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::DumpScopeMaps:
@@ -546,7 +535,6 @@ bool FrontendOptions::canActionEmitModuleSemanticInfo(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::EmitPCH:
@@ -590,7 +578,6 @@ bool FrontendOptions::canActionEmitConstValues(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::DumpScopeMaps:
@@ -633,7 +620,6 @@ bool FrontendOptions::canActionEmitModule(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::EmitPCH:
@@ -679,7 +665,6 @@ bool FrontendOptions::canActionEmitInterface(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::EmitImportedModules:
@@ -721,7 +706,6 @@ bool FrontendOptions::doesActionProduceOutput(ActionType action) {
   case ActionType::Typecheck:
   case ActionType::DumpParse:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::DumpInterfaceHash:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
@@ -781,7 +765,6 @@ bool FrontendOptions::doesActionProduceTextualOutput(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::DumpScopeMaps:
@@ -810,7 +793,6 @@ bool FrontendOptions::doesActionGenerateSIL(ActionType action) {
   case ActionType::Typecheck:
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
-  case ActionType::EmitSyntax:
   case ActionType::DumpAST:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
@@ -852,7 +834,6 @@ bool FrontendOptions::doesActionGenerateIR(ActionType action) {
   case ActionType::DumpParse:
   case ActionType::DumpInterfaceHash:
   case ActionType::DumpAST:
-  case ActionType::EmitSyntax:
   case ActionType::PrintAST:
   case ActionType::PrintASTDecl:
   case ActionType::DumpScopeMaps:
diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
@@ -68,8 +68,6 @@
 #include "swift/Serialization/SerializedModuleLoader.h"
 #include "swift/Subsystems.h"
 #include "swift/SymbolGraphGen/SymbolGraphOptions.h"
-#include "swift/Syntax/Serialization/SyntaxSerialization.h"
-#include "swift/Syntax/SyntaxNodes.h"
 
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringMap.h"
@@ -139,18 +137,6 @@ getFileOutputStream(StringRef OutputFilename, ASTContext &Ctx) {
   return os;
 }
 
-/// Writes the Syntax tree to the given file
-static bool emitSyntax(const SourceFile &SF, StringRef OutputFilename) {
-  auto os = getFileOutputStream(OutputFilename, SF.getASTContext());
-  if (!os) return true;
-
-  json::Output jsonOut(*os, /*UserInfo=*/{}, /*PrettyPrint=*/false);
-  auto Root = SF.getSyntaxRoot().getRaw();
-  jsonOut << *Root;
-  *os << "\n";
-  return false;
-}
-
 /// Writes SIL out to the given file.
 static bool writeSIL(SILModule &SM, ModuleDecl *M, const SILOptions &Opts,
                      StringRef OutputFilename) {
@@ -1344,9 +1330,6 @@ static bool performAction(CompilerInstance &Instance,
   case FrontendOptions::ActionType::DumpInterfaceHash:
     getPrimaryOrMainSourceFile(Instance).dumpInterfaceHash(llvm::errs());
     return Context.hadError();
-  case FrontendOptions::ActionType::EmitSyntax:
-    return emitSyntax(getPrimaryOrMainSourceFile(Instance),
-                      opts.InputsAndOutputs.getSingleOutputFilename());
   case FrontendOptions::ActionType::EmitImportedModules:
     return emitImportedModules(Instance.getMainModule(), opts);
 
diff --git a/lib/Parse/Lexer.cpp b/lib/Parse/Lexer.cpp
@@ -21,7 +21,6 @@
 #include "swift/Basic/SourceManager.h"
 #include "swift/Parse/Confusables.h"
 #include "swift/Parse/RegexParserBridging.h"
-#include "swift/Syntax/Trivia.h"
 #include "llvm/ADT/SmallString.h"
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/ADT/Twine.h"
diff --git a/stdlib/public/CMakeLists.txt b/stdlib/public/CMakeLists.txt
@@ -15,8 +15,6 @@ if(SWIFT_RUNTIME_USE_SANITIZERS)
   endif()
 endif()
 
-list(APPEND  SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS "-Xfrontend" "-verify-syntax-tree")
-
 if(SWIFT_STDLIB_SIL_DEBUGGING)
   list(APPEND SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS "-Xfrontend" "-sil-based-debuginfo")
 endif()
diff --git a/test/Concurrency/Runtime/reasync.swift b/test/Concurrency/Runtime/reasync.swift
@@ -1,5 +1,5 @@
 // RUN: %empty-directory(%t)
-// RUN: %target-swift-frontend -emit-module-path %t/reasync.swiftmodule %S/Inputs/reasync.swift -enable-experimental-concurrency -disable-availability-checking -verify-syntax-tree
+// RUN: %target-swift-frontend -emit-module-path %t/reasync.swiftmodule %S/Inputs/reasync.swift -enable-experimental-concurrency -disable-availability-checking
 // RUN: %target-build-swift %s -I %t -o %t/main -module-name main
 // RUN: %target-codesign %t/main
 // RUN: %target-run %t/main
diff --git a/test/Frontend/emit-syntax.swift b/test/Frontend/emit-syntax.swift
diff --git a/test/Parse/alwaysEmitConformanceMetadata_attr.swift b/test/Parse/alwaysEmitConformanceMetadata_attr.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -parse -parse-stdlib -verify-syntax-tree
+// RUN: %target-typecheck-verify-swift -parse -parse-stdlib
 
 import Swift
 
diff --git a/test/Parse/async-syntax.swift b/test/Parse/async-syntax.swift
@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift  -disable-availability-checking -verify-syntax-tree
+// RUN: %target-typecheck-verify-swift -disable-availability-checking
 
 // REQUIRES: concurrency
 
diff --git a/test/Parse/noimplicitcopy_attr.swift b/test/Parse/noimplicitcopy_attr.swift
@@ -1,4 +1,4 @@
-f// RUN: %target-typecheck-verify-swift -parse -parse-stdlib -disable-availability-checking -verify-syntax-tree
+f// RUN: %target-typecheck-verify-swift -parse -parse-stdlib -disable-availability-checking
 
 import Swift
 
diff --git a/test/SILGen/noimplicitcopy_attr_arg_generic_users_banned.swift b/test/SILGen/noimplicitcopy_attr_arg_generic_users_banned.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-sil -enable-experimental-move-only -parse-stdlib -disable-availability-checking -verify-syntax-tree -verify %s
+// RUN: %target-swift-emit-sil -enable-experimental-move-only -parse-stdlib -disable-availability-checking -verify %s
 
 import Swift
 
diff --git a/test/Sema/alwaysEmitConformanceMetadata_attr.swift b/test/Sema/alwaysEmitConformanceMetadata_attr.swift
diff --git a/test/Sema/moveonly_decl_attr.swift b/test/Sema/moveonly_decl_attr.swift
diff --git a/test/Sema/moveonly_type_attr.swift b/test/Sema/moveonly_type_attr.swift
diff --git a/test/Sema/noimplicitcopy_attr.swift b/test/Sema/noimplicitcopy_attr.swift
diff --git a/test/Sema/noimplicitcopy_attr_check_behind_flag.swift b/test/Sema/noimplicitcopy_attr_check_behind_flag.swift
diff --git a/test/expr/unary/async_await.swift b/test/expr/unary/async_await.swift
diff --git a/unittests/Parse/LexerTests.cpp b/unittests/Parse/LexerTests.cpp
