Move #if evaluation flag out of PersistentParserState

Move this flag onto the parser instead. Now the
only client of PersistentParserState is code
completion.

Author: hamishknight

include/swift/Parse/Parser.h

@@ -223,6 +223,13 @@ class Parser {
   /// lazily parsed and type checked.
   bool DelayBodyParsing;
 
+  /// Whether to evaluate the conditions of #if decls, meaning that the bodies
+  /// of any active clauses are hoisted such that they become sibling nodes with
+  /// the #if decl.
+  // FIXME: When condition evaluation moves to a later phase, remove this bit
+  // and adjust the client call 'performParseOnly'.
+  bool EvaluateConditionals;
+
   /// The receiver to collect all consumed tokens.
   ConsumeTokenReceiver *TokReceiver;
 
@@ -401,16 +408,16 @@ class Parser {
          SILParserTUStateBase *SIL,
          PersistentParserState *PersistentState,
          std::shared_ptr<SyntaxParseActions> SPActions = nullptr,
-         bool DelayBodyParsing = true);
+         bool DelayBodyParsing = true, bool EvaluateConditionals = true);
   Parser(unsigned BufferID, SourceFile &SF, SILParserTUStateBase *SIL,
          PersistentParserState *PersistentState = nullptr,
          std::shared_ptr<SyntaxParseActions> SPActions = nullptr,
-         bool DelayBodyParsing = true);
+         bool DelayBodyParsing = true, bool EvaluateConditionals = true);
   Parser(std::unique_ptr<Lexer> Lex, SourceFile &SF,
          SILParserTUStateBase *SIL = nullptr,
          PersistentParserState *PersistentState = nullptr,
          std::shared_ptr<SyntaxParseActions> SPActions = nullptr,
-         bool DelayBodyParsing = true);
+         bool DelayBodyParsing = true, bool EvaluateConditionals = true);
   ~Parser();
 
   /// Returns true if the buffer being parsed is allowed to contain SIL.

include/swift/Parse/PersistentParserState.h

@@ -19,7 +19,6 @@
 
 #include "swift/Basic/SourceLoc.h"
 #include "swift/Parse/LocalContext.h"
-#include "swift/Parse/ParserPosition.h"
 #include "swift/Parse/Scope.h"
 #include "llvm/ADT/DenseMap.h"
 
@@ -58,11 +57,6 @@ class CodeCompletionDelayedDeclState {
 
 /// Parser state persistent across multiple parses.
 class PersistentParserState {
-public:
-  // FIXME: When condition evaluation moves to a later phase, remove this bit
-  // and adjust the client call 'performParseOnly'.
-  bool PerformConditionEvaluation = true;
-private:
   swift::ScopeInfo ScopeInfo;
 
   std::unique_ptr<CodeCompletionDelayedDeclState> CodeCompletionDelayedDeclStat;

include/swift/Subsystems.h

@@ -117,7 +117,8 @@ namespace swift {
   /// delayed.
   void parseIntoSourceFile(SourceFile &SF, unsigned BufferID,
                            PersistentParserState *PersistentState = nullptr,
-                           bool DelayBodyParsing = true);
+                           bool DelayBodyParsing = true,
+                           bool EvaluateConditionals = true);
 
   /// Parse a source file's SIL declarations into a given SIL module.
   void parseSourceFileSIL(SourceFile &SF, SILParserState *sil);

lib/Frontend/Frontend.cpp

@@ -1122,7 +1122,6 @@ void CompilerInstance::performParseOnly(bool EvaluateConditionals,
   }
 
   PersistentState = std::make_unique<PersistentParserState>();
-  PersistentState->PerformConditionEvaluation = EvaluateConditionals;
 
   auto shouldDelayBodies = [&](unsigned bufferID) -> bool {
     if (!CanDelayBodies)
@@ -1142,7 +1141,7 @@ void CompilerInstance::performParseOnly(bool EvaluateConditionals,
         BufferID);
 
     parseIntoSourceFile(*NextInput, BufferID, PersistentState.get(),
-                        shouldDelayBodies(BufferID));
+                        shouldDelayBodies(BufferID), EvaluateConditionals);
   }
 
   // Now parse the main file.
@@ -1153,7 +1152,7 @@ void CompilerInstance::performParseOnly(bool EvaluateConditionals,
     assert(MainBufferID == MainFile.getBufferID());
 
     parseIntoSourceFile(MainFile, MainBufferID, PersistentState.get(),
-                        shouldDelayBodies(MainBufferID));
+                        shouldDelayBodies(MainBufferID), EvaluateConditionals);
   }
 
   assert(Context->LoadedModules.size() == 1 &&

lib/Parse/ParseIfConfig.cpp

@@ -609,7 +609,7 @@ ParserResult<IfConfigDecl> Parser::parseIfConfig(
 
   bool shouldEvaluate =
       // Don't evaluate if it's in '-parse' mode, etc.
-      State->PerformConditionEvaluation &&
+      EvaluateConditionals &&
       // If it's in inactive #if ... #endif block, there's no point to do it.
       !getScopeInfo().isInactiveConfigBlock();
 

lib/Parse/Parser.cpp

@@ -366,15 +366,15 @@ static LexerMode sourceFileKindToLexerMode(SourceFileKind kind) {
 Parser::Parser(unsigned BufferID, SourceFile &SF, SILParserTUStateBase *SIL,
                PersistentParserState *PersistentState,
                std::shared_ptr<SyntaxParseActions> SPActions,
-               bool DelayBodyParsing)
+               bool DelayBodyParsing, bool EvaluateConditionals)
     : Parser(BufferID, SF, &SF.getASTContext().Diags, SIL, PersistentState,
-             std::move(SPActions), DelayBodyParsing) {}
+             std::move(SPActions), DelayBodyParsing, EvaluateConditionals) {}
 
 Parser::Parser(unsigned BufferID, SourceFile &SF, DiagnosticEngine* LexerDiags,
                SILParserTUStateBase *SIL,
                PersistentParserState *PersistentState,
                std::shared_ptr<SyntaxParseActions> SPActions,
-               bool DelayBodyParsing)
+               bool DelayBodyParsing, bool EvaluateConditionals)
     : Parser(
           std::unique_ptr<Lexer>(new Lexer(
               SF.getASTContext().LangOpts, SF.getASTContext().SourceMgr,
@@ -389,7 +389,8 @@ Parser::Parser(unsigned BufferID, SourceFile &SF, DiagnosticEngine* LexerDiags,
               SF.shouldBuildSyntaxTree()
                   ? TriviaRetentionMode::WithTrivia
                   : TriviaRetentionMode::WithoutTrivia)),
-          SF, SIL, PersistentState, std::move(SPActions), DelayBodyParsing) {}
+          SF, SIL, PersistentState, std::move(SPActions), DelayBodyParsing,
+          EvaluateConditionals) {}
 
 namespace {
 
@@ -510,7 +511,7 @@ Parser::Parser(std::unique_ptr<Lexer> Lex, SourceFile &SF,
                SILParserTUStateBase *SIL,
                PersistentParserState *PersistentState,
                std::shared_ptr<SyntaxParseActions> SPActions,
-               bool DelayBodyParsing)
+               bool DelayBodyParsing, bool EvaluateConditionals)
   : SourceMgr(SF.getASTContext().SourceMgr),
     Diags(SF.getASTContext().Diags),
     SF(SF),
@@ -520,6 +521,7 @@ Parser::Parser(std::unique_ptr<Lexer> Lex, SourceFile &SF,
     Context(SF.getASTContext()),
     CurrentTokenHash(SF.getInterfaceHashPtr()),
     DelayBodyParsing(DelayBodyParsing),
+    EvaluateConditionals(EvaluateConditionals),
     TokReceiver(SF.shouldCollectToken() ?
                 new TokenRecorder(SF, L->getBufferID()) :
                 new ConsumeTokenReceiver()),

lib/ParseSIL/ParseSIL.cpp

@@ -115,7 +115,8 @@ void PrettyStackTraceParser::print(llvm::raw_ostream &out) const {
 
 void swift::parseIntoSourceFile(SourceFile &SF, unsigned int BufferID,
                                 PersistentParserState *PersistentState,
-                                bool DelayBodyParsing) {
+                                bool DelayBodyParsing,
+                                bool EvaluateConditionals) {
   std::shared_ptr<SyntaxTreeCreator> STreeCreator;
   if (SF.shouldBuildSyntaxTree()) {
     STreeCreator = std::make_shared<SyntaxTreeCreator>(
@@ -136,7 +137,7 @@ void swift::parseIntoSourceFile(SourceFile &SF, unsigned int BufferID,
   FrontendStatsTracer tracer(SF.getASTContext().Stats,
                              "Parsing");
   Parser P(BufferID, SF, /*SIL*/ nullptr, PersistentState, STreeCreator,
-           DelayBodyParsing);
+           DelayBodyParsing, EvaluateConditionals);
   PrettyStackTraceParser StackTrace(P);
 
   llvm::SaveAndRestore<NullablePtr<llvm::MD5>> S(P.CurrentTokenHash,

tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp

@@ -715,7 +715,7 @@ class SwiftDocumentSyntaxInfo {
     Parser->getDiagnosticEngine().addConsumer(DiagConsumer);
 
     // Collecting syntactic information shouldn't evaluate # conditions.
-    Parser->getParser().State->PerformConditionEvaluation = false;
+    Parser->getParser().EvaluateConditionals = false;
 
     // If there is a syntax parsing cache, incremental syntax parsing is
     // performed and thus the generated AST may not be up-to-date.

tools/libSwiftSyntaxParser/libSwiftSyntaxParser.cpp

@@ -290,7 +290,7 @@ swiftparse_client_node_t SynParser::parse(const char *source) {
                 "syntax_parse_module", std::move(parseActions),
                 /*SyntaxCache=*/nullptr);
   // Evaluating pound conditions may lead to unknown syntax.
-  PU.getParser().State->PerformConditionEvaluation = false;
+  PU.getParser().EvaluateConditionals = false;
   std::unique_ptr<SynParserDiagConsumer> pConsumer;
   if (DiagHandler) {
     pConsumer = std::make_unique<SynParserDiagConsumer>(*this, bufID);

tools/swift-ide-test/swift-ide-test.cpp

@@ -1124,7 +1124,7 @@ static int doSyntaxColoring(const CompilerInvocation &InitInvok,
     registerTypeCheckerRequestFunctions(Parser.getParser().Context.evaluator);
 
     // Collecting syntactic information shouldn't evaluate # conditions.
-    Parser.getParser().State->PerformConditionEvaluation = false;
+    Parser.getParser().EvaluateConditionals = false;
     Parser.getDiagnosticEngine().addConsumer(PrintDiags);
 
     (void)Parser.parse();
@@ -1361,7 +1361,7 @@ static int doStructureAnnotation(const CompilerInvocation &InitInvok,
       Parser.getParser().Context.evaluator);
 
   // Collecting syntactic information shouldn't evaluate # conditions.
-  Parser.getParser().State->PerformConditionEvaluation = false;
+  Parser.getParser().EvaluateConditionals = false;
 
   // Display diagnostics to stderr.
   PrintingDiagnosticConsumer PrintDiags;