Merge pull request #1307 from hamishknight/pipeline-parse

Author: hamishknight

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -1224,10 +1224,9 @@ static llvm::Expected<ParsedExpression> ParseAndImport(
 
   // Create the source file. Note, we disable delayed parsing for the
   // swift expression parser.
-  swift::SourceFile *source_file = new (*ast_context) swift::SourceFile(
-      module, source_file_kind, buffer_id, /*Keep tokens*/ false,
-      /*KeepSyntaxTree*/ false,
-      swift::SourceFile::ParsingFlags::DisableDelayedBodies);
+  swift::SourceFile *source_file = new (*ast_context)
+      swift::SourceFile(module, source_file_kind, buffer_id,
+                        swift::SourceFile::ParsingFlags::DisableDelayedBodies);
   module.addFile(*source_file);
 
   // Swift Modules that rely on shared libraries (not frameworks)

lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp

@@ -571,9 +571,8 @@ void SwiftREPL::CompleteCode(const std::string &current_code,
       repl_module = swift_ast->CreateModule(completion_module_info, error,
                                             importInfo);
       llvm::Optional<unsigned> bufferID;
-      swift::SourceFile *repl_source_file = new (*ast)
-          swift::SourceFile(*repl_module, swift::SourceFileKind::Main, bufferID,
-                            /*Keep tokens*/false);
+      swift::SourceFile *repl_source_file = new (*ast) swift::SourceFile(
+          *repl_module, swift::SourceFileKind::Main, bufferID);
       repl_module->addFile(*repl_source_file);
       swift::performImportResolution(*repl_source_file);
       m_completion_module_initialized = true;