Merge pull request swiftlang#60990 from DougGregor/swift-swift-parser-validation

Author: DougGregor

include/swift/Basic/Features.def

@@ -130,6 +130,10 @@ EXPERIMENTAL_FEATURE(TypeWrappers)
 /// Whether to perform round-trip testing of the Swift Swift parser.
 EXPERIMENTAL_FEATURE(ParserRoundTrip)
 
+/// Whether to perform validation of the parse tree produced by the Swift
+/// Swift parser.
+EXPERIMENTAL_FEATURE(ParserValidation)
+
 #undef EXPERIMENTAL_FEATURE
 #undef UPCOMING_FEATURE
 #undef SUPPRESSIBLE_LANGUAGE_FEATURE

lib/AST/ASTPrinter.cpp

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

lib/Parse/ParseRequests.cpp

@@ -194,10 +194,18 @@ SourceFileParsingResult ParseSourceFileRequest::evaluate(Evaluator &evaluator,
     tokensRef = ctx.AllocateCopy(*tokens);
 
 #ifdef SWIFT_SWIFT_PARSER
-  if (ctx.LangOpts.hasFeature(Feature::ParserRoundTrip) &&
+  if ((ctx.LangOpts.hasFeature(Feature::ParserRoundTrip) ||
+       ctx.LangOpts.hasFeature(Feature::ParserValidation)) &&
       ctx.SourceMgr.getCodeCompletionBufferID() != bufferID) {
     auto bufferRange = ctx.SourceMgr.getRangeForBuffer(*bufferID);
-    unsigned int flags = SPCC_RoundTrip;
+    unsigned int flags = 0;
+
+    if (ctx.LangOpts.hasFeature(Feature::ParserRoundTrip))
+      flags |= SPCC_RoundTrip;
+
+    if (!ctx.Diags.hadAnyError() &&
+        ctx.LangOpts.hasFeature(Feature::ParserValidation))
+      flags |= SPCC_ParseDiagnostics;
 
     int roundTripResult =
       swift_parser_consistencyCheck(