Merge pull request #61179 from DougGregor/swift-compiler-support-new-header

Author: DougGregor

include/swift/Basic/Features.def

@@ -134,6 +134,10 @@ EXPERIMENTAL_FEATURE(ParserRoundTrip)
 /// Swift parser.
 EXPERIMENTAL_FEATURE(ParserValidation)
 
+/// Whether to fold sequence expressions in the syntax tree produced by the
+/// Swift Swift parser.
+EXPERIMENTAL_FEATURE(ParserSequenceFolding)
+
 #undef EXPERIMENTAL_FEATURE
 #undef UPCOMING_FEATURE
 #undef SUPPRESSIBLE_LANGUAGE_FEATURE

lib/AST/ASTPrinter.cpp

@@ -2945,6 +2945,10 @@ static bool usesFeatureParserValidation(Decl *decl) {
   return false;
 }
 
+static bool usesFeatureParserSequenceFolding(Decl *decl) {
+  return false;
+}
+
 static void suppressingFeatureSpecializeAttributeWithAvailability(
                                         PrintOptions &options,
                                         llvm::function_ref<void()> action) {

lib/Parse/CMakeLists.txt

@@ -57,7 +57,7 @@ if (SWIFT_SWIFT_PARSER)
 
   target_include_directories(swiftParse
     PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}/../../../swift-syntax/Sources/SwiftParser
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../swift-syntax/Sources/SwiftCompilerSupport
   )
 
   target_compile_definitions(swiftParse

lib/Parse/ParseRequests.cpp

@@ -27,7 +27,7 @@
 #include "swift/SyntaxParse/SyntaxTreeCreator.h"
 
 #ifdef SWIFT_SWIFT_PARSER
-#include "SwiftParserCompilerSupport.h"
+#include "SwiftCompilerSupport.h"
 #endif
 
 using namespace swift;
@@ -202,11 +202,14 @@ SourceFileParsingResult ParseSourceFileRequest::evaluate(Evaluator &evaluator,
     unsigned int flags = 0;
 
     if (ctx.LangOpts.hasFeature(Feature::ParserRoundTrip))
-      flags |= SPCC_RoundTrip;
+      flags |= SCC_RoundTrip;
 
     if (!ctx.Diags.hadAnyError() &&
         ctx.LangOpts.hasFeature(Feature::ParserValidation))
-      flags |= SPCC_ParseDiagnostics;
+      flags |= SCC_ParseDiagnostics;
+
+    if (ctx.LangOpts.hasFeature(Feature::ParserSequenceFolding))
+      flags |= SCC_FoldSequences;
 
     int roundTripResult =
       swift_parser_consistencyCheck(